Fix tests: Restrict getpid() to lower 16 bit so that it can still

be used as packet id.  Now scapy calls nexthopmtu with this name
explicitly in icmp structure.

45 files changed, 47 insertions, 47 deletions

diff --git a/regress/sys/net/pf_forward/ping6_mtu.py b/regress/sys/net/pf_forward/ping6_mtu.py
index 52e39b49273..e1eba8ad59e 100644
--- a/regress/sys/net/pf_forward/ping6_mtu.py
+++ b/regress/sys/net/pf_forward/ping6_mtu.py
@@ -11,7 +11,7 @@ srcaddr=sys.argv[1]
 dstaddr=sys.argv[2]
 size=int(sys.argv[3])
 expect=int(sys.argv[4])
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 hdr=IPv6(src=srcaddr, dst=dstaddr)/ICMPv6EchoRequest(id=pid)
 payload="a" * (size - len(str(hdr)))
 ip=hdr/payload
diff --git a/regress/sys/net/pf_forward/ping_mtu.py b/regress/sys/net/pf_forward/ping_mtu.py
index f12a4574767..98577ed1168 100644
--- a/regress/sys/net/pf_forward/ping_mtu.py
+++ b/regress/sys/net/pf_forward/ping_mtu.py
@@ -11,7 +11,7 @@ srcaddr=sys.argv[1]
 dstaddr=sys.argv[2]
 size=int(sys.argv[3])
 expect=int(sys.argv[4])
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 hdr=IP(flags="DF", src=srcaddr, dst=dstaddr)/ICMP(id=pid)
 payload="a" * (size - len(str(hdr)))
 ip=hdr/payload
@@ -20,7 +20,7 @@ eth=Ether(src=SRC_MAC, dst=PF_MAC)/ip
 a=srp1(eth, iface=SRC_IF, timeout=2)
 
 if a and a.payload.payload.type==3 and a.payload.payload.code==4:
-	mtu=a.payload.payload.unused
+	mtu=a.payload.payload.nexthopmtu
 	print "mtu=%d" % (mtu)
 	if mtu != expect:
 		print "MTU!=%d" % (expect)
diff --git a/regress/sys/net/pf_fragment/frag.py b/regress/sys/net/pf_fragment/frag.py
index 62bc1baab80..a9abb99013d 100644
--- a/regress/sys/net/pf_fragment/frag.py
+++ b/regress/sys/net/pf_fragment/frag.py
@@ -6,7 +6,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNO"
 packet=IP(src=SRC_OUT, dst=dstaddr)/ICMP(id=pid)/payload
 frag0=str(packet)[20:36]
diff --git a/regress/sys/net/pf_fragment/frag6.py b/regress/sys/net/pf_fragment/frag6.py
index 1fe1b03f0dc..3834634eaa1 100644
--- a/regress/sys/net/pf_fragment/frag6.py
+++ b/regress/sys/net/pf_fragment/frag6.py
@@ -6,7 +6,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNO"
 packet=IPv6(src=SRC_OUT6, dst=dstaddr)/ICMPv6EchoRequest(id=pid, data=payload)
 frag0=IPv6ExtHdrFragment(nh=58, id=pid, m=1)/str(packet)[40:56]
diff --git a/regress/sys/net/pf_fragment/frag6_cutnew.py b/regress/sys/net/pf_fragment/frag6_cutnew.py
index 5c4b21bda30..99ef2b0e25d 100644
--- a/regress/sys/net/pf_fragment/frag6_cutnew.py
+++ b/regress/sys/net/pf_fragment/frag6_cutnew.py
@@ -11,7 +11,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNO"
 dummy="01234567"
 packet=IPv6(src=SRC_OUT6, dst=dstaddr)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/net/pf_fragment/frag6_cutold.py b/regress/sys/net/pf_fragment/frag6_cutold.py
