X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fntpd.c;h=64e1bce5e03db170accdf18f1a004f94c16652d4;hb=bc7992ed0693313a2b1fe282a5bf23f1cc9f8e42;hp=ff0a48dceeb6a42a4150937fed013c6b06279336;hpb=b42974a9e2d83e70c166cd572725a8d72bd2a1c4;p=collectd.git

diff --git a/src/ntpd.c b/src/ntpd.c
index ff0a48dc..64e1bce5 100644
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -68,7 +68,7 @@ static char  ntpd_port[16];
 #define MAXFILENAME 128
 #define MAXSEQ  127
 #define MODE_PRIVATE 7
-#define NTP_OLDVERSION ((u_char) 1) /* oldest credible version */
+#define NTP_OLDVERSION ((uint8_t) 1) /* oldest credible version */
 #define IMPL_XNTPD 3
 #define FP_FRAC 65536.0
 
@@ -117,27 +117,27 @@ struct resp_pkt
 
 #define	ISRESPONSE(rm_vn_mode)	(((rm_vn_mode)&RESP_BIT)!=0)
 #define	ISMORE(rm_vn_mode)	(((rm_vn_mode)&MORE_BIT)!=0)
-#define INFO_VERSION(rm_vn_mode) ((u_char)(((rm_vn_mode)>>3)&0x7))
+#define INFO_VERSION(rm_vn_mode) ((uint8_t)(((rm_vn_mode)>>3)&0x7))
 #define	INFO_MODE(rm_vn_mode)	((rm_vn_mode)&0x7)
 
 #define	RM_VN_MODE(resp, more, version)		\
-				((u_char)(((resp)?RESP_BIT:0)\
+				((uint8_t)(((resp)?RESP_BIT:0)\
 				|((more)?MORE_BIT:0)\
 				|((version?version:(NTP_OLDVERSION+1))<<3)\
 				|(MODE_PRIVATE)))
 
 #define	INFO_IS_AUTH(auth_seq)	(((auth_seq) & 0x80) != 0)
 #define	INFO_SEQ(auth_seq)	((auth_seq)&0x7f)
-#define	AUTH_SEQ(auth, seq)	((u_char)((((auth)!=0)?0x80:0)|((seq)&0x7f)))
+#define	AUTH_SEQ(auth, seq)	((uint8_t)((((auth)!=0)?0x80:0)|((seq)&0x7f)))
 
-#define	INFO_ERR(err_nitems)	((u_short)((ntohs(err_nitems)>>12)&0xf))
-#define	INFO_NITEMS(err_nitems)	((u_short)(ntohs(err_nitems)&0xfff))
-#define	ERR_NITEMS(err, nitems)	(htons((u_short)((((u_short)(err)<<12)&0xf000)\
-				|((u_short)(nitems)&0xfff))))
+#define	INFO_ERR(err_nitems)	((uint16_t)((ntohs(err_nitems)>>12)&0xf))
+#define	INFO_NITEMS(err_nitems)	((uint16_t)(ntohs(err_nitems)&0xfff))
+#define	ERR_NITEMS(err, nitems)	(htons((uint16_t)((((uint16_t)(err)<<12)&0xf000)\
+				|((uint16_t)(nitems)&0xfff))))
 
 #define	INFO_MBZ(mbz_itemsize)	((ntohs(mbz_itemsize)>>12)&0xf)
-#define	INFO_ITEMSIZE(mbz_itemsize)	((u_short)(ntohs(mbz_itemsize)&0xfff))
-#define	MBZ_ITEMSIZE(itemsize)	(htons((u_short)(itemsize)))
+#define	INFO_ITEMSIZE(mbz_itemsize)	((uint16_t)(ntohs(mbz_itemsize)&0xfff))
+#define	MBZ_ITEMSIZE(itemsize)	(htons((uint16_t)(itemsize)))
 
 /* negate a long float type */
 #define M_NEG(v_i, v_f) \
