X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=c6a651dc56248050ccc0b7a50c7aca68e4f2c3f9;hb=902f7621661d97dac0c7bc83f39acbf76a3b947b;hp=d42453e444f1e5f484ef459a9c6d72b031e0a3a2;hpb=a2bf02b4f5bf4a22395b57bba6715dada3859612;p=collectd.git

diff --git a/src/common.c b/src/common.c
index d42453e4..c6a651dc 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/common.c
- * Copyright (C) 2005-2008  Florian octo Forster
+ * Copyright (C) 2005-2009  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
@@ -43,6 +43,15 @@
 # include <arpa/inet.h>
 #endif
 
+/* for getaddrinfo */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
 #ifdef HAVE_LIBKSTAT
 extern kstat_ctl_t *kc;
 #endif
@@ -837,28 +846,41 @@ int parse_identifier (char *str, char **ret_host,
 	return (0);
 } /* int parse_identifier */
 
-int parse_value (const char *value, value_t *ret_value, const data_source_t ds)
+int parse_value (const char *value, value_t *ret_value, int ds_type)
 {
-	char *endptr = NULL;
-
-	if (DS_TYPE_COUNTER == ds.type)
-		ret_value->counter = (counter_t)strtoll (value, &endptr, 0);
-	else if (DS_TYPE_GAUGE == ds.type)
-		ret_value->gauge = (gauge_t)strtod (value, &endptr);
-	else {
-		ERROR ("parse_value: Invalid data source \"%s\" "
-				"(type = %i).", ds.name, ds.type);
-		return -1;
-	}
-
-	if (value == endptr) {
-		ERROR ("parse_value: Failed to parse string as number: %s.", value);
-		return -1;
-	}
-	else if ((NULL != endptr) && ('\0' != *endptr))
-		WARNING ("parse_value: Ignoring trailing garbage after number: %s.",
-				endptr);
-	return 0;
+  char *endptr = NULL;
+
+  switch (ds_type)
+  {
+    case DS_TYPE_COUNTER:
+      ret_value->counter = (counter_t) strtoull (value, &endptr, 0);
+      break;
+
+    case DS_TYPE_GAUGE:
+      ret_value->gauge = (gauge_t) strtod (value, &endptr);
+      break;
+
+    case DS_TYPE_DERIVE:
+      ret_value->counter = (derive_t) strtoll (value, &endptr, 0);
+      break;
+
+    case DS_TYPE_ABSOLUTE:
+      ret_value->counter = (absolute_t) strtoull (value, &endptr, 0);
+      break;
+
+    default:
+      ERROR ("parse_value: Invalid data source type: %i.", ds_type);
+      return -1;
+  }
+
+  if (value == endptr) {
+    ERROR ("parse_value: Failed to parse string as number: %s.", value);
+    return -1;
+  }
+  else if ((NULL != endptr) && ('\0' != *endptr))
+    WARNING ("parse_value: Ignoring trailing garbage after number: %s.",
+        endptr);
+  return 0;
 } /* int parse_value */
 
 int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds)
@@ -876,7 +898,11 @@ int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds)
 		dummy = NULL;
 
 		if (i >= vl->values_len)
+		{
+			/* Make sure i is invalid. */
+			i = vl->values_len + 1;
 			break;
+		}
 
 		if (i == -1)
 		{
@@ -889,7 +915,7 @@ int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds)
 		{
 			if ((strcmp ("U", ptr) == 0) && (ds->ds[i].type == DS_TYPE_GAUGE))
 				vl->values[i].gauge = NAN;
-			else if (0 != parse_value (ptr, &vl->values[i], ds->ds[i]))
+			else if (0 != parse_value (ptr, &vl->values[i], ds->ds[i].type))
 				return -1;
 		}
 
@@ -1054,3 +1080,56 @@ counter_t counter_diff (counter_t old_value, counter_t new_value)
 
 	return (diff);
 } /* counter_t counter_to_gauge */
+
+int service_name_to_port_number (const char *service_name)
+{
+	struct addrinfo *ai_list;
+	struct addrinfo *ai_ptr;
+	struct addrinfo ai_hints;
+	int status;
+	int service_number;
+
+	if (service_name == NULL)
+		return (-1);
+
+	ai_list = NULL;
+	memset (&ai_hints, 0, sizeof (ai_hints));
+	ai_hints.ai_family = AF_UNSPEC;
+
+	status = getaddrinfo (/* node = */ NULL, service_name,
+			&ai_hints, &ai_list);
+	if (status != 0)
+	{
+		ERROR ("service_name_to_port_number: getaddrinfo failed: %s",
+				gai_strerror (status));
+		return (-1);
+	}
+
+	service_number = -1;
+	for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+	{
+		if (ai_ptr->ai_family == AF_INET)
+		{
+			struct sockaddr_in *sa;
+
+			sa = (void *) ai_ptr->ai_addr;
+			service_number = (int) ntohs (sa->sin_port);
+		}
+		else if (ai_ptr->ai_family == AF_INET6)
+		{
+			struct sockaddr_in6 *sa;
+
+			sa = (void *) ai_ptr->ai_addr;
+			service_number = (int) ntohs (sa->sin6_port);
+		}
+
+		if ((service_number > 0) && (service_number <= 65535))
+			break;
+	}
+
+	freeaddrinfo (ai_list);
+
+	if ((service_number > 0) && (service_number <= 65535))
+		return (service_number);
+	return (-1);
+} /* int service_name_to_port_number */