index 8a3cb5e3c48..e9e6a81ec4e 100644
--- a/regress/sys/net/pf_fragment/frag6_cutold.py
+++ b/regress/sys/net/pf_fragment/frag6_cutold.py
@@ -11,7 +11,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNO"
 dummy="01234567"
 packet=IPv6(src=SRC_OUT6, dst=dstaddr)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/net/pf_fragment/frag6_dropnew.py b/regress/sys/net/pf_fragment/frag6_dropnew.py
index 710292a414c..4cb54513c9e 100644
--- a/regress/sys/net/pf_fragment/frag6_dropnew.py
+++ b/regress/sys/net/pf_fragment/frag6_dropnew.py
@@ -12,7 +12,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNOQRSTUVWX"
 dummy="01234567"
 packet=IPv6(src=SRC_OUT6, dst=dstaddr)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/net/pf_fragment/frag6_dropold.py b/regress/sys/net/pf_fragment/frag6_dropold.py
index 8e54d72303c..895ea8191ac 100644
--- a/regress/sys/net/pf_fragment/frag6_dropold.py
+++ b/regress/sys/net/pf_fragment/frag6_dropold.py
@@ -12,7 +12,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNOQRSTUVWX"
 dummy="01234567"
 packet=IPv6(src=SRC_OUT6, dst=dstaddr)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/net/pf_fragment/frag6_ext.py b/regress/sys/net/pf_fragment/frag6_ext.py
index b0706943acc..72e1bd5f6f6 100644
--- a/regress/sys/net/pf_fragment/frag6_ext.py
+++ b/regress/sys/net/pf_fragment/frag6_ext.py
@@ -6,7 +6,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNO"
 packet=IPv6(src=SRC_OUT6, dst=dstaddr)/ICMPv6EchoRequest(id=pid, data=payload)
 frag0=IPv6ExtHdrFragment(nh=58, id=pid, m=1)/str(packet)[40:56]
diff --git a/regress/sys/net/pf_fragment/frag_cutnew.py b/regress/sys/net/pf_fragment/frag_cutnew.py
index a1866969d47..600d524e5b7 100644
--- a/regress/sys/net/pf_fragment/frag_cutnew.py
+++ b/regress/sys/net/pf_fragment/frag_cutnew.py
@@ -14,7 +14,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNO"
 dummy="01234567"
 packet=IP(src=SRC_OUT, dst=dstaddr)/ICMP(id=pid)/payload
diff --git a/regress/sys/net/pf_fragment/frag_cutold.py b/regress/sys/net/pf_fragment/frag_cutold.py
index 1e3b919f065..5cf10af0d91 100644
--- a/regress/sys/net/pf_fragment/frag_cutold.py
+++ b/regress/sys/net/pf_fragment/frag_cutold.py
@@ -15,7 +15,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNO"
 dummy="01234567"
 packet=IP(src=SRC_OUT, dst=dstaddr)/ICMP(id=pid)/payload
diff --git a/regress/sys/net/pf_fragment/frag_dropnew.py b/regress/sys/net/pf_fragment/frag_dropnew.py
index ce81baa2057..2aadd8df2f4 100644
--- a/regress/sys/net/pf_fragment/frag_dropnew.py
+++ b/regress/sys/net/pf_fragment/frag_dropnew.py
@@ -16,7 +16,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNOQRSTUVWX"
 dummy="01234567"
 packet=IP(src=SRC_OUT, dst=dstaddr)/ICMP(id=pid)/payload
diff --git a/regress/sys/net/pf_fragment/frag_dropold.py b/regress/sys/net/pf_fragment/frag_dropold.py
index 8f4d69819a3..938c616ca95 100644
--- a/regress/sys/net/pf_fragment/frag_dropold.py
+++ b/regress/sys/net/pf_fragment/frag_dropold.py
@@ -16,7 +16,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLOMNOQRSTUVWX"
 dummy="01234567"
 packet=IP(src=SRC_OUT, dst=dstaddr)/ICMP(id=pid)/payload
