From: Dave Hart <hart@ntp.org>
Date: Mon, 6 Dec 2010 05:04:53 +0000 (+0000)
Subject: [Bug 1740] ntpdc -c reslist packet count wrongly treated as signed.
X-Git-Tag: NTP_4_2_7P90~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=364185c2528d72e489240ead78efd86d5b41b9ba;p=thirdparty%2Fntp.git

[Bug 1740] ntpdc -c reslist packet count wrongly treated as signed.

bk: 4cfc6ef51M4ZXnfIT6CRybtGHb-Eow
---

diff --git a/ChangeLog b/ChangeLog
index e650af706..7b6da47ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * [Bug 1738] Windows ntpd has wrong net adapter name.
+* [Bug 1740] ntpdc -c reslist packet count wrongly treated as signed.
 (4.2.7p89) 2010/12/04 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1736] tos int, bool options broken in 4.2.7p66.
 * from 4.2.6p3-RC12: Clean up the SNTP documentation.
diff --git a/ntpdc/ntpdc_ops.c b/ntpdc/ntpdc_ops.c
index 280753aa6..8015851ad 100644
--- a/ntpdc/ntpdc_ops.c
+++ b/ntpdc/ntpdc_ops.c
@@ -520,7 +520,7 @@ again:
 		    ((pcmd->argval->ival == 6) && (plist->v6_flag != 0)) ||
 		    ((pcmd->argval->ival == 4) && (plist->v6_flag == 0)))
 			(void) fprintf(fp,
-			    "%c%-15.15s %-15.15s %2d %4d  %3o %7.7s %9.9s %7.7s\n",
+			    "%c%-15.15s %-15.15s %2u %4d  %3o %7.7s %9.9s %7.7s\n",
 			    c, nntohost(&srcadr), stoa(&dstadr),
 			    plist->stratum, ntp_poll, plist->reach,
 			    fptoa(NTOHS_FP(plist->delay), 5),
@@ -844,37 +844,37 @@ again:
 		src.sa.sa_len = SOCKLEN(&src);
 		dst.sa.sa_len = SOCKLEN(&dst);
 #endif
-		(void) fprintf(fp, "remote host:          %s\n",
-			       nntohost(&src));
-		(void) fprintf(fp, "local interface:      %s\n",
-			       stoa(&dst));
-		(void) fprintf(fp, "time last received:   %lds\n",
-			       (long)ntohl(pp->timereceived));
-		(void) fprintf(fp, "time until next send: %lds\n",
-			       (long)ntohl(pp->timetosend));
-		(void) fprintf(fp, "reachability change:  %lds\n",
-			       (long)ntohl(pp->timereachable));
-		(void) fprintf(fp, "packets sent:         %ld\n",
-			       (long)ntohl(pp->sent));
-		(void) fprintf(fp, "packets received:     %ld\n",
-			       (long)ntohl(pp->processed));
-		(void) fprintf(fp, "bad authentication:   %ld\n",
-			       (long)ntohl(pp->badauth));
-		(void) fprintf(fp, "bogus origin:         %ld\n",
-			       (long)ntohl(pp->bogusorg));
-		(void) fprintf(fp, "duplicate:            %ld\n",
-			       (long)ntohl(pp->oldpkt));
-		(void) fprintf(fp, "bad dispersion:       %ld\n",
-			       (long)ntohl(pp->seldisp));
-		(void) fprintf(fp, "bad reference time:   %ld\n",
-			       (long)ntohl(pp->selbroken));
-		(void) fprintf(fp, "candidate order:      %d\n",
-			       (int)pp->candidate);
+		fprintf(fp, "remote host:          %s\n",
+			nntohost(&src));
+		fprintf(fp, "local interface:      %s\n",
+			stoa(&dst));
+		fprintf(fp, "time last received:   %lus\n",
+			(u_long)ntohl(pp->timereceived));
+		fprintf(fp, "time until next send: %lus\n",
+			(u_long)ntohl(pp->timetosend));
+		fprintf(fp, "reachability change:  %lus\n",
+			(u_long)ntohl(pp->timereachable));
+		fprintf(fp, "packets sent:         %lu\n",
+			(u_long)ntohl(pp->sent));
+		fprintf(fp, "packets received:     %lu\n",
+			(u_long)ntohl(pp->processed));
+		fprintf(fp, "bad authentication:   %lu\n",
+			(u_long)ntohl(pp->badauth));
+		fprintf(fp, "bogus origin:         %lu\n",
+			(u_long)ntohl(pp->bogusorg));
+		fprintf(fp, "duplicate:            %lu\n",
+			(u_long)ntohl(pp->oldpkt));
+		fprintf(fp, "bad dispersion:       %lu\n",
+			(u_long)ntohl(pp->seldisp));
+		fprintf(fp, "bad reference time:   %lu\n",
+			(u_long)ntohl(pp->selbroken));
+		fprintf(fp, "candidate order:      %u\n",
+			pp->candidate);
 		if (items > 0)
-		    (void) fprintf(fp, "\n");
-		(void) fprintf(fp, "flags:	");
+			fprintf(fp, "\n");
+		fprintf(fp, "flags:	");
 		print_pflag(fp, ntohs(pp->flags));
-	        pp++;
+		pp++;
 	}
 }
 
