Use a simpler expression to check the ether type in scapy. This

makes the fragment tests work on FreeBSD.  From Ilya Bakulin.

diff --git a/regress/sys/net/pf_forward/ping6_mtu.py b/regress/sys/net/pf_forward/ping6_mtu.py
index cc0804b..7c2a5b9 100644 (file)
--- a/regress/sys/net/pf_forward/ping6_mtu.py
+++ b/regress/sys/net/pf_forward/ping6_mtu.py
@@ -26,7 +26,7 @@ if len(ans) == 0:
        exit(2)
 a=ans[0]
 
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Packet too big':
        mtu=a.payload.payload.mtu

diff --git a/regress/sys/net/pf_fragment/frag.py b/regress/sys/net/pf_fragment/frag.py
index 1c4b0cd..62bc1ba 100644 (file)
--- a/regress/sys/net/pf_fragment/frag.py
+++ b/regress/sys/net/pf_fragment/frag.py
@@ -25,7 +25,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip and src "+dstaddr+" and dst "+SRC_OUT+" and icmp")
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv4 and \
+if a and a.type == ETH_P_IP and \
     a.payload.proto == 1 and \
     a.payload.frag == 0 and a.payload.flags == 0 and \
     icmptypes[a.payload.payload.type] == 'echo-reply':

diff --git a/regress/sys/net/pf_fragment/frag6.py b/regress/sys/net/pf_fragment/frag6.py
index 88304f4..1fe1b03 100644 (file)
--- a/regress/sys/net/pf_fragment/frag6.py
+++ b/regress/sys/net/pf_fragment/frag6.py
@@ -25,7 +25,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+dstaddr+" and dst "+SRC_OUT6+" and icmp6")
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Echo Reply':
        id=a.payload.payload.id

diff --git a/regress/sys/net/pf_fragment/frag6_cutnew.py b/regress/sys/net/pf_fragment/frag6_cutnew.py
index 8d8c7e5..5c4b21b 100644 (file)
--- a/regress/sys/net/pf_fragment/frag6_cutnew.py
+++ b/regress/sys/net/pf_fragment/frag6_cutnew.py
@@ -34,7 +34,7 @@ if len(ans) == 0:
        print "no reply"
        exit(0)
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Echo Reply':
        id=a.payload.payload.id

diff --git a/regress/sys/net/pf_fragment/frag6_cutold.py b/regress/sys/net/pf_fragment/frag6_cutold.py
index b1444cf..8a3cb5e 100644 (file)
--- a/regress/sys/net/pf_fragment/frag6_cutold.py
+++ b/regress/sys/net/pf_fragment/frag6_cutold.py
@@ -34,7 +34,7 @@ if len(ans) == 0:
        print "no reply"
        exit(0)
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Echo Reply':
        id=a.payload.payload.id

diff --git a/regress/sys/net/pf_fragment/frag6_dropnew.py b/regress/sys/net/pf_fragment/frag6_dropnew.py
index 1ae1b5d..710292a 100644 (file)
--- a/regress/sys/net/pf_fragment/frag6_dropnew.py
+++ b/regress/sys/net/pf_fragment/frag6_dropnew.py
@@ -38,7 +38,7 @@ if len(ans) == 0:
        print "no reply"
        exit(0)
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Echo Reply':
        id=a.payload.payload.id

diff --git a/regress/sys/net/pf_fragment/frag6_dropold.py b/regress/sys/net/pf_fragment/frag6_dropold.py
index 4716ef0..8e54d72 100644 (file)
--- a/regress/sys/net/pf_fragment/frag6_dropold.py
+++ b/regress/sys/net/pf_fragment/frag6_dropold.py
@@ -38,7 +38,7 @@ if len(ans) == 0:
        print "no reply"
        exit(0)
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Echo Reply':
        id=a.payload.payload.id

diff --git a/regress/sys/net/pf_fragment/frag6_ext.py b/regress/sys/net/pf_fragment/frag6_ext.py
index e85db24..b070694 100644 (file)
--- a/regress/sys/net/pf_fragment/frag6_ext.py
+++ b/regress/sys/net/pf_fragment/frag6_ext.py
@@ -25,7 +25,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+dstaddr+" and dst "+SRC_OUT6+" and icmp6")
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Echo Reply':
        id=a.payload.payload.id