diff --git a/regress/sys/net/pf_fragment/ping6_cksum.py b/regress/sys/net/pf_fragment/ping6_cksum.py
index fb4cbd1fa70..57d44a509bc 100644
--- a/regress/sys/net/pf_fragment/ping6_cksum.py
+++ b/regress/sys/net/pf_fragment/ping6_cksum.py
@@ -6,7 +6,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="a" * 1452
 p=(Ether(src=SRC_MAC, dst=PF_MAC)/IPv6(src=SRC_OUT6, dst=dstaddr)/
     ICMPv6EchoRequest(id=pid, data=payload))
diff --git a/regress/sys/net/pf_fragment/ping6_mtu_1300.py b/regress/sys/net/pf_fragment/ping6_mtu_1300.py
index da63974cce7..d5c78a75e98 100644
--- a/regress/sys/net/pf_fragment/ping6_mtu_1300.py
+++ b/regress/sys/net/pf_fragment/ping6_mtu_1300.py
@@ -6,7 +6,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 hdr=IPv6(src=SRC_OUT6, dst=dstaddr)/ICMPv6EchoRequest(id=pid)
 payload="a" * (1400 - len(str(hdr)))
 ip=hdr/payload
diff --git a/regress/sys/net/pf_fragment/ping_cksum.py b/regress/sys/net/pf_fragment/ping_cksum.py
index 005be1462a0..73885f9ef34 100644
--- a/regress/sys/net/pf_fragment/ping_cksum.py
+++ b/regress/sys/net/pf_fragment/ping_cksum.py
@@ -6,7 +6,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="a" * 1472
 p=(Ether(src=SRC_MAC, dst=PF_MAC)/IP(flags="DF", src=SRC_OUT, dst=dstaddr)/
     ICMP(id=pid)/payload)
diff --git a/regress/sys/net/pf_fragment/ping_mtu_1300.py b/regress/sys/net/pf_fragment/ping_mtu_1300.py
index d86de0e205c..4f3dd85191d 100644
--- a/regress/sys/net/pf_fragment/ping_mtu_1300.py
+++ b/regress/sys/net/pf_fragment/ping_mtu_1300.py
@@ -6,7 +6,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 hdr=IP(flags="DF", src=SRC_OUT, dst=dstaddr)/ICMP(id=pid)
 payload="a" * (1400 - len(str(hdr)))
 ip=hdr/payload
@@ -14,7 +14,7 @@ eth=Ether(src=SRC_MAC, dst=PF_MAC)/ip
 a=srp1(eth, iface=SRC_IF, timeout=2)
 
 if a and a.payload.payload.type==3 and a.payload.payload.code==4:
-	mtu=a.payload.payload.unused
+	mtu=a.payload.payload.nexthopmtu
 	print "mtu=%d" % (mtu)
 	if mtu == 1300:
 		exit(0)
diff --git a/regress/sys/net/pf_fragment/udp6_cksum.py b/regress/sys/net/pf_fragment/udp6_cksum.py
index 030449dac4f..91f51d1c807 100644
--- a/regress/sys/net/pf_fragment/udp6_cksum.py
+++ b/regress/sys/net/pf_fragment/udp6_cksum.py
@@ -6,7 +6,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="a" * 1452
 p=(Ether(src=SRC_MAC, dst=PF_MAC)/IPv6(src=SRC_OUT6, dst=dstaddr)/
     UDP(sport=pid,dport=9)/payload)
diff --git a/regress/sys/net/pf_fragment/udp_cksum.py b/regress/sys/net/pf_fragment/udp_cksum.py
index 75ce54c409a..010151d54e3 100644
--- a/regress/sys/net/pf_fragment/udp_cksum.py
+++ b/regress/sys/net/pf_fragment/udp_cksum.py
@@ -6,7 +6,7 @@ from addr import *
 from scapy.all import *
 
 dstaddr=sys.argv[1]
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="a" * 1472
 p=(Ether(src=SRC_MAC, dst=PF_MAC)/IP(flags="DF", src=SRC_OUT, dst=dstaddr)/
     UDP(sport=pid,dport=9)/payload)
