rename local sin to avoid potential conflicts.

This commit is contained in:
Joris Vink 2017-02-06 19:54:50 +01:00
parent b8b8373702
commit 09b0ae6d42

View File

@ -88,7 +88,7 @@ int
kore_connection_accept(struct listener *listener, struct connection **out) kore_connection_accept(struct listener *listener, struct connection **out)
{ {
struct connection *c; struct connection *c;
struct sockaddr *sin; struct sockaddr *s;
socklen_t len; socklen_t len;
kore_debug("kore_connection_accept(%p)", listener); kore_debug("kore_connection_accept(%p)", listener);
@ -99,13 +99,13 @@ kore_connection_accept(struct listener *listener, struct connection **out)
c->addrtype = listener->addrtype; c->addrtype = listener->addrtype;
if (c->addrtype == AF_INET) { if (c->addrtype == AF_INET) {
len = sizeof(struct sockaddr_in); len = sizeof(struct sockaddr_in);
sin = (struct sockaddr *)&(c->addr.ipv4); s = (struct sockaddr *)&(c->addr.ipv4);
} else { } else {
len = sizeof(struct sockaddr_in6); len = sizeof(struct sockaddr_in6);
sin = (struct sockaddr *)&(c->addr.ipv6); s = (struct sockaddr *)&(c->addr.ipv6);
} }
if ((c->fd = accept(listener->fd, sin, &len)) == -1) { if ((c->fd = accept(listener->fd, s, &len)) == -1) {
kore_pool_put(&connection_pool, c); kore_pool_put(&connection_pool, c);
kore_debug("accept(): %s", errno_s); kore_debug("accept(): %s", errno_s);
return (KORE_RESULT_ERROR); return (KORE_RESULT_ERROR);