From: Denis Ovsienko Date: Tue, 21 Jan 2025 18:06:58 +0000 (+0000) Subject: TESTrun: Add more IEEE 802.11 aliases. [skip appveyor] X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/05aa8007a91690573226690e795901ac861c47a3?ds=inline TESTrun: Add more IEEE 802.11 aliases. [skip appveyor] The tests now cover most (all?) of the undocumented "wlan" syntax in grammar.y.in. --- diff --git a/testprogs/TESTrun b/testprogs/TESTrun index 59cb33f9..f7032c8a 100755 --- a/testprogs/TESTrun +++ b/testprogs/TESTrun @@ -2103,6 +2103,7 @@ my %accept_blocks = ( wlan_addr1 => { DLT => 'IEEE802_11', expr => 'wlan addr1 12:34:56:78:9a:bc', + aliases => ['wlan address1 12:34:56:78:9a:bc'], opt => <<~'EOF', (000) ld [6] (001) jeq #0x56789abc jt 2 jf 5 @@ -2115,6 +2116,7 @@ my %accept_blocks = ( wlan_addr2 => { DLT => 'IEEE802_11', expr => 'wlan addr2 12:34:56:78:9a:bc', + aliases => ['wlan address2 12:34:56:78:9a:bc'], opt => <<~'EOF', (000) ldb [0] (001) and #0xc @@ -2136,6 +2138,7 @@ my %accept_blocks = ( wlan_addr3 => { DLT => 'IEEE802_11', expr => 'wlan addr3 12:34:56:78:9a:bc', + aliases => ['wlan address3 12:34:56:78:9a:bc'], opt => <<~'EOF', (000) ldb [0] (001) and #0xc @@ -2151,6 +2154,7 @@ my %accept_blocks = ( wlan_addr4 => { DLT => 'IEEE802_11', expr => 'wlan addr4 12:34:56:78:9a:bc', + aliases => ['wlan address4 12:34:56:78:9a:bc'], opt => <<~'EOF', (000) ldb [1] (001) and #0x3 @@ -2170,6 +2174,8 @@ my %accept_blocks = ( 'type mgt', 'wlan type 0', 'type 0', + 'wlan type management', + 'type management', ], opt => <<~'EOF', (000) ldb [0] @@ -2191,6 +2197,18 @@ my %accept_blocks = ( 'type mgt subtype 0x00', 'wlan type 0 subtype 0x00', 'type 0 subtype 0x00', + 'wlan subtype assocreq', + 'subtype assocreq', + 'wlan type mgt subtype assocreq', + 'type mgt subtype assocreq', + 'wlan type 0 subtype assocreq', + 'type 0 subtype assocreq', + 'wlan type management subtype assoc-req', + 'type management subtype assoc-req', + 'wlan type management subtype 0x00', + 'type management subtype 0x00', + 'wlan type management subtype assocreq', + 'type management subtype assocreq', ], opt => <<~'EOF', (000) ldb [0] @@ -2212,6 +2230,18 @@ my %accept_blocks = ( 'type mgt subtype 0x10', 'wlan type 0 subtype 0x10', 'type 0 subtype 0x10', + 'wlan subtype assocresp', + 'subtype assocresp', + 'wlan type mgt subtype assocresp', + 'type mgt subtype assocresp', + 'wlan type 0 subtype assocresp', + 'type 0 subtype assocresp', + 'wlan type management subtype assoc-resp', + 'type management subtype assoc-resp', + 'wlan type management subtype 0x10', + 'type management subtype 0x10', + 'wlan type management subtype assocresp', + 'type management subtype assocresp', ], opt => <<~'EOF', (000) ldb [0] @@ -2234,6 +2264,18 @@ my %accept_blocks = ( 'type mgt subtype 0x20', 'wlan type 0 subtype 0x20', 'type 0 subtype 0x20', + 'wlan subtype reassocreq', + 'subtype reassocreq', + 'wlan type mgt subtype reassocreq', + 'type mgt subtype reassocreq', + 'wlan type 0 subtype reassocreq', + 'type 0 subtype reassocreq', + 'wlan type management subtype reassoc-req', + 'type management subtype reassoc-req', + 'wlan type management subtype 0x20', + 'type management subtype 0x20', + 'wlan type management subtype reassocreq', + 'type management subtype reassocreq', ], opt => <<~'EOF', (000) ldb [0] @@ -2256,6 +2298,18 @@ my %accept_blocks = ( 'type mgt subtype 0x30', 'wlan type 0 subtype 0x30', 'type 0 subtype 0x30', + 'wlan subtype reassocresp', + 'subtype reassocresp', + 'wlan type mgt subtype reassocresp', + 'type mgt subtype reassocresp', + 'wlan type 0 subtype reassocresp', + 'type 0 subtype reassocresp', + 'wlan type management subtype reassoc-resp', + 'type management subtype reassoc-resp', + 'wlan type management subtype 0x30', + 'type management subtype 0x30', + 'wlan type management subtype reassocresp', + 'type management subtype reassocresp', ], opt => <<~'EOF', (000) ldb [0] @@ -2278,6 +2332,18 @@ my %accept_blocks = ( 'type mgt subtype 0x40', 'wlan type 0 subtype 0x40', 'type 0 subtype 0x40', + 'wlan subtype probereq', + 'subtype probereq', + 'wlan type mgt subtype probereq', + 'type mgt subtype probereq', + 'wlan type 0 subtype probereq', + 'type 0 subtype probereq', + 'wlan type management subtype probe-req', + 'type management subtype probe-req', + 'wlan type management subtype 0x40', + 'type management subtype 0x40', + 'wlan type management subtype probereq', + 'type management subtype probereq', ], opt => <<~'EOF', (000) ldb [0] @@ -2300,6 +2366,18 @@ my %accept_blocks = ( 'type mgt subtype 0x50', 'wlan type 0 subtype 0x50', 'type 0 subtype 0x50', + 'wlan subtype proberesp', + 'subtype proberesp', + 'wlan type mgt subtype proberesp', + 'type mgt subtype proberesp', + 'wlan type 0 subtype proberesp', + 'type 0 subtype proberesp', + 'wlan type management subtype probe-resp', + 'type management subtype probe-resp', + 'wlan type management subtype 0x50', + 'type management subtype 0x50', + 'wlan type management subtype proberesp', + 'type management subtype proberesp', ], opt => <<~'EOF', (000) ldb [0] @@ -2322,6 +2400,10 @@ my %accept_blocks = ( 'type mgt subtype 0x80', 'wlan type 0 subtype 0x80', 'type 0 subtype 0x80', + 'wlan type management subtype beacon', + 'type management subtype beacon', + 'wlan type management subtype 0x80', + 'type management subtype 0x80', ], opt => <<~'EOF', (000) ldb [0] @@ -2344,6 +2426,10 @@ my %accept_blocks = ( 'type mgt subtype 0x90', 'wlan type 0 subtype 0x90', 'type 0 subtype 0x90', + 'wlan type management subtype atim', + 'type management subtype atim', + 'wlan type management subtype 0x90', + 'type management subtype 0x90', ], opt => <<~'EOF', (000) ldb [0] @@ -2366,6 +2452,18 @@ my %accept_blocks = ( 'type mgt subtype 0xa0', 'wlan type 0 subtype 0xa0', 'type 0 subtype 0xa0', + 'wlan subtype disassociation', + 'subtype disassociation', + 'wlan type mgt subtype disassociation', + 'type mgt subtype disassociation', + 'wlan type 0 subtype disassociation', + 'type 0 subtype disassociation', + 'wlan type management subtype disassoc', + 'type management subtype disassoc', + 'wlan type management subtype 0xa0', + 'type management subtype 0xa0', + 'wlan type management subtype disassociation', + 'type management subtype disassociation', ], opt => <<~'EOF', (000) ldb [0] @@ -2388,6 +2486,18 @@ my %accept_blocks = ( 'type mgt subtype 0xb0', 'wlan type 0 subtype 0xb0', 'type 0 subtype 0xb0', + 'wlan subtype authentication', + 'subtype authentication', + 'wlan type mgt subtype authentication', + 'type mgt subtype authentication', + 'wlan type 0 subtype authentication', + 'type 0 subtype authentication', + 'wlan type management subtype auth', + 'type management subtype auth', + 'wlan type management subtype 0xb0', + 'type management subtype 0xb0', + 'wlan type management subtype authentication', + 'type management subtype authentication', ], opt => <<~'EOF', (000) ldb [0] @@ -2410,6 +2520,18 @@ my %accept_blocks = ( 'type mgt subtype 0xc0', 'wlan type 0 subtype 0xc0', 'type 0 subtype 0xc0', + 'wlan subtype deauthentication', + 'subtype deauthentication', + 'wlan type mgt subtype deauthentication', + 'type mgt subtype deauthentication', + 'wlan type 0 subtype deauthentication', + 'type 0 subtype deauthentication', + 'wlan type management subtype deauth', + 'type management subtype deauth', + 'wlan type management subtype 0xc0', + 'type management subtype 0xc0', + 'wlan type management subtype deauthentication', + 'type management subtype deauthentication', ], opt => <<~'EOF', (000) ldb [0] @@ -2426,6 +2548,8 @@ my %accept_blocks = ( 'type ctl', 'wlan type 4', 'type 4', + 'wlan type control', + 'type control', ], opt => <<~'EOF', (000) ldb [0] @@ -2448,6 +2572,10 @@ my %accept_blocks = ( 'type ctl subtype 0x80', 'wlan type 4 subtype 0x80', 'type 4 subtype 0x80', + 'wlan type control subtype bar', + 'type control subtype bar', + 'wlan type control subtype 0x80', + 'type control subtype 0x80', ], opt => <<~'EOF', (000) ldb [0] @@ -2470,6 +2598,10 @@ my %accept_blocks = ( 'type ctl subtype 0x90', 'wlan type 4 subtype 0x90', 'type 4 subtype 0x90', + 'wlan type control subtype ba', + 'type control subtype ba', + 'wlan type control subtype 0x90', + 'type control subtype 0x90', ], opt => <<~'EOF', (000) ldb [0] @@ -2492,6 +2624,10 @@ my %accept_blocks = ( 'type ctl subtype 0xa0', 'wlan type 4 subtype 0xa0', 'type 4 subtype 0xa0', + 'wlan type control subtype ps-poll', + 'type control subtype ps-poll', + 'wlan type control subtype 0xa0', + 'type control subtype 0xa0', ], opt => <<~'EOF', (000) ldb [0] @@ -2514,6 +2650,10 @@ my %accept_blocks = ( 'type ctl subtype 0xb0', 'wlan type 4 subtype 0xb0', 'type 4 subtype 0xb0', + 'wlan type control subtype rts', + 'type control subtype rts', + 'wlan type control subtype 0xb0', + 'type control subtype 0xb0', ], opt => <<~'EOF', (000) ldb [0] @@ -2536,6 +2676,10 @@ my %accept_blocks = ( 'type ctl subtype 0xc0', 'wlan type 4 subtype 0xc0', 'type 4 subtype 0xc0', + 'wlan type control subtype cts', + 'type control subtype cts', + 'wlan type control subtype 0xc0', + 'type control subtype 0xc0', ], opt => <<~'EOF', (000) ldb [0] @@ -2558,6 +2702,10 @@ my %accept_blocks = ( 'type ctl subtype 0xd0', 'wlan type 4 subtype 0xd0', 'type 4 subtype 0xd0', + 'wlan type control subtype ack', + 'type control subtype ack', + 'wlan type control subtype 0xd0', + 'type control subtype 0xd0', ], opt => <<~'EOF', (000) ldb [0] @@ -2580,6 +2728,10 @@ my %accept_blocks = ( 'type ctl subtype 0xe0', 'wlan type 4 subtype 0xe0', 'type 4 subtype 0xe0', + 'wlan type control subtype cf-end', + 'type control subtype cf-end', + 'wlan type control subtype 0xe0', + 'type control subtype 0xe0', ], opt => <<~'EOF', (000) ldb [0] @@ -2602,6 +2754,10 @@ my %accept_blocks = ( 'type ctl subtype 0xf0', 'wlan type 4 subtype 0xf0', 'type 4 subtype 0xf0', + 'wlan type control subtype cf-end-ack', + 'type control subtype cf-end-ack', + 'wlan type control subtype 0xf0', + 'type control subtype 0xf0', ], opt => <<~'EOF', (000) ldb [0] @@ -2977,6 +3133,10 @@ my %accept_blocks = ( 'wlan dir 0', 'dir nods', 'dir 0', + 'wlan direction nods', + 'wlan direction 0', + 'direction nods', + 'direction 0', ], opt => <<~'EOF', (000) ldb [1] @@ -2992,6 +3152,10 @@ my %accept_blocks = ( 'wlan dir 1', 'dir tods', 'dir 1', + 'wlan direction tods', + 'wlan direction 1', + 'direction tods', + 'direction 1', ], opt => <<~'EOF', (000) ldb [1] @@ -3008,6 +3172,10 @@ my %accept_blocks = ( 'wlan dir 2', 'dir fromds', 'dir 2', + 'wlan direction fromds', + 'wlan direction 2', + 'direction fromds', + 'direction 2', ], opt => <<~'EOF', (000) ldb [1] @@ -3024,6 +3192,10 @@ my %accept_blocks = ( 'wlan dir 3', 'dir dstods', 'dir 3', + 'wlan direction dstods', + 'wlan direction 3', + 'direction dstods', + 'direction 3', ], opt => <<~'EOF', (000) ldb [1]