CVS commit: src/tests/ipf/expected

2015-11-05 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Nov  5 10:43:42 UTC 2015

Modified Files:
src/tests/ipf/expected: in2 in2_6

Log Message:
Ooops, pilot error - revert last


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/expected/in2
cvs rdiff -u -r1.3 -r1.4 src/tests/ipf/expected/in2_6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/ipf/expected/in2
diff -u src/tests/ipf/expected/in2:1.6 src/tests/ipf/expected/in2:1.7
--- src/tests/ipf/expected/in2:1.6	Thu Nov  5 10:35:58 2015
+++ src/tests/ipf/expected/in2	Thu Nov  5 10:43:42 2015
@@ -1,5 +1,5 @@
 rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1/32 port 0 tcp
-rdr le0 9.8.7.6/32 -> 1.1.1.1/32 255
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 reserved
 rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp
 rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip
 rdr le0 9.0.0.0/8 -> 1.1.1.1/32 ip

Index: src/tests/ipf/expected/in2_6
diff -u src/tests/ipf/expected/in2_6:1.3 src/tests/ipf/expected/in2_6:1.4
--- src/tests/ipf/expected/in2_6:1.3	Thu Nov  5 10:35:58 2015
+++ src/tests/ipf/expected/in2_6	Thu Nov  5 10:43:42 2015
@@ -1,5 +1,5 @@
 rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1/128 port 0 tcp
-rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 255
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 reserved
 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp
 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip
 rdr le0 inet6 9:8::/32 -> 1:1:1::1/128 ip



CVS commit: src/tests/ipf/expected

2015-11-05 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Nov  5 10:35:58 UTC 2015

Modified Files:
src/tests/ipf/expected: in2 in2_6

Log Message:
Fix expected output to match -current NetBSD reality (port "255" is not
mapped to "reserved")


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/expected/in2
cvs rdiff -u -r1.2 -r1.3 src/tests/ipf/expected/in2_6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/ipf/expected/in2
diff -u src/tests/ipf/expected/in2:1.5 src/tests/ipf/expected/in2:1.6
--- src/tests/ipf/expected/in2:1.5	Mon Jun 30 16:14:35 2014
+++ src/tests/ipf/expected/in2	Thu Nov  5 10:35:58 2015
@@ -1,5 +1,5 @@
 rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1/32 port 0 tcp
-rdr le0 9.8.7.6/32 -> 1.1.1.1/32 reserved
+rdr le0 9.8.7.6/32 -> 1.1.1.1/32 255
 rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp
 rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip
 rdr le0 9.0.0.0/8 -> 1.1.1.1/32 ip

Index: src/tests/ipf/expected/in2_6
diff -u src/tests/ipf/expected/in2_6:1.2 src/tests/ipf/expected/in2_6:1.3
--- src/tests/ipf/expected/in2_6:1.2	Tue Jul 15 19:51:36 2014
+++ src/tests/ipf/expected/in2_6	Thu Nov  5 10:35:58 2015
@@ -1,5 +1,5 @@
 rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1/128 port 0 tcp
-rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 reserved
+rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 255
 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp
 rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip
 rdr le0 inet6 9:8::/32 -> 1:1:1::1/128 ip



CVS commit: src/tests/ipf/expected

2014-11-25 Thread Ryota Ozaki
Module Name:src
Committed By:   ozaki-r
Date:   Tue Nov 25 08:25:46 UTC 2014

Modified Files:
src/tests/ipf/expected: n14 n14_6

Log Message:
Fix wrong expected outputs

IP addresses in the expected outputs looks reversed (in byte order).
It seems the expected outputs had been generated based on source code
with a bug and the bug was fixed by a commit titled #534 destination
list hashing not endian neutral by darrenr@.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/expected/n14
cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/expected/n14_6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/ipf/expected/n14
diff -u src/tests/ipf/expected/n14:1.5 src/tests/ipf/expected/n14:1.6
--- src/tests/ipf/expected/n14:1.5	Sun Jul 22 14:33:28 2012
+++ src/tests/ipf/expected/n14	Tue Nov 25 08:25:46 2014
@@ -11,9 +11,9 @@ RDR 10.1.1.253  80- - 203.1.1.
 RDR 10.1.1.254  80- - 203.1.1.1   80[10.2.2.5 2000]
 
 Hostmap table:
-10.2.2.7,203.1.1.1 - 254.1.1.10,0.0.0.0 (use = 1)
-10.2.2.6,203.1.1.1 - 253.1.1.10,0.0.0.0 (use = 1)
-10.2.2.5,203.1.1.1 - 254.1.1.10,0.0.0.0 (use = 1)
+10.2.2.7,203.1.1.1 - 10.1.1.254,0.0.0.0 (use = 1)
+10.2.2.6,203.1.1.1 - 10.1.1.253,0.0.0.0 (use = 1)
+10.2.2.5,203.1.1.1 - 10.1.1.254,0.0.0.0 (use = 1)
 List of active state sessions:
 List of configured pools
 List of configured hash tables

Index: src/tests/ipf/expected/n14_6
diff -u src/tests/ipf/expected/n14_6:1.4 src/tests/ipf/expected/n14_6:1.5
--- src/tests/ipf/expected/n14_6:1.4	Sun Jul 22 14:33:28 2012
+++ src/tests/ipf/expected/n14_6	Tue Nov 25 08:25:46 2014
@@ -11,9 +11,9 @@ RDR 10:1:1::253 80- - 203:0:1::1:1
 RDR 10:1:1::254 80- - 203:0:1::1:1 80[10::2:2:5 2000]
 
 Hostmap table:
-10::2:2:7,203:0:1:0:0:0:1:1 - 254:1:1::10,any (use = 1)
-10::2:2:6,203:0:1:0:0:0:1:1 - 253:0:1:0:0:0:1:10,any (use = 1)
-10::2:2:5,203:0:1:0:0:0:1:1 - 254:1:1::10,any (use = 3)
+10::2:2:7,203:0:1:0:0:0:1:1 - 10:1:1::254,any (use = 1)
+10::2:2:6,203:0:1:0:0:0:1:1 - 10:0:1:0:0:0:1:253,any (use = 1)
+10::2:2:5,203:0:1:0:0:0:1:1 - 10:1:1::254,any (use = 3)
 List of active state sessions:
 List of configured pools
 List of configured hash tables



CVS commit: src/tests/ipf/expected

2014-07-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Jul 15 19:51:36 UTC 2014

Modified Files:
src/tests/ipf/expected: in2_6

Log Message:
NetBSD has an entry for protocol #255 in /etc/protocols labeled reserved
so expect that in the parsing output instead of 255.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/ipf/expected/in2_6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/ipf/expected/in2_6
diff -u src/tests/ipf/expected/in2_6:1.1 src/tests/ipf/expected/in2_6:1.2
--- src/tests/ipf/expected/in2_6:1.1	Sun Jun 29 09:25:31 2014
+++ src/tests/ipf/expected/in2_6	Tue Jul 15 19:51:36 2014
@@ -1,5 +1,5 @@
 rdr le0 inet6 9:8:7::6/128 port 0 - 1:1:1::1/128 port 0 tcp
-rdr le0 inet6 9:8:7::6/128 - 1:1:1::1/128 255
+rdr le0 inet6 9:8:7::6/128 - 1:1:1::1/128 reserved
 rdr le0 inet6 9:8:7::6/128 port 80 - 1:1:1::1/128 port 80 tcp
 rdr le0 inet6 9:8:7::6/128 - 1:1:1::1/128 ip
 rdr le0 inet6 9:8::/32 - 1:1:1::1/128 ip



CVS commit: src/tests/ipf/expected

2014-06-30 Thread Darren Reed
Module Name:src
Committed By:   darrenr
Date:   Mon Jun 30 16:14:35 UTC 2014

Modified Files:
src/tests/ipf/expected: in2

Log Message:
NetBSD has an entry for protocol #255 in /etc/protocols labeled reserved
so expect that in the parsing output instead of 255.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/expected/in2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/ipf/expected/in2
diff -u src/tests/ipf/expected/in2:1.4 src/tests/ipf/expected/in2:1.5
--- src/tests/ipf/expected/in2:1.4	Fri Mar 23 23:08:00 2012
+++ src/tests/ipf/expected/in2	Mon Jun 30 16:14:35 2014
@@ -1,5 +1,5 @@
 rdr le0 9.8.7.6/32 port 0 - 1.1.1.1/32 port 0 tcp
