tpcdump: Update to 4.99.4

Local changes:

- Update some local modifications to fix build
- Synch config.h with upstream as much as possible

Changelog:      https://git.tcpdump.org/tcpdump/blob/55bc126b0216cfe409b8d6bd378f65679d136ddf:/CHANGES
Reviewed by:    emaste
Obtained from:  https://www.tcpdump.org/release/tcpdump-4.99.4.tar.gz
Sponsored by:   The FreeBSD Foundation

1 files changed, 68 insertions, 68 deletions

diff --git a/contrib/tcpdump/print-pfsync.c b/contrib/tcpdump/print-pfsync.c
index ee13cade1b14..83670481d40f 100644
--- a/contrib/tcpdump/print-pfsync.c
+++ b/contrib/tcpdump/print-pfsync.c
@@ -66,7 +66,7 @@ pfsync_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	ts_print(ndo, &h->ts);
 
 	if (caplen < PFSYNC_HDRLEN) {
-		ND_PRINT((ndo, "[|pfsync]"));
+		ND_PRINT("[|pfsync]");
 		goto out;
 	}
 
@@ -77,7 +77,7 @@ out:
 	if (ndo->ndo_xflag) {
 		hex_print(ndo, "\n\t", p, caplen);
 	}
-	safeputchar(ndo, '\n');
+	fn_print_char(ndo, '\n');
 	return (caplen);
 }
 
@@ -87,7 +87,7 @@ pfsync_ip_print(netdissect_options *ndo , const u_char *bp, u_int len)
 	struct pfsync_header *hdr = (struct pfsync_header *)bp;
 
 	if (len < PFSYNC_HDRLEN)
-		ND_PRINT((ndo, "[|pfsync]"));
+		ND_PRINT("[|pfsync]");
 	else
 		pfsync_print(ndo, hdr, bp + sizeof(struct pfsync_header),
 		    len - sizeof(struct pfsync_header));
@@ -143,7 +143,7 @@ pfsync_print(netdissect_options *ndo, struct pfsync_header *hdr,
 
 	plen = ntohs(hdr->len);
 
-	ND_PRINT((ndo, "PFSYNCv%d len %d", hdr->version, plen));
+	ND_PRINT("PFSYNCv%d len %d", hdr->version, plen);
 
 	if (hdr->version != PFSYNC_VERSION)
 		return;
@@ -160,22 +160,22 @@ pfsync_print(netdissect_options *ndo, struct pfsync_header *hdr,
 		plen -= sizeof(*subh);
 
 		if (subh->action >= PFSYNC_ACT_MAX) {
-			ND_PRINT((ndo, "\n    act UNKNOWN id %d",
-			    subh->action));
+			ND_PRINT("\n    act UNKNOWN id %d",
+			    subh->action);
 			return;
 		}
 
 		count = ntohs(subh->count);
-		ND_PRINT((ndo, "\n    %s count %d", actions[subh->action].name,
-		    count));
+		ND_PRINT("\n    %s count %d", actions[subh->action].name,
+		    count);
 		alen = actions[subh->action].len;
 
 		if (subh->action == PFSYNC_ACT_EOF)
 			return;
 
 		if (actions[subh->action].print == NULL) {
-			ND_PRINT((ndo, "\n    unimplemented action %hhu",
-			    subh->action));
+			ND_PRINT("\n    unimplemented action %hhu",
+			    subh->action);
 			return;
 		}
 
@@ -195,15 +195,15 @@ pfsync_print(netdissect_options *ndo, struct pfsync_header *hdr,
 	}
 
 	if (plen > 0) {
-		ND_PRINT((ndo, "\n    ..."));
+		ND_PRINT("\n    ...");
 		return;
 	}
 	if (plen < 0) {
-		ND_PRINT((ndo, "\n    invalid header length"));
+		ND_PRINT("\n    invalid header length");
 		return;
 	}
 	if (len > 0)
-		ND_PRINT((ndo, "\n    invalid packet length"));
+		ND_PRINT("\n    invalid packet length");
 }
 
 static void
@@ -211,9 +211,9 @@ pfsync_print_clr(netdissect_options *ndo, const void *bp)
 {
 	const struct pfsync_clr *clr = bp;
 
-	ND_PRINT((ndo, "\n\tcreatorid: %08x", htonl(clr->creatorid)));
+	ND_PRINT("\n\tcreatorid: %08x", htonl(clr->creatorid));
 	if (clr->ifname[0] != '\0')
-		ND_PRINT((ndo, " interface: %s", clr->ifname));
+		ND_PRINT(" interface: %s", clr->ifname);
 }
 
 static void
@@ -221,7 +221,7 @@ pfsync_print_state_1301(netdissect_options *ndo, const void *bp)
 {
 	struct pfsync_state_1301 *st = (struct pfsync_state_1301 *)bp;
 
-	safeputchar(ndo, '\n');
+	fn_print_char(ndo, '\n');
 	print_state(ndo, (union pfsync_state_union *)st, PFSYNC_MSG_VERSION_1301);
 }
 
@@ -230,7 +230,7 @@ pfsync_print_state_1400(netdissect_options *ndo, const void *bp)
 {
 	struct pfsync_state_1301 *st = (struct pfsync_state_1301 *)bp;
 
-	safeputchar(ndo, '\n');
+	fn_print_char(ndo, '\n');
 	print_state(ndo, (union pfsync_state_union *)st, PFSYNC_MSG_VERSION_1400);
 }
 
@@ -239,8 +239,8 @@ pfsync_print_ins_ack(netdissect_options *ndo, const void *bp)
 {
 	const struct pfsync_ins_ack *iack = bp;
 
-	ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
-	    (uintmax_t)be64toh(iack->id), ntohl(iack->creatorid)));
+	ND_PRINT("\n\tid: %016jx creatorid: %08x",
+	    (uintmax_t)be64toh(iack->id), ntohl(iack->creatorid));
 }
 
 static void