@@ -1079,30 +1079,30 @@ again:
 		checkitemsize(itemsize, sizeof(struct info_sys_stats));
 		return;
 	}
-	fprintf(fp, "time since restart:     %ld\n",
-	       (u_long)ntohl(ss->timeup));
-	fprintf(fp, "time since reset:       %ld\n",
+	fprintf(fp, "time since restart:     %lu\n",
+		(u_long)ntohl(ss->timeup));
+	fprintf(fp, "time since reset:       %lu\n",
 		(u_long)ntohl(ss->timereset));
-        fprintf(fp, "packets received:       %ld\n",
+	fprintf(fp, "packets received:       %lu\n",
 		(u_long)ntohl(ss->received));
-	fprintf(fp, "packets processed:      %ld\n",
+	fprintf(fp, "packets processed:      %lu\n",
 		(u_long)ntohl(ss->processed));
-	fprintf(fp, "current version:        %ld\n",
-	       (u_long)ntohl(ss->newversionpkt));
-	fprintf(fp, "previous version:       %ld\n",
-	       (u_long)ntohl(ss->oldversionpkt));
-	fprintf(fp, "declined:               %ld\n",
-	       (u_long)ntohl(ss->unknownversion));
-	fprintf(fp, "access denied:          %ld\n",
+	fprintf(fp, "current version:        %lu\n",
+		(u_long)ntohl(ss->newversionpkt));
+	fprintf(fp, "previous version:       %lu\n",
+		(u_long)ntohl(ss->oldversionpkt));
+	fprintf(fp, "declined:               %lu\n",
+		(u_long)ntohl(ss->unknownversion));
+	fprintf(fp, "access denied:          %lu\n",
 		(u_long)ntohl(ss->denied));
-	fprintf(fp, "bad length or format:   %ld\n",
-	       (u_long)ntohl(ss->badlength));
-	fprintf(fp, "bad authentication:     %ld\n",
-	       (u_long)ntohl(ss->badauth));
+	fprintf(fp, "bad length or format:   %lu\n",
+		(u_long)ntohl(ss->badlength));
+	fprintf(fp, "bad authentication:     %lu\n",
+		(u_long)ntohl(ss->badauth));
 	if (itemsize != sizeof(struct info_sys_stats))
 	    return;
 	
-	fprintf(fp, "rate exceeded:          %ld\n",
+	fprintf(fp, "rate exceeded:          %lu\n",
 	       (u_long)ntohl(ss->limitrejected));
 }
 
@@ -1124,9 +1124,8 @@ iostats(
 	int res;
 
 again:
-	res = doquery(impl_ver, REQ_IO_STATS, 0, 0, 0, (char *)NULL,
-		      &items, &itemsize, (void *)&io, 0, 
-		      sizeof(struct info_io_stats));
+	res = doquery(impl_ver, REQ_IO_STATS, 0, 0, 0, NULL, &items,
+		      &itemsize, (void *)&io, 0, sizeof(*io));
 	
 	if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
 		impl_ver = IMPL_XNTPD_OLD;
@@ -1134,38 +1133,38 @@ again:
 	}
 
 	if (res != 0)
-	    return;
+		return;
 
 	if (!check1item(items, fp))
-	    return;
+		return;
 
-	if (!checkitemsize(itemsize, sizeof(struct info_io_stats)))
-	    return;
+	if (!checkitemsize(itemsize, sizeof(*io)))
+		return;
 
-	(void) fprintf(fp, "time since reset:     %ld\n",
-		       (u_long)ntohl(io->timereset));
-	(void) fprintf(fp, "receive buffers:      %d\n",
-		       ntohs(io->totalrecvbufs));
-	(void) fprintf(fp, "free receive buffers: %d\n",
-		       ntohs(io->freerecvbufs));
-	(void) fprintf(fp, "used receive buffers: %d\n",
-		       ntohs(io->fullrecvbufs));
-	(void) fprintf(fp, "low water refills:    %d\n",
-		       ntohs(io->lowwater));
-	(void) fprintf(fp, "dropped packets:      %ld\n",
-		       (u_long)ntohl(io->dropped));
-	(void) fprintf(fp, "ignored packets:      %ld\n",
-		       (u_long)ntohl(io->ignored));
-	(void) fprintf(fp, "received packets:     %ld\n",
-		       (u_long)ntohl(io->received));
-	(void) fprintf(fp, "packets sent:         %ld\n",
-		       (u_long)ntohl(io->sent));
-	(void) fprintf(fp, "packets not sent:     %ld\n",
-		       (u_long)ntohl(io->notsent));
-	(void) fprintf(fp, "interrupts handled:   %ld\n",
-		       (u_long)ntohl(io->interrupts));
-	(void) fprintf(fp, "received by int:      %ld\n",
-		       (u_long)ntohl(io->int_received));
+	fprintf(fp, "time since reset:     %lu\n",
+		(u_long)ntohl(io->timereset));
+	fprintf(fp, "receive buffers:      %u\n",
+		(u_int)ntohs(io->totalrecvbufs));
+	fprintf(fp, "free receive buffers: %u\n",
+		(u_int)ntohs(io->freerecvbufs));
+	fprintf(fp, "used receive buffers: %u\n",
+		(u_int)ntohs(io->fullrecvbufs));
+	fprintf(fp, "low water refills:    %u\n",
+		(u_int)ntohs(io->lowwater));
+	fprintf(fp, "dropped packets:      %lu\n",
+		(u_long)ntohl(io->dropped));
+	fprintf(fp, "ignored packets:      %lu\n",
+		(u_long)ntohl(io->ignored));
+	fprintf(fp, "received packets:     %lu\n",
+		(u_long)ntohl(io->received));
+	fprintf(fp, "packets sent:         %lu\n",
+		(u_long)ntohl(io->sent));
+	fprintf(fp, "packets not sent:     %lu\n",
+		(u_long)ntohl(io->notsent));
+	fprintf(fp, "interrupts handled:   %lu\n",
+		(u_long)ntohl(io->interrupts));
+	fprintf(fp, "received by int:      %lu\n",
+		(u_long)ntohl(io->int_received));
 }
 
 
@@ -1186,9 +1185,8 @@ memstats(
 	int res;
 
 again:
-	res = doquery(impl_ver, REQ_MEM_STATS, 0, 0, 0, (char *)NULL,
-		      &items, &itemsize, (void *)&mem, 0, 
-		      sizeof(struct info_mem_stats));
+	res = doquery(impl_ver, REQ_MEM_STATS, 0, 0, 0, NULL, &items,
+		      &itemsize, (void *)&mem, 0, sizeof(*mem));
 	
 	if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
 		impl_ver = IMPL_XNTPD_OLD;
@@ -1196,35 +1194,34 @@ again:
 	}
 
 	if (res != 0)
-	    return;
+		return;
 
 	if (!check1item(items, fp))
-	    return;
+		return;
 
-	if (!checkitemsize(itemsize, sizeof(struct info_mem_stats)))
-	    return;
+	if (!checkitemsize(itemsize, sizeof(*mem)))
+		return;
 
-	(void) fprintf(fp, "time since reset:     %ld\n",
-		       (u_long)ntohl(mem->timereset));
-	(void) fprintf(fp, "total peer memory:    %d\n",
-		       ntohs(mem->totalpeermem));
-	(void) fprintf(fp, "free peer memory:     %d\n",
-		       ntohs(mem->freepeermem));
-	(void) fprintf(fp, "calls to findpeer:    %ld\n",
-		       (u_long)ntohl(mem->findpeer_calls));
-	(void) fprintf(fp, "new peer allocations: %ld\n",
-		       (u_long)ntohl(mem->allocations));
-	(void) fprintf(fp, "peer demobilizations: %ld\n",
-		       (u_long)ntohl(mem->demobilizations));
-
-	(void) fprintf(fp, "hash table counts:   ");
+	fprintf(fp, "time since reset:     %lu\n",
+		(u_long)ntohl(mem->timereset));
+	fprintf(fp, "total peer memory:    %u\n",
+		(u_int)ntohs(mem->totalpeermem));
+	fprintf(fp, "free peer memory:     %u\n",
+		(u_int)ntohs(mem->freepeermem));
+	fprintf(fp, "calls to findpeer:    %lu\n",
+		(u_long)ntohl(mem->findpeer_calls));
+	fprintf(fp, "new peer allocations: %lu\n",
+		(u_long)ntohl(mem->allocations));
+	fprintf(fp, "peer demobilizations: %lu\n",
+		(u_long)ntohl(mem->demobilizations));
+
+	fprintf(fp, "hash table counts:   ");
 	for (i = 0; i < NTP_HASH_SIZE; i++) {
-		(void) fprintf(fp, "%4d", (int)mem->hashcount[i]);
-		if ((i % 8) == 7 && i != (NTP_HASH_SIZE-1)) {
-			(void) fprintf(fp, "\n                     ");
-		}
+		fprintf(fp, "%4d", (int)mem->hashcount[i]);
+		if ((i % 8) == 7 && i != (NTP_HASH_SIZE-1))
+			fprintf(fp, "\n                     ");
 	}
-	(void) fprintf(fp, "\n");
+	fprintf(fp, "\n");
 }
 
 
@@ -1245,9 +1242,8 @@ timerstats(
 	int res;
 
 again:
-	res = doquery(impl_ver, REQ_TIMER_STATS, 0, 0, 0, (char *)NULL,
-		      &items, &itemsize, (void *)&tim, 0, 
-		      sizeof(struct info_timer_stats));
+	res = doquery(impl_ver, REQ_TIMER_STATS, 0, 0, 0, NULL, &items,
+		      &itemsize, (void *)&tim, 0, sizeof(*tim));
 	
 	if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
 		impl_ver = IMPL_XNTPD_OLD;
@@ -1255,22 +1251,22 @@ again:
 	}
 
 	if (res != 0)
-	    return;
+		return;
 
 	if (!check1item(items, fp))
-	    return;
+		return;
 
-	if (!checkitemsize(itemsize, sizeof(struct info_timer_stats)))
-	    return;
+	if (!checkitemsize(itemsize, sizeof(*tim)))
+		return;
 
-	(void) fprintf(fp, "time since reset:  %ld\n",
-		       (u_long)ntohl(tim->timereset));
-	(void) fprintf(fp, "alarms handled:    %ld\n",
-		       (u_long)ntohl(tim->alarms));
-	(void) fprintf(fp, "alarm overruns:    %ld\n",
-		       (u_long)ntohl(tim->overflows));
-	(void) fprintf(fp, "calls to transmit: %ld\n",
-		       (u_long)ntohl(tim->xmtcalls));
+	fprintf(fp, "time since reset:  %lu\n",
+		(u_long)ntohl(tim->timereset));
+	fprintf(fp, "alarms handled:    %lu\n",
+		(u_long)ntohl(tim->alarms));
+	fprintf(fp, "alarm overruns:    %lu\n",
+		(u_long)ntohl(tim->overflows));
+	fprintf(fp, "calls to transmit: %lu\n",
+		(u_long)ntohl(tim->xmtcalls));
 }
 
 
@@ -1784,11 +1780,11 @@ again:
 		}
 
 		if (flagstr[0] == '\0')