diff --git a/regress/sys/netinet6/frag6/frag6.py b/regress/sys/netinet6/frag6/frag6.py
index 1d7013778c6..fbd49af7aca 100644
--- a/regress/sys/netinet6/frag6/frag6.py
+++ b/regress/sys/netinet6/frag6/frag6.py
@@ -8,7 +8,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
 frag=[]
diff --git a/regress/sys/netinet6/frag6/frag6_ext.py b/regress/sys/netinet6/frag6/frag6_ext.py
index 993bb2c68cd..02a92cd4b0e 100644
--- a/regress/sys/netinet6/frag6/frag6_ext.py
+++ b/regress/sys/netinet6/frag6/frag6_ext.py
@@ -5,7 +5,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
 frag=[]
diff --git a/regress/sys/netinet6/frag6/frag6_opt.py b/regress/sys/netinet6/frag6/frag6_opt.py
index b3a88307d5f..ce5ffef5ac0 100644
--- a/regress/sys/netinet6/frag6/frag6_opt.py
+++ b/regress/sys/netinet6/frag6/frag6_opt.py
@@ -5,7 +5,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/IPv6ExtHdrDestOpt( \
     options=PadN(optdata='\0'*12)/PadN(optdata='\0'*6))/ \
diff --git a/regress/sys/netinet6/frag6/frag6_overatomic.py b/regress/sys/netinet6/frag6/frag6_overatomic.py
index d1bb7bdd5a4..a2f5787d869 100644
--- a/regress/sys/netinet6/frag6/frag6_overatomic.py
+++ b/regress/sys/netinet6/frag6/frag6_overatomic.py
@@ -9,7 +9,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 dummy="0123456701234567"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/netinet6/frag6/frag6_overdrop.py b/regress/sys/netinet6/frag6/frag6_overdrop.py
index 97fda504a8c..72eb157765a 100644
--- a/regress/sys/netinet6/frag6/frag6_overdrop.py
+++ b/regress/sys/netinet6/frag6/frag6_overdrop.py
@@ -12,7 +12,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 dummy="0123456701234567"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/netinet6/frag6/frag6_overhead.py b/regress/sys/netinet6/frag6/frag6_overhead.py
index 41e3d28a600..a3e77ef70ce 100644
--- a/regress/sys/netinet6/frag6/frag6_overhead.py
+++ b/regress/sys/netinet6/frag6/frag6_overhead.py
@@ -10,7 +10,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 dummy="0123456701234567"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/netinet6/frag6/frag6_overhead0.py b/regress/sys/netinet6/frag6/frag6_overhead0.py
index daa09a18529..63b5c9b9128 100644
--- a/regress/sys/netinet6/frag6/frag6_overhead0.py
+++ b/regress/sys/netinet6/frag6/frag6_overhead0.py
@@ -9,7 +9,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 dummy="0123456701234567"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/netinet6/frag6/frag6_overtail.py b/regress/sys/netinet6/frag6/frag6_overtail.py
index 6c7bf3068e4..f144c90a868 100644
--- a/regress/sys/netinet6/frag6/frag6_overtail.py
+++ b/regress/sys/netinet6/frag6/frag6_overtail.py
@@ -9,7 +9,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 dummy="0123456701234567"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/netinet6/frag6/frag6_padding.py b/regress/sys/netinet6/frag6/frag6_padding.py
index 714defe6126..18ecdccbdc8 100644
--- a/regress/sys/netinet6/frag6/frag6_padding.py
+++ b/regress/sys/netinet6/frag6/frag6_padding.py
@@ -8,7 +8,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 padding="0123"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/netinet6/frag6/frag6_permute.py b/regress/sys/netinet6/frag6/frag6_permute.py
index 481f506379a..3d3481ea1bb 100644
--- a/regress/sys/netinet6/frag6/frag6_permute.py
+++ b/regress/sys/netinet6/frag6/frag6_permute.py
@@ -17,7 +17,7 @@ permute.append([2,0,1])
 permute.append([1,2,0])
 permute.append([2,1,0])
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 for p in permute:
 	pid += 1