@@ -248,10 +248,10 @@ pfsync_print_upd_c(netdissect_options *ndo, const void *bp)
 {
 	const struct pfsync_upd_c *u = bp;
 
-	ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
-	    (uintmax_t)be64toh(u->id), ntohl(u->creatorid)));
+	ND_PRINT("\n\tid: %016jx creatorid: %08x",
+	    (uintmax_t)be64toh(u->id), ntohl(u->creatorid));
 	if (ndo->ndo_vflag > 2) {
-		ND_PRINT((ndo, "\n\tTCP? :"));
+		ND_PRINT("\n\tTCP? :");
 		print_src_dst(ndo, &u->src, &u->dst, IPPROTO_TCP);
 	}
 }
@@ -261,8 +261,8 @@ pfsync_print_upd_req(netdissect_options *ndo, const void *bp)
 {
 	const struct pfsync_upd_req *ur = bp;
 
-	ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
-	    (uintmax_t)be64toh(ur->id), ntohl(ur->creatorid)));
+	ND_PRINT("\n\tid: %016jx creatorid: %08x",
+	    (uintmax_t)be64toh(ur->id), ntohl(ur->creatorid));
 }
 
 static void
@@ -270,8 +270,8 @@ pfsync_print_del_c(netdissect_options *ndo, const void *bp)
 {
 	const struct pfsync_del_c *d = bp;
 
-	ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
-	    (uintmax_t)be64toh(d->id), ntohl(d->creatorid)));
+	ND_PRINT("\n\tid: %016jx creatorid: %08x",
+	    (uintmax_t)be64toh(d->id), ntohl(d->creatorid));
 }
 
 static void
@@ -300,8 +300,8 @@ pfsync_print_bus(netdissect_options *ndo, const void *bp)
 		break;
 	}
 
-	ND_PRINT((ndo, "\n\tcreatorid: %08x age: %.2u:%.2u:%.2u status: %s",
-	    htonl(b->creatorid), endtime, min, sec, status));
+	ND_PRINT("\n\tcreatorid: %08x age: %.2u:%.2u:%.2u status: %s",
+	    htonl(b->creatorid), endtime, min, sec, status);
 }
 
 static void
@@ -309,9 +309,9 @@ pfsync_print_tdb(netdissect_options *ndo, const void *bp)
 {
 	const struct pfsync_tdb *t = bp;
 
-	ND_PRINT((ndo, "\n\tspi: 0x%08x rpl: %ju cur_bytes: %ju",
+	ND_PRINT("\n\tspi: 0x%08x rpl: %ju cur_bytes: %ju",
 	    ntohl(t->spi), (uintmax_t )be64toh(t->rpl),
-	    (uintmax_t )be64toh(t->cur_bytes)));
+	    (uintmax_t )be64toh(t->cur_bytes));
 }
 
 static void
