Patches from author/maintainer to make it work with -current.

This commit is contained in:
dhartmei 2002-12-02 00:02:27 +00:00
parent b53b764017
commit 389aa03d01
2 changed files with 54 additions and 3 deletions

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-Makefile,v 1.2 2002/09/12 01:01:01 lebel Exp $
$OpenBSD: patch-Makefile,v 1.3 2002/12/02 00:02:27 dhartmei Exp $
--- Makefile.orig Wed Sep 4 20:32:03 2002
+++ Makefile Wed Sep 4 20:32:09 2002
@@ -1,8 +1,8 @@
# $Id: patch-Makefile,v 1.2 2002/09/12 01:01:01 lebel Exp $
# $Id: patch-Makefile,v 1.3 2002/12/02 00:02:27 dhartmei Exp $
# set OS level to 32 if using 3.1-current
-#OSLEVEL=32
-OSLEVEL=${OSrev}
+OSLEVEL=32
+OSLEVEL=33
+#OSLEVEL=${OSrev}
PROG= pftop

View File

@ -0,0 +1,51 @@
--- pftop.c.orig Tue Sep 10 20:58:15 2002
+++ pftop.c Mon Nov 25 16:03:29 2002
@@ -1439,8 +1439,8 @@
PF_AZERO(&src->addr, AF_INET6) &&
PF_AZERO(&dst->addr, AF_INET6) &&
#endif
- PF_AZERO(&src->mask, AF_INET6) &&
- PF_AZERO(&dst->mask, AF_INET6) &&
+ PF_AZERO(&src->addr.mask, AF_INET6) &&
+ PF_AZERO(&dst->addr.mask, AF_INET6) &&
!src->port_op && !dst->port_op)
tbprintf("all ");
else {
@@ -1456,15 +1456,15 @@
#else
if (PF_AZERO(&src->addr, AF_INET6) &&
#endif
- PF_AZERO(&src->mask, AF_INET6))
+ PF_AZERO(&src->addr.mask, AF_INET6))
tbprintf("any ");
else {
if (src->not)
tbprintf("! ");
#if OS_LEVEL > 31
- tb_print_addrw(&src->addr, &src->mask, af);
+ tb_print_addrw(&src->addr, &src->addr.mask, af);
#else
- tb_print_addr(&src->addr, &src->mask, af);
+ tb_print_addr(&src->addr, &src->addr.mask, af);
#endif
tbprintf(" ");
}
@@ -1485,15 +1485,15 @@
#else
if (PF_AZERO(&dst->addr, AF_INET6) &&
#endif
- PF_AZERO(&dst->mask, AF_INET6))
+ PF_AZERO(&dst->addr.mask, AF_INET6))
tbprintf("any ");
else {
if (dst->not)
tbprintf("! ");
#if OS_LEVEL > 31
- tb_print_addrw(&dst->addr, &dst->mask, af);
+ tb_print_addrw(&dst->addr, &dst->addr.mask, af);
#else
- tb_print_addr(&dst->addr, &dst->mask, af);
+ tb_print_addr(&dst->addr, &dst->addr.mask, af);
#endif
tbprintf(" ");
}