external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always obtain IP address during accept(), and not do it later as a call to getsockname().

Browse Source 
Signed-off-by: Jan Vidar Krey <janvidar@extatic.org>
This commit is contained in:
Jan Vidar Krey
2009-03-23 15:05:27 +01:00
parent 95b741bb5e
commit 5d5dda2f9b
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/netevent.c
View File

@@ -260,12 +260,13 @@ void net_on_accept(int server_fd, short ev, void *arg)
{
struct hub_info* hub = (struct hub_info*) arg;
struct user* user = 0;
struct ip_addr_encap ipaddr;
const char* addr;
struct timeval timeout = { TIMEOUT_CONNECTED, 0 };
for (;;)
{
int fd = net_accept(server_fd);
int fd = net_accept(server_fd, &ipaddr);
if (fd == -1)
{
if (net_error() == EWOULDBLOCK)
@@ -279,7 +280,7 @@ void net_on_accept(int server_fd, short ev, void *arg)
}
}
addr = net_get_peer_address(fd);
addr = ip_convert_to_string(&ipaddr);
/* FIXME: Should have a plugin log this */
hub_log(log_trace, "Got connection from %s", addr);
@@ -301,7 +302,7 @@ void net_on_accept(int server_fd, short ev, void *arg)
}
/* Store IP address in user object */
ip_convert_to_binary(addr, &user->ipaddr);
memcpy(&user->ipaddr, &ipaddr, sizeof(ipaddr));
net_set_nonblocking(fd, 1);
net_set_nosigpipe(fd, 1);