@@ -269,11 +269,10 @@ static int ntpd_config (const char *key, const char *value)
 	{
 		int port = (int) (atof (value));
 		if ((port > 0) && (port <= 65535))
-			snprintf (ntpd_port, sizeof (ntpd_port),
+			ssnprintf (ntpd_port, sizeof (ntpd_port),
 					"%i", port);
 		else
-			strncpy (ntpd_port, value, sizeof (ntpd_port));
-		ntpd_port[sizeof (ntpd_port) - 1] = '\0';
+			sstrncpy (ntpd_port, value, sizeof (ntpd_port));
 	}
 	else if (strcasecmp (key, "ReverseLookups") == 0)
 	{
@@ -301,38 +300,13 @@ static void ntpd_submit (char *type, char *type_inst, double value)
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "ntpd", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
-	strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
-}
-
-/* returns `tv0 - tv1' in milliseconds or 0 if `tv1 > tv0' */
-static int timeval_sub (const struct timeval *tv0, const struct timeval *tv1)
-{
-	int sec;
-	int usec;
-
-	if ((tv0->tv_sec < tv1->tv_sec)
-			|| ((tv0->tv_sec == tv1->tv_sec) && (tv0->tv_usec < tv1->tv_usec)))
-		return (0);
-
-	sec  = tv0->tv_sec  - tv1->tv_sec;
-	usec = tv0->tv_usec - tv1->tv_usec;
-
-	while (usec < 0)
-	{
-		usec += 1000000;
-		sec  -= 1;
-	}
-
-	if (sec < 0)
-		return (0);
-
-	return ((sec * 1000) + ((usec + 500) / 1000));
+	plugin_dispatch_values (&vl);
 }
 
 static int ntpd_connect (void)
@@ -459,6 +433,8 @@ static int ntpd_receive_response (int *res_items, int *res_size,
 	done = 0;
 	while (done == 0)
 	{
+		struct timeval time_left;
+
 		if (gettimeofday (&time_now, NULL) < 0)
 		{
 			char errbuf[1024];
@@ -467,8 +443,14 @@ static int ntpd_receive_response (int *res_items, int *res_size,
 			return (-1);
 		}
 
+		if (timeval_cmp (time_end, time_now, &time_left) <= 0)
+			timeout = 0;
+		else
+			timeout = 1000 * time_left.tv_sec
+				+ ((time_left.tv_usec + 500) / 1000);
+
 		/* timeout reached */
-		if ((timeout = timeval_sub (&time_end, &time_now)) == 0)
+		if (timeout <= 0)
 			break;
 
 		poll_s.fd      = sd;
@@ -612,7 +594,7 @@ static int ntpd_receive_response (int *res_items, int *res_size,
 		pkt_padding = 0;
 		if (pkt_item_len < res_item_size)
 			pkt_padding = res_item_size - pkt_item_len;
-		DEBUG ("res_item_size = %i; pkt_padding = %i;",
+		DEBUG ("res_item_size = %i; pkt_padding = %zi;",
 				res_item_size, pkt_padding);
 
 		/* Extract the sequence number */
@@ -651,7 +633,7 @@ static int ntpd_receive_response (int *res_items, int *res_size,
 		 * Enough with the checks. Copy the data now.
 		 * We start by allocating some more memory.
 		 */
-		DEBUG ("realloc (%p, %i)", (void *) *res_data,
+		DEBUG ("realloc (%p, %zu)", (void *) *res_data,
 				(items_num + pkt_item_num) * res_item_size);
 		items = realloc ((void *) *res_data,
 				(items_num + pkt_item_num) * res_item_size);
@@ -874,7 +856,7 @@ static int ntpd_read (void)
 
 			if (refclock_id < refclock_names_num)
 			{
-				strncpy (peername, refclock_names[refclock_id],
+				sstrncpy (peername, refclock_names[refclock_id],
 						sizeof (peername));
 			}
 			else
@@ -883,7 +865,7 @@ static int ntpd_read (void)
 				addr_obj.s_addr = ptr->srcadr;
 				addr_str = inet_ntoa (addr_obj);
 
-				strncpy (peername, addr_str, sizeof (peername));
+				sstrncpy (peername, addr_str, sizeof (peername));
 			}
 		}
 		else /* Normal network host. */