[Git][NTPsec/ntpsec][master] 2 commits: Remove dead storage - goes with deletion of key-aging code.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
75e9d7c0 by Eric S. Raymond at 2016-09-25T09:22:59-04:00
Remove dead storage - goes with deletion of key-aging code.

- - - - -
352378a0 by Eric S. Raymond at 2016-09-25T10:59:06-04:00
Devolatilize some variables that are no longer updated by interrupt.

- - - - -


4 changed files:

- include/ntpd.h
- libntp/recvbuff.c
- ntpd/ntp_io.c
- ntpq/ntpq.c


Changes:

=====================================
include/ntpd.h
=====================================
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -285,9 +285,9 @@ extern u_long	numasyncmsgs;		/* number of async messages we've sent */
 /*
  * Other statistics of possible interest
  */
-extern volatile u_long packets_dropped;	/* total number of packets dropped on reception */
-extern volatile u_long packets_ignored;	/* packets received on wild card interface */
-extern volatile u_long packets_received;/* total number of packets received */
+extern u_long packets_dropped;	/* total number of packets dropped on reception */
+extern u_long	packets_ignored;	/* received on wild card interface */
+extern u_long	packets_received;	/* total number of packets received */
 extern u_long	packets_sent;		/* total number of packets sent */
 extern u_long	packets_notsent; 	/* total number of packets which couldn't be sent */
 


=====================================
libntp/recvbuff.c
=====================================
--- a/libntp/recvbuff.c
+++ b/libntp/recvbuff.c
@@ -10,13 +10,13 @@
 
 
 /*
- * Memory allocation
+ * Memory allocation.
  */
-static u_long volatile full_recvbufs;	/* recvbufs on full_recv_fifo */
-static u_long volatile free_recvbufs;	/* recvbufs on free_recv_list */
-static u_long volatile total_recvbufs;	/* total recvbufs currently in use */
-static u_long volatile lowater_adds;	/* number of times we have added memory */
-static u_long volatile buffer_shortfall;/* number of missed free receive buffers
+static u_long full_recvbufs;	/* recvbufs on full_recv_fifo */
+static u_long free_recvbufs;	/* recvbufs on free_recv_list */
+static u_long total_recvbufs;	/* total recvbufs currently in use */
+static u_long lowater_adds;	/* number of times we have added memory */
+static u_long buffer_shortfall;	/* number of missed free receive buffers
 					   between replenishments */
 
 static DECL_FIFO_ANCHOR(recvbuf_t) full_recv_fifo;


=====================================
ntpd/ntp_io.c
=====================================
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -151,11 +151,11 @@ nic_rule *nic_rule_list;
 /*
  * Other statistics of possible interest
  */
-volatile u_long packets_dropped;	/* total number of packets dropped on reception */
-volatile u_long packets_ignored;	/* packets received on wild card interface */
-volatile u_long packets_received;	/* total number of packets received */
-	 u_long packets_sent;		/* total number of packets sent */
-	 u_long packets_notsent;	/* total number of packets which couldn't be sent */
+u_long packets_dropped;		/* total # of packets dropped on reception */
+u_long packets_ignored;		/* packets received on wild card interface */
+u_long packets_received;	/* total # of packets received */
+u_long packets_sent;		/* total # of packets sent */
+u_long packets_notsent;		/* total # of packets which couldn't be sent */
 
 volatile u_long handler_calls;	/* number of calls to interrupt handler */
 volatile u_long handler_pkts;	/* number of pkts received by handler */
@@ -170,7 +170,7 @@ endpt *	loopback_interface;	/* loopback ipv4 interface */
 
 bool broadcast_client_enabled;	/* is broadcast client enabled */
 u_int sys_ifnum;			/* next .ifnum to assign */
-int ninterfaces;			/* Total number of interfaces */
+int ninterfaces;			/* total # of interfaces */
 
 bool disable_dynamic_updates;	/* if true, scan interfaces once only */
 


=====================================
ntpq/ntpq.c
=====================================
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -56,7 +56,6 @@ u_long info_auth_keyid = 0;
 
 static	int	info_auth_keytype = NID_md5;	/* MD5 */
 static	size_t	info_auth_hashlen = 16;		/* MD5 */
-u_long	current_time;		/* needed by authkeys; not used */
 
 /*
  * Flag which indicates we should always send authenticated requests



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/e4ad9f215ed23acc042550ec332e4629b512d653...352378a05e1233bd19cbecb3a3915ca9d642b26e
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160925/fa254f9e/attachment.html>