From 14b68bb14eb7360219e65120e41b0ee496b6b3da Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 13 May 2016 19:13:12 +0200 Subject: tests/py: update for changed set name in payload Original patch posted in the mailing list from Patrick, I have refreshed this so it applies on top of current HEAD. Signed-off-by: Pablo Neira Ayuso --- tests/py/ip6/vmap.t.payload.inet | 252 +++++++++++++++++++-------------------- 1 file changed, 126 insertions(+), 126 deletions(-) (limited to 'tests/py/ip6/vmap.t.payload.inet') diff --git a/tests/py/ip6/vmap.t.payload.inet b/tests/py/ip6/vmap.t.payload.inet index f0312bf3..53f19eb9 100644 --- a/tests/py/ip6/vmap.t.payload.inet +++ b/tests/py/ip6/vmap.t.payload.inet @@ -1,420 +1,420 @@ # ip6 saddr vmap { abcd::3 : accept } -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 0000cdab 00000000 00000000 03000000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34120000 34123412 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00003412 34123412 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34120000 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00003412 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 34120000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 00003412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234::1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 34123412 34120000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:1234:: : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 34123412 00003412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00000000 34123412 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00003412 34120000 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00000000 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00003412 34120000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234::1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 00000000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234::1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 00003412 34120000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:1234:: : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 34123412 00000000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00000000 34120000 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00003412 00000000 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00000000 34120000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00003412 00000000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234::1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 00000000 34120000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:1234:: : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 00003412 00000000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00000000 00000000 34123412 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00003412 00000000 34120000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00000000 00000000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234::1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00003412 00000000 34120000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:1234:: : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 00000000 00000000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00000000 00000000 34120000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00003412 00000000 00000000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234::1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00000000 00000000 34120000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:1234:: : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00003412 00000000 00000000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234:1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00000000 00000000 00000000 34123412 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234::1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00003412 00000000 00000000 34120000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:1234:: : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 00000000 00000000 00000000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::1234 : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00000000 00000000 00000000 34120000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { 1234:: : accept} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 00003412 00000000 00000000 00000000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap { ::/64 : accept} -map%d test-inet f -map%d test-inet 0 +__map%d test-inet f +__map%d test-inet 0 element 00000000 00000000 00000000 00000000 : 0 [end] element 00000000 01000000 00000000 00000000 : 1 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:: : accept, ::aaaa : drop} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 34123412 0000aaaa : 0 [end] element 00000000 00000000 00000000 aaaa0000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept, ::bbbb : drop} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 34123412 0000aaaa : 0 [end] element 00000000 00000000 00000000 bbbb0000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::cccc : drop} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 34123412 0000aaaa : 0 [end] element 00000000 00000000 00000000 cccc0000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] # ip6 saddr vmap {1234:1234:1234:1234:1234:1234:aaaa:::accept,::dddd: drop} -map%d test-inet b -map%d test-inet 0 +__map%d test-inet b +__map%d test-inet 0 element 34123412 34123412 34123412 0000aaaa : 0 [end] element 00000000 00000000 00000000 dddd0000 : 0 [end] inet test-inet input [ meta load nfproto => reg 1 ] [ cmp eq reg 1 0x0000000a ] [ payload load 16b @ network header + 8 => reg 1 ] - [ lookup reg 1 set map%d dreg 0 ] + [ lookup reg 1 set __map%d dreg 0 ] -- cgit v1.2.3