stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

applying patch:

Browse source 
1) Close ts->fdc if a new connect is received before the previous
   connect was accepted or rejected. Otherwise we will "leak" fds.

2) Include 0 in valid fd range

3) Don't try accept if ts->fdc < 0

4) Don't set tc->fdc = -1 (without closing) when connect fails,
   connect will be retried using alternative sockaddr in loop.
This commit is contained in:
Alfred E. Heggestad 2013-04-09 19:46:21 +00:00
parent 8bfe715cb8
commit 02b6159ac5
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/tcp/tcp.c
View file

@ -497,6 +497,9 @@ static void tcp_conn_handler(int flags, void *arg)
sa_init(&peer, AF_UNSPEC);
if (ts->fdc >= 0)
(void)close(ts->fdc);
ts->fdc = SOK_CAST accept(ts->fd, &peer.u.sa, &peer.len);
if (-1 == ts->fdc) {
@ -605,7 +608,7 @@ int tcp_sock_alloc(struct tcp_sock **tsp, const struct sa *local,
for (r = res; r; r = r->ai_next) {
int fd = -1;
if (ts->fd > 0)
if (ts->fd >= 0)
continue;
fd = SOK_CAST socket(r->ai_family, SOCK_STREAM, IPPROTO_TCP);
@ -760,7 +763,7 @@ int tcp_accept(struct tcp_conn **tcp, struct tcp_sock *ts, tcp_estab_h *eh,
struct tcp_conn *tc;
int err;
if (!tcp || !ts)
if (!tcp || !ts || ts->fdc < 0)
return EINVAL;
tc = conn_alloc(eh, rh, ch, arg);
@ -796,7 +799,7 @@ void tcp_reject(struct tcp_sock *ts)
if (!ts)
return;
if (ts->fdc > 0) {
if (ts->fdc >= 0) {
(void)close(ts->fdc);
ts->fdc = -1;
}
@ -1030,7 +1033,6 @@ int tcp_conn_connect(struct tcp_conn *tc, const struct sa *peer)
goto again;
if (EINPROGRESS != errno && EALREADY != errno) {
tc->fdc = -1;
err = errno;
DEBUG_INFO("connect: connect() %J: %m\n",
peer, err);
@ -1256,7 +1258,7 @@ int tcp_conn_local_get(const struct tcp_conn *tc, struct sa *local)
*/
int tcp_conn_peer_get(const struct tcp_conn *tc, struct sa *peer)
{
if (!tc)
if (!tc || !peer)
return EINVAL;
sa_init(peer, AF_UNSPEC);