-rdr le0 9.8.7.6/32 - 1.1.1.1/32 255
+rdr le0 9.8.7.6/32 - 1.1.1.1/32 reserved
 rdr le0 9.8.7.6/32 port 80 - 1.1.1.1/32 port 80 tcp
 rdr le0 9.8.7.6/32 - 1.1.1.1/32 ip
 rdr le0 9.0.0.0/8 - 1.1.1.1/32 ip



CVS commit: src/tests/ipf/expected

2012-12-03 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Dec  3 19:35:33 UTC 2012

Modified Files:
src/tests/ipf/expected: i14

Log Message:
For rules without any address, don't infer an address family.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/expected/i14

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/ipf/expected/i14
diff -u src/tests/ipf/expected/i14:1.4 src/tests/ipf/expected/i14:1.5
--- src/tests/ipf/expected/i14:1.4	Fri Mar 23 23:08:00 2012
+++ src/tests/ipf/expected/i14	Mon Dec  3 19:35:33 2012
@@ -1,5 +1,5 @@
 block in on eri0(!) all head 1
-pass in on eri0(!) inet proto icmp from any to any group 1
+pass in on eri0(!) proto icmp from any to any group 1
 pass out on ed0(!) all head 100
 block out on ed0(!) proto udp from any to any group 100
 block in on vm0(!) proto tcp/udp from any to any head 101



CVS commit: src/tests/ipf/expected

2012-12-03 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Dec  3 19:42:00 UTC 2012

Modified Files:
src/tests/ipf/expected: i19.dist

Log Message:
Without explicit address, the address family is not inferred and not
displayed in the output.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/expected/i19.dist

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/ipf/expected/i19.dist
diff -u src/tests/ipf/expected/i19.dist:1.4 src/tests/ipf/expected/i19.dist:1.5
--- src/tests/ipf/expected/i19.dist:1.4	Fri Mar 23 23:08:00 2012
+++ src/tests/ipf/expected/i19.dist	Mon Dec  3 19:42:00 2012
@@ -1,22 +1,22 @@
-block in log level user.debug quick inet proto icmp from any to any
-block in log level mail.info quick inet proto icmp from any to any
-block in log level daemon.notice quick inet proto icmp from any to any
-block in log level auth.warn quick inet proto icmp from any to any
-block in log level syslog.err quick inet proto icmp from any to any
-block in log level lpr.crit quick inet proto icmp from any to any
-block in log level news.alert quick inet proto icmp from any to any
-block in log level uucp.emerg quick inet proto icmp from any to any
-block in log level cron.debug quick inet proto icmp from any to any
-block in log level ftp.info quick inet proto icmp from any to any
-block in log level authpriv.notice quick inet proto icmp from any to any
-block in log level logalert.warn quick inet proto icmp from any to any
-block in log level local0.err quick inet proto icmp from any to any
-block in log level local1.crit quick inet proto icmp from any to any
-block in log level local2.alert quick inet proto icmp from any to any
-block in log level local3.emerg quick inet proto icmp from any to any
-block in log level local4.debug quick inet proto icmp from any to any
-block in log level local5.info quick inet proto icmp from any to any
-block in log level local6.notice quick inet proto icmp from any to any
-block in log level local7.warn quick inet proto icmp from any to any
-block in log level kern.err quick inet proto icmp from any to any
-block in log level security.emerg quick inet proto icmp from any to any
+block in log level user.debug quick proto icmp from any to any
+block in log level mail.info quick proto icmp from any to any
+block in log level daemon.notice quick proto icmp from any to any
+block in log level auth.warn quick proto icmp from any to any
+block in log level syslog.err quick proto icmp from any to any
+block in log level lpr.crit quick proto icmp from any to any
+block in log level news.alert quick proto icmp from any to any
+block in log level uucp.emerg quick proto icmp from any to any
+block in log level cron.debug quick proto icmp from any to any
+block in log level ftp.info quick proto icmp from any to any
+block in log level authpriv.notice quick proto icmp from any to any
+block in log level logalert.warn quick proto icmp from any to any
+block in log level local0.err quick proto icmp from any to any
+block in log level local1.crit quick proto icmp from any to any
+block in log level local2.alert quick proto icmp from any to any
+block in log level local3.emerg quick proto icmp from any to any
+block in log level local4.debug quick proto icmp from any to any
+block in log level local5.info quick proto icmp from any to any
+block in log level local6.notice quick proto icmp from any to any
+block in log level local7.warn quick proto icmp from any to any
+block in log level kern.err quick proto icmp from any to any
+block in log level security.emerg quick proto icmp from any to any