[Git][NTPsec/ntpsec][master] Remove soime unused vast_flags arguments.

[Eric S. Raymond]

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


Commits:
82174857 by Eric S. Raymond at 2017-01-22T15:20:33-05:00
Remove soime unused vast_flags arguments.

This is debris cleanup from the removal of multicast.

- - - - -


5 changed files:

- include/ntpd.h
- ntpd/ntp_config.c
- ntpd/ntp_peer.c
- ntpd/ntp_proto.c
- ntpd/ntp_refclock.c


Changes:

=====================================
include/ntpd.h
=====================================
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -146,7 +146,7 @@ extern  int	mon_get_oldest_age(l_fp);
 /* ntp_peer.c */
 extern	void	init_peer	(void);
 extern	struct peer *findexistingpeer(sockaddr_u *, const char *,
-				      struct peer *, int, uint8_t);
+				      struct peer *, int);
 extern	struct peer *findpeer	(struct recvbuf *, int, int *);
 extern	struct peer *findpeerbyassoc(associd_t);
 extern  void	set_peerdstadr	(struct peer *, endpt *);


=====================================
ntpd/ntp_config.c
=====================================
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -3009,7 +3009,7 @@ config_unpeers(
 		if (rc > 0) {
 			DPRINTF(1, ("unpeer: searching for %s\n",
 				    socktoa(&peeraddr)));
-			p = findexistingpeer(&peeraddr, NULL, NULL, -1, 0);
+			p = findexistingpeer(&peeraddr, NULL, NULL, -1);
 			if (p != NULL) {
 				msyslog(LOG_NOTICE, "unpeered %s",
 					socktoa(&peeraddr));
@@ -3091,7 +3091,7 @@ unpeer_name_resolved(
 		memcpy(&peeraddr, res->ai_addr, res->ai_addrlen);
 		DPRINTF(1, ("unpeer: searching for peer %s\n",
 			    socktoa(&peeraddr)));
-		peer = findexistingpeer(&peeraddr, NULL, NULL, -1, 0);
+		peer = findexistingpeer(&peeraddr, NULL, NULL, -1);
 		if (peer != NULL) {
 			af = AF(&peeraddr);
 			fam_spec = (AF_INET6 == af)


=====================================
ntpd/ntp_peer.c
=====================================
--- a/ntpd/ntp_peer.c
+++ b/ntpd/ntp_peer.c
@@ -114,8 +114,7 @@ static struct peer init_peer_alloc[INIT_PEER_ALLOC]; /* init alloc */
 static struct peer *	findexistingpeer_name(const char *, u_short,
 					      struct peer *, int);
 static struct peer *	findexistingpeer_addr(sockaddr_u *,
-					      struct peer *, int,
-					      uint8_t);
+					      struct peer *, int);
 static void		free_peer(struct peer *, int);
 static void		getmorepeermem(void);
 static int		score(struct peer *);
@@ -200,18 +199,17 @@ struct peer *
 findexistingpeer_addr(
 	sockaddr_u *	addr,
 	struct peer *	start_peer,
-	int		mode,
-	uint8_t		cast_flags
+	int		mode
 	)
 {
 	struct peer *peer;
 
-	DPRINTF(2, ("findexistingpeer_addr(%s, %s, %d, 0x%x)\n",
+	DPRINTF(2, ("findexistingpeer_addr(%s, %s, %d)\n",
 		sockporttoa(addr),
 		(start_peer)
 		    ? sockporttoa(&start_peer->srcadr)
 		    : "NULL",
-		mode, (u_int)cast_flags));
+		    mode));
 
 	/*
 	 * start_peer is included so we can locate instances of the
@@ -225,9 +223,9 @@ findexistingpeer_addr(
 		peer = start_peer->adr_link;
 	
 	while (peer != NULL) {
-		DPRINTF(3, ("%s %s %d %d 0x%x 0x%x ", sockporttoa(addr),
+		DPRINTF(3, ("%s %s %d %d 0x%x ", sockporttoa(addr),
 			sockporttoa(&peer->srcadr), mode, peer->hmode,
-			(u_int)cast_flags, (u_int)peer->cast_flags));
+			(u_int)peer->cast_flags));
 		if ((-1 == mode || peer->hmode == mode) &&
 		    ADDR_PORT_EQ(addr, &peer->srcadr)) {
 			DPRINTF(3, ("found.\n"));
@@ -249,16 +247,13 @@ findexistingpeer(
 	sockaddr_u *	addr,
 	const char *	hostname,
 	struct peer *	start_peer,
-	int		mode,
-	uint8_t		cast_flags
-	)
+	int		mode)
 {
 	if (hostname != NULL)
 		return findexistingpeer_name(hostname, AF(addr),
 					     start_peer, mode);
 	else
-		return findexistingpeer_addr(addr, start_peer, mode,
-					     cast_flags);
+		return findexistingpeer_addr(addr, start_peer, mode);
 }
 
 
@@ -649,8 +644,7 @@ newpeer(
 	 * structure.
 	 */
 	if (dstadr != NULL) {
-		peer = findexistingpeer(srcadr, hostname, NULL, hmode,
-					cast_flags);
+		peer = findexistingpeer(srcadr, hostname, NULL, hmode);
 		while (peer != NULL) {
 			if (peer->dstadr == dstadr ||
 			    ((MDF_BCLNT & cast_flags) &&
@@ -661,13 +655,11 @@ newpeer(
 			    peer->dstadr == findinterface(srcadr))
 				break;
 
-			peer = findexistingpeer(srcadr, hostname, peer,
-						hmode, cast_flags);
+			peer = findexistingpeer(srcadr, hostname, peer,	hmode);
 		}
 	} else {
 		/* no endpt address given */
-		peer = findexistingpeer(srcadr, hostname, NULL, hmode,
-					cast_flags);
+		peer = findexistingpeer(srcadr, hostname, NULL, hmode);
 	}
 
 	/*


=====================================
ntpd/ntp_proto.c
=====================================
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2424,7 +2424,7 @@ pool_xmit(
 		/* copy_addrinfo_list ai_addr points to a sockaddr_u */
 		rmtadr = (sockaddr_u *)(void *)pool->ai->ai_addr;
 		pool->ai = pool->ai->ai_next;
-		p = findexistingpeer(rmtadr, NULL, NULL, MODE_CLIENT, 0);
+		p = findexistingpeer(rmtadr, NULL, NULL, MODE_CLIENT);
 	} while (p != NULL && pool->ai != NULL);
 	if (p != NULL)
 		return;	/* out of addresses, re-query DNS next poll */


=====================================
ntpd/ntp_refclock.c
=====================================
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -861,7 +861,7 @@ refclock_control(
 	/*
 	 * Check for valid address and running peer
 	 */
-	peer = findexistingpeer(srcadr, NULL, NULL, -1, 0);
+	peer = findexistingpeer(srcadr, NULL, NULL, -1);
 
 	if (NULL == peer)
 		return;



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/82174857a946aa65df9db0ed94cf0428751e17aa
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170122/85f6d95d/attachment.html>