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

Code cleanup

Browse Source
This commit is contained in:
angt
2016-02-03 21:39:43 +01:00
parent 0596afef7e
commit c4fe9fead7
1 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
mud.c
View File

@@ -14,6 +14,11 @@
#define MUD_PKT_SIZE (2048u) #define MUD_PKT_SIZE (2048u)
struct addr {
struct sockaddr_storage data;
socklen_t size;
};
struct path_info { struct path_info {
uint32_t dt; uint32_t dt;
uint32_t time; uint32_t time;
@@ -22,8 +27,7 @@ struct path_info {
struct path { struct path {
int fd; int fd;
struct sockaddr_storage addr; struct addr addr;
socklen_t addrlen;
uint32_t rtt; uint32_t rtt;
struct path_info recv; struct path_info recv;
struct path_info send; struct path_info send;
@@ -90,7 +94,8 @@ uint32_t mud_now (void)
static static
ssize_t mud_send_path (struct path *path, const void *data, size_t size) ssize_t mud_send_path (struct path *path, const void *data, size_t size)
{ {
return sendto(path->fd, data, size, 0, (struct sockaddr *)&path->addr, path->addrlen); return sendto(path->fd, data, size, 0,
(struct sockaddr *)&path->addr.data, path->addr.size);
} }
static static
@@ -135,14 +140,14 @@ struct addrinfo *mud_addrinfo (const char *host, const char *port, int flags)
} }
static static
struct path *mud_get_path (struct mud *mud, int fd, struct sockaddr_storage *addr, socklen_t addrlen) struct path *mud_get_path (struct mud *mud, int fd, struct addr *addr)
{ {
struct path *path; struct path *path;
for (path = mud->path; path; path = path->next) { for (path = mud->path; path; path = path->next) {
if ((path->fd == fd) && if ((path->fd == fd) &&
(path->addrlen == addrlen) && (path->addr.size == addr->size) &&
(!memcmp(&path->addr, addr, addrlen))) (!memcmp(&path->addr.data, &addr->data, addr->size)))
break; break;
} }
@@ -150,9 +155,9 @@ struct path *mud_get_path (struct mud *mud, int fd, struct sockaddr_storage *add
} }
static static
struct path *mud_new_path (struct mud *mud, int fd, struct sockaddr_storage *addr, socklen_t addrlen) struct path *mud_new_path (struct mud *mud, int fd, struct addr *addr)
{ {
struct path *path = mud_get_path(mud, fd, addr, addrlen); struct path *path = mud_get_path(mud, fd, addr);
if (path) if (path)
return path; return path;
@@ -163,8 +168,7 @@ struct path *mud_new_path (struct mud *mud, int fd, struct sockaddr_storage *add
return NULL; return NULL;
path->fd = fd; path->fd = fd;
memcpy(&path->addr, addr, addrlen); memcpy(&path->addr, addr, sizeof(struct addr));
path->addrlen = addrlen;
path->next = mud->path; path->next = mud->path;
mud->path = path; mud->path = path;
@@ -172,11 +176,11 @@ struct path *mud_new_path (struct mud *mud, int fd, struct sockaddr_storage *add
} }
static static
void mud_new_addr (struct mud *mud, struct sockaddr_storage *addr, socklen_t addrlen) void mud_new_addr (struct mud *mud, struct addr *addr)
{ {
int family; int family;
switch (addrlen) { switch (addr->size) {
case INET_ADDRSTRLEN: case INET_ADDRSTRLEN:
family = AF_INET; family = AF_INET;
break; break;
@@ -191,7 +195,7 @@ void mud_new_addr (struct mud *mud, struct sockaddr_storage *addr, socklen_t add
for (sock = mud->sock; sock; sock = sock->next) { for (sock = mud->sock; sock; sock = sock->next) {
if (sock->family == family) if (sock->family == family)
mud_new_path(mud, sock->fd, addr, addrlen); mud_new_path(mud, sock->fd, addr);
} }
} }
@@ -208,14 +212,14 @@ void mud_new_sock (struct mud *mud, int fd, int family)
sock->next = mud->sock; sock->next = mud->sock;
mud->sock = sock; mud->sock = sock;
socklen_t addrlen; socklen_t addr_size;
switch (family) { switch (family) {
case AF_INET: case AF_INET:
addrlen = INET_ADDRSTRLEN; addr_size = INET_ADDRSTRLEN;
break; break;
case AF_INET6: case AF_INET6:
addrlen = INET6_ADDRSTRLEN; addr_size = INET6_ADDRSTRLEN;
break; break;
default: default:
return; return;
@@ -224,8 +228,8 @@ void mud_new_sock (struct mud *mud, int fd, int family)
struct path *path; struct path *path;
for (path = mud->path; path; path = path->next) { for (path = mud->path; path; path = path->next) {
if (path->addrlen == addrlen) if (path->addr.size == addr_size)
mud_new_path(mud, fd, &path->addr, path->addrlen); mud_new_path(mud, fd, &path->addr);
} }
} }
@@ -239,8 +243,14 @@ int mud_peer (struct mud *mud, const char *host, const char *port)
if (!ai) if (!ai)
return -1; return -1;
for (p = ai; p; p = p->ai_next) for (p = ai; p; p = p->ai_next) {
mud_new_addr(mud, (struct sockaddr_storage *)p->ai_addr, p->ai_addrlen); struct addr addr;
memcpy(&addr.data, p->ai_addr, p->ai_addrlen);
addr.size = p->ai_addrlen;
mud_new_addr(mud, &addr);
}
freeaddrinfo(ai); freeaddrinfo(ai);
@@ -319,14 +329,17 @@ void mud_delete (struct mud *mud)
while (mud->sock) { while (mud->sock) {
struct sock *sock = mud->sock; struct sock *sock = mud->sock;
if (sock->fd != -1) if (sock->fd != -1)
close(sock->fd); close(sock->fd);
mud->sock = sock->next; mud->sock = sock->next;
free(sock); free(sock);
} }
while (mud->path) { while (mud->path) {
struct path *path = mud->path; struct path *path = mud->path;
mud->path = path->next; mud->path = path->next;
free(path); free(path);
} }
@@ -414,18 +427,16 @@ int mud_pull (struct mud *mud)
if (mud->rx.start == next) if (mud->rx.start == next)
return 0; return 0;
struct addr addr;
struct packet *packet = &mud->rx.packet[mud->rx.end]; struct packet *packet = &mud->rx.packet[mud->rx.end];
struct sockaddr_storage addr;
socklen_t addrlen = sizeof(addr);
ssize_t ret = recvfrom(sock->fd, packet->data, sizeof(packet->data), ssize_t ret = recvfrom(sock->fd, packet->data, sizeof(packet->data),
0, (struct sockaddr *)&addr, &addrlen); 0, (struct sockaddr *)&addr.data, &addr.size);
if (ret <= 0) if (ret <= 0)
break; break;
struct path *path = mud_new_path(mud, sock->fd, &addr, addrlen); struct path *path = mud_new_path(mud, sock->fd, &addr);
if (!path) if (!path)
return -1; return -1;