@@ -321,23 +321,23 @@ print_host(netdissect_options *ndo, struct pf_addr *addr, uint16_t port,
 	char buf[48];
 
 	if (inet_ntop(af, addr, buf, sizeof(buf)) == NULL)
-		ND_PRINT((ndo, "?"));
+		ND_PRINT("?");
 	else
-		ND_PRINT((ndo, "%s", buf));
+		ND_PRINT("%s", buf);
 
 	if (port)
-		ND_PRINT((ndo, ".%hu", ntohs(port)));
+		ND_PRINT(".%hu", ntohs(port));
 }
 
 static void
 print_seq(netdissect_options *ndo, const struct pfsync_state_peer *p)
 {
 	if (p->seqdiff)
-		ND_PRINT((ndo, "[%u + %u](+%u)", ntohl(p->seqlo),
-		    ntohl(p->seqhi) - ntohl(p->seqlo), ntohl(p->seqdiff)));
+		ND_PRINT("[%u + %u](+%u)", ntohl(p->seqlo),
+		    ntohl(p->seqhi) - ntohl(p->seqlo), ntohl(p->seqdiff));
 	else
-		ND_PRINT((ndo, "[%u + %u]", ntohl(p->seqlo),
-		    ntohl(p->seqhi) - ntohl(p->seqlo)));
+		ND_PRINT("[%u + %u]", ntohl(p->seqlo),
+		    ntohl(p->seqhi) - ntohl(p->seqlo));
 }
 
 static void
@@ -348,42 +348,42 @@ print_src_dst(netdissect_options *ndo, const struct pfsync_state_peer *src,
 	if (proto == IPPROTO_TCP) {
 		if (src->state <= TCPS_TIME_WAIT &&
 		    dst->state <= TCPS_TIME_WAIT)
-			ND_PRINT((ndo, "   %s:%s", tcpstates[src->state],
-			    tcpstates[dst->state]));
+			ND_PRINT("   %s:%s", tcpstates[src->state],
+			    tcpstates[dst->state]);
 		else if (src->state == PF_TCPS_PROXY_SRC ||
 		    dst->state == PF_TCPS_PROXY_SRC)
-			ND_PRINT((ndo, "   PROXY:SRC"));
+			ND_PRINT("   PROXY:SRC");
 		else if (src->state == PF_TCPS_PROXY_DST ||
 		    dst->state == PF_TCPS_PROXY_DST)
-			ND_PRINT((ndo, "   PROXY:DST"));
+			ND_PRINT("   PROXY:DST");
 		else
-			ND_PRINT((ndo, "   <BAD STATE LEVELS %u:%u>",
-			    src->state, dst->state));
+			ND_PRINT("   <BAD STATE LEVELS %u:%u>",
+			    src->state, dst->state);
 		if (ndo->ndo_vflag > 1) {
-			ND_PRINT((ndo, "\n\t"));
+			ND_PRINT("\n\t");
 			print_seq(ndo, src);
 			if (src->wscale && dst->wscale)
-				ND_PRINT((ndo, " wscale %u",
-				    src->wscale & PF_WSCALE_MASK));
-			ND_PRINT((ndo, "  "));
+				ND_PRINT(" wscale %u",
+				    src->wscale & PF_WSCALE_MASK);
+			ND_PRINT("  ");
 			print_seq(ndo, dst);
 			if (src->wscale && dst->wscale)
-				ND_PRINT((ndo, " wscale %u",
-				    dst->wscale & PF_WSCALE_MASK));
+				ND_PRINT(" wscale %u",
+				    dst->wscale & PF_WSCALE_MASK);
 		}
 	} else if (proto == IPPROTO_UDP && src->state < PFUDPS_NSTATES &&
 	    dst->state < PFUDPS_NSTATES) {
 		const char *states[] = PFUDPS_NAMES;
 
-		ND_PRINT((ndo, "   %s:%s", states[src->state], states[dst->state]));
+		ND_PRINT("   %s:%s", states[src->state], states[dst->state]);
 	} else if (proto != IPPROTO_ICMP && src->state < PFOTHERS_NSTATES &&
 	    dst->state < PFOTHERS_NSTATES) {
 		/* XXX ICMP doesn't really have state levels */
 		const char *states[] = PFOTHERS_NAMES;
 
-		ND_PRINT((ndo, "   %s:%s", states[src->state], states[dst->state]));
+		ND_PRINT("   %s:%s", states[src->state], states[dst->state]);
 	} else {
-		ND_PRINT((ndo, "   %u:%u", src->state, dst->state));
+		ND_PRINT("   %u:%u", src->state, dst->state);
 	}
 }
 
