drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-04-20 22:12:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

nfq/darkmagic: unbreak IPv6 on FreeBSD 14

Browse Source 
https://github.com/freebsd/freebsd-src/blob/4da7282a1882/sys/netinet/ip_divert.c#L321
allows only AF_INET in sa, causing runtime issue with IPv6:
[...]
rawsend: sendto_divert: Address family not supported by protocol family
[...]

After hardcoding AF_INET in sa, sin_len check returns EINVAL:
[...]
rawsend: sendto_divert: Invalid argument
[...]

FreeBSD's div_output_outbound() past check still handles AF_INET6,
and --dpi-desync=fake,split works after hardcoding sa AF and len
to get past the check.
This commit is contained in:
Evgeniy Khramtsov 2023-07-16 18:32:34 +00:00
parent aed912e702
commit 11a68e521e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nfq/darkmagic.c
View File

@ -918,6 +918,10 @@ static int rawsend_sendto_divert(sa_family_t family, int sock, const void *buf,
socklen_t slen; socklen_t slen;
memset(&sa,0,sizeof(sa)); memset(&sa,0,sizeof(sa));
#if __FreeBSD_version >= 1400066 && defined(PF_DIVERT)
sa.ss_family = AF_INET;
slen = sizeof(struct sockaddr_in);
#else
sa.ss_family = family; sa.ss_family = family;
switch(family) switch(family)
{ {
@ -930,6 +934,7 @@ static int rawsend_sendto_divert(sa_family_t family, int sock, const void *buf,
default: default:
return -1; return -1;
} }
#endif
return sendto(sock, buf, len, 0, (struct sockaddr*)&sa, slen); return sendto(sock, buf, len, 0, (struct sockaddr*)&sa, slen);
} }
#endif #endif