1 files changed, 66 insertions, 35 deletions
diff --git a/contrib/ipfilter/test/expected/i8 b/contrib/ipfilter/test/expected/i8
index f033e6b..a85f1de 100644
--- a/contrib/ipfilter/test/expected/i8
+++ b/contrib/ipfilter/test/expected/i8
@@ -1,35 +1,66 @@
-pass in proto icmp from 127.0.0.1/32 to 127.0.0.1/32 icmp-type timest
-block in proto icmp from any to any icmp-type unreach code 1
-pass in proto icmp from any to any icmp-type unreach code 15
-pass in proto icmp from any to any icmp-type unreach code 13
-pass in proto icmp from any to any icmp-type unreach code 8
-pass in proto icmp from any to any icmp-type unreach code 4
-pass in proto icmp from any to any icmp-type unreach code 9
-pass in proto icmp from any to any icmp-type unreach code 11
-pass in proto icmp from any to any icmp-type unreach code 14
-pass in proto icmp from any to any icmp-type unreach code 10
-pass in proto icmp from any to any icmp-type unreach code 12
-pass in proto icmp from any to any icmp-type unreach code 7
-pass in proto icmp from any to any icmp-type unreach code 1
-pass in proto icmp from any to any icmp-type unreach code 6
-pass in proto icmp from any to any icmp-type unreach code 0
-pass in proto icmp from any to any icmp-type unreach code 3
-pass in proto icmp from any to any icmp-type unreach code 2
-pass in proto icmp from any to any icmp-type unreach code 5
-pass in proto icmp from any to any icmp-type echo
-pass in proto icmp from any to any icmp-type echorep
-pass in proto icmp from any to any icmp-type inforeq
-pass in proto icmp from any to any icmp-type inforep
-pass in proto icmp from any to any icmp-type maskrep
-pass in proto icmp from any to any icmp-type maskreq
-pass in proto icmp from any to any icmp-type paramprob
-pass in proto icmp from any to any icmp-type redir
-pass in proto icmp from any to any icmp-type unreach
-pass in proto icmp from any to any icmp-type routerad
-pass in proto icmp from any to any icmp-type routersol
-pass in proto icmp from any to any icmp-type squench
-pass in proto icmp from any to any icmp-type timest
-pass in proto icmp from any to any icmp-type timestrep
-pass in proto icmp from any to any icmp-type timex
-pass in proto icmp from any to any icmp-type 254
-pass in proto icmp from any to any icmp-type 253 code 254
+pass in inet proto icmp from 127.0.0.1/32 to 127.0.0.1/32 icmp-type timest
+block in inet proto icmp from any to any icmp-type unreach code 1
+pass in inet proto icmp from any to any icmp-type unreach code 15
+pass in inet proto icmp from any to any icmp-type unreach code 13
+pass in inet proto icmp from any to any icmp-type unreach code 8
+pass in inet proto icmp from any to any icmp-type unreach code 4
+pass in inet proto icmp from any to any icmp-type unreach code 9
+pass in inet proto icmp from any to any icmp-type unreach code 11
+pass in inet proto icmp from any to any icmp-type unreach code 14
+pass in inet proto icmp from any to any icmp-type unreach code 10
+pass in inet proto icmp from any to any icmp-type unreach code 12
+pass in inet proto icmp from any to any icmp-type unreach code 7
+pass in inet proto icmp from any to any icmp-type unreach code 1
+pass in inet proto icmp from any to any icmp-type unreach code 6
+pass in inet proto icmp from any to any icmp-type unreach code 0
+pass in inet proto icmp from any to any icmp-type unreach code 3
+pass in inet proto icmp from any to any icmp-type unreach code 2
+pass in inet proto icmp from any to any icmp-type unreach code 5
+pass in inet proto icmp from any to any icmp-type echo
+pass in inet proto icmp from any to any icmp-type echorep
+pass in inet proto icmp from any to any icmp-type inforeq
+pass in inet proto icmp from any to any icmp-type inforep
+pass in inet proto icmp from any to any icmp-type maskrep
+pass in inet proto icmp from any to any icmp-type maskreq
+pass in inet proto icmp from any to any icmp-type paramprob
+pass in inet proto icmp from any to any icmp-type redir
+pass in inet proto icmp from any to any icmp-type unreach
+pass in inet proto icmp from any to any icmp-type routerad
+pass in inet proto icmp from any to any icmp-type routersol
+pass in inet proto icmp from any to any icmp-type squench
+pass in inet proto icmp from any to any icmp-type timest
+pass in inet proto icmp from any to any icmp-type timestrep
+pass in inet proto icmp from any to any icmp-type timex
+pass in inet proto icmp from any to any icmp-type 254
+pass in inet proto icmp from any to any icmp-type 253 code 254
+pass in inet proto icmp from any to any icmp-type unreach code 15
+pass in inet proto icmp from any to any icmp-type unreach code 13
+pass in inet proto icmp from any to any icmp-type unreach code 8
+pass in inet proto icmp from any to any icmp-type unreach code 4
+pass in inet proto icmp from any to any icmp-type unreach code 9
+pass in inet proto icmp from any to any icmp-type unreach code 11
+pass in inet proto icmp from any to any icmp-type unreach code 14
+pass in inet proto icmp from any to any icmp-type unreach code 10
+pass in inet proto icmp from any to any icmp-type unreach code 12
+pass in inet proto icmp from any to any icmp-type unreach code 7
+pass in inet proto icmp from any to any icmp-type unreach code 1
+pass in inet proto icmp from any to any icmp-type unreach code 6
+pass in inet proto icmp from any to any icmp-type unreach code 0
+pass in inet proto icmp from any to any icmp-type unreach code 3
+pass in inet proto icmp from any to any icmp-type unreach code 2
+pass in inet proto icmp from any to any icmp-type unreach code 5
+pass in inet proto icmp from any to any icmp-type echo
+pass in inet proto icmp from any to any icmp-type echorep
+pass in inet proto icmp from any to any icmp-type inforeq
+pass in inet proto icmp from any to any icmp-type inforep
+pass in inet proto icmp from any to any icmp-type maskrep
+pass in inet proto icmp from any to any icmp-type maskreq
+pass in inet proto icmp from any to any icmp-type paramprob
+pass in inet proto icmp from any to any icmp-type redir
+pass in inet proto icmp from any to any icmp-type unreach
+pass in inet proto icmp from any to any icmp-type routerad
+pass in inet proto icmp from any to any icmp-type routersol
+pass in inet proto icmp from any to any icmp-type squench
+pass in inet proto icmp from any to any icmp-type timest
+pass in inet proto icmp from any to any icmp-type timestrep
+pass in inet proto icmp from any to any icmp-type timex