diff --git a/regress/sys/net/pf_fragment/frag_cutnew.py b/regress/sys/net/pf_fragment/frag_cutnew.py
index a2f1a84..a186696 100644 (file)
--- a/regress/sys/net/pf_fragment/frag_cutnew.py
+++ b/regress/sys/net/pf_fragment/frag_cutnew.py
@@ -34,7 +34,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip and src "+dstaddr+" and dst "+SRC_OUT+" and icmp")
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv4 and \
+if a and a.type == ETH_P_IP and \
     a.payload.proto == 1 and \
     a.payload.frag == 0 and a.payload.flags == 0 and \
     icmptypes[a.payload.payload.type] == 'echo-reply':

diff --git a/regress/sys/net/pf_fragment/frag_cutold.py b/regress/sys/net/pf_fragment/frag_cutold.py
index 2479987..1e3b919 100644 (file)
--- a/regress/sys/net/pf_fragment/frag_cutold.py
+++ b/regress/sys/net/pf_fragment/frag_cutold.py
@@ -35,7 +35,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip and src "+dstaddr+" and dst "+SRC_OUT+" and icmp")
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv4 and \
+if a and a.type == ETH_P_IP and \
     a.payload.proto == 1 and \
     a.payload.frag == 0 and a.payload.flags == 0 and \
     icmptypes[a.payload.payload.type] == 'echo-reply':

diff --git a/regress/sys/net/pf_fragment/frag_dropnew.py b/regress/sys/net/pf_fragment/frag_dropnew.py
index 5f5bc33..ce81baa 100644 (file)
--- a/regress/sys/net/pf_fragment/frag_dropnew.py
+++ b/regress/sys/net/pf_fragment/frag_dropnew.py
@@ -39,7 +39,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip and src "+dstaddr+" and dst "+SRC_OUT+" and icmp")
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv4 and \
+if a and a.type == ETH_P_IP and \
     a.payload.proto == 1 and \
     a.payload.frag == 0 and a.payload.flags == 0 and \
     icmptypes[a.payload.payload.type] == 'echo-reply':

diff --git a/regress/sys/net/pf_fragment/frag_dropold.py b/regress/sys/net/pf_fragment/frag_dropold.py
index 520a816..8f4d698 100644 (file)
--- a/regress/sys/net/pf_fragment/frag_dropold.py
+++ b/regress/sys/net/pf_fragment/frag_dropold.py
@@ -39,7 +39,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip and src "+dstaddr+" and dst "+SRC_OUT+" and icmp")
 a=ans[0]
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv4 and \
+if a and a.type == ETH_P_IP and \
     a.payload.proto == 1 and \
     a.payload.frag == 0 and a.payload.flags == 0 and \
     icmptypes[a.payload.payload.type] == 'echo-reply':

