d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gleb Smirnoff 2022-08-30 16:23:36 -07:00
parent f70a2e2948
commit 4627bc1e90
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/sys/common/divert.py
View File

@ -36,7 +36,7 @@
import argparse
IPPROTO_DIVERT = 258
PF_DIVERT = 44
def parse_args():
@ -52,14 +52,14 @@ 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))
@ -67,7 +67,7 @@ def ipdivert_ip6_output_remote_success(args):
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))

2
tools/regression/netinet/ipdivert/ipdivert.c
View File

@ -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);