diff --git a/regress/sys/netinet6/frag6/frag6_refrag.py b/regress/sys/netinet6/frag6/frag6_refrag.py
index 4813e55567c..8b9608826cd 100644
--- a/regress/sys/netinet6/frag6/frag6_refrag.py
+++ b/regress/sys/netinet6/frag6/frag6_refrag.py
@@ -11,7 +11,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload=100 * "ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
 request_cksum=ICMPv6Unknown(str(packet.payload)).cksum
diff --git a/regress/sys/netinet6/frag6/frag6_shortatomic.py b/regress/sys/netinet6/frag6/frag6_shortatomic.py
index 4465848dc2d..07d25580341 100644
--- a/regress/sys/netinet6/frag6/frag6_shortatomic.py
+++ b/regress/sys/netinet6/frag6/frag6_shortatomic.py
@@ -10,7 +10,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/IPv6ExtHdrDestOpt()/ \
     ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/netinet6/frag6/frag6_timeout.py b/regress/sys/netinet6/frag6/frag6_timeout.py
index 9299fe2e761..a5b4155824f 100644
--- a/regress/sys/netinet6/frag6/frag6_timeout.py
+++ b/regress/sys/netinet6/frag6/frag6_timeout.py
@@ -12,7 +12,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcd"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
 frag=[]
diff --git a/regress/sys/netinet6/frag6/frag6_udpatomic.py b/regress/sys/netinet6/frag6/frag6_udpatomic.py
index 632caa83f06..cc50c50434a 100644
--- a/regress/sys/netinet6/frag6/frag6_udpatomic.py
+++ b/regress/sys/netinet6/frag6/frag6_udpatomic.py
@@ -8,7 +8,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/UDP(sport=pid, dport=7)/payload
 frag=[]
diff --git a/regress/sys/netinet6/frag6/frag6_udpheader.py b/regress/sys/netinet6/frag6/frag6_udpheader.py
index 617cf147c09..431beaf4d9c 100644
--- a/regress/sys/netinet6/frag6/frag6_udpheader.py
+++ b/regress/sys/netinet6/frag6/frag6_udpheader.py
@@ -8,7 +8,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/UDP(sport=pid, dport=7)/payload
 frag=[]
diff --git a/regress/sys/netinet6/frag6/frag6_udppayload.py b/regress/sys/netinet6/frag6/frag6_udppayload.py
index c5bfd9a0da2..598faa57858 100644
--- a/regress/sys/netinet6/frag6/frag6_udppayload.py
+++ b/regress/sys/netinet6/frag6/frag6_udppayload.py
@@ -8,7 +8,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/UDP(sport=pid, dport=7)/payload
 frag=[]
diff --git a/regress/sys/netinet6/frag6/frag6_zerofirst.py b/regress/sys/netinet6/frag6/frag6_zerofirst.py
index 80610a34382..0cfea6d69cd 100644
--- a/regress/sys/netinet6/frag6/frag6_zerofirst.py
+++ b/regress/sys/netinet6/frag6/frag6_zerofirst.py
@@ -9,7 +9,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
 frag=[]
diff --git a/regress/sys/netinet6/frag6/frag6_zerosecond.py b/regress/sys/netinet6/frag6/frag6_zerosecond.py
index 90971f7750f..06a95e3f40b 100644
--- a/regress/sys/netinet6/frag6/frag6_zerosecond.py
+++ b/regress/sys/netinet6/frag6/frag6_zerosecond.py
@@ -9,7 +9,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/ICMPv6EchoRequest(id=pid, data=payload)
 frag=[]
