From: Danny Mayer <mayer@ntp.org>
Date: Sun, 18 May 2003 01:18:16 +0000 (-0400)
Subject: Update for Listening Interfaces and not put out duplicate info to stdout.
X-Git-Tag: NTP_4_1_80_RC1~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b8c6e14eb06e9471354a9cbe693b34a7465c27e;p=thirdparty%2Fntp.git

Update for Listening Interfaces and not put out duplicate info to stdout.

bk: 3ec6df58B1Yq2eCYd8cGdl0K_fuTDA
---

diff --git a/libntp/msyslog.c b/libntp/msyslog.c
index 16ce442f5..6dbe50024 100644
--- a/libntp/msyslog.c
+++ b/libntp/msyslog.c
@@ -49,7 +49,7 @@ void
 addto_syslog(int level, char * buf)
 {
 	char *prog;
-	FILE *out_file;
+	FILE *out_file = syslog_file;
 
 #if !defined(VMS) && !defined (SYS_VXWORKS)
 	if (syslogit)
@@ -69,6 +69,10 @@ addto_syslog(int level, char * buf)
 		(void) fprintf(out_file, "%s[%d]: %s", prog, (int)getpid(), buf);
 		fflush (out_file);
 	}
+#if DEBUG
+	if (debug && out_file != stdout && out_file != stderr)
+		printf("addto_syslog: %s\n", buf);
+#endif
 }
 void
 format_errmsg(char *nfmt, int lennfmt, const char *fmt, int errval)
@@ -156,10 +160,6 @@ void msyslog(int level, const char *fmt, ...)
 	format_errmsg(nfmt, sizeof(nfmt), fmt, errval);
 
 	vsnprintf(buf, sizeof(buf), nfmt, ap);
-#if DEBUG
-	if (debug)
-		printf("msyslog: %s\n", buf);
-#endif
 	addto_syslog(level, buf);
 	va_end(ap);
 }
@@ -201,10 +201,6 @@ void netsyslog(int level, const char *fmt, ...)
 	format_errmsg(nfmt, sizeof(nfmt), fmt, errval);
 
 	vsnprintf(buf, sizeof(buf), nfmt, ap);
-#if DEBUG
-	if (debug)
-		printf("netsyslog: %s\n", buf);
-#endif
 	addto_syslog(level, buf);
 	va_end(ap);
 }
diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 8800298bd..897665e45 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -207,6 +207,7 @@ create_wildcards(u_short port) {
 	(void) strncpy(inter_list[idx].name, "wildcard", sizeof(inter_list[idx].name));
 	inter_list[idx].mask.ss_family = AF_INET;
 	((struct sockaddr_in*)&inter_list[idx].mask)->sin_addr.s_addr = htonl(~(u_int32)0);
+	inter_list[idx].bfd = INVALID_SOCKET;
 	inter_list[idx].num_mcast = 0;
 	inter_list[idx].received = 0;
 	inter_list[idx].sent = 0;
@@ -235,6 +236,7 @@ create_wildcards(u_short port) {
 		(void) strncpy(inter_list[idx].name, "wildcard", sizeof(inter_list[idx].name));
 		inter_list[idx].mask.ss_family = AF_INET6;
 		memset(&((struct sockaddr_in6*)&inter_list[idx].mask)->sin6_addr.s6_addr, 0xff, sizeof(struct in6_addr));
+		inter_list[idx].bfd = INVALID_SOCKET;
 		inter_list[idx].num_mcast = 0;
 		inter_list[idx].received = 0;
 		inter_list[idx].sent = 0;
@@ -445,8 +447,19 @@ create_sockets(
 	/*
 	 * Calculate the address hash for each interface address.
 	 */
-	for (i = 0; i < ninterfaces; i++)
+	for (i = 0; i < ninterfaces; i++) {
 		inter_list[i].addr_refid = addr2refid(&inter_list[i].sin);
+		msyslog(LOG_INFO, "Listening on %s interface, %s#%d",
+			inter_list[i].name,
+			stoa((&inter_list[i].sin)),
+			NTP_PORT);
+		if ((inter_list[i].flags & INT_BROADCAST) &&
+		     inter_list[i].bfd != INVALID_SOCKET)
+			msyslog(LOG_INFO, "Listening on broadcast address %s#%d",
+				stoa((&inter_list[i].bcast)),
+				NTP_PORT);
+	}
+
 
 #ifdef DEBUG
 	if (debug > 1) {