1 files changed, 96 insertions, 34 deletions

diff --git a/contrib/ipfilter/lib/printactivenat.c b/contrib/ipfilter/lib/printactivenat.c
index a2e2924..c696c0b 100644
--- a/contrib/ipfilter/lib/printactivenat.c
+++ b/contrib/ipfilter/lib/printactivenat.c
@@ -1,7 +1,7 @@
 /*	$FreeBSD$	*/
 
 /*
- * Copyright (C) 2002-2004 by Darren Reed.
+ * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
@@ -12,73 +12,135 @@
 
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: printactivenat.c,v 1.3.2.7 2006/12/12 16:13:00 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id$";
 #endif
 
 
-void printactivenat(nat, opts, alive, now)
-nat_t *nat;
-int opts, alive;
-u_long now;
+void
+printactivenat(nat, opts, ticks)
+	nat_t *nat;
+	int opts;
+	u_long ticks;
 {
 
-	printf("%s", getnattype(nat, alive));
+	PRINTF("%s", getnattype(nat));
 
 	if (nat->nat_flags & SI_CLONE)
-		printf(" CLONE");
+		PRINTF(" CLONE");
+	if (nat->nat_phnext[0] == NULL && nat->nat_phnext[1] == NULL)
+		PRINTF(" ORPHAN");
 
-	printf(" %-15s", inet_ntoa(nat->nat_inip));
+	putchar(' ');
+	if (nat->nat_redir & NAT_REWRITE) {
+		printactiveaddress(nat->nat_v[0], "%-15s", &nat->nat_osrc6,
+				   nat->nat_ifnames[0]);
 
-	if ((nat->nat_flags & IPN_TCPUDP) != 0)
-		printf(" %-5hu", ntohs(nat->nat_inport));
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %-5hu", ntohs(nat->nat_osport));
 
-	printf(" <- -> %-15s",inet_ntoa(nat->nat_outip));
+		putchar(' ');
+		printactiveaddress(nat->nat_v[0], "%-15s", &nat->nat_odst6,
+				   nat->nat_ifnames[0]);
 
-	if ((nat->nat_flags & IPN_TCPUDP) != 0)
-		printf(" %-5hu", ntohs(nat->nat_outport));
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %-5hu", ntohs(nat->nat_odport));
 
-	printf(" [%s", inet_ntoa(nat->nat_oip));
-	if ((nat->nat_flags & IPN_TCPUDP) != 0)
-		printf(" %hu", ntohs(nat->nat_oport));
-	printf("]");
+		PRINTF("<- -> ");
+		printactiveaddress(nat->nat_v[1], "%-15s", &nat->nat_nsrc6,
+				   nat->nat_ifnames[0]);
+
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %-5hu", ntohs(nat->nat_nsport));
+
+		putchar(' ');
+		printactiveaddress(nat->nat_v[1], "%-15s", &nat->nat_ndst6,
+				   nat->nat_ifnames[0]);
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %-5hu", ntohs(nat->nat_ndport));
+
+	} else if (nat->nat_dir == NAT_OUTBOUND) {
+		printactiveaddress(nat->nat_v[0], "%-15s", &nat->nat_osrc6,
+				   nat->nat_ifnames[0]);
+
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %-5hu", ntohs(nat->nat_osport));
+
+		PRINTF(" <- -> ");
+		printactiveaddress(nat->nat_v[1], "%-15s", &nat->nat_nsrc6,
+				   nat->nat_ifnames[0]);
+
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %-5hu", ntohs(nat->nat_nsport));
+
+		PRINTF(" [");
+		printactiveaddress(nat->nat_v[0], "%s", &nat->nat_odst6,
+				   nat->nat_ifnames[0]);
+
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %hu", ntohs(nat->nat_odport));
+		PRINTF("]");
+	} else {
+		printactiveaddress(nat->nat_v[1], "%-15s", &nat->nat_ndst6,
+				   nat->nat_ifnames[0]);
+
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %-5hu", ntohs(nat->nat_ndport));
+
+		PRINTF(" <- -> ");
+		printactiveaddress(nat->nat_v[0], "%-15s", &nat->nat_odst6,
+				   nat->nat_ifnames[0]);
+
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %-5hu", ntohs(nat->nat_odport));
+
+		PRINTF(" [");
+		printactiveaddress(nat->nat_v[0], "%s", &nat->nat_osrc6,
+				   nat->nat_ifnames[0]);
+
+		if ((nat->nat_flags & IPN_TCPUDP) != 0)
+			PRINTF(" %hu", ntohs(nat->nat_osport));
+		PRINTF("]");
+	}
 
 	if (opts & OPT_VERBOSE) {
-		printf("\n\tttl %lu use %hu sumd %s/",
-			nat->nat_age - now, nat->nat_use,
+		PRINTF("\n\tttl %lu use %hu sumd %s/",
+			nat->nat_age - ticks, nat->nat_use,
 			getsumd(nat->nat_sumd[0]));
-		printf("%s pr %u bkt %d/%d flags %x\n",
-			getsumd(nat->nat_sumd[1]), nat->nat_p,
+		PRINTF("%s pr %u/%u hash %u/%u flags %x\n",
+			getsumd(nat->nat_sumd[1]),
+			nat->nat_pr[0], nat->nat_pr[1],
 			nat->nat_hv[0], nat->nat_hv[1], nat->nat_flags);
-		printf("\tifp %s", getifname(nat->nat_ifps[0]));
-		printf(",%s ", getifname(nat->nat_ifps[1]));
+		PRINTF("\tifp %s", getifname(nat->nat_ifps[0]));
+		PRINTF(",%s ", getifname(nat->nat_ifps[1]));
 #ifdef	USE_QUAD_T
-		printf("bytes %qu/%qu pkts %qu/%qu",
+		PRINTF("bytes %"PRIu64"/%"PRIu64" pkts %"PRIu64"/%"PRIu64"",
 			(unsigned long long)nat->nat_bytes[0],
 			(unsigned long long)nat->nat_bytes[1],
 			(unsigned long long)nat->nat_pkts[0],
 			(unsigned long long)nat->nat_pkts[1]);
 #else
-		printf("bytes %lu/%lu pkts %lu/%lu", nat->nat_bytes[0],
+		PRINTF("bytes %lu/%lu pkts %lu/%lu", nat->nat_bytes[0],
 			nat->nat_bytes[1], nat->nat_pkts[0], nat->nat_pkts[1]);
 #endif
-		printf(" ipsumd %x", nat->nat_ipsumd);
+		PRINTF(" ipsumd %x", nat->nat_ipsumd);
 	}
 
 	if (opts & OPT_DEBUG) {
-		printf("\n\tnat_next %p _pnext %p _hm %p\n",
+		PRINTF("\n\tnat_next %p _pnext %p _hm %p\n",
 			nat->nat_next, nat->nat_pnext, nat->nat_hm);
-		printf("\t_hnext %p/%p _phnext %p/%p\n",
+		PRINTF("\t_hnext %p/%p _phnext %p/%p\n",
 			nat->nat_hnext[0], nat->nat_hnext[1],
 			nat->nat_phnext[0], nat->nat_phnext[1]);
-		printf("\t_data %p _me %p _state %p _aps %p\n",
-			nat->nat_data, nat->nat_me, nat->nat_state, nat->nat_aps);
-		printf("\tfr %p ptr %p ifps %p/%p sync %p\n",
+		PRINTF("\t_data %p _me %p _state %p _aps %p\n",
+			nat->nat_data, nat->nat_me, nat->nat_state,
+			nat->nat_aps);
+		PRINTF("\tfr %p ptr %p ifps %p/%p sync %p\n",
 			nat->nat_fr, nat->nat_ptr, nat->nat_ifps[0],
 			nat->nat_ifps[1], nat->nat_sync);
-		printf("\ttqe:pnext %p next %p ifq %p parent %p/%p\n",
+		PRINTF("\ttqe:pnext %p next %p ifq %p parent %p/%p\n",
 			nat->nat_tqe.tqe_pnext, nat->nat_tqe.tqe_next,
 			nat->nat_tqe.tqe_ifq, nat->nat_tqe.tqe_parent, nat);
-		printf("\ttqe:die %ld touched %ld flags %x state %d/%d\n",
+		PRINTF("\ttqe:die %d touched %d flags %x state %d/%d\n",
 			nat->nat_tqe.tqe_die, nat->nat_tqe.tqe_touched,
 			nat->nat_tqe.tqe_flags, nat->nat_tqe.tqe_state[0],
 			nat->nat_tqe.tqe_state[1]);