diff --git a/regress/sys/net/pf_fragment/ping6_cksum.py b/regress/sys/net/pf_fragment/ping6_cksum.py
index 752124c..fb4cbd1 100644 (file)
--- a/regress/sys/net/pf_fragment/ping6_cksum.py
+++ b/regress/sys/net/pf_fragment/ping6_cksum.py
@@ -13,7 +13,7 @@ p=(Ether(src=SRC_MAC, dst=PF_MAC)/IPv6(src=SRC_OUT6, dst=dstaddr)/
 echocksum=IPv6(str(p.payload)).payload.cksum
 print "echocksum=%#04x" % (echocksum)
 a=srp1(p, iface=SRC_IF, timeout=2)
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Packet too big':
        outercksum=a.payload.payload.cksum

diff --git a/regress/sys/net/pf_fragment/ping6_mtu_1300.py b/regress/sys/net/pf_fragment/ping6_mtu_1300.py
index e7b85af..30c220a 100644 (file)
--- a/regress/sys/net/pf_fragment/ping6_mtu_1300.py
+++ b/regress/sys/net/pf_fragment/ping6_mtu_1300.py
@@ -10,7 +10,7 @@ pid=os.getpid()
 payload="a" * 1452
 a=srp1(Ether(src=SRC_MAC, dst=PF_MAC)/IPv6(src=SRC_OUT6, dst=dstaddr)/
     ICMPv6EchoRequest(id=pid, data=payload), iface=SRC_IF, timeout=2)
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Packet too big':
        mtu=a.payload.payload.mtu

diff --git a/regress/sys/net/pf_fragment/ping_cksum.py b/regress/sys/net/pf_fragment/ping_cksum.py
index 803fb77..8b4eddc 100644 (file)
--- a/regress/sys/net/pf_fragment/ping_cksum.py
+++ b/regress/sys/net/pf_fragment/ping_cksum.py
@@ -15,7 +15,7 @@ print "ipcksum=%#04x" % (ipcksum)
 echocksum=IP(str(p.payload)).payload.chksum
 print "echocksum=%#04x" % (echocksum)
 a=srp1(p, iface=SRC_IF, timeout=2)
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv4 and \
+if a and a.type == ETH_P_IP and \
     a.payload.proto == 1 and \
     icmptypes[a.payload.payload.type] == 'dest-unreach' and \
     icmpcodes[a.payload.payload.type][a.payload.payload.code] == \

diff --git a/regress/sys/net/pf_fragment/udp6_cksum.py b/regress/sys/net/pf_fragment/udp6_cksum.py
index d61d847..030449d 100644 (file)
--- a/regress/sys/net/pf_fragment/udp6_cksum.py
+++ b/regress/sys/net/pf_fragment/udp6_cksum.py
@@ -13,7 +13,7 @@ p=(Ether(src=SRC_MAC, dst=PF_MAC)/IPv6(src=SRC_OUT6, dst=dstaddr)/
 udpcksum=IPv6(str(p.payload)).payload.chksum
 print "udpcksum=%#04x" % (udpcksum)
 a=srp1(p, iface=SRC_IF, timeout=2)
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+if a and a.type == ETH_P_IPV6 and \
     ipv6nh[a.payload.nh] == 'ICMPv6' and \
     icmp6types[a.payload.payload.type] == 'Packet too big':
        outercksum=a.payload.payload.cksum

diff --git a/regress/sys/net/pf_fragment/udp_cksum.py b/regress/sys/net/pf_fragment/udp_cksum.py
index 064a01d..296bdb3 100644 (file)
--- a/regress/sys/net/pf_fragment/udp_cksum.py
+++ b/regress/sys/net/pf_fragment/udp_cksum.py
@@ -15,7 +15,7 @@ print "ipcksum=%#04x" % (ipcksum)
 udpcksum=IP(str(p.payload)).payload.chksum
 print "udpcksum=%#04x" % (udpcksum)
 a=srp1(p, iface=SRC_IF, timeout=2)
-if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv4 and \
+if a and a.type == ETH_P_IP and \
     a.payload.proto == 1 and \
     icmptypes[a.payload.payload.type] == 'dest-unreach' and \
     icmpcodes[a.payload.payload.type][a.payload.payload.code] == \

diff --git a/regress/sys/netinet6/frag6/frag6.py b/regress/sys/netinet6/frag6/frag6.py
index 6e99f90..1d70137 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6.py
+++ b/regress/sys/netinet6/frag6/frag6.py
@@ -27,7 +27,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_ext.py b/regress/sys/netinet6/frag6/frag6_ext.py
index fabe23d..993bb2c 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_ext.py
+++ b/regress/sys/netinet6/frag6/frag6_ext.py
@@ -24,7 +24,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_opt.py b/regress/sys/netinet6/frag6/frag6_opt.py
index 230734a..b3a8830 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_opt.py
+++ b/regress/sys/netinet6/frag6/frag6_opt.py
@@ -26,7 +26,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_overatomic.py b/regress/sys/netinet6/frag6/frag6_overatomic.py
index 612ef89..d1bb7bd 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_overatomic.py
+++ b/regress/sys/netinet6/frag6/frag6_overatomic.py
@@ -29,7 +29,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_overdrop.py b/regress/sys/netinet6/frag6/frag6_overdrop.py
index e9763e0..97fda50 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_overdrop.py
+++ b/regress/sys/netinet6/frag6/frag6_overdrop.py
@@ -35,7 +35,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_overhead.py b/regress/sys/netinet6/frag6/frag6_overhead.py
index cdc1b04..41e3d28 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_overhead.py
+++ b/regress/sys/netinet6/frag6/frag6_overhead.py
@@ -32,7 +32,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_overhead0.py b/regress/sys/netinet6/frag6/frag6_overhead0.py
index 9f0d009..daa09a1 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_overhead0.py
+++ b/regress/sys/netinet6/frag6/frag6_overhead0.py
@@ -30,7 +30,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_overtail.py b/regress/sys/netinet6/frag6/frag6_overtail.py
index 52a8e0f..6c7bf30 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_overtail.py
+++ b/regress/sys/netinet6/frag6/frag6_overtail.py
@@ -30,7 +30,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_permute.py b/regress/sys/netinet6/frag6/frag6_permute.py
index aca6621..481f506 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_permute.py
+++ b/regress/sys/netinet6/frag6/frag6_permute.py
@@ -43,7 +43,7 @@ for p in permute:
        ans=sniff(iface=SRC_IF, timeout=3, filter=
            "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
        for a in ans:
-               if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+               if a and a.type == ETH_P_IPV6 and \
                    ipv6nh[a.payload.nh] == 'ICMPv6' and \
                    icmp6types[a.payload.payload.type] == 'Echo Reply':
                        id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_refrag.py b/regress/sys/netinet6/frag6/frag6_refrag.py
index a0697ba..4813e55 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_refrag.py
+++ b/regress/sys/netinet6/frag6/frag6_refrag.py
@@ -39,7 +39,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and proto ipv6-frag")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'Fragment Header' and \
            a.payload.payload.offset == 0 and \
            ipv6nh[a.payload.payload.nh] == 'ICMPv6' and \

diff --git a/regress/sys/netinet6/frag6/frag6_shortatomic.py b/regress/sys/netinet6/frag6/frag6_shortatomic.py
index 1d6e636..4465848 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_shortatomic.py
+++ b/regress/sys/netinet6/frag6/frag6_shortatomic.py
@@ -31,7 +31,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_timeout.py b/regress/sys/netinet6/frag6/frag6_timeout.py
index e43984e..9299fe2 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_timeout.py
+++ b/regress/sys/netinet6/frag6/frag6_timeout.py
@@ -37,7 +37,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=90, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_udpatomic.py b/regress/sys/netinet6/frag6/frag6_udpatomic.py
index d77e79f..632caa8 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_udpatomic.py
+++ b/regress/sys/netinet6/frag6/frag6_udpatomic.py
@@ -26,7 +26,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and udp")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'UDP' and \
            a.payload.payload.sport == 7:
                port=a.payload.payload.dport

diff --git a/regress/sys/netinet6/frag6/frag6_udpheader.py b/regress/sys/netinet6/frag6/frag6_udpheader.py
index dd6b2ad..617cf14 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_udpheader.py
+++ b/regress/sys/netinet6/frag6/frag6_udpheader.py
@@ -27,7 +27,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and udp")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'UDP' and \
            a.payload.payload.sport == 7:
                port=a.payload.payload.dport

diff --git a/regress/sys/netinet6/frag6/frag6_udppayload.py b/regress/sys/netinet6/frag6/frag6_udppayload.py
index 16efbce..c5bfd9a 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_udppayload.py
+++ b/regress/sys/netinet6/frag6/frag6_udppayload.py
@@ -27,7 +27,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and udp")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'UDP' and \
            a.payload.payload.sport == 7:
                port=a.payload.payload.dport

diff --git a/regress/sys/netinet6/frag6/frag6_zerofirst.py b/regress/sys/netinet6/frag6/frag6_zerofirst.py
index bbc6fdc..80610a3 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_zerofirst.py
+++ b/regress/sys/netinet6/frag6/frag6_zerofirst.py
@@ -29,7 +29,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/frag6/frag6_zerosecond.py b/regress/sys/netinet6/frag6/frag6_zerosecond.py
index 240c96d..90971f7 100644 (file)
--- a/regress/sys/netinet6/frag6/frag6_zerosecond.py
+++ b/regress/sys/netinet6/frag6/frag6_zerosecond.py
@@ -29,7 +29,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                id=a.payload.payload.id

diff --git a/regress/sys/netinet6/nd6/nd6_ar.py b/regress/sys/netinet6/nd6/nd6_ar.py
index 2c13895..3ccf6ef 100644 (file)
--- a/regress/sys/netinet6/nd6/nd6_ar.py
+++ b/regress/sys/netinet6/nd6/nd6_ar.py
@@ -35,7 +35,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Neighbor Advertisement':
                tgt=a.payload.payload.tgt

diff --git a/regress/sys/netinet6/nd6/nd6_dad.py b/regress/sys/netinet6/nd6/nd6_dad.py
index 054b06f..ace040d 100644 (file)
--- a/regress/sys/netinet6/nd6/nd6_dad.py
+++ b/regress/sys/netinet6/nd6/nd6_dad.py
@@ -35,7 +35,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+lla(DST_MAC)+" and dst ff02::1 and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Neighbor Advertisement':
                tgt=a.payload.payload.tgt

diff --git a/regress/sys/netinet6/nd6/nd6_nud.py b/regress/sys/netinet6/nd6/nd6_nud.py
index b7a7c1a..4fd2182 100644 (file)
--- a/regress/sys/netinet6/nd6/nd6_nud.py
+++ b/regress/sys/netinet6/nd6/nd6_nud.py
@@ -35,7 +35,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and src "+DST_IN6+" and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Neighbor Advertisement':
                tgt=a.payload.payload.tgt

diff --git a/regress/sys/netinet6/rh0/rh0_empty.py b/regress/sys/netinet6/rh0/rh0_empty.py
index 68c5ed5..eeb92d1 100644 (file)
--- a/regress/sys/netinet6/rh0/rh0_empty.py
+++ b/regress/sys/netinet6/rh0/rh0_empty.py
@@ -22,7 +22,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Parameter problem':
                pprob=a.payload.payload

diff --git a/regress/sys/netinet6/rh0/rh0_final.py b/regress/sys/netinet6/rh0/rh0_final.py
index 14d2825..e76fb79 100644 (file)
--- a/regress/sys/netinet6/rh0/rh0_final.py
+++ b/regress/sys/netinet6/rh0/rh0_final.py
@@ -22,7 +22,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Parameter problem':
                pprob=a.payload.payload

diff --git a/regress/sys/netinet6/rh0/rh0_frag2.py b/regress/sys/netinet6/rh0/rh0_frag2.py
index 667aa58..a9e4677 100644 (file)
--- a/regress/sys/netinet6/rh0/rh0_frag2.py
+++ b/regress/sys/netinet6/rh0/rh0_frag2.py
@@ -30,7 +30,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                reply=a.payload.payload

diff --git a/regress/sys/netinet6/rh0/rh0_frag_empty.py b/regress/sys/netinet6/rh0/rh0_frag_empty.py
index cd940a4..f2939f7 100644 (file)
--- a/regress/sys/netinet6/rh0/rh0_frag_empty.py
+++ b/regress/sys/netinet6/rh0/rh0_frag_empty.py
@@ -24,7 +24,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                reply=a.payload.payload

diff --git a/regress/sys/netinet6/rh0/rh0_frag_final.py b/regress/sys/netinet6/rh0/rh0_frag_final.py
index 71d12e6..cc35c62 100644 (file)
--- a/regress/sys/netinet6/rh0/rh0_frag_final.py
+++ b/regress/sys/netinet6/rh0/rh0_frag_final.py
@@ -24,7 +24,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                reply=a.payload.payload

diff --git a/regress/sys/netinet6/rh0/rh0_frag_route.py b/regress/sys/netinet6/rh0/rh0_frag_route.py
index 86bdc72..dc7b009 100644 (file)
--- a/regress/sys/netinet6/rh0/rh0_frag_route.py
+++ b/regress/sys/netinet6/rh0/rh0_frag_route.py
@@ -24,7 +24,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Parameter problem':
                pprob=a.payload.payload

diff --git a/regress/sys/netinet6/rh0/rh0_none.py b/regress/sys/netinet6/rh0/rh0_none.py
index e144c40..7405a0a 100644 (file)
--- a/regress/sys/netinet6/rh0/rh0_none.py
+++ b/regress/sys/netinet6/rh0/rh0_none.py
@@ -20,7 +20,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Echo Reply':
                reply=a.payload.payload

diff --git a/regress/sys/netinet6/rh0/rh0_route.py b/regress/sys/netinet6/rh0/rh0_route.py
index 9e468b6..def084e 100644 (file)
--- a/regress/sys/netinet6/rh0/rh0_route.py
+++ b/regress/sys/netinet6/rh0/rh0_route.py
@@ -22,7 +22,7 @@ if os.fork() == 0:
 ans=sniff(iface=SRC_IF, timeout=3, filter=
     "ip6 and dst "+SRC_OUT6+" and icmp6")
 for a in ans:
-       if a and a.type == scapy.layers.dot11.ETHER_TYPES.IPv6 and \
+       if a and a.type == ETH_P_IPV6 and \
            ipv6nh[a.payload.nh] == 'ICMPv6' and \
            icmp6types[a.payload.payload.type] == 'Parameter problem':
                pprob=a.payload.payload