tests: use PF_DIVERT/SOCK_RAW instead of PF_INET/SOCK_RAW/IPPROTO_DIVERT

glebius · glebius · commit 4627bc1e90fd · 2022-08-30T16:24:37.000-07:00
diff --git a/tests/sys/common/divert.py b/tests/sys/common/divert.py
@@ -36,7 +36,7 @@
 import argparse
 
 
-IPPROTO_DIVERT = 258
+PF_DIVERT = 44
 
 
 def parse_args():
@@ -52,22 +52,22 @@ def parse_args():
 
 def ipdivert_ip_output_remote_success(args):
     packet = sc.IP(dst=args.dip) / sc.ICMP(type='echo-request')
-    with socket.socket(socket.AF_INET, socket.SOCK_RAW, IPPROTO_DIVERT) as s:
+    with socket.socket(PF_DIVERT, socket.SOCK_RAW, 0) as s:
         s.bind(('0.0.0.0', args.divert_port))
         s.sendto(bytes(packet), ('0.0.0.0', 0))
 
 
 def ipdivert_ip6_output_remote_success(args):
     packet = sc.IPv6(dst=args.dip) / sc.ICMPv6EchoRequest()
-    with socket.socket(socket.AF_INET, socket.SOCK_RAW, IPPROTO_DIVERT) as s:
+    with socket.socket(PF_DIVERT, socket.SOCK_RAW, 0) as s:
         s.bind(('0.0.0.0', args.divert_port))
         s.sendto(bytes(packet), ('0.0.0.0', 0))
 
 
 def ipdivert_ip_input_local_success(args):
     """Sends IPv4 packet to OS stack as inbound local packet."""
     packet = sc.IP(dst=args.dip,src=args.sip) / sc.ICMP(type='echo-request')
-    with socket.socket(socket.AF_INET, socket.SOCK_RAW, IPPROTO_DIVERT) as s:
+    with socket.socket(PF_DIVERT, socket.SOCK_RAW, 0) as s:
         s.bind(('0.0.0.0', args.divert_port))
         s.sendto(bytes(packet), (args.dip, 0))
 
diff --git a/tools/regression/netinet/ipdivert/ipdivert.c b/tools/regression/netinet/ipdivert/ipdivert.c
@@ -76,7 +76,7 @@ ipdivert_create(const char *test)
 {
 	int s;
 
-	s = socket(PF_INET, SOCK_RAW, IPPROTO_DIVERT);
+	s = socket(PF_DIVERT, SOCK_RAW, 0);
 	if (s < 0)
 		fail(test, "socket");
 	return (s);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ ipdivert_create(const char *test)`
`76`	`76`	`{`
`77`	`77`	`int s;`
`78`	`78`
`79`		`- s = socket(PF_INET, SOCK_RAW, IPPROTO_DIVERT);`
	`79`	`+ s = socket(PF_DIVERT, SOCK_RAW, 0);`
`80`	`80`	`if (s < 0)`
`81`	`81`	`fail(test, "socket");`
`82`	`82`	`return (s);`