diff --git a/regress/sys/netinet6/rh0/rh0_empty.py b/regress/sys/netinet6/rh0/rh0_empty.py
index eeb92d10530..25dee07dfa5 100644
--- a/regress/sys/netinet6/rh0/rh0_empty.py
+++ b/regress/sys/netinet6/rh0/rh0_empty.py
@@ -7,7 +7,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/\
     IPv6ExtHdrRouting(addresses=[])/\
diff --git a/regress/sys/netinet6/rh0/rh0_final.py b/regress/sys/netinet6/rh0/rh0_final.py
index e76fb798c43..9c4b7f89309 100644
--- a/regress/sys/netinet6/rh0/rh0_final.py
+++ b/regress/sys/netinet6/rh0/rh0_final.py
@@ -7,7 +7,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/\
     IPv6ExtHdrRouting(addresses=[SRT_IN6, SRT_OUT6], segleft=0)/\
diff --git a/regress/sys/netinet6/rh0/rh0_frag2.py b/regress/sys/netinet6/rh0/rh0_frag2.py
index a9e46770bd2..1aef4a9d3b8 100644
--- a/regress/sys/netinet6/rh0/rh0_frag2.py
+++ b/regress/sys/netinet6/rh0/rh0_frag2.py
@@ -8,7 +8,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/\
     IPv6ExtHdrDestOpt()/\
diff --git a/regress/sys/netinet6/rh0/rh0_frag_empty.py b/regress/sys/netinet6/rh0/rh0_frag_empty.py
index f2939f76b24..f6283293b33 100644
--- a/regress/sys/netinet6/rh0/rh0_frag_empty.py
+++ b/regress/sys/netinet6/rh0/rh0_frag_empty.py
@@ -8,7 +8,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/\
     IPv6ExtHdrFragment(id=pid)/\
diff --git a/regress/sys/netinet6/rh0/rh0_frag_final.py b/regress/sys/netinet6/rh0/rh0_frag_final.py
index cc35c629f7b..3e845332a54 100644
--- a/regress/sys/netinet6/rh0/rh0_frag_final.py
+++ b/regress/sys/netinet6/rh0/rh0_frag_final.py
@@ -8,7 +8,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/\
     IPv6ExtHdrFragment(id=pid)/\
diff --git a/regress/sys/netinet6/rh0/rh0_frag_route.py b/regress/sys/netinet6/rh0/rh0_frag_route.py
index dc7b0099736..64efc70d17a 100644
--- a/regress/sys/netinet6/rh0/rh0_frag_route.py
+++ b/regress/sys/netinet6/rh0/rh0_frag_route.py
@@ -8,7 +8,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/\
     IPv6ExtHdrFragment(id=pid)/\
diff --git a/regress/sys/netinet6/rh0/rh0_none.py b/regress/sys/netinet6/rh0/rh0_none.py
index 7405a0ab88c..438f5c003ec 100644
--- a/regress/sys/netinet6/rh0/rh0_none.py
+++ b/regress/sys/netinet6/rh0/rh0_none.py
@@ -6,7 +6,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/\
     ICMPv6EchoRequest(id=pid, data=payload)
diff --git a/regress/sys/netinet6/rh0/rh0_route.py b/regress/sys/netinet6/rh0/rh0_route.py
index def084e770d..aca7f8e94a5 100644
--- a/regress/sys/netinet6/rh0/rh0_route.py
+++ b/regress/sys/netinet6/rh0/rh0_route.py
@@ -7,7 +7,7 @@ import os
 from addr import *
 from scapy.all import *
 
-pid=os.getpid()
+pid=os.getpid() & 0xffff
 payload="ABCDEFGHIJKLMNOP"
 packet=IPv6(src=SRC_OUT6, dst=DST_IN6)/\
     IPv6ExtHdrRouting(addresses=[SRT_IN6, SRT_OUT6], segleft=2)/\