X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=4fe50cc2e11ee71a00dcd53bd843460cf68a5973;hb=ab3724ba43c8d86d5c0bc3c777ff0f5aab44dc33;hp=33a7c200dbb3fc95d57e1b731c4e2397a2cbcd61;hpb=0eff156c7816507fa1865b76e948574dd320fae0;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 33a7c200..4fe50cc2 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/configfile.c
- * Copyright (C) 2005-2010  Florian octo Forster
+ * Copyright (C) 2005-2011  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,7 +17,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * Authors:
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
  *   Sebastian tokkee Harl <sh at tokkee.org>
  **/
 
@@ -1058,21 +1058,90 @@ int cf_util_get_flag (const oconfig_item_t *ci, /* {{{ */
 	return (0);
 } /* }}} int cf_util_get_flag */
 
-/* Assures that the config option is a string. The string is then converted to
- * a port number using `service_name_to_port_number' and returned. Returns the
- * port number in the range [1-65535] or less than zero upon failure. */
+/* Assures that the config option is a string or a number if the correct range
+ * of 1-65535. The string is then converted to a port number using
+ * `service_name_to_port_number' and returned.
+ * Returns the port number in the range [1-65535] or less than zero upon
+ * failure. */
 int cf_util_get_port_number (const oconfig_item_t *ci) /* {{{ */
 {
-	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
+	int tmp;
+
+	if ((ci->values_num != 1)
+			|| ((ci->values[0].type != OCONFIG_TYPE_STRING)
+				&& (ci->values[0].type != OCONFIG_TYPE_NUMBER)))
 	{
-		ERROR ("cf_util_get_port_number: The %s option requires "
+		ERROR ("cf_util_get_port_number: The \"%s\" option requires "
 				"exactly one string argument.", ci->key);
 		return (-1);
 	}
 
-	return (service_name_to_port_number (ci->values[0].value.string));
+	if (ci->values[0].type == OCONFIG_TYPE_STRING)
+		return (service_name_to_port_number (ci->values[0].value.string));
+
+	assert (ci->values[0].type == OCONFIG_TYPE_NUMBER);
+	tmp = (int) (ci->values[0].value.number + 0.5);
+	if ((tmp < 1) || (tmp > 65535))
+	{
+		ERROR ("cf_util_get_port_number: The \"%s\" option requires "
+				"a service name or a port number. The number "
+				"you specified, %i, is not in the valid "
+				"range of 1-65535.",
+				ci->key, tmp);
+		return (-1);
+	}
+
+	return (tmp);
 } /* }}} int cf_util_get_port_number */
 
+int cf_util_get_service (const oconfig_item_t *ci, char **ret_string) /* {{{ */
+{
+	int port;
+	char *service;
+	int status;
+
+	if (ci->values_num != 1)
+	{
+		ERROR ("cf_util_get_service: The %s option requires exactly "
+				"one argument.", ci->key);
+		return (-1);
+	}
+
+	if (ci->values[0].type == OCONFIG_TYPE_STRING)
+		return (cf_util_get_string (ci, ret_string));
+	if (ci->values[0].type != OCONFIG_TYPE_NUMBER)
+	{
+		ERROR ("cf_util_get_service: The %s option requires "
+				"exactly one string or numeric argument.",
+				ci->key);
+	}
+
+	port = 0;
+	status = cf_util_get_int (ci, &port);
+	if (status != 0)
+		return (status);
+	else if ((port < 1) || (port > 65535))
+	{
+		ERROR ("cf_util_get_service: The port number given "
+				"for the %s option is out of "
+				"range (%i).", ci->key, port);
+		return (-1);
+	}
+
+	service = malloc (6);
+	if (service == NULL)
+	{
+		ERROR ("cf_util_get_service: Out of memory.");
+		return (-1);
+	}
+	ssnprintf (service, 6, "%i", port);
+
+	sfree (*ret_string);
+	*ret_string = service;
+
+	return (0);
+} /* }}} int cf_util_get_service */
+
 int cf_util_get_cdtime (const oconfig_item_t *ci, cdtime_t *ret_value) /* {{{ */
 {
 	if ((ci == NULL) || (ret_value == NULL))