gandc/zapret2
Template
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-14 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfqws2: remove bind to address in rawsend

Browse Source
This commit is contained in:
bol-van
2026-02-09 15:59:53 +03:00
parent c3b1cc3eb9
commit 41bac1833e
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
nfq2/darkmagic.c
View File

@@ -1769,6 +1769,7 @@ static int rawsend_sendto_divert(sa_family_t family, int sock, const void *buf,
{ {
struct sockaddr_storage sa; struct sockaddr_storage sa;
socklen_t slen; socklen_t slen;
ssize_t wr;
#ifdef __FreeBSD__ #ifdef __FreeBSD__
// since FreeBSD 14 it requires hardcoded ipv4 values, although can also send ipv6 frames // since FreeBSD 14 it requires hardcoded ipv4 values, although can also send ipv6 frames
@@ -1790,7 +1791,16 @@ static int rawsend_sendto_divert(sa_family_t family, int sock, const void *buf,
#endif #endif
memset(&sa,0,slen); memset(&sa,0,slen);
sa.ss_family = family; sa.ss_family = family;
return sendto(sock, buf, len, 0, (struct sockaddr*)&sa, slen); while ((wr=sendto(sock, buf, len, 0, (struct sockaddr*)&sa, slen))<0 && errno==EINTR);
if (wr<0)
{
char s[64];
snprintf(s,sizeof(s),"rawsend_sendto_divert: sendto (%zu)",len);
DLOG_PERROR(s);
return false;
}
return wr;
} }
#endif #endif
@@ -1922,47 +1932,32 @@ bool rawsend(const struct sockaddr* dst,uint32_t fwmark,const char *ifout,const
#else #else
#ifdef __linux__ #ifdef __linux__
struct sockaddr_storage sa_src;
switch(dst->sa_family) switch(dst->sa_family)
{ {
case AF_INET: case AF_INET:
if (!b_bind_fix4) goto nofix; if (!b_bind_fix4) goto nofix;
extract_endpoints(data,NULL,NULL,NULL, &sa_src, NULL);
break; break;
case AF_INET6: case AF_INET6:
if (!b_bind_fix6) goto nofix; if (!b_bind_fix6) goto nofix;
extract_endpoints(NULL,data,NULL,NULL, &sa_src, NULL);
break; break;
default: default:
return false; // should not happen return false; // should not happen
} }
//printf("family %u dev %s bind : ", dst->sa_family, ifout); print_sockaddr((struct sockaddr *)&sa_src); printf("\n");
// force outgoing interface for raw packets. linux may choose it wrong if ip rules exist
if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, ifout, ifout ? strlen(ifout)+1 : 0) == -1) if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, ifout, ifout ? strlen(ifout)+1 : 0) == -1)
{ {
DLOG_PERROR("rawsend: setsockopt(SO_BINDTODEVICE)"); DLOG_PERROR("rawsend: setsockopt(SO_BINDTODEVICE)");
return false; return false;
} }
if (bind(sock, (const struct sockaddr*)&sa_src, dst->sa_family==AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)))
{
DLOG_PERROR("rawsend: bind (ignoring)");
// do not fail. this can happen regardless of IP_FREEBIND
// rebind to any address
memset(&sa_src,0,sizeof(sa_src));
sa_src.ss_family = dst->sa_family;
if (bind(sock, (const struct sockaddr*)&sa_src, dst->sa_family==AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)))
{
DLOG_PERROR("rawsend: bind to any");
return false;
}
}
nofix: nofix:
#endif #endif
// normal raw socket sendto // normal raw socket sendto
bytes = sendto(sock, data, len, 0, (struct sockaddr*)&dst2, salen); while ((bytes = sendto(sock, data, len, 0, (struct sockaddr*)&dst2, salen))<0 && errno==EINTR);
if (bytes==-1) if (bytes<0)
{ {
char s[40]; char s[64];
snprintf(s,sizeof(s),"rawsend: sendto (%zu)",len); snprintf(s,sizeof(s),"rawsend: sendto (%zu)",len);
DLOG_PERROR(s); DLOG_PERROR(s);
return false; return false;