miegl/mud
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Select the path with addr on BSD

Browse Source
This commit is contained in:
Adrien Gallouët
2016-06-21 16:46:34 +00:00
parent 5289ff0f27
commit 9474ea9d9d
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mud.c
View File

@@ -91,6 +91,7 @@ struct path {
unsigned active : 1; unsigned active : 1;
} state; } state;
unsigned index; unsigned index;
struct in_addr ifa_in_addr;
struct sockaddr_storage addr; struct sockaddr_storage addr;
struct { struct {
unsigned char data[256]; unsigned char data[256];
@@ -310,15 +311,22 @@ int mud_cmp_addr (struct sockaddr *a, struct sockaddr *b)
} }
static static
struct path *mud_get_path (struct mud *mud, int index, struct sockaddr *addr) struct path *mud_get_path (struct mud *mud, int index, struct in_addr *ifa_in_addr, struct sockaddr *addr)
{ {
struct path *path; struct path *path;
for (path = mud->path; path; path = path->next) { for (path = mud->path; path; path = path->next) {
if (index && (path->index != index)) if (index) {
if (path->index != index)
continue; continue;
} else if (ifa_in_addr) {
if (memcmp(&path->ifa_in_addr, ifa_in_addr, sizeof(struct in_addr)))
continue;
}
if (mud_cmp_addr(addr, (struct sockaddr *)&path->addr)) if (mud_cmp_addr(addr, (struct sockaddr *)&path->addr))
continue; continue;
break; break;
} }
@@ -342,6 +350,10 @@ void mud_set_path (struct path *path, unsigned index,
if (addr != (struct sockaddr *)&path->addr) if (addr != (struct sockaddr *)&path->addr)
memcpy(&path->addr, addr, sizeof(struct sockaddr_in)); memcpy(&path->addr, addr, sizeof(struct sockaddr_in));
memcpy(&path->ifa_in_addr,
&((struct sockaddr_in *)ifa_addr)->sin_addr,
sizeof(struct in_addr));
cmsg->cmsg_level = IPPROTO_IP; cmsg->cmsg_level = IPPROTO_IP;
#if defined IP_PKTINFO #if defined IP_PKTINFO
cmsg->cmsg_type = IP_PKTINFO; cmsg->cmsg_type = IP_PKTINFO;
@@ -422,7 +434,7 @@ void mud_reset_path (struct path *path, unsigned index, struct sockaddr *addr)
static static
struct path *mud_new_path (struct mud *mud, unsigned index, struct sockaddr *addr) struct path *mud_new_path (struct mud *mud, unsigned index, struct sockaddr *addr)
{ {
struct path *path = mud_get_path(mud, index, addr); struct path *path = mud_get_path(mud, index, NULL, addr);
if (path) if (path)
return path; return path;
@@ -955,16 +967,19 @@ int mud_pull (struct mud *mud)
continue; continue;
unsigned index = 0; unsigned index = 0;
struct in_addr ifa_in_addr;
#ifdef IP_PKTINFO
if (cmsg->cmsg_level == IPPROTO_IP) { if (cmsg->cmsg_level == IPPROTO_IP) {
#if defined IP_PKTINFO
memcpy(&index, memcpy(&index,
&((struct in_pktinfo *)CMSG_DATA(cmsg))->ipi_ifindex, &((struct in_pktinfo *)CMSG_DATA(cmsg))->ipi_ifindex,
sizeof(index)); sizeof(index));
} #elif defined IP_RECVDSTADDR
#else memcpy(&ifa_in_addr,
// TODO (struct in_addr *)CMSG_DATA(cmsg),
sizeof(struct in_addr));
#endif #endif
}
if (cmsg->cmsg_level == IPPROTO_IPV6) { if (cmsg->cmsg_level == IPPROTO_IPV6) {
memcpy(&index, memcpy(&index,
@@ -972,7 +987,7 @@ int mud_pull (struct mud *mud)
sizeof(index)); sizeof(index));
} }
struct path *path = mud_get_path(mud, index, (struct sockaddr *)&addr); struct path *path = mud_get_path(mud, index, &ifa_in_addr, (struct sockaddr *)&addr);
if (!path) { if (!path) {
if (mud_packet && (ret == (ssize_t)MUD_PONG_SIZE)) if (mud_packet && (ret == (ssize_t)MUD_PONG_SIZE))