External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-12-22 21:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcp, udp: Map source address to gateway for any traffic from 127.0.0.0/8

Browse Source 
...instead of just 127.0.0.1.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2021-07-26 18:20:01 +02:00
parent 9663378d6d
commit 8af961b85b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tcp.c
View File

@ -2291,13 +2291,13 @@ static void tcp_conn_from_sock(struct ctx *c, union epoll_ref ref,
tcp_hash_insert(c, conn, AF_INET6, &sa6->sin6_addr); tcp_hash_insert(c, conn, AF_INET6, &sa6->sin6_addr);
} else { } else {
struct sockaddr_in *sa4 = (struct sockaddr_in *)&sa; struct sockaddr_in *sa4 = (struct sockaddr_in *)&sa;
in_addr_t s_addr = ntohl(sa4->sin_addr.s_addr);
memset(&conn->a.a4.zero, 0, sizeof(conn->a.a4.zero)); memset(&conn->a.a4.zero, 0, sizeof(conn->a.a4.zero));
memset(&conn->a.a4.one, 0xff, sizeof(conn->a.a4.one)); memset(&conn->a.a4.one, 0xff, sizeof(conn->a.a4.one));
if (ntohl(sa4->sin_addr.s_addr) == INADDR_LOOPBACK || if (s_addr >> IN_CLASSA_NSHIFT == IN_LOOPBACKNET ||
ntohl(sa4->sin_addr.s_addr) == INADDR_ANY || s_addr == INADDR_ANY || s_addr == c->addr4_seen)
sa4->sin_addr.s_addr == c->addr4_seen)
sa4->sin_addr.s_addr = c->gw4; sa4->sin_addr.s_addr = c->gw4;
memcpy(&conn->a.a4.a, &sa4->sin_addr, sizeof(conn->a.a4.a)); memcpy(&conn->a.a4.a, &sa4->sin_addr, sizeof(conn->a.a4.a));

7
udp.c
View File

@ -728,15 +728,16 @@ void udp_sock_handler(struct ctx *c, union epoll_ref ref, uint32_t events,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
struct udp4_l2_buf_t *b = &udp4_l2_buf[i]; struct udp4_l2_buf_t *b = &udp4_l2_buf[i];
size_t ip_len, iov_len; size_t ip_len, iov_len;
in_addr_t s_addr;
ip_len = udp4_l2_mh_sock[i].msg_len + ip_len = udp4_l2_mh_sock[i].msg_len +
sizeof(b->iph) + sizeof(b->uh); sizeof(b->iph) + sizeof(b->uh);
b->iph.tot_len = htons(ip_len); b->iph.tot_len = htons(ip_len);
if (ntohl(b->s_in.sin_addr.s_addr) == INADDR_LOOPBACK || s_addr = ntohl(b->s_in.sin_addr.s_addr);
ntohl(b->s_in.sin_addr.s_addr) == INADDR_ANY || if (s_addr >> IN_CLASSA_NSHIFT == IN_LOOPBACKNET ||
b->s_in.sin_addr.s_addr == c->addr4_seen) { s_addr == INADDR_ANY || s_addr == c->addr4_seen) {
in_port_t src = htons(b->s_in.sin_port); in_port_t src = htons(b->s_in.sin_port);
b->iph.saddr = c->gw4; b->iph.saddr = c->gw4;