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

Code cleanup

Browse Source
This commit is contained in:
Adrien Gallouët
2016-07-29 10:34:55 +00:00
parent cec0e4132e
commit 9f1bf41a01
1 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
mud.c
View File

@@ -389,25 +389,6 @@ int mud_cmp_addr (struct sockaddr *a, struct sockaddr *b)
return 1; return 1;
} }
static
struct path *mud_get_path (struct mud *mud, struct ipaddr *local_addr,
struct sockaddr *addr)
{
struct path *path;
for (path = mud->path; path; path = path->next) {
if (mud_cmp_ipaddr(local_addr, &path->local_addr))
continue;
if (mud_cmp_addr(addr, (struct sockaddr *)&path->addr))
continue;
break;
}
return path;
}
static static
void mud_set_path (struct path *path, struct ipaddr *local_addr, void mud_set_path (struct path *path, struct ipaddr *local_addr,
struct sockaddr *addr) struct sockaddr *addr)
@@ -468,15 +449,27 @@ void mud_set_path (struct path *path, struct ipaddr *local_addr,
} }
static static
struct path *mud_new_path (struct mud *mud, struct ipaddr *local_addr, struct path *mud_path (struct mud *mud, struct ipaddr *local_addr,
struct sockaddr *addr) struct sockaddr *addr, int create)
{ {
if (local_addr->family != addr->sa_family) if (local_addr->family != addr->sa_family) {
errno = EINVAL;
return NULL; return NULL;
}
struct path *path = mud_get_path(mud, local_addr, addr); struct path *path;
if (path) for (path = mud->path; path; path = path->next) {
if (mud_cmp_ipaddr(local_addr, &path->local_addr))
continue;
if (mud_cmp_addr(addr, (struct sockaddr *)&path->addr))
continue;
break;
}
if (path || !create)
return path; return path;
path = calloc(1, sizeof(struct path)); path = calloc(1, sizeof(struct path));
@@ -561,7 +554,8 @@ int mud_peer (struct mud *mud, const char *name, const char *host, int port)
mud_unmapv4((struct sockaddr *)&addr); mud_unmapv4((struct sockaddr *)&addr);
struct path *path = mud_new_path(mud, &local_addr, (struct sockaddr *)&addr); struct path *path = mud_path(mud, &local_addr,
(struct sockaddr *)&addr, 1);
if (!path) if (!path)
return -1; return -1;
@@ -1049,18 +1043,11 @@ int mud_pull (struct mud *mud)
if (mud_localaddr(&local_addr, &msg, addr.ss_family)) if (mud_localaddr(&local_addr, &msg, addr.ss_family))
continue; continue;
struct path *path = mud_get_path(mud, &local_addr, struct path *path = mud_path(mud, &local_addr,
(struct sockaddr *)&addr); (struct sockaddr *)&addr, mud_packet);
if (!path) { if (!path)
if (!mud_packet) return -1;
continue;
path = mud_new_path(mud, &local_addr, (struct sockaddr *)&addr);
if (!path)
return -1;
}
path->state.up = 1; path->state.up = 1;