-		    (void) strcpy(flagstr, "none");
+			strcpy(flagstr, "none");
 
 		if (!skip)
-			(void) fprintf(fp, "%-15.15s %-15.15s %9ld  %s\n",
-					addr, mask, (u_long)count, flagstr);
+			fprintf(fp, "%-15.15s %-15.15s %9lu  %s\n",
+				addr, mask, (u_long)count, flagstr);
 		rl++;
 		items--;
 	}
@@ -2015,8 +2011,8 @@ again:
 			if ((pcmd->nargs == 0) ||
 			    ((pcmd->argval->ival == 6) && (ml->v6_flag != 0)) ||
 			    ((pcmd->argval->ival == 4) && (ml->v6_flag == 0)))
-				(void) fprintf(fp, 
-				    "%-22.22s %5d %-15s %8ld %1d %1d %6lx %6lu %7lu\n",
+				fprintf(fp, 
+				    "%-22.22s %5d %-15s %8lu %1u %1u %6lx %6lu %7lu\n",
 				    nntohost(&addr), 
 				    ntohs(ml->port),
 				    stoa(&dstadr),
@@ -2043,7 +2039,7 @@ again:
 			    ((pcmd->argval->ival == 6) && (ml->v6_flag != 0)) ||
 			    ((pcmd->argval->ival == 4) && (ml->v6_flag == 0)))
 				(void) fprintf(fp,
-				    "%-25.25s %5d %9ld %4d %2d %9lx %9lu %9lu\n",
+				    "%-25.25s %5u %9lu %4u %2u %9lx %9lu %9lu\n",
 				    nntohost(&dstadr),
 				    ntohs(ml->port),
 				    (u_long)ntohl(ml->count),
@@ -2063,7 +2059,7 @@ again:
 			       "======================================================================\n");
 		while (items > 0) {
 			SET_ADDR(dstadr, oml->v6_flag, oml->addr, oml->addr6);
-			(void) fprintf(fp, "%-20.20s %5d %9ld %4d   %3d %9lu %9lu\n",
+			(void) fprintf(fp, "%-20.20s %5u %9lu %4u   %3u %9lu %9lu\n",
 				       nntohost(&dstadr),
 				       ntohs(oml->port),
 				       (u_long)ntohl(oml->count),
@@ -2323,9 +2319,8 @@ authinfo(
 	int res;
 
 again:
-	res = doquery(impl_ver, REQ_AUTHINFO, 0, 0, 0, (char *)NULL,
-		      &items, &itemsize, (void *)&ia, 0, 
-		      sizeof(struct info_auth));
+	res = doquery(impl_ver, REQ_AUTHINFO, 0, 0, 0, NULL, &items,
+		      &itemsize, (void *)&ia, 0, sizeof(*ia));
 	
 	if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
 		impl_ver = IMPL_XNTPD_OLD;
@@ -2333,32 +2328,32 @@ again:
 	}
 
 	if (res != 0)
-	    return;
+		return;
 
 	if (!check1item(items, fp))
-	    return;
+		return;
 
-	if (!checkitemsize(itemsize, sizeof(struct info_auth)))
-	    return;
+	if (!checkitemsize(itemsize, sizeof(*ia)))
+		return;
 
-	(void) fprintf(fp, "time since reset:     %ld\n",
-	    (u_long)ntohl(ia->timereset));
-	(void) fprintf(fp, "stored keys:          %ld\n",
-	    (u_long)ntohl(ia->numkeys));
-	(void) fprintf(fp, "free keys:            %ld\n",
-	    (u_long)ntohl(ia->numfreekeys));
-	(void) fprintf(fp, "key lookups:          %ld\n",
-	    (u_long)ntohl(ia->keylookups));
-	(void) fprintf(fp, "keys not found:       %ld\n",
-	    (u_long)ntohl(ia->keynotfound));
-	(void) fprintf(fp, "uncached keys:        %ld\n",
-	    (u_long)ntohl(ia->keyuncached));
-	(void) fprintf(fp, "encryptions:          %ld\n",
-	    (u_long)ntohl(ia->encryptions));
-	(void) fprintf(fp, "decryptions:          %ld\n",
-	    (u_long)ntohl(ia->decryptions));
-	(void) fprintf(fp, "expired keys:         %ld\n",
-	    (u_long)ntohl(ia->expired));
+	fprintf(fp, "time since reset:     %lu\n",
+		(u_long)ntohl(ia->timereset));
+	fprintf(fp, "stored keys:          %lu\n",
+		(u_long)ntohl(ia->numkeys));
+	fprintf(fp, "free keys:            %lu\n",
+		(u_long)ntohl(ia->numfreekeys));
+	fprintf(fp, "key lookups:          %lu\n",
+		(u_long)ntohl(ia->keylookups));
+	fprintf(fp, "keys not found:       %lu\n",
+		(u_long)ntohl(ia->keynotfound));
+	fprintf(fp, "uncached keys:        %lu\n",
+		(u_long)ntohl(ia->keyuncached));
+	fprintf(fp, "encryptions:          %lu\n",
+		(u_long)ntohl(ia->encryptions));
+	fprintf(fp, "decryptions:          %lu\n",
+		(u_long)ntohl(ia->decryptions));
+	fprintf(fp, "expired keys:         %lu\n",
+		(u_long)ntohl(ia->expired));
 }
 
 
@@ -2605,9 +2600,8 @@ ctlstats(
 	int res;
 
 again:
-	res = doquery(impl_ver, REQ_GET_CTLSTATS, 0, 0, 0, (char *)NULL,
-		      &items, &itemsize, (void *)&ic, 0, 
-		      sizeof(struct info_control));
+	res = doquery(impl_ver, REQ_GET_CTLSTATS, 0, 0, 0, NULL, &items,
+		      &itemsize, (void *)&ic, 0, sizeof(*ic));
 	
 	if (res == INFO_ERR_IMPL && impl_ver == IMPL_XNTPD) {
 		impl_ver = IMPL_XNTPD_OLD;
@@ -2615,44 +2609,44 @@ again:
 	}
 
 	if (res != 0)
-	    return;
+		return;
 
 	if (!check1item(items, fp))
-	    return;
+		return;
 
-	if (!checkitemsize(itemsize, sizeof(struct info_control)))
-	    return;
+	if (!checkitemsize(itemsize, sizeof(*ic)))
+		return;
 
-	(void) fprintf(fp, "time since reset:       %ld\n",
-		       (u_long)ntohl(ic->ctltimereset));
-	(void) fprintf(fp, "requests received:      %ld\n",
-		       (u_long)ntohl(ic->numctlreq));
-	(void) fprintf(fp, "responses sent:         %ld\n",
-		       (u_long)ntohl(ic->numctlresponses));
-	(void) fprintf(fp, "fragments sent:         %ld\n",
-		       (u_long)ntohl(ic->numctlfrags));
-	(void) fprintf(fp, "async messages sent:    %ld\n",
-		       (u_long)ntohl(ic->numasyncmsgs));
-	(void) fprintf(fp, "error msgs sent:        %ld\n",
-		       (u_long)ntohl(ic->numctlerrors));
-	(void) fprintf(fp, "total bad pkts:         %ld\n",
-		       (u_long)ntohl(ic->numctlbadpkts));
-	(void) fprintf(fp, "packet too short:       %ld\n",
-		       (u_long)ntohl(ic->numctltooshort));
-	(void) fprintf(fp, "response on input:      %ld\n",
-		       (u_long)ntohl(ic->numctlinputresp));
-	(void) fprintf(fp, "fragment on input:      %ld\n",
-		       (u_long)ntohl(ic->numctlinputfrag));
-	(void) fprintf(fp, "error set on input:     %ld\n",
-		       (u_long)ntohl(ic->numctlinputerr));
-	(void) fprintf(fp, "bad offset on input:    %ld\n",
-		       (u_long)ntohl(ic->numctlbadoffset));
-	(void) fprintf(fp, "bad version packets:    %ld\n",
-		       (u_long)ntohl(ic->numctlbadversion));
-	(void) fprintf(fp, "data in pkt too short:  %ld\n",
-		       (u_long)ntohl(ic->numctldatatooshort));
-	(void) fprintf(fp, "unknown op codes:       %ld\n",
-		       (u_long)ntohl(ic->numctlbadop));
+	fprintf(fp, "time since reset:       %lu\n",
+		(u_long)ntohl(ic->ctltimereset));
+	fprintf(fp, "requests received:      %lu\n",
+		(u_long)ntohl(ic->numctlreq));
+	fprintf(fp, "responses sent:         %lu\n",
+		(u_long)ntohl(ic->numctlresponses));
+	fprintf(fp, "fragments sent:         %lu\n",
+		(u_long)ntohl(ic->numctlfrags));
+	fprintf(fp, "async messages sent:    %lu\n",
+		(u_long)ntohl(ic->numasyncmsgs));
+	fprintf(fp, "error msgs sent:        %lu\n",
+		(u_long)ntohl(ic->numctlerrors));
+	fprintf(fp, "total bad pkts:         %lu\n",
+		(u_long)ntohl(ic->numctlbadpkts));
+	fprintf(fp, "packet too short:       %lu\n",
+		(u_long)ntohl(ic->numctltooshort));
+	fprintf(fp, "response on input:      %lu\n",
+		(u_long)ntohl(ic->numctlinputresp));
+	fprintf(fp, "fragment on input:      %lu\n",
+		(u_long)ntohl(ic->numctlinputfrag));
+	fprintf(fp, "error set on input:     %lu\n",
+		(u_long)ntohl(ic->numctlinputerr));
+	fprintf(fp, "bad offset on input:    %lu\n",
+		(u_long)ntohl(ic->numctlbadoffset));
+	fprintf(fp, "bad version packets:    %lu\n",
+		(u_long)ntohl(ic->numctlbadversion));
+	fprintf(fp, "data in pkt too short:  %lu\n",
+		(u_long)ntohl(ic->numctldatatooshort));
+	fprintf(fp, "unknown op codes:       %lu\n",
+		(u_long)ntohl(ic->numctlbadop));
 }
 
 
@@ -3060,7 +3054,7 @@ again:
 		      (u_long)ntohl(ik->errcnt));
 }
 
-#define IF_LIST_FMT     "%2d %c %48s %c %c %12.12s %03x %3d %2d %5d %5d %5d %2d %3d %7d\n"
+#define IF_LIST_FMT     "%2d %c %48s %c %c %12.12s %03lx %3lu %2lu %5lu %5lu %5lu %2lu %3lu %7lu\n"
 #define IF_LIST_FMT_STR "%2s %c %48s %c %c %12.12s %3s %3s %2s %5s %5s %5s %2s %3s %7s\n"
 #define IF_LIST_AFMT_STR "     %48s %c\n"
 #define IF_LIST_LABELS  "#", 'A', "Address/Mask/Broadcast", 'T', 'E', "IF name", "Flg", "TL", "#M", "recv", "sent", "drop", "S", "PC", "uptime"
@@ -3099,15 +3093,15 @@ iflist(
 			stoa((&saddr)), 'A',
 			ifs->ignore_packets ? 'D' : 'E',
 			ifs->name,
-			ntohl(ifs->flags),
-			ntohl(ifs->last_ttl),
-			ntohl(ifs->num_mcast),
-			ntohl(ifs->received),
-			ntohl(ifs->sent),
-			ntohl(ifs->notsent),
-			ntohl(ifs->scopeid),
-			ntohl(ifs->peercnt),
-			ntohl(ifs->uptime));
+			(u_long)ntohl(ifs->flags),
+			(u_long)ntohl(ifs->last_ttl),
+			(u_long)ntohl(ifs->num_mcast),
+			(u_long)ntohl(ifs->received),
+			(u_long)ntohl(ifs->sent),
+			(u_long)ntohl(ifs->notsent),
+			(u_long)ntohl(ifs->scopeid),
+			(u_long)ntohl(ifs->peercnt),
+			(u_long)ntohl(ifs->uptime));
 
 		SET_ADDR(saddr, ntohl(ifs->v6_flag), 
 			 ifs->unmask.addr.s_addr, ifs->unmask.addr6);