Consolidate MAC-48 address matching code.

[libpcap] / testprogs / TESTrun

diff --git a/testprogs/TESTrun b/testprogs/TESTrun
index 1ae06f66f796ef6dcff93eebe96813e3f9c2a2a5..5bef31585bcc29e9cd193d506327cd31c15216c7 100755 (executable)
--- a/testprogs/TESTrun
+++ b/testprogs/TESTrun
@@ -14643,75 +14643,6 @@ my @reject_tests = (
                expr => 'proto 1.2.3.4',
                errstr => '\'proto\' qualifier applied to IPv4 address',
        },
-       # In the tests below the hostname normally should not matter because the
-       # lookup would be made not in the IPv4/IPv6 space, or not at all.  Still
-       # use a hostname that does not exist on the Internet, just in case.
-       {
-               name => 'link_host_en10mb',
-               DLT => 'EN10MB',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown ether host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_netanalyzer',
-               DLT => 'NETANALYZER',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown ether host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_netanalyzer_transparent',
-               DLT => 'NETANALYZER_TRANSPARENT',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown ether host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_fddi',
-               DLT => 'FDDI',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown FDDI host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_ieee802',
-               DLT => 'IEEE802',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown token ring host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_802_11',
-               DLT => 'IEEE802_11',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown 802.11 host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_802_11_radio',
-               DLT => 'IEEE802_11_RADIO_AVS',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown 802.11 host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_802_11_radio_avs',
-               DLT => 'IEEE802_11_RADIO_AVS',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown 802.11 host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_prism_header',
-               DLT => 'PRISM_HEADER',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown 802.11 host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_ip_over_fc',
-               DLT => 'IP_OVER_FC',
-               expr => "link host ${nonexistent}",
-               errstr => "unknown Fibre Channel host '${nonexistent}'",
-       },
-       {
-               name => 'link_host_other',
-               DLT => 'ARCNET',
-               expr => "link host ${nonexistent}",
-               errstr => 'supports link-level host name',
-       },
        {
                name => 'decnet_host',
                DLT => 'EN10MB',
@@ -14739,15 +14670,6 @@ my @reject_tests = (
                expr => 'gateway eth-noipv4-ipv6.host123.libpcap.test',
                errstr => 'unknown host', # no IPv4 address in /etc/hosts
        },
-       {
-               name => 'gateway_noeth',
-               skip => skip_config_def1 ('INET6') ||
-                       skip_no_ethers() ||
-                       skip_no_hosts(),
-               DLT => 'EN10MB',
-               expr => 'gateway noeth-ipv4-noipv6.host123.libpcap.test',
-               errstr => 'unknown ether host', # not in /etc/ethers
-       },
        {
                name => 'src_gateway',
                skip => skip_config_def1 ('INET6') ||
@@ -15959,7 +15881,7 @@ foreach (DLTs_without 'link_host_mac48') {
                                skip_no_hosts(),
                DLT => $_,
                expr => 'gateway eth-ipv4-noipv6.host123.libpcap.test',
-               errstr => '\'gateway\' supported only on',
+               errstr => '\'gateway\' not supported on',
        };
        # ID -> gen_scode() -> case Q_GATEWAY -> gen_gateway() -> case Q_DEFAULT -> default
        # Invokes bpf_error() after pcap_ether_hostton().
@@ -15970,7 +15892,7 @@ foreach (DLTs_without 'link_host_mac48') {
                                skip_no_hosts(),
                DLT => $_,
                expr => 'gateway eth-ipv4-ipv6.host123.libpcap.test',
-               errstr => '\'gateway\' supported only on',
+               errstr => '\'gateway\' not supported on',
        };
 }
 
@@ -16118,7 +16040,7 @@ foreach (DLTs_without 'link_proto') {
        };
 }
 
-# gen_broadcast() -> case Q_LINK -> default
+# gen_broadcast() -> case Q_LINK -> gen_mac48host() -> fail_kw_on_dlt()
 foreach (DLTs_without 'link_broadcast') {
        push @reject_tests, {
                name => "link_broadcast_${_}",
@@ -16185,7 +16107,7 @@ foreach (DLTs_without 'wlan') {
        };
 }
 
-# gen_scode() -> case Q_HOST -> proto == Q_LINK -> non-WLAN case -> gen_mac48hostop() -> default case
+# gen_scode() -> case Q_HOST -> proto == Q_LINK -> non-WLAN case -> gen_mac48host() -> default case
 # Invokes bpf_error() after pcap_ether_hostton().
 foreach my $DLT (DLTs_without '') {
        next if ! DLT_feature ($DLT, 'link_host_mac48') || DLT_feature ($DLT, 'wlan');
@@ -16220,7 +16142,7 @@ foreach (DLTs_without 'ss7') {
 }
 
 foreach (DLTs_without 'link_host_mac48') {
-       # gen_gateway() -> case Q_DEFAULT -> default
+       # gen_scode() -> case Q_GATEWAY -> fail_kw_on_dlt()
        push @reject_tests, {
                name => "gateway_name_${_}",
                skip => skip_config_def1 ('INET6') ||
@@ -16228,15 +16150,44 @@ foreach (DLTs_without 'link_host_mac48') {
                        skip_no_hosts(),
                DLT => $_,
                expr => 'gateway eth-ipv4-noipv6.host123.libpcap.test',
-               errstr => '\'gateway\' supported only on ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel',
+               errstr => '\'gateway\' not supported on',
        };
-       # gen_scode() -> case Q_DEFAULT -> Q_LINK
+       # gen_scode() -> case Q_DEFAULT -> Q_LINK -> fail_kw_on_dlt()
        push @reject_tests, {
                name => "link_host_name_${_}",
                skip => skip_no_ethers(),
                DLT => $_,
                expr => 'link host eth-noipv4-noipv6.host123.libpcap.test',
-               errstr => 'only ethernet/FDDI/token ring/802.11/ATM LANE/Fibre Channel supports link-level host name',
+               errstr => '\'link host NAME\' not supported on',
+       };
+       # gen_ecode() -> fail_kw_on_dlt()
+       push @reject_tests, {
+               name => "link_host_mac48_${_}",
+               DLT => $_,
+               expr => 'link host a:b:c:d:e:f',
+               errstr => '\'link host XX:XX:XX:XX:XX:XX\' not supported on',
+       };
+}
+
+foreach (DLTs_with 'link_host_mac48') {
+       # gen_scode() -> case Q_GATEWAY -> eaddrp == NULL
+       push @reject_tests, {
+               name => "gateway_nonex_${_}",
+               skip => skip_config_def1 ('INET6') ||
+                       skip_no_hosts(),
+               DLT => $_,
+               expr => 'gateway noeth-ipv4-noipv6.host123.libpcap.test',
+               errstr => "unknown Ethernet-like host 'noeth-ipv4-noipv6.host123.libpcap.test'",
+       };
+       # In the test below the hostname normally should not matter because the
+       # lookup would be made not in the IPv4/IPv6 space, or not at all.  Still
+       # use a hostname that does not exist on the Internet, just in case.
+       # gen_scode() -> case Q_HOST -> proto == Q_LINK -> eaddrp == NULL
+       push @reject_tests, {
+               name => "link_host_nonex_${_}",
+               DLT => $_,
+               expr => "link host ${nonexistent}",
+               errstr => "unknown Ethernet-like host '${nonexistent}'",
        };
 }