@@ -409,26 +409,26 @@ print_state(netdissect_options *ndo, union pfsync_state_union *s, int version)
 		if (s->pfs_1301.proto == IPPROTO_ICMP || s->pfs_1301.proto == IPPROTO_ICMPV6)
 			sk->port[1] = nk->port[1];
 	}
-	ND_PRINT((ndo, "\t%s ", s->pfs_1301.ifname));
-	ND_PRINT((ndo, "proto %u ", s->pfs_1301.proto));
+	ND_PRINT("\t%s ", s->pfs_1301.ifname);
+	ND_PRINT("proto %u ", s->pfs_1301.proto);
 
 	print_host(ndo, &nk->addr[1], nk->port[1], s->pfs_1301.af, NULL);
 	if (PF_ANEQ(&nk->addr[1], &sk->addr[1], s->pfs_1301.af) ||
 	    nk->port[1] != sk->port[1]) {
-		ND_PRINT((ndo, " ("));
+		ND_PRINT((" ("));
 		print_host(ndo, &sk->addr[1], sk->port[1], s->pfs_1301.af, NULL);
-		ND_PRINT((ndo, ")"));
+		ND_PRINT(")");
 	}
 	if (s->pfs_1301.direction == PF_OUT)
-		ND_PRINT((ndo, " -> "));
+		ND_PRINT((" -> "));
 	else
-		ND_PRINT((ndo, " <- "));
+		ND_PRINT((" <- "));
 	print_host(ndo, &nk->addr[0], nk->port[0], s->pfs_1301.af, NULL);
 	if (PF_ANEQ(&nk->addr[0], &sk->addr[0], s->pfs_1301.af) ||
 	    nk->port[0] != sk->port[0]) {
-		ND_PRINT((ndo, " ("));
+		ND_PRINT((" ("));
 		print_host(ndo, &sk->addr[0], sk->port[0], s->pfs_1301.af, NULL);
-		ND_PRINT((ndo, ")"));
+		ND_PRINT((")"));
 	}
 
 	print_src_dst(ndo, src, dst, s->pfs_1301.proto);
@@ -443,30 +443,30 @@ print_state(netdissect_options *ndo, union pfsync_state_union *s, int version)
 		creation /= 60;
 		min = creation % 60;
 		creation /= 60;
-		ND_PRINT((ndo, "\n\tage %.2u:%.2u:%.2u", creation, min, sec));
+		ND_PRINT("\n\tage %.2u:%.2u:%.2u", creation, min, sec);
 		sec = expire % 60;
 		expire /= 60;
 		min = expire % 60;
 		expire /= 60;
-		ND_PRINT((ndo, ", expires in %.2u:%.2u:%.2u", expire, min, sec));
+		ND_PRINT(", expires in %.2u:%.2u:%.2u", expire, min, sec);
 
 		bcopy(s->pfs_1301.packets[0], &packets[0], sizeof(uint64_t));
 		bcopy(s->pfs_1301.packets[1], &packets[1], sizeof(uint64_t));
 		bcopy(s->pfs_1301.bytes[0], &bytes[0], sizeof(uint64_t));
 		bcopy(s->pfs_1301.bytes[1], &bytes[1], sizeof(uint64_t));
-		ND_PRINT((ndo, ", %ju:%ju pkts, %ju:%ju bytes",
+		ND_PRINT(", %ju:%ju pkts, %ju:%ju bytes",
 		    be64toh(packets[0]), be64toh(packets[1]),
-		    be64toh(bytes[0]), be64toh(bytes[1])));
+		    be64toh(bytes[0]), be64toh(bytes[1]));
 		if (s->pfs_1301.anchor != ntohl(-1))
-			ND_PRINT((ndo, ", anchor %u", ntohl(s->pfs_1301.anchor)));
+			ND_PRINT(", anchor %u", ntohl(s->pfs_1301.anchor));
 		if (s->pfs_1301.rule != ntohl(-1))
-			ND_PRINT((ndo, ", rule %u", ntohl(s->pfs_1301.rule)));
+			ND_PRINT(", rule %u", ntohl(s->pfs_1301.rule));
 	}
 	if (ndo->ndo_vflag > 1) {
 		uint64_t id;
 
 		bcopy(&s->pfs_1301.id, &id, sizeof(uint64_t));
-		ND_PRINT((ndo, "\n\tid: %016jx creatorid: %08x",
-		    (uintmax_t )be64toh(id), ntohl(s->pfs_1301.creatorid)));
+		ND_PRINT("\n\tid: %016jx creatorid: %08x",
+		    (uintmax_t )be64toh(id), ntohl(s->pfs_1301.creatorid));
 	}
 }