X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fipvs.c;h=ab76f1eb8638d2517dd1e56ddb981148d17ed556;hb=aff80830f1154a5b6c4da16a0b1033aafde14e24;hp=68a3d7f3bf9d46a9f47c17492a6acd926458cfbc;hpb=917abf10c462903cd3bb37faadba68f91f5ca8b1;p=collectd.git

diff --git a/src/ipvs.c b/src/ipvs.c
index 68a3d7f3..ab76f1eb 100644
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -191,7 +191,7 @@ static int get_pi (struct ip_vs_service_entry *se, char *pi, size_t size)
 
 	/* inet_ntoa() returns a pointer to a statically allocated buffer
 	 * I hope non-glibc systems behave the same */
-	len = snprintf (pi, size, "%s_%s%u", inet_ntoa (addr),
+	len = ssnprintf (pi, size, "%s_%s%u", inet_ntoa (addr),
 			(se->protocol == IPPROTO_TCP) ? "TCP" : "UDP",
 			ntohs (se->port));
 
@@ -215,7 +215,7 @@ static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size)
 
 	/* inet_ntoa() returns a pointer to a statically allocated buffer
 	 * I hope non-glibc systems behave the same */
-	len = snprintf (ti, size, "%s_%u", inet_ntoa (addr),
+	len = ssnprintf (ti, size, "%s_%u", inet_ntoa (addr),
 			ntohs (de->port));
 
 	if ((0 > len) || (size <= len)) {
@@ -225,49 +225,47 @@ static int get_ti (struct ip_vs_dest_entry *de, char *ti, size_t size)
 	return 0;
 } /* get_ti */
 
-static void cipvs_submit_connections (char *pi, char *ti, counter_t value)
+static void cipvs_submit_connections (char *pi, char *ti, derive_t value)
 {
 	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].counter = value;
+	values[0].derive = value;
 
 	vl.values     = values;
 	vl.values_len = 1;
 
-	vl.time     = time (NULL);
-	vl.interval = interval_g;
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "ipvs", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, pi, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, "connections", sizeof (vl.type));
+	sstrncpy (vl.type_instance, (NULL != ti) ? ti : "total",
+		sizeof (vl.type_instance));
 
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "ipvs");
-	strcpy (vl.plugin_instance, pi);
-	strcpy (vl.type_instance, (NULL != ti) ? ti : "total");
-
-	plugin_dispatch_values ("connections", &vl);
+	plugin_dispatch_values (&vl);
 	return;
 } /* cipvs_submit_connections */
 
 static void cipvs_submit_if (char *pi, char *t, char *ti,
-		counter_t rx, counter_t tx)
+		derive_t rx, derive_t tx)
 {
 	value_t values[2];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].counter = rx;
-	values[1].counter = tx;
+	values[0].derive = rx;
+	values[1].derive = tx;
 
 	vl.values     = values;
 	vl.values_len = 2;
 
-	vl.time     = time (NULL);
-	vl.interval = interval_g;
-
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "ipvs");
-	strcpy (vl.plugin_instance, pi);
-	strcpy (vl.type_instance, (NULL != ti) ? ti : "total");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "ipvs", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, pi, sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, t, sizeof (vl.type));
+	sstrncpy (vl.type_instance, (NULL != ti) ? ti : "total",
+		sizeof (vl.type_instance));
 
-	plugin_dispatch_values (t, &vl);
+	plugin_dispatch_values (&vl);
 	return;
 } /* cipvs_submit_if */
 
@@ -276,7 +274,7 @@ static void cipvs_submit_dest (char *pi, struct ip_vs_dest_entry *de) {
 
 	char ti[DATA_MAX_NAME_LEN];
 
-	if (0 != get_ti (de, ti, DATA_MAX_NAME_LEN))
+	if (0 != get_ti (de, ti, sizeof (ti)))
 		return;
 
 	cipvs_submit_connections (pi, ti, stats.conns);
@@ -294,7 +292,7 @@ static void cipvs_submit_service (struct ip_vs_service_entry *se)
 
 	int i = 0;
 
-	if (0 != get_pi (se, pi, DATA_MAX_NAME_LEN))
+	if (0 != get_pi (se, pi, sizeof (pi)))
 		return;
 
 	cipvs_submit_connections (pi, NULL, stats.conns);