From: kn <kn@openbsd.org>
Date: Thu, 6 Sep 2018 14:46:36 +0000 (+0000)
Subject: Fill netmask AF-independently in print_host()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=53f568abff35222ac92a2944772f8c6567f09901;p=openbsd

Fill netmask AF-independently in print_host()

Instead of masking the host address in two different ways, just fill it
no matter the address family. In case of AF_INET, setting the extra 96 bit
does not hurt.

While here, stop resetting `af' for no reason and move up the variable
declaration.

OK benno sashan
---

diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c
index f996f05661f..0516796c660 100644
--- a/sbin/pfctl/pf_print_state.c
+++ b/sbin/pfctl/pf_print_state.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_print_state.c,v 1.65 2018/07/24 09:48:04 kn Exp $	*/
+/*	$OpenBSD: pf_print_state.c,v 1.66 2018/09/06 14:46:36 kn Exp $	*/
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -166,8 +166,9 @@ void
 print_host(struct pf_addr *addr, u_int16_t port, sa_family_t af, u_int16_t rdom,
     const char *proto, int opts)
 {
-	struct servent	*s = NULL;
-	char		ps[6];
+	struct pf_addr_wrap	 aw;
+	struct servent		*s = NULL;
+	char			 ps[6];
 
 	if (rdom)
 		printf("(%u) ", ntohs(rdom));
@@ -175,16 +176,9 @@ print_host(struct pf_addr *addr, u_int16_t port, sa_family_t af, u_int16_t rdom,
 	if (opts & PF_OPT_USEDNS)
 		print_name(addr, af);
 	else {
-		struct pf_addr_wrap aw;
-
 		memset(&aw, 0, sizeof(aw));
 		aw.v.a.addr = *addr;
-		if (af == AF_INET)
-			aw.v.a.mask.addr32[0] = 0xffffffff;
-		else {
-			memset(&aw.v.a.mask, 0xff, sizeof(aw.v.a.mask));
-			af = AF_INET6;
-		}
+		memset(&aw.v.a.mask, 0xff, sizeof(aw.v.a.mask));
 		print_addr(&aw, af, opts & PF_OPT_VERBOSE2);
 	}