From 226a0e072d5c1edeb53cb61b959b011168c5c29a Mon Sep 17 00:00:00 2001 From: Stephen Suryaputra Date: Wed, 3 Jul 2019 20:30:52 -0400 Subject: exthdr: add support for matching IPv4 options Add capability to have rules matching IPv4 options. This is developed mainly to support dropping of IP packets with loose and/or strict source route route options. Signed-off-by: Stephen Suryaputra Signed-off-by: Pablo Neira Ayuso --- tests/py/ip6/dst.t.payload.ip6 | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'tests/py/ip6/dst.t.payload.ip6') diff --git a/tests/py/ip6/dst.t.payload.ip6 b/tests/py/ip6/dst.t.payload.ip6 index 56afc126..9bf564cb 100644 --- a/tests/py/ip6/dst.t.payload.ip6 +++ b/tests/py/ip6/dst.t.payload.ip6 @@ -1,22 +1,22 @@ # dst nexthdr 22 ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ cmp eq reg 1 0x00000016 ] # dst nexthdr != 233 ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ cmp neq reg 1 0x000000e9 ] # dst nexthdr 33-45 ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ cmp gte reg 1 0x00000021 ] [ cmp lte reg 1 0x0000002d ] # dst nexthdr != 33-45 ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ range neq reg 1 0x00000021 0x0000002d ] # dst nexthdr { 33, 55, 67, 88} @@ -24,7 +24,7 @@ __set%d test-ip6 3 __set%d test-ip6 0 element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # dst nexthdr != { 33, 55, 67, 88} @@ -32,7 +32,7 @@ __set%d test-ip6 3 __set%d test-ip6 0 element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # dst nexthdr { 33-55} @@ -40,7 +40,7 @@ __set%d test-ip6 7 __set%d test-ip6 0 element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # dst nexthdr != { 33-55} @@ -48,7 +48,7 @@ __set%d test-ip6 7 __set%d test-ip6 0 element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # dst nexthdr { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} @@ -56,7 +56,7 @@ __set%d test-ip6 3 __set%d test-ip6 0 element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # dst nexthdr != { udplite, ipcomp, udp, ah, sctp, esp, dccp, tcp, ipv6-icmp} @@ -64,38 +64,38 @@ __set%d test-ip6 3 __set%d test-ip6 0 element 00000088 : 0 [end] element 0000006c : 0 [end] element 00000011 : 0 [end] element 00000033 : 0 [end] element 00000084 : 0 [end] element 00000032 : 0 [end] element 00000021 : 0 [end] element 00000006 : 0 [end] element 0000003a : 0 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # dst nexthdr icmp ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ cmp eq reg 1 0x00000001 ] # dst nexthdr != icmp ip6 test-ip6 input - [ exthdr load 1b @ 60 + 0 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 0 => reg 1 ] [ cmp neq reg 1 0x00000001 ] # dst hdrlength 22 ip6 test-ip6 input - [ exthdr load 1b @ 60 + 1 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ cmp eq reg 1 0x00000016 ] # dst hdrlength != 233 ip6 test-ip6 input - [ exthdr load 1b @ 60 + 1 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ cmp neq reg 1 0x000000e9 ] # dst hdrlength 33-45 ip6 test-ip6 input - [ exthdr load 1b @ 60 + 1 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ cmp gte reg 1 0x00000021 ] [ cmp lte reg 1 0x0000002d ] # dst hdrlength != 33-45 ip6 test-ip6 input - [ exthdr load 1b @ 60 + 1 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ range neq reg 1 0x00000021 0x0000002d ] # dst hdrlength { 33, 55, 67, 88} @@ -103,7 +103,7 @@ __set%d test-ip6 3 __set%d test-ip6 0 element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 1 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] # dst hdrlength != { 33, 55, 67, 88} @@ -111,7 +111,7 @@ __set%d test-ip6 3 __set%d test-ip6 0 element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 1 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # dst hdrlength { 33-55} @@ -119,7 +119,7 @@ __set%d test-ip6 7 __set%d test-ip6 0 element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 1 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ lookup reg 1 set __set%d ] # dst hdrlength != { 33-55} @@ -127,7 +127,7 @@ __set%d test-ip6 7 __set%d test-ip6 0 element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] ip6 test-ip6 input - [ exthdr load 1b @ 60 + 1 => reg 1 ] + [ exthdr load ipv6 1b @ 60 + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] -- cgit v1.2.3