diff options
| author | Phil Sutter <phil@nwl.cc> | 2025-10-16 14:31:46 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2026-01-27 23:01:54 +0100 |
| commit | 0f566ac1c1dbd9f2e7d006ca01211aae791f09a8 (patch) | |
| tree | a672d67eefb7ca5b51550721c9d440bd1845a887 /tests/py/inet | |
| parent | db82466117b8bfc93923eec49114d47200f7f913 (diff) | |
tests: py: Update payload records
This is the bulk change of py test suite payload records with improved
data reg printing in libnftnl using data (component) size and byteorder
collected in nftables.
Aside from printing values in the right byte order and padded with
zeroes to match their actual size, this patch also exposes the improved
set element dump format:
* No '[end]' marker, 'element' clearly separates elements
* No semi-colon for non-map elements
* 'flags' value printed only if non-zero and prefixed by 'flags' to
distinguish from element data
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'tests/py/inet')
46 files changed, 1001 insertions, 1033 deletions
diff --git a/tests/py/inet/ah.t.payload b/tests/py/inet/ah.t.payload index e0cd2002..cc89ebb7 100644 --- a/tests/py/inet/ah.t.payload +++ b/tests/py/inet/ah.t.payload @@ -1,178 +1,177 @@ # ah hdrlength 11-23 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ range eq reg 1 0x0000000b 0x00000017 ] + [ range eq reg 1 0x0b 0x17 ] # ah hdrlength != 11-23 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ range neq reg 1 0x0000000b 0x00000017 ] + [ range neq reg 1 0x0b 0x17 ] # ah hdrlength {11, 23, 44 } __set%d test-inet 3 __set%d test-inet 0 - element 0000000b : 0 [end] element 00000017 : 0 [end] element 0000002c : 0 [end] + element 0b element 17 element 2c inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 1b @ transport header + 1 => reg 1 ] [ lookup reg 1 set __set%d ] # ah hdrlength != {11, 23, 44 } __set%d test-inet 3 __set%d test-inet 0 - element 0000000b : 0 [end] element 00000017 : 0 [end] element 0000002c : 0 [end] + element 0b element 17 element 2c inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 1b @ transport header + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # ah reserved 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ah reserved != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # ah reserved 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # ah reserved != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # ah reserved {23, 100} __set%d test-inet 3 __set%d test-inet 0 - element 00001700 : 0 [end] element 00006400 : 0 [end] + element 0017 element 0064 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] # ah reserved != {23, 100} __set%d test-inet 3 __set%d test-inet 0 - element 00001700 : 0 [end] element 00006400 : 0 [end] + element 0017 element 0064 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # ah spi 111 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp eq reg 1 0x6f000000 ] + [ cmp eq reg 1 0x0000006f ] # ah spi != 111 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp neq reg 1 0x6f000000 ] + [ cmp neq reg 1 0x0000006f ] # ah spi 111-222 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range eq reg 1 0x6f000000 0xde000000 ] + [ range eq reg 1 0x0000006f 0x000000de ] # ah spi != 111-222 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range neq reg 1 0x6f000000 0xde000000 ] + [ range neq reg 1 0x0000006f 0x000000de ] # ah spi {111, 122} __set%d test-inet 3 __set%d test-inet 0 - element 6f000000 : 0 [end] element 7a000000 : 0 [end] + element 0000006f element 0000007a inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # ah spi != {111, 122} __set%d test-inet 3 __set%d test-inet 0 - element 6f000000 : 0 [end] element 7a000000 : 0 [end] + element 0000006f element 0000007a inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # ah sequence 123 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0x7b000000 ] + [ cmp eq reg 1 0x0000007b ] # ah sequence != 123 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp neq reg 1 0x7b000000 ] + [ cmp neq reg 1 0x0000007b ] # ah sequence {23, 25, 33} __set%d test-inet 3 __set%d test-inet 0 - element 17000000 : 0 [end] element 19000000 : 0 [end] element 21000000 : 0 [end] + element 00000017 element 00000019 element 00000021 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 8 => reg 1 ] [ lookup reg 1 set __set%d ] # ah sequence != {23, 25, 33} __set%d test-inet 3 __set%d test-inet 0 - element 17000000 : 0 [end] element 19000000 : 0 [end] element 21000000 : 0 [end] + element 00000017 element 00000019 element 00000021 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 8 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # ah sequence 23-33 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ range eq reg 1 0x17000000 0x21000000 ] + [ range eq reg 1 0x00000017 0x00000021 ] # ah sequence != 23-33 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000033 ] + [ cmp eq reg 1 0x33 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ range neq reg 1 0x17000000 0x21000000 ] - + [ range neq reg 1 0x00000017 0x00000021 ] diff --git a/tests/py/inet/comp.t.payload b/tests/py/inet/comp.t.payload index 2ffe3b31..3c684139 100644 --- a/tests/py/inet/comp.t.payload +++ b/tests/py/inet/comp.t.payload @@ -1,103 +1,102 @@ # comp nexthdr != esp inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp neq reg 1 0x00000032 ] + [ cmp neq reg 1 0x32 ] # comp flags 0x0 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # comp flags != 0x23 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ cmp neq reg 1 0x00000023 ] + [ cmp neq reg 1 0x23 ] # comp flags 0x33-0x45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ range eq reg 1 0x00000033 0x00000045 ] + [ range eq reg 1 0x33 0x45 ] # comp flags != 0x33-0x45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ range neq reg 1 0x00000033 0x00000045 ] + [ range neq reg 1 0x33 0x45 ] # comp flags {0x33, 0x55, 0x67, 0x88} __set%d test-inet 3 __set%d test-inet 0 - element 00000033 : 0 [end] element 00000055 : 0 [end] element 00000067 : 0 [end] element 00000088 : 0 [end] + element 33 element 55 element 67 element 88 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 1b @ transport header + 1 => reg 1 ] [ lookup reg 1 set __set%d ] # comp flags != {0x33, 0x55, 0x67, 0x88} __set%d test-inet 3 __set%d test-inet 0 - element 00000033 : 0 [end] element 00000055 : 0 [end] element 00000067 : 0 [end] element 00000088 : 0 [end] + element 33 element 55 element 67 element 88 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 1b @ transport header + 1 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # comp cpi 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # comp cpi != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # comp cpi 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # comp cpi != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # comp cpi {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] # comp cpi != {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000006c ] + [ cmp eq reg 1 0x6c ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] - diff --git a/tests/py/inet/ct.t.payload b/tests/py/inet/ct.t.payload index 216dad2b..4e9d5f04 100644 --- a/tests/py/inet/ct.t.payload +++ b/tests/py/inet/ct.t.payload @@ -1,31 +1,31 @@ # meta nfproto ipv4 ct original saddr 1.2.3.4 ip test-ip4 output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ ct load src => reg 1 , dir original ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] # ct original ip6 saddr ::1 inet test-inet input [ ct load src_ip6 => reg 1 , dir original ] - [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x01000000 ] + [ cmp eq reg 1 0x00000000 0x00000000 0x00000000 0x00000001 ] # ct original ip daddr 1.2.3.4 accept inet test-inet input [ ct load dst_ip => reg 1 , dir original ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ immediate reg 0 accept ] # meta nfproto ipv4 ct mark 0x00000001 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ ct load mark => reg 1 ] [ cmp eq reg 1 0x00000001 ] # meta nfproto ipv6 ct protocol 6 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ ct load protocol => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] diff --git a/tests/py/inet/dccp.t.payload b/tests/py/inet/dccp.t.payload index b5edfa5d..d447fe58 100644 --- a/tests/py/inet/dccp.t.payload +++ b/tests/py/inet/dccp.t.payload @@ -1,99 +1,98 @@ # dccp sport 21-35 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range eq reg 1 0x00001500 0x00002300 ] + [ range eq reg 1 0x0015 0x0023 ] # dccp sport != 21-35 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range neq reg 1 0x00001500 0x00002300 ] + [ range neq reg 1 0x0015 0x0023 ] # dccp sport {23, 24, 25} __set%d test-inet 3 __set%d test-inet 0 - element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end] + element 0017 element 0018 element 0019 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # dccp sport != {23, 24, 25} __set%d test-inet 3 __set%d test-inet 0 - element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end] + element 0017 element 0018 element 0019 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # dccp sport 20-50 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range eq reg 1 0x00001400 0x00003200 ] + [ range eq reg 1 0x0014 0x0032 ] # dccp dport {23, 24, 25} __set%d test-ip4 3 __set%d test-ip4 0 - element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end] + element 0017 element 0018 element 0019 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] # dccp dport != {23, 24, 25} __set%d test-ip4 3 __set%d test-ip4 0 - element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end] + element 0017 element 0018 element 0019 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # dccp type {request, response, data, ack, dataack, closereq, close, reset, sync, syncack} __set%d test-inet 3 __set%d test-inet 0 - element 00000000 : 0 [end] element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000006 : 0 [end] element 00000008 : 0 [end] element 0000000a : 0 [end] element 0000000c : 0 [end] element 0000000e : 0 [end] element 00000010 : 0 [end] element 00000012 : 0 [end] + element 00 element 02 element 04 element 06 element 08 element 0a element 0c element 0e element 10 element 12 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 1b @ transport header + 8 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000001e ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x1e ) ^ 0x00 ] [ lookup reg 1 set __set%d ] # dccp type != {request, response, data, ack, dataack, closereq, close, reset, sync, syncack} __set%d test-inet 3 __set%d test-inet 0 - element 00000000 : 0 [end] element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000006 : 0 [end] element 00000008 : 0 [end] element 0000000a : 0 [end] element 0000000c : 0 [end] element 0000000e : 0 [end] element 00000010 : 0 [end] element 00000012 : 0 [end] + element 00 element 02 element 04 element 06 element 08 element 0a element 0c element 0e element 10 element 12 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 1b @ transport header + 8 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000001e ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x1e ) ^ 0x00 ] [ lookup reg 1 set __set%d 0x1 ] # dccp type request inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 1b @ transport header + 8 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000001e ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x1e ) ^ 0x00 ] + [ cmp eq reg 1 0x00 ] # dccp type != request inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000021 ] + [ cmp eq reg 1 0x21 ] [ payload load 1b @ transport header + 8 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000001e ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000000 ] - + [ bitwise reg 1 = ( reg 1 & 0x1e ) ^ 0x00 ] + [ cmp neq reg 1 0x00 ] diff --git a/tests/py/inet/dnat.t.payload b/tests/py/inet/dnat.t.payload index ce1601ab..75dd7235 100644 --- a/tests/py/inet/dnat.t.payload +++ b/tests/py/inet/dnat.t.payload @@ -1,41 +1,41 @@ # iifname "foo" tcp dport 80 redirect to :8080 inet test-inet prerouting [ meta load iifname => reg 1 ] - [ cmp eq reg 1 0x006f6f66 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x666f6f00 0x00000000 0x00000000 0x00000000 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00005000 ] - [ immediate reg 1 0x0000901f ] + [ cmp eq reg 1 0x0050 ] + [ immediate reg 1 0x1f90 ] [ redir proto_min reg 1 flags 0x2 ] # iifname "eth0" tcp dport 443 dnat ip to 192.168.3.2 inet test-inet prerouting [ meta load iifname => reg 1 ] - [ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x65746830 0x00000000 0x00000000 0x00000000 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000bb01 ] - [ immediate reg 1 0x0203a8c0 ] + [ cmp eq reg 1 0x01bb ] + [ immediate reg 1 0xc0a80302 ] [ nat dnat ip addr_min reg 1 ] # iifname "eth0" tcp dport 443 dnat ip6 to [dead::beef]:4443 inet test-inet prerouting [ meta load iifname => reg 1 ] - [ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x65746830 0x00000000 0x00000000 0x00000000 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000bb01 ] - [ immediate reg 1 0x0000adde 0x00000000 0x00000000 0xefbe0000 ] - [ immediate reg 2 0x00005b11 ] + [ cmp eq reg 1 0x01bb ] + [ immediate reg 1 0xdead0000 0x00000000 0x00000000 0x0000beef ] + [ immediate reg 2 0x115b ] [ nat dnat ip6 addr_min reg 1 proto_min reg 2 flags 0x2 ] # dnat ip to ct mark map { 0x00000014 : 1.2.3.4} __map%d test-inet b size 1 __map%d test-inet 0 - element 00000014 : 04030201 0 [end] + element 00000014 : 01020304 inet test-inet prerouting [ ct load mark => reg 1 ] [ lookup reg 1 set __map%d dreg 1 ] @@ -44,10 +44,10 @@ inet test-inet prerouting # dnat ip to ct mark . ip daddr map { 0x00000014 . 1.1.1.1 : 1.2.3.4} __map%d test-inet b size 1 __map%d test-inet 0 - element 00000014 01010101 : 04030201 0 [end] + element 00000014 . 01010101 : 01020304 inet test-inet prerouting [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ ct load mark => reg 1 ] [ payload load 4b @ network header + 16 => reg 9 ] [ lookup reg 1 set __map%d dreg 1 ] @@ -56,31 +56,30 @@ inet test-inet prerouting # meta l4proto { tcp, udp } dnat ip to 1.1.1.1:80 __set%d test-inet 3 __set%d test-inet 0 - element 00000006 : 0 [end] element 00000011 : 0 [end] + element 06 element 11 inet [ meta load l4proto => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 1 0x01010101 ] - [ immediate reg 2 0x00005000 ] + [ immediate reg 2 0x0050 ] [ nat dnat ip addr_min reg 1 proto_min reg 2 flags 0x2 ] # ip protocol { tcp, udp } dnat ip to 1.1.1.1:80 __set%d test-inet 3 __set%d test-inet 0 - element 00000006 : 0 [end] element 00000011 : 0 [end] + element 06 element 11 inet [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 9 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 1 0x01010101 ] - [ immediate reg 2 0x00005000 ] + [ immediate reg 2 0x0050 ] [ nat dnat ip addr_min reg 1 proto_min reg 2 flags 0x2 ] # meta l4proto tcp dnat to :80 inet [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0x00005000 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0x0050 ] [ nat dnat inet proto_min reg 1 flags 0x2 ] - diff --git a/tests/py/inet/esp.t.payload b/tests/py/inet/esp.t.payload index bb67aad6..c315c97c 100644 --- a/tests/py/inet/esp.t.payload +++ b/tests/py/inet/esp.t.payload @@ -1,89 +1,88 @@ # esp spi 100 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x64000000 ] + [ cmp eq reg 1 0x00000064 ] # esp spi != 100 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp neq reg 1 0x64000000 ] + [ cmp neq reg 1 0x00000064 ] # esp spi 111-222 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ range eq reg 1 0x6f000000 0xde000000 ] + [ range eq reg 1 0x0000006f 0x000000de ] # esp spi != 111-222 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ range neq reg 1 0x6f000000 0xde000000 ] + [ range neq reg 1 0x0000006f 0x000000de ] # esp spi { 100, 102} __set%d test-inet 3 __set%d test-inet 0 - element 64000000 : 0 [end] element 66000000 : 0 [end] + element 00000064 element 00000066 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # esp spi != { 100, 102} __set%d test-inet 3 __set%d test-inet 0 - element 64000000 : 0 [end] element 66000000 : 0 [end] + element 00000064 element 00000066 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # esp sequence 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp eq reg 1 0x16000000 ] + [ cmp eq reg 1 0x00000016 ] # esp sequence 22-24 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range eq reg 1 0x16000000 0x18000000 ] + [ range eq reg 1 0x00000016 0x00000018 ] # esp sequence != 22-24 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range neq reg 1 0x16000000 0x18000000 ] + [ range neq reg 1 0x00000016 0x00000018 ] # esp sequence { 22, 24} __set%d test-inet 3 __set%d test-inet 0 - element 16000000 : 0 [end] element 18000000 : 0 [end] + element 00000016 element 00000018 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # esp sequence != { 22, 24} __set%d test-inet 3 __set%d test-inet 0 - element 16000000 : 0 [end] element 18000000 : 0 [end] + element 00000016 element 00000018 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000032 ] + [ cmp eq reg 1 0x32 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] - diff --git a/tests/py/inet/ether-ip.t.payload b/tests/py/inet/ether-ip.t.payload index 62e37a59..912a19b8 100644 --- a/tests/py/inet/ether-ip.t.payload +++ b/tests/py/inet/ether-ip.t.payload @@ -1,28 +1,28 @@ # tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 8b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00080411 ] + [ cmp eq reg 1 0x000f540c 0x11040800 ] [ payload load 4b @ network header + 16 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ immediate reg 0 accept ] # tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ network header + 16 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] diff --git a/tests/py/inet/ether-ip.t.payload.netdev b/tests/py/inet/ether-ip.t.payload.netdev index b0fa6d84..aca7a4b7 100644 --- a/tests/py/inet/ether-ip.t.payload.netdev +++ b/tests/py/inet/ether-ip.t.payload.netdev @@ -1,29 +1,28 @@ # tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 4b @ network header + 16 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] # tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 8b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00080411 ] + [ cmp eq reg 1 0x000f540c 0x11040800 ] [ payload load 4b @ network header + 16 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ immediate reg 0 accept ] - diff --git a/tests/py/inet/ether.t.payload b/tests/py/inet/ether.t.payload index 8b74a781..e0a36d43 100644 --- a/tests/py/inet/ether.t.payload +++ b/tests/py/inet/ether.t.payload @@ -1,52 +1,51 @@ # tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # ether saddr 00:0f:54:0c:11:04 accept inet test-inet input [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # vlan id 1 netdev test-netdev ingress [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x8100 ] [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000100 ] + [ bitwise reg 1 = ( reg 1 & 0x0fff ) ^ 0x0000 ] + [ cmp eq reg 1 0x0001 ] # ether type vlan vlan id 2 netdev test-netdev ingress [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x8100 ] [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000200 ] - + [ bitwise reg 1 = ( reg 1 & 0x0fff ) ^ 0x0000 ] + [ cmp eq reg 1 0x0002 ] diff --git a/tests/py/inet/ether.t.payload.bridge b/tests/py/inet/ether.t.payload.bridge index 0128d5f0..d5d4f5c0 100644 --- a/tests/py/inet/ether.t.payload.bridge +++ b/tests/py/inet/ether.t.payload.bridge @@ -1,44 +1,43 @@ # tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 accept bridge test-bridge input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept bridge test-bridge input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # ether saddr 00:0f:54:0c:11:04 accept bridge test-bridge input [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # vlan id 1 bridge test-bridge input [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x8100 ] [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000100 ] + [ bitwise reg 1 = ( reg 1 & 0x0fff ) ^ 0x0000 ] + [ cmp eq reg 1 0x0001 ] # ether type vlan vlan id 2 bridge test-bridge input [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x8100 ] [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000200 ] - + [ bitwise reg 1 = ( reg 1 & 0x0fff ) ^ 0x0000 ] + [ cmp eq reg 1 0x0002 ] diff --git a/tests/py/inet/ether.t.payload.ip b/tests/py/inet/ether.t.payload.ip index 7c91f412..5a4fb008 100644 --- a/tests/py/inet/ether.t.payload.ip +++ b/tests/py/inet/ether.t.payload.ip @@ -1,52 +1,51 @@ # tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 accept ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # ether saddr 00:0f:54:0c:11:04 accept ip test-ip4 input [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 6b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0x0c540f00 0x00000411 ] + [ cmp eq reg 1 0x000f540c 0x1104 ] [ immediate reg 0 accept ] # vlan id 1 ip test-ip4 input [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x8100 ] [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000100 ] + [ bitwise reg 1 = ( reg 1 & 0x0fff ) ^ 0x0000 ] + [ cmp eq reg 1 0x0001 ] # ether type vlan vlan id 2 ip test-ip4 input [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x8100 ] [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000200 ] - + [ bitwise reg 1 = ( reg 1 & 0x0fff ) ^ 0x0000 ] + [ cmp eq reg 1 0x0002 ] diff --git a/tests/py/inet/fib.t.payload b/tests/py/inet/fib.t.payload index 02d92b57..612e5ba8 100644 --- a/tests/py/inet/fib.t.payload +++ b/tests/py/inet/fib.t.payload @@ -6,7 +6,7 @@ ip test-ip prerouting # fib saddr . iif oifname "lo" ip test-ip prerouting [ fib saddr . iif oifname => reg 1 ] - [ cmp eq reg 1 0x00006f6c 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x6c6f0000 0x00000000 0x00000000 0x00000000 ] # fib daddr . iif type local ip test-ip prerouting @@ -16,7 +16,7 @@ ip test-ip prerouting # fib daddr . iif type vmap { blackhole : drop, prohibit : drop, unicast : accept } __map%d test-ip b __map%d test-ip 0 - element 00000006 : drop 0 [end] element 00000008 : drop 0 [end] element 00000001 : accept 0 [end] + element 00000006 : drop element 00000008 : drop element 00000001 : accept ip test-ip prerouting [ fib daddr . iif type => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] @@ -24,21 +24,21 @@ ip test-ip prerouting # fib daddr oif exists ip test-ip prerouting [ fib daddr oif present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # fib daddr check missing ip test-ip prerouting [ fib daddr oif present => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # fib daddr check vmap { missing : drop, exists : accept } - element 00000000 : drop 0 [end] element 00000001 : accept 0 [end] + element 00 : drop element 01 : accept ip test-ip prerouting [ fib daddr oif present => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # meta mark set fib daddr check . ct mark map { exists . 0x00000000 : 0x00000001 } - element 00000001 00000000 : 00000001 0 [end] + element 01 . 00000000 : 00000001 ip test-ip prerouting [ fib daddr oif present => reg 1 ] [ ct load mark => reg 9 ] diff --git a/tests/py/inet/geneve.t.payload b/tests/py/inet/geneve.t.payload index 59778738..f38a63a7 100644 --- a/tests/py/inet/geneve.t.payload +++ b/tests/py/inet/geneve.t.payload @@ -1,114 +1,113 @@ # udp dport 6081 geneve vni 10 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ payload load 3b @ tunnel header + 4 => reg 1 ] ] - [ cmp eq reg 1 0x000a0000 ] + [ cmp eq reg 1 0x00000a ] # udp dport 6081 geneve ip saddr 10.141.11.2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 2 hdrsize 8 flags f [ payload load 4b @ network header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x020b8d0a ] + [ cmp eq reg 1 0x0a8d0b02 ] # udp dport 6081 geneve ip saddr 10.141.11.0/24 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 2 hdrsize 8 flags f [ payload load 3b @ network header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x000b8d0a ] + [ cmp eq reg 1 0x0a8d0b ] # udp dport 6081 geneve ip protocol 1 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 2 hdrsize 8 flags f [ payload load 1b @ network header + 9 => reg 1 ] ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # udp dport 6081 geneve udp sport 8888 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ meta load l4proto => reg 1 ] ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ inner type 2 hdrsize 8 flags f [ payload load 2b @ transport header + 0 => reg 1 ] ] - [ cmp eq reg 1 0x0000b822 ] + [ cmp eq reg 1 0x22b8 ] # udp dport 6081 geneve icmp type echo-reply ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ payload load 2b @ link header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 2 hdrsize 8 flags f [ meta load l4proto => reg 1 ] ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ inner type 2 hdrsize 8 flags f [ payload load 1b @ transport header + 0 => reg 1 ] ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # udp dport 6081 geneve ether saddr 62:87:4d:d6:19:05 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ payload load 6b @ link header + 6 => reg 1 ] ] - [ cmp eq reg 1 0xd64d8762 0x00000519 ] + [ cmp eq reg 1 0x62874dd6 0x1905 ] # udp dport 6081 geneve vlan id 10 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ payload load 2b @ link header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x8100 ] [ inner type 2 hdrsize 8 flags f [ payload load 2b @ link header + 14 => reg 1 ] ] - [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000a00 ] + [ bitwise reg 1 = ( reg 1 & 0x0fff ) ^ 0x0000 ] + [ cmp eq reg 1 0x000a ] # udp dport 6081 geneve ip dscp 0x02 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 2 hdrsize 8 flags f [ payload load 1b @ network header + 1 => reg 1 ] ] - [ bitwise reg 1 = ( reg 1 & 0x000000fc ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000008 ] + [ bitwise reg 1 = ( reg 1 & 0xfc ) ^ 0x00 ] + [ cmp eq reg 1 0x08 ] # udp dport 6081 geneve ip saddr . geneve ip daddr { 1.2.3.4 . 4.3.2.1 } __set%d test-ip4 3 size 1 __set%d test-ip4 0 - element 04030201 01020304 : 0 [end] + element 01020304 . 04030201 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000c117 ] + [ cmp eq reg 1 0x17c1 ] [ inner type 2 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 2 hdrsize 8 flags f [ payload load 4b @ network header + 12 => reg 1 ] ] [ inner type 2 hdrsize 8 flags f [ payload load 4b @ network header + 16 => reg 9 ] ] [ lookup reg 1 set __set%d ] - diff --git a/tests/py/inet/gre.t.payload b/tests/py/inet/gre.t.payload index 333133ed..6ca6680d 100644 --- a/tests/py/inet/gre.t.payload +++ b/tests/py/inet/gre.t.payload @@ -1,78 +1,77 @@ # gre version 0 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ payload load 1b @ transport header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000007 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x07 ) ^ 0x00 ] + [ cmp eq reg 1 0x00 ] # gre ip saddr 10.141.11.2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 3 hdrsize 4 flags c [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 3 hdrsize 4 flags c [ payload load 4b @ network header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x020b8d0a ] + [ cmp eq reg 1 0x0a8d0b02 ] # gre ip saddr 10.141.11.0/24 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 3 hdrsize 4 flags c [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 3 hdrsize 4 flags c [ payload load 3b @ network header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x000b8d0a ] + [ cmp eq reg 1 0x0a8d0b ] # gre ip protocol 1 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 3 hdrsize 4 flags c [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 3 hdrsize 4 flags c [ payload load 1b @ network header + 9 => reg 1 ] ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # gre udp sport 8888 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 3 hdrsize 4 flags c [ meta load l4proto => reg 1 ] ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ inner type 3 hdrsize 4 flags c [ payload load 2b @ transport header + 0 => reg 1 ] ] - [ cmp eq reg 1 0x0000b822 ] + [ cmp eq reg 1 0x22b8 ] # gre icmp type echo-reply ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 3 hdrsize 4 flags c [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 3 hdrsize 4 flags c [ meta load l4proto => reg 1 ] ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ inner type 3 hdrsize 4 flags c [ payload load 1b @ transport header + 0 => reg 1 ] ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # gre ip dscp 0x02 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 3 hdrsize 4 flags c [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 3 hdrsize 4 flags c [ payload load 1b @ network header + 1 => reg 1 ] ] - [ bitwise reg 1 = ( reg 1 & 0x000000fc ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000008 ] + [ bitwise reg 1 = ( reg 1 & 0xfc ) ^ 0x00 ] + [ cmp eq reg 1 0x08 ] # gre ip saddr . gre ip daddr { 1.2.3.4 . 4.3.2.1 } __set%d test-ip4 3 size 1 __set%d test-ip4 0 - element 04030201 01020304 : 0 [end] + element 01020304 . 04030201 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 3 hdrsize 4 flags c [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 3 hdrsize 4 flags c [ payload load 4b @ network header + 12 => reg 1 ] ] [ inner type 3 hdrsize 4 flags c [ payload load 4b @ network header + 16 => reg 9 ] ] [ lookup reg 1 set __set%d ] - diff --git a/tests/py/inet/gretap.t.payload b/tests/py/inet/gretap.t.payload index 654c71e4..222a10e7 100644 --- a/tests/py/inet/gretap.t.payload +++ b/tests/py/inet/gretap.t.payload @@ -1,87 +1,86 @@ # gretap ip saddr 10.141.11.2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 4 hdrsize 4 flags e [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 4 hdrsize 4 flags e [ payload load 4b @ network header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x020b8d0a ] + [ cmp eq reg 1 0x0a8d0b02 ] # gretap ip saddr 10.141.11.0/24 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 4 hdrsize 4 flags e [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 4 hdrsize 4 flags e [ payload load 3b @ network header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x000b8d0a ] + [ cmp eq reg 1 0x0a8d0b ] # gretap ip protocol 1 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 4 hdrsize 4 flags e [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 4 hdrsize 4 flags e [ payload load 1b @ network header + 9 => reg 1 ] ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # gretap udp sport 8888 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 4 hdrsize 4 flags e [ meta load l4proto => reg 1 ] ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ inner type 4 hdrsize 4 flags e [ payload load 2b @ transport header + 0 => reg 1 ] ] - [ cmp eq reg 1 0x0000b822 ] + [ cmp eq reg 1 0x22b8 ] # gretap icmp type echo-reply ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 4 hdrsize 4 flags e [ payload load 2b @ link header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 4 hdrsize 4 flags e [ meta load l4proto => reg 1 ] ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ inner type 4 hdrsize 4 flags e [ payload load 1b @ transport header + 0 => reg 1 ] ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # gretap ether saddr 62:87:4d:d6:19:05 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 4 hdrsize 4 flags e [ payload load 6b @ link header + 6 => reg 1 ] ] - [ cmp eq reg 1 0xd64d8762 0x00000519 ] + [ cmp eq reg 1 0x62874dd6 0x1905 ] # gretap vlan id 10 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 4 hdrsize 4 flags e [ payload load 2b @ link header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x8100 ] [ inner type 4 hdrsize 4 flags e [ payload load 2b @ link header + 14 => reg 1 ] ] - [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000a00 ] + [ bitwise reg 1 = ( reg 1 & 0x0fff ) ^ 0x0000 ] + [ cmp eq reg 1 0x000a ] # gretap ip dscp 0x02 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 4 hdrsize 4 flags e [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 4 hdrsize 4 flags e [ payload load 1b @ network header + 1 => reg 1 ] ] - [ bitwise reg 1 = ( reg 1 & 0x000000fc ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000008 ] + [ bitwise reg 1 = ( reg 1 & 0xfc ) ^ 0x00 ] + [ cmp eq reg 1 0x08 ] # gretap ip saddr . gretap ip daddr { 1.2.3.4 . 4.3.2.1 } __set%d test-ip4 3 size 1 __set%d test-ip4 0 - element 04030201 01020304 : 0 [end] + element 01020304 . 04030201 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000002f ] + [ cmp eq reg 1 0x2f ] [ inner type 4 hdrsize 4 flags e [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 4 hdrsize 4 flags e [ payload load 4b @ network header + 12 => reg 1 ] ] [ inner type 4 hdrsize 4 flags e [ payload load 4b @ network header + 16 => reg 9 ] ] [ lookup reg 1 set __set%d ] - diff --git a/tests/py/inet/icmp.t.payload b/tests/py/inet/icmp.t.payload index f98cfc39..4db6b6fe 100644 --- a/tests/py/inet/icmp.t.payload +++ b/tests/py/inet/icmp.t.payload @@ -1,54 +1,53 @@ # icmp type echo-request inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x08 ] # icmpv6 type echo-request inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000080 ] + [ cmp eq reg 1 0x80 ] # meta nfproto ipv4 icmp type echo-request inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x08 ] # meta nfproto ipv4 icmpv6 type echo-request inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000080 ] + [ cmp eq reg 1 0x80 ] # meta nfproto ipv6 icmp type echo-request inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x08 ] # meta nfproto ipv6 icmpv6 type echo-request inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000080 ] - + [ cmp eq reg 1 0x80 ] diff --git a/tests/py/inet/icmpX.t.payload b/tests/py/inet/icmpX.t.payload index 9a761eef..61b857b5 100644 --- a/tests/py/inet/icmpX.t.payload +++ b/tests/py/inet/icmpX.t.payload @@ -1,46 +1,46 @@ # ip protocol icmp icmp type echo-request inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x08 ] # icmp type echo-request inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x08 ] # ip6 nexthdr icmpv6 icmpv6 type echo-request inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 1b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000080 ] + [ cmp eq reg 1 0x80 ] # icmpv6 type echo-request inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000080 ] + [ cmp eq reg 1 0x80 ] # ip protocol ipv6-icmp meta l4proto ipv6-icmp icmpv6 type 1 inet filter input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x0000003a ] + [ cmp eq reg 1 0x3a ] [ payload load 1b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] diff --git a/tests/py/inet/ip.t.payload b/tests/py/inet/ip.t.payload index 589a5cd3..6ed1967d 100644 --- a/tests/py/inet/ip.t.payload +++ b/tests/py/inet/ip.t.payload @@ -1,10 +1,10 @@ # ip saddr . ip daddr . ether saddr { 1.1.1.1 . 2.2.2.2 . ca:fe:ca:fe:ca:fe } __set%d test-inet 3 __set%d test-inet 0 - element 01010101 02020202 fecafeca 0000feca : 0 [end] + element 01010101 . 02020202 . cafecafe cafe inet test-ip input [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ network header + 16 => reg 9 ] [ payload load 6b @ link header + 6 => reg 10 ] diff --git a/tests/py/inet/ip.t.payload.bridge b/tests/py/inet/ip.t.payload.bridge index 57dbc9eb..3e7421c8 100644 --- a/tests/py/inet/ip.t.payload.bridge +++ b/tests/py/inet/ip.t.payload.bridge @@ -1,10 +1,10 @@ # ip saddr . ip daddr . ether saddr { 1.1.1.1 . 2.2.2.2 . ca:fe:ca:fe:ca:fe } __set%d test-bridge 3 __set%d test-bridge 0 - element 01010101 02020202 fecafeca 0000feca : 0 [end] + element 01010101 . 02020202 . cafecafe cafe bridge test-bridge input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ network header + 16 => reg 9 ] [ payload load 6b @ link header + 6 => reg 10 ] diff --git a/tests/py/inet/ip.t.payload.inet b/tests/py/inet/ip.t.payload.inet index 8df41def..f566c988 100644 --- a/tests/py/inet/ip.t.payload.inet +++ b/tests/py/inet/ip.t.payload.inet @@ -1,14 +1,13 @@ # ip saddr . ip daddr . ether saddr { 1.1.1.1 . 2.2.2.2 . ca:fe:ca:fe:ca:fe } __set%d test-inet 3 __set%d test-inet 0 - element 01010101 02020202 fecafeca 0000feca : 0 [end] + element 01010101 . 02020202 . cafecafe cafe inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ network header + 16 => reg 9 ] [ payload load 6b @ link header + 6 => reg 10 ] [ lookup reg 1 set __set%d ] - diff --git a/tests/py/inet/ip.t.payload.netdev b/tests/py/inet/ip.t.payload.netdev index 95be9194..e3799893 100644 --- a/tests/py/inet/ip.t.payload.netdev +++ b/tests/py/inet/ip.t.payload.netdev @@ -1,14 +1,13 @@ # ip saddr . ip daddr . ether saddr { 1.1.1.1 . 2.2.2.2 . ca:fe:ca:fe:ca:fe } __set%d test-netdev 3 __set%d test-netdev 0 - element 01010101 02020202 fecafeca 0000feca : 0 [end] + element 01010101 . 02020202 . cafecafe cafe netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ network header + 16 => reg 9 ] [ payload load 6b @ link header + 6 => reg 10 ] [ lookup reg 1 set __set%d ] - diff --git a/tests/py/inet/ip_tcp.t.payload b/tests/py/inet/ip_tcp.t.payload index 1e16f852..cf68b98a 100644 --- a/tests/py/inet/ip_tcp.t.payload +++ b/tests/py/inet/ip_tcp.t.payload @@ -1,52 +1,52 @@ # ip protocol tcp tcp dport 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip protocol tcp ip saddr 1.2.3.4 tcp dport 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip protocol tcp counter ip saddr 1.2.3.4 tcp dport 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ counter pkts 0 bytes 0 ] [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip protocol tcp counter tcp dport 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ counter pkts 0 bytes 0 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ether type ip tcp dport 22 inet test-inet input [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] diff --git a/tests/py/inet/ip_tcp.t.payload.bridge b/tests/py/inet/ip_tcp.t.payload.bridge index 0344cd66..121052d9 100644 --- a/tests/py/inet/ip_tcp.t.payload.bridge +++ b/tests/py/inet/ip_tcp.t.payload.bridge @@ -1,51 +1,50 @@ # ip protocol tcp tcp dport 22 bridge test-bridge input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip protocol tcp ip saddr 1.2.3.4 tcp dport 22 bridge test-bridge input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip protocol tcp counter ip saddr 1.2.3.4 tcp dport 22 bridge test-bridge input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ counter pkts 0 bytes 0 ] [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip protocol tcp counter tcp dport 22 bridge test-bridge input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ counter pkts 0 bytes 0 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ether type ip tcp dport 22 bridge test-bridge input [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] - + [ cmp eq reg 1 0x0016 ] diff --git a/tests/py/inet/ip_tcp.t.payload.netdev b/tests/py/inet/ip_tcp.t.payload.netdev index 915a7870..bef0d6f5 100644 --- a/tests/py/inet/ip_tcp.t.payload.netdev +++ b/tests/py/inet/ip_tcp.t.payload.netdev @@ -1,53 +1,52 @@ # ip protocol tcp tcp dport 22 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip protocol tcp ip saddr 1.2.3.4 tcp dport 22 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip protocol tcp counter ip saddr 1.2.3.4 tcp dport 22 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ counter pkts 0 bytes 0 ] [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ip protocol tcp counter tcp dport 22 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ counter pkts 0 bytes 0 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # ether type ip tcp dport 22 netdev test-netdev ingress [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] - + [ cmp eq reg 1 0x0016 ] diff --git a/tests/py/inet/ipsec.t.payload b/tests/py/inet/ipsec.t.payload index f8ecd9d1..2e012db1 100644 --- a/tests/py/inet/ipsec.t.payload +++ b/tests/py/inet/ipsec.t.payload @@ -16,12 +16,12 @@ ip ipsec-ip4 ipsec-input # ipsec out spi 1-561 inet ipsec-inet ipsec-post [ xfrm load out 0 spi => reg 1 ] - [ range eq reg 1 0x01000000 0x31020000 ] + [ range eq reg 1 0x00000001 0x00000231 ] # ipsec in spnum 2 ip saddr { 1.2.3.4, 10.6.0.0/16 } __set%d ipsec-ip4 7 size 5 __set%d ipsec-ip4 0 - element 00000000 : 1 [end] element 04030201 : 0 [end] element 05030201 : 1 [end] element 0000060a : 0 [end] element 0000070a : 1 [end] + element 00000000 flags 1 element 01020304 element 01020305 flags 1 element 0a060000 element 0a070000 flags 1 ip ipsec-ip4 ipsec-input [ xfrm load in 2 saddr4 => reg 1 ] [ lookup reg 1 set __set%d ] @@ -29,16 +29,15 @@ ip ipsec-ip4 ipsec-input # ipsec in ip6 daddr dead::beef ip ipsec-ip4 ipsec-forw [ xfrm load in 0 daddr6 => reg 1 ] - [ cmp eq reg 1 0x0000adde 0x00000000 0x00000000 0xefbe0000 ] + [ cmp eq reg 1 0xdead0000 0x00000000 0x00000000 0x0000beef ] # ipsec out ip6 saddr dead::feed ip ipsec-ip4 ipsec-forw [ xfrm load out 0 saddr6 => reg 1 ] - [ cmp eq reg 1 0x0000adde 0x00000000 0x00000000 0xedfe0000 ] + [ cmp eq reg 1 0xdead0000 0x00000000 0x00000000 0x0000feed ] # counter ipsec out ip daddr 192.168.1.2 ip ipsec-ip4 ipsec-forw [ counter pkts 0 bytes 0 ] [ xfrm load out 0 daddr4 => reg 1 ] - [ cmp eq reg 1 0x0201a8c0 ] - + [ cmp eq reg 1 0xc0a80102 ] diff --git a/tests/py/inet/map.t.payload b/tests/py/inet/map.t.payload index 50344ada..f9ab4ef6 100644 --- a/tests/py/inet/map.t.payload +++ b/tests/py/inet/map.t.payload @@ -1,10 +1,10 @@ # mark set ip saddr map { 10.2.3.2 : 0x0000002a, 10.2.3.1 : 0x00000017} __map%d test-inet b __map%d test-inet 0 - element 0203020a : 0000002a 0 [end] element 0103020a : 00000017 0 [end] + element 0a020302 : 0000002a element 0a020301 : 00000017 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ network header + 12 => reg 1 ] [ lookup reg 1 set __map%d dreg 1 ] [ meta set mark with reg 1 ] @@ -12,12 +12,11 @@ inet test-inet input # mark set ip hdrlength map { 5 : 0x00000017, 4 : 0x00000001} __map%d test-inet b __map%d test-inet 0 - element 00000005 : 00000017 0 [end] element 00000004 : 00000001 0 [end] + element 05 : 00000017 element 04 : 00000001 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000000f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0f ) ^ 0x00 ] [ lookup reg 1 set __map%d dreg 1 ] [ meta set mark with reg 1 ] - diff --git a/tests/py/inet/map.t.payload.ip b/tests/py/inet/map.t.payload.ip index 3e456675..33c03e49 100644 --- a/tests/py/inet/map.t.payload.ip +++ b/tests/py/inet/map.t.payload.ip @@ -1,7 +1,7 @@ # mark set ip saddr map { 10.2.3.2 : 0x0000002a, 10.2.3.1 : 0x00000017} __map%d test-ip4 b __map%d test-ip4 0 - element 0203020a : 0000002a 0 [end] element 0103020a : 00000017 0 [end] + element 0a020302 : 0000002a element 0a020301 : 00000017 ip test-ip4 input [ payload load 4b @ network header + 12 => reg 1 ] [ lookup reg 1 set __map%d dreg 1 ] @@ -10,10 +10,9 @@ ip test-ip4 input # mark set ip hdrlength map { 5 : 0x00000017, 4 : 0x00000001} __map%d test-ip4 b __map%d test-ip4 0 - element 00000005 : 00000017 0 [end] element 00000004 : 00000001 0 [end] + element 05 : 00000017 element 04 : 00000001 ip test-ip4 input [ payload load 1b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000000f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0f ) ^ 0x00 ] [ lookup reg 1 set __map%d dreg 1 ] [ meta set mark with reg 1 ] - diff --git a/tests/py/inet/map.t.payload.netdev b/tests/py/inet/map.t.payload.netdev index 2e60f09d..af1cfeb7 100644 --- a/tests/py/inet/map.t.payload.netdev +++ b/tests/py/inet/map.t.payload.netdev @@ -1,10 +1,10 @@ # mark set ip saddr map { 10.2.3.2 : 0x0000002a, 10.2.3.1 : 0x00000017} __map%d test-netdev b __map%d test-netdev 0 - element 0203020a : 0000002a 0 [end] element 0103020a : 00000017 0 [end] + element 0a020302 : 0000002a element 0a020301 : 00000017 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 4b @ network header + 12 => reg 1 ] [ lookup reg 1 set __map%d dreg 1 ] [ meta set mark with reg 1 ] @@ -12,12 +12,11 @@ netdev test-netdev ingress # mark set ip hdrlength map { 5 : 0x00000017, 4 : 0x00000001} __map%d test-netdev b __map%d test-netdev 0 - element 00000005 : 00000017 0 [end] element 00000004 : 00000001 0 [end] + element 05 : 00000017 element 04 : 00000001 netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 1b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000000f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0f ) ^ 0x00 ] [ lookup reg 1 set __map%d dreg 1 ] [ meta set mark with reg 1 ] - diff --git a/tests/py/inet/meta.t.payload b/tests/py/inet/meta.t.payload index 04dfbd8f..44c18c63 100644 --- a/tests/py/inet/meta.t.payload +++ b/tests/py/inet/meta.t.payload @@ -1,17 +1,17 @@ # meta nfproto ipv4 ip test-ip4 input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] # meta nfproto ipv6 ip test-ip4 input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] # meta nfproto {ipv4, ipv6} __set%d test-ip4 3 __set%d test-ip4 0 - element 00000002 : 0 [end] element 0000000a : 0 [end] + element 02 element 0a ip test-ip4 input [ meta load nfproto => reg 1 ] [ lookup reg 1 set __set%d ] @@ -19,7 +19,7 @@ ip test-ip4 input # meta nfproto != {ipv4, ipv6} __set%d test-ip4 3 __set%d test-ip4 0 - element 00000002 : 0 [end] element 0000000a : 0 [end] + element 02 element 0a ip test-ip4 input [ meta load nfproto => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -27,52 +27,52 @@ ip test-ip4 input # meta nfproto ipv6 tcp dport 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # meta nfproto ipv4 tcp dport 22 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # meta nfproto ipv4 ip saddr 1.2.3.4 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] # meta nfproto ipv6 meta l4proto tcp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] # meta nfproto ipv4 counter ip saddr 1.2.3.4 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ counter pkts 0 bytes 0 ] [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x04030201 ] + [ cmp eq reg 1 0x01020304 ] # meta ipsec exists inet test-inet input [ meta load secpath => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # meta secpath missing inet test-inet input [ meta load secpath => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # meta mark set ct mark >> 8 inet test-inet input @@ -92,28 +92,28 @@ inet test-inet input # meta protocol ip udp dport 67 inet test-inet input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00004300 ] + [ cmp eq reg 1 0x0043 ] # meta protocol ip6 udp dport 67 inet test-inet input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00004300 ] + [ cmp eq reg 1 0x0043 ] # meta mark . tcp dport { 0x0000000a-0x00000014 . 80-90, 0x00100000-0x00100123 . 100-120 } __set%d test-inet 87 size 1 __set%d test-inet 0 - element 0a000000 00005000 - 14000000 00005a00 : 0 [end] element 00001000 00006400 - 23011000 00007800 : 0 [end] + element 0000000a . 0050 - 00000014 . 005a element 00100000 . 0064 - 00100123 . 0078 ip test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ meta load mark => reg 1 ] [ byteorder reg 1 = hton(reg 1, 4, 4) ] [ payload load 2b @ transport header + 2 => reg 9 ] @@ -122,10 +122,10 @@ ip test-inet input # ip saddr . meta mark { 1.2.3.4 . 0x00000100 , 1.2.3.6-1.2.3.8 . 0x00000200-0x00000300 } __set%d test-inet 87 size 2 __set%d test-inet 0 - element 04030201 00010000 - 04030201 00010000 : 0 [end] element 06030201 00020000 - 08030201 00030000 : 0 [end] + element 01020304 . 00000100 - 01020304 . 00000100 element 01020306 . 00000200 - 01020308 . 00000300 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ network header + 12 => reg 1 ] [ meta load mark => reg 9 ] [ byteorder reg 9 = hton(reg 9, 4, 4) ] @@ -134,10 +134,10 @@ inet test-inet input # ip saddr . meta mark { 1.2.3.4 . 0x00000100 , 5.6.7.8 . 0x00000200 } __set%d test-inet 3 size 2 __set%d test-inet 0 - element 04030201 00000100 : 0 [end] element 08070605 00000200 : 0 [end] + element 01020304 . 00000100 element 05060708 . 00000200 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ network header + 12 => reg 1 ] [ meta load mark => reg 9 ] [ lookup reg 1 set __set%d ] @@ -145,18 +145,18 @@ inet test-inet input # meta mark set ip dscp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000fc ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xfc ) ^ 0x00 ] [ bitwise reg 1 = ( reg 1 >> 0x00000002 ) ] [ meta set mark with reg 1 ] # meta mark set ip dscp | 0x40 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 1b @ network header + 1 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000fc ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0xfc ) ^ 0x00 ] [ bitwise reg 1 = ( reg 1 >> 0x00000002 ) ] [ bitwise reg 1 = ( reg 1 & 0xffffffbf ) ^ 0x00000040 ] [ meta set mark with reg 1 ] @@ -164,9 +164,9 @@ inet test-inet input # meta mark set ip6 dscp inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ meta set mark with reg 1 ] @@ -174,9 +174,9 @@ inet test-inet input # meta mark set ip6 dscp | 0x40 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 2b @ network header + 0 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000c00f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x0fc0 ) ^ 0x0000 ] [ byteorder reg 1 = ntoh(reg 1, 2, 2) ] [ bitwise reg 1 = ( reg 1 >> 0x00000006 ) ] [ bitwise reg 1 = ( reg 1 & 0xffffffbf ) ^ 0x00000040 ] @@ -185,14 +185,13 @@ inet test-inet input # ip saddr . ether saddr . meta l4proto { 1.2.3.4 . aa:bb:cc:dd:ee:ff . 6 } __set%d test-inet 3 size 1 __set%d test-inet 0 - element 04030201 ddccbbaa 0000ffee 00000006 : 0 [end] + element 01020304 . aabbccdd eeff . 06 inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 6b @ link header + 6 => reg 9 ] [ meta load l4proto => reg 11 ] [ lookup reg 1 set __set%d ] - diff --git a/tests/py/inet/osf.t.payload b/tests/py/inet/osf.t.payload index 6ddab976..65d0a2e0 100644 --- a/tests/py/inet/osf.t.payload +++ b/tests/py/inet/osf.t.payload @@ -1,27 +1,27 @@ # osf name "Linux" inet osfinet osfchain [ osf dreg 1 ] - [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x4c696e75 0x78000000 0x00000000 0x00000000 ] # osf ttl loose name "Linux" inet osfinet osfchain [ osf dreg 1 ] - [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x4c696e75 0x78000000 0x00000000 0x00000000 ] # osf ttl skip name "Linux" inet osfinet osfchain [ osf dreg 1 ] - [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x4c696e75 0x78000000 0x00000000 0x00000000 ] # osf ttl skip version "Linux:3.0" inet osfinet osfchain [ osf dreg 1 ] - [ cmp eq reg 1 0x756e694c 0x2e333a78 0x00000030 0x00000000 ] + [ cmp eq reg 1 0x4c696e75 0x783a332e 0x30000000 0x00000000 ] # osf name { "Windows", "MacOs" } __set%d osfinet 3 size 2 __set%d osfinet 0 - element 646e6957 0073776f 00000000 00000000 : 0 [end] element 4f63614d 00000073 00000000 00000000 : 0 [end] + element 57696e64 6f777300 00000000 00000000 element 4d61634f 73000000 00000000 00000000 inet osfinet osfchain [ osf dreg 1 ] [ lookup reg 1 set __set%d ] @@ -29,7 +29,7 @@ inet osfinet osfchain # osf version { "Windows:XP", "MacOs:Sierra" } __set%d osfinet 3 size 2 __set%d osfinet 0 - element 646e6957 3a73776f 00005058 00000000 : 0 [end] element 4f63614d 69533a73 61727265 00000000 : 0 [end] + element 57696e64 6f77733a 58500000 00000000 element 4d61634f 733a5369 65727261 00000000 inet osfinet osfchain [ osf dreg 1 ] [ lookup reg 1 set __set%d ] @@ -37,7 +37,7 @@ inet osfinet osfchain # ct mark set osf name map { "Windows" : 0x00000001, "MacOs" : 0x00000002 } __map%d osfinet b size 2 __map%d osfinet 0 - element 646e6957 0073776f 00000000 00000000 : 00000001 0 [end] element 4f63614d 00000073 00000000 00000000 : 00000002 0 [end] + element 57696e64 6f777300 00000000 00000000 : 00000001 element 4d61634f 73000000 00000000 00000000 : 00000002 inet osfinet osfchain [ osf dreg 1 ] [ lookup reg 1 set __map%d dreg 1 ] @@ -46,7 +46,7 @@ inet osfinet osfchain # ct mark set osf version map { "Windows:XP" : 0x00000003, "MacOs:Sierra" : 0x00000004 } __map%d osfinet b size 2 __map%d osfinet 0 - element 646e6957 3a73776f 00005058 00000000 : 00000003 0 [end] element 4f63614d 69533a73 61727265 00000000 : 00000004 0 [end] + element 57696e64 6f77733a 58500000 00000000 : 00000003 element 4d61634f 733a5369 65727261 00000000 : 00000004 inet osfinet osfchain [ osf dreg 1 ] [ lookup reg 1 set __map%d dreg 1 ] diff --git a/tests/py/inet/payloadmerge.t.payload b/tests/py/inet/payloadmerge.t.payload index a0465cdd..e94adcc5 100644 --- a/tests/py/inet/payloadmerge.t.payload +++ b/tests/py/inet/payloadmerge.t.payload @@ -1,66 +1,65 @@ # tcp sport 1 tcp dport 2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x02000100 ] + [ cmp eq reg 1 0x00010002 ] # tcp sport != 1 tcp dport != 2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp neq reg 1 0x00000100 ] + [ cmp neq reg 1 0x0001 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp neq reg 1 0x00000200 ] + [ cmp neq reg 1 0x0002 ] # tcp sport 1 tcp dport != 2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000100 ] + [ cmp eq reg 1 0x0001 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp neq reg 1 0x00000200 ] + [ cmp neq reg 1 0x0002 ] # tcp sport != 1 tcp dport 2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp neq reg 1 0x00000100 ] + [ cmp neq reg 1 0x0001 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00000200 ] + [ cmp eq reg 1 0x0002 ] # meta l4proto != 6 th dport 2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp neq reg 1 0x00000006 ] + [ cmp neq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00000200 ] + [ cmp eq reg 1 0x0002 ] # meta l4proto 6 tcp dport 22 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # tcp sport > 1 tcp dport > 2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp gt reg 1 0x00000100 ] + [ cmp gt reg 1 0x0001 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp gt reg 1 0x00000200 ] + [ cmp gt reg 1 0x0002 ] # tcp sport 1 tcp dport > 2 ip test-ip4 input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000100 ] + [ cmp eq reg 1 0x0001 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp gt reg 1 0x00000200 ] - + [ cmp gt reg 1 0x0002 ] diff --git a/tests/py/inet/reject.t.payload.inet b/tests/py/inet/reject.t.payload.inet index 828cb839..00f3f2ad 100644 --- a/tests/py/inet/reject.t.payload.inet +++ b/tests/py/inet/reject.t.payload.inet @@ -1,73 +1,73 @@ # reject with icmp host-unreachable inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 0 code 1 ] # reject with icmp net-unreachable inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 0 code 0 ] # reject with icmp prot-unreachable inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 0 code 2 ] # reject with icmp port-unreachable inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 0 code 3 ] # reject with icmp net-prohibited inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 0 code 9 ] # reject with icmp host-prohibited inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 0 code 10 ] # reject with icmp admin-prohibited inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 0 code 13 ] # reject with icmpv6 no-route inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ reject type 0 code 0 ] # reject with icmpv6 admin-prohibited inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ reject type 0 code 1 ] # reject with icmpv6 addr-unreachable inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ reject type 0 code 3 ] # reject with icmpv6 port-unreachable inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ reject type 0 code 4 ] # mark 12345 reject with tcp reset inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ meta load mark => reg 1 ] [ cmp eq reg 1 0x00003039 ] [ reject type 1 code 0 ] @@ -79,13 +79,13 @@ inet test-inet input # meta nfproto ipv4 reject inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 0 code 3 ] # meta nfproto ipv6 reject inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ reject type 0 code 4 ] # reject with icmpx host-unreachable @@ -111,34 +111,33 @@ inet test-inet input # meta nfproto ipv4 reject with icmp host-unreachable inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 0 code 1 ] # meta nfproto ipv6 reject with icmpv6 no-route inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ reject type 0 code 0 ] # meta nfproto ipv4 reject with icmpx admin-prohibited inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ reject type 2 code 3 ] # meta nfproto ipv6 reject with icmpx admin-prohibited inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ reject type 2 code 3 ] # ether saddr aa:bb:cc:dd:ee:ff ip daddr 192.168.0.1 reject inet test-inet input [ meta load iiftype => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x0001 ] [ payload load 8b @ link header + 6 => reg 1 ] - [ cmp eq reg 1 0xddccbbaa 0x0008ffee ] + [ cmp eq reg 1 0xaabbccdd 0xeeff0800 ] [ payload load 4b @ network header + 16 => reg 1 ] - [ cmp eq reg 1 0x0100a8c0 ] + [ cmp eq reg 1 0xc0a80001 ] [ reject type 0 code 3 ] - diff --git a/tests/py/inet/rt.t.payload b/tests/py/inet/rt.t.payload index 84dea12c..3d65fef6 100644 --- a/tests/py/inet/rt.t.payload +++ b/tests/py/inet/rt.t.payload @@ -1,18 +1,17 @@ # meta nfproto ipv4 rt nexthop 192.168.0.1 inet test-inet output [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ rt load nexthop4 => reg 1 ] - [ cmp eq reg 1 0x0100a8c0 ] + [ cmp eq reg 1 0xc0a80001 ] # rt ip6 nexthop fd00::1 inet test-inet output [ rt load nexthop6 => reg 1 ] - [ cmp eq reg 1 0x000000fd 0x00000000 0x00000000 0x01000000 ] + [ cmp eq reg 1 0xfd000000 0x00000000 0x00000000 0x00000001 ] # tcp option maxseg size set rt mtu inet test-inet output [ rt load tcpmss => reg 1 ] [ byteorder reg 1 = hton(reg 1, 2, 2) ] [ exthdr write tcpopt reg 1 => 2b @ 2 + 2 ] - diff --git a/tests/py/inet/sctp.t.payload b/tests/py/inet/sctp.t.payload index 0f6b3a8b..baeda137 100644 --- a/tests/py/inet/sctp.t.payload +++ b/tests/py/inet/sctp.t.payload @@ -1,347 +1,346 @@ # sctp sport 23 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00001700 ] + [ cmp eq reg 1 0x0017 ] # sctp sport != 23 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp neq reg 1 0x00001700 ] + [ cmp neq reg 1 0x0017 ] # sctp sport 23-44 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range eq reg 1 0x00001700 0x00002c00 ] + [ range eq reg 1 0x0017 0x002c ] # sctp sport != 23-44 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range neq reg 1 0x00001700 0x00002c00 ] + [ range neq reg 1 0x0017 0x002c ] # sctp sport { 23, 24, 25} __set%d test-inet 3 __set%d test-inet 0 - element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end] + element 0017 element 0018 element 0019 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # sctp sport != { 23, 24, 25} __set%d test-inet 3 __set%d test-inet 0 - element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end] + element 0017 element 0018 element 0019 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # sctp dport 23 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001700 ] + [ cmp eq reg 1 0x0017 ] # sctp dport != 23 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp neq reg 1 0x00001700 ] + [ cmp neq reg 1 0x0017 ] # sctp dport 23-44 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00001700 0x00002c00 ] + [ range eq reg 1 0x0017 0x002c ] # sctp dport != 23-44 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range neq reg 1 0x00001700 0x00002c00 ] + [ range neq reg 1 0x0017 0x002c ] # sctp dport { 23, 24, 25} __set%d test-inet 3 __set%d test-inet 0 - element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end] + element 0017 element 0018 element 0019 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] # sctp dport != { 23, 24, 25} __set%d test-inet 3 __set%d test-inet 0 - element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end] + element 0017 element 0018 element 0019 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # sctp checksum 1111 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0x57040000 ] + [ cmp eq reg 1 0x00000457 ] # sctp checksum != 11 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp neq reg 1 0x0b000000 ] + [ cmp neq reg 1 0x0000000b ] # sctp checksum 21-333 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ range eq reg 1 0x15000000 0x4d010000 ] + [ range eq reg 1 0x00000015 0x0000014d ] # sctp checksum != 32-111 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ range neq reg 1 0x20000000 0x6f000000 ] + [ range neq reg 1 0x00000020 0x0000006f ] # sctp checksum { 22, 33, 44} __set%d test-inet 3 __set%d test-inet 0 - element 16000000 : 0 [end] element 21000000 : 0 [end] element 2c000000 : 0 [end] + element 00000016 element 00000021 element 0000002c inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 8 => reg 1 ] [ lookup reg 1 set __set%d ] # sctp checksum != { 22, 33, 44} __set%d test-inet 3 __set%d test-inet 0 - element 16000000 : 0 [end] element 21000000 : 0 [end] element 2c000000 : 0 [end] + element 00000016 element 00000021 element 0000002c inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 8 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # sctp vtag 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp eq reg 1 0x16000000 ] + [ cmp eq reg 1 0x00000016 ] # sctp vtag != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp neq reg 1 0xe9000000 ] + [ cmp neq reg 1 0x000000e9 ] # sctp vtag 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range eq reg 1 0x21000000 0x2d000000 ] + [ range eq reg 1 0x00000021 0x0000002d ] # sctp vtag != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range neq reg 1 0x21000000 0x2d000000 ] + [ range neq reg 1 0x00000021 0x0000002d ] # sctp vtag {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # sctp vtag != {33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000084 ] + [ cmp eq reg 1 0x84 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # sctp chunk data exists ip [ exthdr load 1b @ 0 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk init exists ip [ exthdr load 1b @ 1 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk init-ack exists ip [ exthdr load 1b @ 2 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk sack exists ip [ exthdr load 1b @ 3 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk heartbeat exists ip [ exthdr load 1b @ 4 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk heartbeat-ack exists ip [ exthdr load 1b @ 5 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk abort exists ip [ exthdr load 1b @ 6 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk shutdown exists ip [ exthdr load 1b @ 7 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk shutdown-ack exists ip [ exthdr load 1b @ 8 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk error exists ip [ exthdr load 1b @ 9 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk cookie-echo exists ip [ exthdr load 1b @ 10 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk cookie-ack exists ip [ exthdr load 1b @ 11 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk ecne exists ip [ exthdr load 1b @ 12 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk cwr exists ip [ exthdr load 1b @ 13 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk shutdown-complete exists ip [ exthdr load 1b @ 14 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk asconf-ack exists ip [ exthdr load 1b @ 128 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk forward-tsn exists ip [ exthdr load 1b @ 192 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk asconf exists ip [ exthdr load 1b @ 193 + 0 present => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # sctp chunk data type 0 ip [ exthdr load 1b @ 0 + 0 => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # sctp chunk init flags 23 ip [ exthdr load 1b @ 1 + 1 => reg 1 ] - [ cmp eq reg 1 0x00000017 ] + [ cmp eq reg 1 0x17 ] # sctp chunk init-ack length 42 ip [ exthdr load 2b @ 2 + 2 => reg 1 ] - [ cmp eq reg 1 0x00002a00 ] + [ cmp eq reg 1 0x002a ] # sctp chunk data stream 1337 ip [ exthdr load 2b @ 0 + 8 => reg 1 ] - [ cmp eq reg 1 0x00003905 ] + [ cmp eq reg 1 0x0539 ] # sctp chunk init initial-tsn 5 ip [ exthdr load 4b @ 1 + 16 => reg 1 ] - [ cmp eq reg 1 0x05000000 ] + [ cmp eq reg 1 0x00000005 ] # sctp chunk init-ack num-outbound-streams 3 ip [ exthdr load 2b @ 2 + 12 => reg 1 ] - [ cmp eq reg 1 0x00000300 ] + [ cmp eq reg 1 0x0003 ] # sctp chunk sack a-rwnd 1 ip [ exthdr load 4b @ 3 + 8 => reg 1 ] - [ cmp eq reg 1 0x01000000 ] + [ cmp eq reg 1 0x00000001 ] # sctp chunk shutdown cum-tsn-ack 65535 ip [ exthdr load 4b @ 7 + 4 => reg 1 ] - [ cmp eq reg 1 0xffff0000 ] + [ cmp eq reg 1 0x0000ffff ] # sctp chunk ecne lowest-tsn 5 ip [ exthdr load 4b @ 12 + 4 => reg 1 ] - [ cmp eq reg 1 0x05000000 ] + [ cmp eq reg 1 0x00000005 ] # sctp chunk cwr lowest-tsn 8 ip [ exthdr load 4b @ 13 + 4 => reg 1 ] - [ cmp eq reg 1 0x08000000 ] + [ cmp eq reg 1 0x00000008 ] # sctp chunk asconf-ack seqno 12345 ip [ exthdr load 4b @ 128 + 4 => reg 1 ] - [ cmp eq reg 1 0x39300000 ] + [ cmp eq reg 1 0x00003039 ] # sctp chunk forward-tsn new-cum-tsn 31337 ip [ exthdr load 4b @ 192 + 4 => reg 1 ] - [ cmp eq reg 1 0x697a0000 ] + [ cmp eq reg 1 0x00007a69 ] # sctp chunk asconf seqno 12345 ip [ exthdr load 4b @ 193 + 4 => reg 1 ] - [ cmp eq reg 1 0x39300000 ] - + [ cmp eq reg 1 0x00003039 ] diff --git a/tests/py/inet/sets.t.payload.bridge b/tests/py/inet/sets.t.payload.bridge index 3dd9d57b..c5be4cae 100644 --- a/tests/py/inet/sets.t.payload.bridge +++ b/tests/py/inet/sets.t.payload.bridge @@ -1,7 +1,7 @@ # ip saddr @set1 drop bridge test-inet input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 4b @ network header + 12 => reg 1 ] [ lookup reg 1 set set1 ] [ immediate reg 0 drop ] @@ -9,7 +9,7 @@ bridge test-inet input # ip6 daddr != @set2 accept bridge test-inet input [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 24 => reg 1 ] [ lookup reg 1 set set2 0x1 ] [ immediate reg 0 accept ] @@ -17,9 +17,9 @@ bridge test-inet input # ip saddr . ip daddr . tcp dport @set3 accept bridge [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ network header + 16 => reg 9 ] [ payload load 2b @ transport header + 2 => reg 10 ] @@ -29,14 +29,13 @@ bridge # ip daddr . tcp dport { 10.0.0.0/8 . 10-23, 192.168.1.1-192.168.3.8 . 80-443 } accept __set%d test-inet 87 __set%d test-inet 0 - element 0000000a 00000a00 - ffffff0a 00001700 : 0 [end] element 0101a8c0 00005000 - 0803a8c0 0000bb01 : 0 [end] + element 0a000000 . 000a - 0affffff . 0017 element c0a80101 . 0050 - c0a80308 . 01bb bridge [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ network header + 16 => reg 1 ] [ payload load 2b @ transport header + 2 => reg 9 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] - diff --git a/tests/py/inet/sets.t.payload.inet b/tests/py/inet/sets.t.payload.inet index 53c6b182..8c903b35 100644 --- a/tests/py/inet/sets.t.payload.inet +++ b/tests/py/inet/sets.t.payload.inet @@ -1,7 +1,7 @@ # ip saddr @set1 drop inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ network header + 12 => reg 1 ] [ lookup reg 1 set set1 ] [ immediate reg 0 drop ] @@ -9,7 +9,7 @@ inet test-inet input # ip6 daddr != @set2 accept inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x0000000a ] + [ cmp eq reg 1 0x0a ] [ payload load 16b @ network header + 24 => reg 1 ] [ lookup reg 1 set set2 0x1 ] [ immediate reg 0 accept ] @@ -17,9 +17,9 @@ inet test-inet input # ip saddr . ip daddr . tcp dport @set3 accept inet [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ network header + 16 => reg 9 ] [ payload load 2b @ transport header + 2 => reg 10 ] @@ -29,12 +29,12 @@ inet # ip daddr . tcp dport { 10.0.0.0/8 . 10-23, 192.168.1.1-192.168.3.8 . 80-443 } accept __set%d test-inet 87 __set%d test-inet 0 - element 0000000a 00000a00 - ffffff0a 00001700 : 0 [end] element 0101a8c0 00005000 - 0803a8c0 0000bb01 : 0 [end] + element 0a000000 . 000a - 0affffff . 0017 element c0a80101 . 0050 - c0a80308 . 01bb inet [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ network header + 16 => reg 1 ] [ payload load 2b @ transport header + 2 => reg 9 ] [ lookup reg 1 set __set%d ] diff --git a/tests/py/inet/sets.t.payload.netdev b/tests/py/inet/sets.t.payload.netdev index e31aeb92..37660015 100644 --- a/tests/py/inet/sets.t.payload.netdev +++ b/tests/py/inet/sets.t.payload.netdev @@ -1,7 +1,7 @@ # ip saddr @set1 drop netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 4b @ network header + 12 => reg 1 ] [ lookup reg 1 set set1 ] [ immediate reg 0 drop ] @@ -9,7 +9,7 @@ netdev test-netdev ingress # ip6 daddr != @set2 accept netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x0000dd86 ] + [ cmp eq reg 1 0x86dd ] [ payload load 16b @ network header + 24 => reg 1 ] [ lookup reg 1 set set2 0x1 ] [ immediate reg 0 accept ] @@ -17,9 +17,9 @@ netdev test-netdev ingress # ip saddr . ip daddr . tcp dport @set3 accept netdev [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ network header + 16 => reg 9 ] [ payload load 2b @ transport header + 2 => reg 10 ] @@ -29,12 +29,12 @@ netdev # ip daddr . tcp dport { 10.0.0.0/8 . 10-23, 192.168.1.1-192.168.3.8 . 80-443 } accept __set%d test-netdev 87 __set%d test-netdev 0 - element 0000000a 00000a00 - ffffff0a 00001700 : 0 [end] element 0101a8c0 00005000 - 0803a8c0 0000bb01 : 0 [end] + element 0a000000 . 000a - 0affffff . 0017 element c0a80101 . 0050 - c0a80308 . 01bb netdev [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ network header + 16 => reg 1 ] [ payload load 2b @ transport header + 2 => reg 9 ] [ lookup reg 1 set __set%d ] diff --git a/tests/py/inet/snat.t.payload b/tests/py/inet/snat.t.payload index 50519c6b..3399d33e 100644 --- a/tests/py/inet/snat.t.payload +++ b/tests/py/inet/snat.t.payload @@ -1,42 +1,42 @@ # iifname "eth0" tcp dport 81 snat ip to 192.168.3.2 inet test-inet postrouting [ meta load iifname => reg 1 ] - [ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x65746830 0x00000000 0x00000000 0x00000000 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00005100 ] - [ immediate reg 1 0x0203a8c0 ] + [ cmp eq reg 1 0x0051 ] + [ immediate reg 1 0xc0a80302 ] [ nat snat ip addr_min reg 1 ] # iifname "eth0" tcp dport 81 ip saddr 10.1.1.1 snat to 192.168.3.2 inet test-inet postrouting [ meta load iifname => reg 1 ] - [ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x65746830 0x00000000 0x00000000 0x00000000 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00005100 ] + [ cmp eq reg 1 0x0051 ] [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0101010a ] - [ immediate reg 1 0x0203a8c0 ] + [ cmp eq reg 1 0x0a010101 ] + [ immediate reg 1 0xc0a80302 ] [ nat snat ip addr_min reg 1 ] # iifname "eth0" tcp dport 81 snat ip6 to dead::beef inet test-inet postrouting [ meta load iifname => reg 1 ] - [ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x65746830 0x00000000 0x00000000 0x00000000 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00005100 ] - [ immediate reg 1 0x0000adde 0x00000000 0x00000000 0xefbe0000 ] + [ cmp eq reg 1 0x0051 ] + [ immediate reg 1 0xdead0000 0x00000000 0x00000000 0x0000beef ] [ nat snat ip6 addr_min reg 1 ] # iifname "foo" masquerade random inet test-inet postrouting [ meta load iifname => reg 1 ] - [ cmp eq reg 1 0x006f6f66 0x00000000 0x00000000 0x00000000 ] + [ cmp eq reg 1 0x666f6f00 0x00000000 0x00000000 0x00000000 ] [ masq flags 0x4 ] diff --git a/tests/py/inet/socket.t.payload b/tests/py/inet/socket.t.payload index e66ccbf7..c3520db8 100644 --- a/tests/py/inet/socket.t.payload +++ b/tests/py/inet/socket.t.payload @@ -1,12 +1,12 @@ # socket transparent 0 inet sockin sockchain [ socket load transparent => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # socket transparent 1 inet sockin sockchain [ socket load transparent => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # socket mark 0x00000005 inet sockin sockchain @@ -16,9 +16,9 @@ inet sockin sockchain # socket wildcard 0 inet sockin sockchain [ socket load wildcard => reg 1 ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # socket wildcard 1 inet sockin sockchain [ socket load wildcard => reg 1 ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] diff --git a/tests/py/inet/tcp.t.payload b/tests/py/inet/tcp.t.payload index 5c36ad3e..cbf433a5 100644 --- a/tests/py/inet/tcp.t.payload +++ b/tests/py/inet/tcp.t.payload @@ -1,58 +1,58 @@ # tcp dport 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # tcp dport != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # tcp dport 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # tcp dport != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # tcp dport { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] # tcp dport != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # tcp dport {telnet, http, https} accept __set%d test-inet 3 __set%d test-inet 0 - element 00001700 : 0 [end] element 00005000 : 0 [end] element 0000bb01 : 0 [end] + element 0017 element 0050 element 01bb inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] @@ -60,259 +60,259 @@ inet test-inet input # tcp dport vmap { 22 : accept, 23 : drop } __map%d test-inet b __map%d test-inet 0 - element 00001600 : accept 0 [end] element 00001700 : drop 0 [end] + element 0016 : accept element 0017 : drop inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # tcp dport vmap { 25:accept, 28:drop } __map%d test-inet b __map%d test-inet 0 - element 00001900 : accept 0 [end] element 00001c00 : drop 0 [end] + element 0019 : accept element 001c : drop inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # tcp dport { 22, 53, 80, 110 } __set%d test-inet 3 __set%d test-inet 0 - element 00001600 : 0 [end] element 00003500 : 0 [end] element 00005000 : 0 [end] element 00006e00 : 0 [end] + element 0016 element 0035 element 0050 element 006e inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] # tcp dport != { 22, 53, 80, 110 } __set%d test-inet 3 __set%d test-inet 0 - element 00001600 : 0 [end] element 00003500 : 0 [end] element 00005000 : 0 [end] element 00006e00 : 0 [end] + element 0016 element 0035 element 0050 element 006e inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # tcp sport 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # tcp sport != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # tcp sport 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # tcp sport != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # tcp sport { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] # tcp sport != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # tcp sport vmap { 25:accept, 28:drop } __map%d test-inet b __map%d test-inet 0 - element 00001900 : accept 0 [end] element 00001c00 : drop 0 [end] + element 0019 : accept element 001c : drop inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __map%d dreg 0 ] # tcp sport 8080 drop inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x0000901f ] + [ cmp eq reg 1 0x1f90 ] [ immediate reg 0 drop ] # tcp sport 1024 tcp dport 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x16000004 ] + [ cmp eq reg 1 0x04000016 ] # tcp sport 1024 tcp dport 22 tcp sequence 0 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x16000004 ] + [ cmp eq reg 1 0x04000016 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ cmp eq reg 1 0x00000000 ] # tcp sequence 0 tcp sport 1024 tcp dport 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ cmp eq reg 1 0x00000000 ] [ payload load 4b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x16000004 ] + [ cmp eq reg 1 0x04000016 ] # tcp sequence 0 tcp sport { 1024, 1022} tcp dport 22 __set%d test-inet 3 __set%d test-inet 0 - element 00000004 : 0 [end] element 0000fe03 : 0 [end] + element 0400 element 03fe inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ cmp eq reg 1 0x00000000 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # tcp sequence 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp eq reg 1 0x16000000 ] + [ cmp eq reg 1 0x00000016 ] # tcp sequence != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ cmp neq reg 1 0xe9000000 ] + [ cmp neq reg 1 0x000000e9 ] # tcp sequence 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range eq reg 1 0x21000000 0x2d000000 ] + [ range eq reg 1 0x00000021 0x0000002d ] # tcp sequence != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 4 => reg 1 ] - [ range neq reg 1 0x21000000 0x2d000000 ] + [ range neq reg 1 0x00000021 0x0000002d ] # tcp sequence { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d ] # tcp sequence != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # tcp ackseq 42949672 drop inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0x285c8f02 ] + [ cmp eq reg 1 0x028f5c28 ] [ immediate reg 0 drop ] # tcp ackseq 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp eq reg 1 0x16000000 ] + [ cmp eq reg 1 0x00000016 ] # tcp ackseq != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ cmp neq reg 1 0xe9000000 ] + [ cmp neq reg 1 0x000000e9 ] # tcp ackseq 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ range eq reg 1 0x21000000 0x2d000000 ] + [ range eq reg 1 0x00000021 0x0000002d ] # tcp ackseq != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 8 => reg 1 ] - [ range neq reg 1 0x21000000 0x2d000000 ] + [ range neq reg 1 0x00000021 0x0000002d ] # tcp ackseq { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 8 => reg 1 ] [ lookup reg 1 set __set%d ] # tcp ackseq != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end] + element 00000021 element 00000037 element 00000043 element 00000058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 4b @ transport header + 8 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # tcp flags { fin, syn, rst, psh, ack, urg, ecn, cwr} drop __set%d test-inet 3 __set%d test-inet 0 - element 00000001 : 0 [end] element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000008 : 0 [end] element 00000010 : 0 [end] element 00000020 : 0 [end] element 00000040 : 0 [end] element 00000080 : 0 [end] + element 01 element 02 element 04 element 08 element 10 element 20 element 40 element 80 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 drop ] @@ -320,10 +320,10 @@ inet test-inet input # tcp flags != { fin, urg, ecn, cwr} drop __set%d test-inet 3 __set%d test-inet 0 - element 00000001 : 0 [end] element 00000020 : 0 [end] element 00000040 : 0 [end] element 00000080 : 0 [end] + element 01 element 20 element 40 element 80 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 drop ] @@ -331,337 +331,337 @@ inet test-inet input # tcp flags cwr inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000080 ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x80 ) ^ 0x00 ] + [ cmp neq reg 1 0x00 ] # tcp flags != cwr inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ cmp neq reg 1 0x00000080 ] + [ cmp neq reg 1 0x80 ] # tcp flags == syn inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] # tcp flags fin,syn / fin,syn inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000003 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000003 ] + [ bitwise reg 1 = ( reg 1 & 0x03 ) ^ 0x00 ] + [ cmp eq reg 1 0x03 ] # tcp flags != syn / fin,syn inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000003 ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x03 ) ^ 0x00 ] + [ cmp neq reg 1 0x02 ] # tcp flags & syn != 0 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x02 ) ^ 0x00 ] + [ cmp neq reg 1 0x00 ] # tcp flags & syn == 0 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x02 ) ^ 0x00 ] + [ cmp eq reg 1 0x00 ] # tcp flags & (syn | ack) != 0 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000012 ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x12 ) ^ 0x00 ] + [ cmp neq reg 1 0x00 ] # tcp flags & (syn | ack) == 0 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000012 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x12 ) ^ 0x00 ] + [ cmp eq reg 1 0x00 ] # tcp flags & syn == syn inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x02 ) ^ 0x00 ] + [ cmp eq reg 1 0x02 ] # tcp flags & syn != syn inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000002 ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x02 ) ^ 0x00 ] + [ cmp neq reg 1 0x02 ] # tcp flags & (fin | syn | rst | ack) syn inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000017 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x17 ) ^ 0x00 ] + [ cmp eq reg 1 0x02 ] # tcp flags & (fin | syn | rst | ack) == syn inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000017 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x17 ) ^ 0x00 ] + [ cmp eq reg 1 0x02 ] # tcp flags & (fin | syn | rst | ack) != syn inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000017 ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000002 ] + [ bitwise reg 1 = ( reg 1 & 0x17 ) ^ 0x00 ] + [ cmp neq reg 1 0x02 ] # tcp flags & (fin | syn | rst | ack) == syn | ack inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000017 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000012 ] + [ bitwise reg 1 = ( reg 1 & 0x17 ) ^ 0x00 ] + [ cmp eq reg 1 0x12 ] # tcp flags & (fin | syn | rst | ack) != syn | ack inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000017 ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000012 ] + [ bitwise reg 1 = ( reg 1 & 0x17 ) ^ 0x00 ] + [ cmp neq reg 1 0x12 ] # tcp flags & (syn | ack) == syn | ack inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000012 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000012 ] + [ bitwise reg 1 = ( reg 1 & 0x12 ) ^ 0x00 ] + [ cmp eq reg 1 0x12 ] # tcp flags & (fin | syn | rst | psh | ack | urg | ecn | cwr) == fin | syn | rst | psh | ack | urg | ecn | cwr inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000ff ) ^ 0x00000000 ] - [ cmp eq reg 1 0x000000ff ] + [ bitwise reg 1 = ( reg 1 & 0xff ) ^ 0x00 ] + [ cmp eq reg 1 0xff ] # tcp window 22222 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ cmp eq reg 1 0x0000ce56 ] + [ cmp eq reg 1 0x56ce ] # tcp window 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # tcp window != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # tcp window 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # tcp window != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 14 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # tcp window { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 14 => reg 1 ] [ lookup reg 1 set __set%d ] # tcp window != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 14 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # tcp checksum 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 16 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # tcp checksum != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 16 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # tcp checksum 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 16 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # tcp checksum != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 16 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # tcp checksum { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 16 => reg 1 ] [ lookup reg 1 set __set%d ] # tcp checksum != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 16 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # tcp urgptr 1234 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ cmp eq reg 1 0x0000d204 ] + [ cmp eq reg 1 0x04d2 ] [ immediate reg 0 accept ] # tcp urgptr 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # tcp urgptr != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # tcp urgptr 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # tcp urgptr != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 18 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # tcp urgptr { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 18 => reg 1 ] [ lookup reg 1 set __set%d ] # tcp urgptr != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 2b @ transport header + 18 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] # tcp doff 8 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 12 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x000000f0 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000080 ] + [ bitwise reg 1 = ( reg 1 & 0xf0 ) ^ 0x00 ] + [ cmp eq reg 1 0x80 ] # tcp flags & (fin | syn | rst | psh | ack | urg) == { fin, ack, psh | ack, fin | psh | ack } __set%d test-inet 3 __set%d test-inet 0 - element 00000001 : 0 [end] element 00000010 : 0 [end] element 00000018 : 0 [end] element 00000019 : 0 [end] + element 01 element 10 element 18 element 19 ip [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x0000003f ) ^ 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x3f ) ^ 0x00 ] [ lookup reg 1 set __set%d ] # tcp flags { syn, syn | ack } __set%d test-inet 3 __set%d test-inet 0 - element 00000002 : 0 [end] element 00000012 : 0 [end] + element 02 element 12 inet [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] [ lookup reg 1 set __set%d ] # tcp flags ! fin,rst inet [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] + [ cmp eq reg 1 0x06 ] [ payload load 1b @ transport header + 13 => reg 1 ] - [ bitwise reg 1 = ( reg 1 & 0x00000005 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] + [ bitwise reg 1 = ( reg 1 & 0x05 ) ^ 0x00 ] + [ cmp eq reg 1 0x00 ] diff --git a/tests/py/inet/tproxy.t.payload b/tests/py/inet/tproxy.t.payload index 2f419042..ac30070a 100644 --- a/tests/py/inet/tproxy.t.payload +++ b/tests/py/inet/tproxy.t.payload @@ -1,75 +1,74 @@ # meta l4proto 17 tproxy ip to 192.0.2.1 inet x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ immediate reg 1 0x010200c0 ] + [ cmp eq reg 1 0x11 ] + [ immediate reg 1 0xc0000201 ] [ tproxy ip addr reg 1 ] # meta l4proto 6 tproxy ip to 192.0.2.1:50080 inet x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0x010200c0 ] - [ immediate reg 2 0x0000a0c3 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0xc0000201 ] + [ immediate reg 2 0xc3a0 ] [ tproxy ip addr reg 1 port reg 2 ] # meta l4proto 6 tproxy ip6 to [2001:db8::1] inet x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0xb80d0120 0x00000000 0x00000000 0x01000000 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0x20010db8 0x00000000 0x00000000 0x00000001 ] [ tproxy ip6 addr reg 1 ] # meta l4proto 17 tproxy ip6 to [2001:db8::1]:50080 inet x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ immediate reg 1 0xb80d0120 0x00000000 0x00000000 0x01000000 ] - [ immediate reg 2 0x0000a0c3 ] + [ cmp eq reg 1 0x11 ] + [ immediate reg 1 0x20010db8 0x00000000 0x00000000 0x00000001 ] + [ immediate reg 2 0xc3a0 ] [ tproxy ip6 addr reg 1 port reg 2 ] # meta l4proto 17 tproxy to :50080 inet x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ immediate reg 1 0x0000a0c3 ] + [ cmp eq reg 1 0x11 ] + [ immediate reg 1 0xc3a0 ] [ tproxy port reg 1 ] # meta l4proto 17 tproxy ip to :50080 inet x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ immediate reg 1 0x0000a0c3 ] + [ cmp eq reg 1 0x11 ] + [ immediate reg 1 0xc3a0 ] [ tproxy ip port reg 1 ] # meta l4proto 17 tproxy ip6 to :50080 inet x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ immediate reg 1 0x0000a0c3 ] + [ cmp eq reg 1 0x11 ] + [ immediate reg 1 0xc3a0 ] [ tproxy ip6 port reg 1 ] # ip daddr 0.0.0.0/0 meta l4proto 6 tproxy ip to :2000 inet x y [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ network header + 16 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x00000000 ) ^ 0x00000000 ] [ cmp eq reg 1 0x00000000 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0x0000d007 ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0x07d0 ] [ tproxy ip port reg 1 ] # meta l4proto 6 tproxy ip to 127.0.0.1:symhash mod 2 map { 0 : 23, 1 : 42 } __map%d x b size 2 __map%d x 0 - element 00000000 : 00001700 0 [end] element 00000001 : 00002a00 0 [end] + element 00000000 : 0017 element 00000001 : 002a inet x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ immediate reg 1 0x0100007f ] + [ cmp eq reg 1 0x06 ] + [ immediate reg 1 0x7f000001 ] [ hash reg 2 = symhash() % mod 2 ] [ lookup reg 2 set __map%d dreg 2 ] [ tproxy ip addr reg 1 port reg 2 ] - diff --git a/tests/py/inet/udp.t.payload b/tests/py/inet/udp.t.payload index d2c62d92..77311378 100644 --- a/tests/py/inet/udp.t.payload +++ b/tests/py/inet/udp.t.payload @@ -1,42 +1,42 @@ # udp sport 80 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00005000 ] + [ cmp eq reg 1 0x0050 ] [ immediate reg 0 accept ] # udp sport != 60 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp neq reg 1 0x00003c00 ] + [ cmp neq reg 1 0x003c ] [ immediate reg 0 accept ] # udp sport 50-70 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range eq reg 1 0x00003200 0x00004600 ] + [ range eq reg 1 0x0032 0x0046 ] [ immediate reg 0 accept ] # udp sport != 50-60 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range neq reg 1 0x00003200 0x00003c00 ] + [ range neq reg 1 0x0032 0x003c ] [ immediate reg 0 accept ] # udp sport { 49, 50} drop __set%d test-inet 3 __set%d test-inet 0 - element 00003100 : 0 [end] element 00003200 : 0 [end] + element 0031 element 0032 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 drop ] @@ -44,10 +44,10 @@ inet test-inet input # udp sport != { 50, 60} accept __set%d test-inet 3 __set%d test-inet 0 - element 00003200 : 0 [end] element 00003c00 : 0 [end] + element 0032 element 003c inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 accept ] @@ -55,42 +55,42 @@ inet test-inet input # udp dport 80 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00005000 ] + [ cmp eq reg 1 0x0050 ] [ immediate reg 0 accept ] # udp dport != 60 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp neq reg 1 0x00003c00 ] + [ cmp neq reg 1 0x003c ] [ immediate reg 0 accept ] # udp dport 70-75 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00004600 0x00004b00 ] + [ range eq reg 1 0x0046 0x004b ] [ immediate reg 0 accept ] # udp dport != 50-60 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range neq reg 1 0x00003200 0x00003c00 ] + [ range neq reg 1 0x0032 0x003c ] [ immediate reg 0 accept ] # udp dport { 49, 50} drop __set%d test-inet 3 __set%d test-inet 0 - element 00003100 : 0 [end] element 00003200 : 0 [end] + element 0031 element 0032 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 drop ] @@ -98,10 +98,10 @@ inet test-inet input # udp dport != { 50, 60} accept __set%d test-inet 3 __set%d test-inet 0 - element 00003200 : 0 [end] element 00003c00 : 0 [end] + element 0032 element 003c inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 accept ] @@ -109,40 +109,40 @@ inet test-inet input # udp length 6666 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ cmp eq reg 1 0x00000a1a ] + [ cmp eq reg 1 0x1a0a ] # udp length != 6666 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ cmp neq reg 1 0x00000a1a ] + [ cmp neq reg 1 0x1a0a ] # udp length 50-65 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ range eq reg 1 0x00003200 0x00004100 ] + [ range eq reg 1 0x0032 0x0041 ] [ immediate reg 0 accept ] # udp length != 50-65 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 4 => reg 1 ] - [ range neq reg 1 0x00003200 0x00004100 ] + [ range neq reg 1 0x0032 0x0041 ] [ immediate reg 0 accept ] # udp length { 50, 65} accept __set%d test-inet 3 __set%d test-inet 0 - element 00003200 : 0 [end] element 00004100 : 0 [end] + element 0032 element 0041 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 accept ] @@ -150,10 +150,10 @@ inet test-inet input # udp length != { 50, 65} accept __set%d test-inet 3 __set%d test-inet 0 - element 00003200 : 0 [end] element 00004100 : 0 [end] + element 0032 element 0041 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 4 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 accept ] @@ -161,18 +161,18 @@ inet test-inet input # udp checksum 6666 drop inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000a1a ] + [ cmp eq reg 1 0x1a0a ] [ immediate reg 0 drop ] # udp checksum != { 444, 555} accept __set%d test-inet 3 __set%d test-inet 0 - element 0000bc01 : 0 [end] element 00002b02 : 0 [end] + element 01bc element 022b inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 6 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 accept ] @@ -180,48 +180,48 @@ inet test-inet input # udp checksum 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # udp checksum != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # udp checksum 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # udp checksum != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # udp checksum { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 6 => reg 1 ] [ lookup reg 1 set __set%d ] # udp checksum != { 33, 55, 67, 88} __set%d test-inet 3 __set%d test-inet 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 6 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] @@ -230,8 +230,8 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ immediate reg 1 0x00000000 ] + [ cmp eq reg 1 0x11 ] + [ immediate reg 1 0x0000 ] [ payload write reg 1 => 2b @ transport header + 6 csum_type 0 csum_off 0 csum_flags 0x1 ] # iif "lo" udp dport set 65535 @@ -239,6 +239,6 @@ inet test-inet input [ meta load iif => reg 1 ] [ cmp eq reg 1 0x00000001 ] [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ immediate reg 1 0x0000ffff ] + [ cmp eq reg 1 0x11 ] + [ immediate reg 1 0xffff ] [ payload write reg 1 => 2b @ transport header + 2 csum_type 0 csum_off 0 csum_flags 0x1 ] diff --git a/tests/py/inet/udplite.t.payload b/tests/py/inet/udplite.t.payload index dbaeaa78..945b3051 100644 --- a/tests/py/inet/udplite.t.payload +++ b/tests/py/inet/udplite.t.payload @@ -1,42 +1,42 @@ # udplite sport 80 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp eq reg 1 0x00005000 ] + [ cmp eq reg 1 0x0050 ] [ immediate reg 0 accept ] # udplite sport != 60 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ cmp neq reg 1 0x00003c00 ] + [ cmp neq reg 1 0x003c ] [ immediate reg 0 accept ] # udplite sport 50-70 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range eq reg 1 0x00003200 0x00004600 ] + [ range eq reg 1 0x0032 0x0046 ] [ immediate reg 0 accept ] # udplite sport != 50-60 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 0 => reg 1 ] - [ range neq reg 1 0x00003200 0x00003c00 ] + [ range neq reg 1 0x0032 0x003c ] [ immediate reg 0 accept ] # udplite sport { 49, 50} drop __set%d test-ip4 3 __set%d test-ip4 0 - element 00003100 : 0 [end] element 00003200 : 0 [end] + element 0031 element 0032 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 drop ] @@ -44,10 +44,10 @@ inet test-inet input # udplite sport != { 49, 50} accept __set%d test-ip4 3 __set%d test-ip4 0 - element 00003100 : 0 [end] element 00003200 : 0 [end] + element 0031 element 0032 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 0 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 accept ] @@ -55,42 +55,42 @@ inet test-inet input # udplite dport 80 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00005000 ] + [ cmp eq reg 1 0x0050 ] [ immediate reg 0 accept ] # udplite dport != 60 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp neq reg 1 0x00003c00 ] + [ cmp neq reg 1 0x003c ] [ immediate reg 0 accept ] # udplite dport 70-75 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range eq reg 1 0x00004600 0x00004b00 ] + [ range eq reg 1 0x0046 0x004b ] [ immediate reg 0 accept ] # udplite dport != 50-60 accept inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ range neq reg 1 0x00003200 0x00003c00 ] + [ range neq reg 1 0x0032 0x003c ] [ immediate reg 0 accept ] # udplite dport { 49, 50} drop __set%d test-ip4 3 __set%d test-ip4 0 - element 00003100 : 0 [end] element 00003200 : 0 [end] + element 0031 element 0032 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d ] [ immediate reg 0 drop ] @@ -98,10 +98,10 @@ inet test-inet input # udplite dport != { 49, 50} accept __set%d test-ip4 3 __set%d test-ip4 0 - element 00003100 : 0 [end] element 00003200 : 0 [end] + element 0031 element 0032 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 2 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 accept ] @@ -109,18 +109,18 @@ inet test-inet input # udplite checksum 6666 drop inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000a1a ] + [ cmp eq reg 1 0x1a0a ] [ immediate reg 0 drop ] # udplite checksum != { 444, 555} accept __set%d test-inet 3 __set%d test-inet 0 - element 0000bc01 : 0 [end] element 00002b02 : 0 [end] + element 01bc element 022b inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 6 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] [ immediate reg 0 accept ] @@ -128,48 +128,47 @@ inet test-inet input # udplite checksum 22 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] + [ cmp eq reg 1 0x0016 ] # udplite checksum != 233 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] + [ cmp neq reg 1 0x00e9 ] # udplite checksum 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ range eq reg 1 0x00002100 0x00002d00 ] + [ range eq reg 1 0x0021 0x002d ] # udplite checksum != 33-45 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 6 => reg 1 ] - [ range neq reg 1 0x00002100 0x00002d00 ] + [ range neq reg 1 0x0021 0x002d ] # udplite checksum { 33, 55, 67, 88} __set%d test-ip4 3 __set%d test-ip4 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 6 => reg 1 ] [ lookup reg 1 set __set%d ] # udplite checksum != { 33, 55, 67, 88} __set%d test-ip4 3 __set%d test-ip4 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] + element 0021 element 0037 element 0043 element 0058 inet test-inet input [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000088 ] + [ cmp eq reg 1 0x88 ] [ payload load 2b @ transport header + 6 => reg 1 ] [ lookup reg 1 set __set%d 0x1 ] - diff --git a/tests/py/inet/vmap.t.payload b/tests/py/inet/vmap.t.payload index 29ec846d..c905f80e 100644 --- a/tests/py/inet/vmap.t.payload +++ b/tests/py/inet/vmap.t.payload @@ -1,10 +1,10 @@ # iifname . ip protocol . th dport vmap { "eth0" . tcp . 22 : accept, "eth1" . udp . 67 : drop } __map%d test-inet b size 2 __map%d test-inet 0 - element 30687465 00000000 00000000 00000000 00000006 00001600 : accept 0 [end] element 31687465 00000000 00000000 00000000 00000011 00004300 : drop 0 [end] + element 65746830 00000000 00000000 00000000 . 06 . 0016 : accept element 65746831 00000000 00000000 00000000 . 11 . 0043 : drop inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ meta load iifname => reg 1 ] [ payload load 1b @ network header + 9 => reg 2 ] [ payload load 2b @ transport header + 2 => reg 13 ] @@ -13,10 +13,10 @@ inet test-inet input # ip saddr . @ih,32,32 { 1.1.1.1 . 0x14, 2.2.2.2 . 0x1e } __set%d test-inet 3 size 2 __set%d test-inet 0 - element 01010101 14000000 : 0 [end] element 02020202 1e000000 : 0 [end] + element 01010101 . 00000014 element 02020202 . 0000001e inet test-inet input [ meta load nfproto => reg 1 ] - [ cmp eq reg 1 0x00000002 ] + [ cmp eq reg 1 0x02 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ inner header + 4 => reg 9 ] [ lookup reg 1 set __set%d ] @@ -24,11 +24,10 @@ inet test-inet input # udp length . @th,160,128 vmap { 47-63 . 0xe373135363130333131303735353203 : accept } __map%d x 8f size 1 __map%d x 0 - element 00002f00 3531370e 33303136 37303131 03323535 - 00003f00 3531370e 33303136 37303131 03323535 : accept 0 [end] + element 002f . 0e373135 36313033 31313037 35353203 - 003f . 0e373135 36313033 31313037 35353203 : accept inet x y [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 4 => reg 1 ] [ payload load 16b @ transport header + 20 => reg 9 ] [ lookup reg 1 set __map%d dreg 0 ] - diff --git a/tests/py/inet/vmap.t.payload.netdev b/tests/py/inet/vmap.t.payload.netdev index 3f51bb33..881550df 100644 --- a/tests/py/inet/vmap.t.payload.netdev +++ b/tests/py/inet/vmap.t.payload.netdev @@ -1,10 +1,10 @@ # iifname . ip protocol . th dport vmap { "eth0" . tcp . 22 : accept, "eth1" . udp . 67 : drop } __map%d test-netdev b size 2 __map%d test-netdev 0 - element 30687465 00000000 00000000 00000000 00000006 00001600 : accept 0 [end] element 31687465 00000000 00000000 00000000 00000011 00004300 : drop 0 [end] + element 65746830 00000000 00000000 00000000 . 06 . 0016 : accept element 65746831 00000000 00000000 00000000 . 11 . 0043 : drop netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ meta load iifname => reg 1 ] [ payload load 1b @ network header + 9 => reg 2 ] [ payload load 2b @ transport header + 2 => reg 13 ] @@ -13,10 +13,10 @@ netdev test-netdev ingress # ip saddr . @ih,32,32 { 1.1.1.1 . 0x14, 2.2.2.2 . 0x1e } __set%d test-netdev 3 size 2 __set%d test-netdev 0 - element 01010101 14000000 : 0 [end] element 02020202 1e000000 : 0 [end] + element 01010101 . 00000014 element 02020202 . 0000001e netdev test-netdev ingress [ meta load protocol => reg 1 ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ payload load 4b @ network header + 12 => reg 1 ] [ payload load 4b @ inner header + 4 => reg 9 ] [ lookup reg 1 set __set%d ] @@ -24,11 +24,10 @@ netdev test-netdev ingress # udp length . @th,160,128 vmap { 47-63 . 0xe373135363130333131303735353203 : accept } __map%d test-netdev 8f size 1 __map%d test-netdev 0 - element 00002f00 3531370e 33303136 37303131 03323535 - 00003f00 3531370e 33303136 37303131 03323535 : accept 0 [end] + element 002f . 0e373135 36313033 31313037 35353203 - 003f . 0e373135 36313033 31313037 35353203 : accept netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 4 => reg 1 ] [ payload load 16b @ transport header + 20 => reg 9 ] [ lookup reg 1 set __map%d dreg 0 ] - diff --git a/tests/py/inet/vxlan.t.payload b/tests/py/inet/vxlan.t.payload index b9e4ca2c..f7d8116f 100644 --- a/tests/py/inet/vxlan.t.payload +++ b/tests/py/inet/vxlan.t.payload @@ -1,114 +1,113 @@ # udp dport 4789 vxlan vni 10 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ payload load 3b @ tunnel header + 4 => reg 1 ] ] - [ cmp eq reg 1 0x000a0000 ] + [ cmp eq reg 1 0x00000a ] # udp dport 4789 vxlan ip saddr 10.141.11.2 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 1 hdrsize 8 flags f [ payload load 4b @ network header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x020b8d0a ] + [ cmp eq reg 1 0x0a8d0b02 ] # udp dport 4789 vxlan ip saddr 10.141.11.0/24 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 1 hdrsize 8 flags f [ payload load 3b @ network header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x000b8d0a ] + [ cmp eq reg 1 0x0a8d0b ] # udp dport 4789 vxlan ip protocol 1 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 1 hdrsize 8 flags f [ payload load 1b @ network header + 9 => reg 1 ] ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] # udp dport 4789 vxlan udp sport 8888 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ meta load l4proto => reg 1 ] ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ inner type 1 hdrsize 8 flags f [ payload load 2b @ transport header + 0 => reg 1 ] ] - [ cmp eq reg 1 0x0000b822 ] + [ cmp eq reg 1 0x22b8 ] # udp dport 4789 vxlan icmp type echo-reply netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ payload load 2b @ link header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 1 hdrsize 8 flags f [ meta load l4proto => reg 1 ] ] - [ cmp eq reg 1 0x00000001 ] + [ cmp eq reg 1 0x01 ] [ inner type 1 hdrsize 8 flags f [ payload load 1b @ transport header + 0 => reg 1 ] ] - [ cmp eq reg 1 0x00000000 ] + [ cmp eq reg 1 0x00 ] # udp dport 4789 vxlan ether saddr 62:87:4d:d6:19:05 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ payload load 6b @ link header + 6 => reg 1 ] ] - [ cmp eq reg 1 0xd64d8762 0x00000519 ] + [ cmp eq reg 1 0x62874dd6 0x1905 ] # udp dport 4789 vxlan vlan id 10 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ payload load 2b @ link header + 12 => reg 1 ] ] - [ cmp eq reg 1 0x00000081 ] + [ cmp eq reg 1 0x8100 ] [ inner type 1 hdrsize 8 flags f [ payload load 2b @ link header + 14 => reg 1 ] ] - [ bitwise reg 1 = ( reg 1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000a00 ] + [ bitwise reg 1 = ( reg 1 & 0x0fff ) ^ 0x0000 ] + [ cmp eq reg 1 0x000a ] # udp dport 4789 vxlan ip dscp 0x02 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 1 hdrsize 8 flags f [ payload load 1b @ network header + 1 => reg 1 ] ] - [ bitwise reg 1 = ( reg 1 & 0x000000fc ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000008 ] + [ bitwise reg 1 = ( reg 1 & 0xfc ) ^ 0x00 ] + [ cmp eq reg 1 0x08 ] # udp dport 4789 vxlan ip saddr . vxlan ip daddr { 1.2.3.4 . 4.3.2.1 } __set%d test-netdev 3 size 1 __set%d test-netdev 0 - element 04030201 01020304 : 0 [end] + element 01020304 . 04030201 netdev test-netdev ingress [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000011 ] + [ cmp eq reg 1 0x11 ] [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x0000b512 ] + [ cmp eq reg 1 0x12b5 ] [ inner type 1 hdrsize 8 flags f [ meta load protocol => reg 1 ] ] - [ cmp eq reg 1 0x00000008 ] + [ cmp eq reg 1 0x0800 ] [ inner type 1 hdrsize 8 flags f [ payload load 4b @ network header + 12 => reg 1 ] ] [ inner type 1 hdrsize 8 flags f [ payload load 4b @ network header + 16 => reg 9 ] ] [ lookup reg 1 set __set%d ] - |