mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-23 14:40:43 +00:00
Code Issues Releases Wiki Activity

Do not return -EINVAL as socket value (obviously not a good idea).

Browse source 
Also, fix socket descriptor leak in `tr_netBindTCPImpl` if `IPV6_V6ONLY` is defined.
This commit is contained in:
Mike Gelfand 2015-03-26 18:29:11 +00:00
parent cefc477918
commit 12095175a1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libtransmission/net.c
View file

@ -241,7 +241,7 @@ tr_netOpenPeerSocket (tr_session * session,
assert (tr_address_is_valid (addr)); assert (tr_address_is_valid (addr));
if (!tr_address_is_valid_for_peers (addr, port)) if (!tr_address_is_valid_for_peers (addr, port))
return -EINVAL; return TR_BAD_SOCKET; /* -EINVAL */
s = tr_fdSocketCreate (session, domains[addr->type], SOCK_STREAM); s = tr_fdSocketCreate (session, domains[addr->type], SOCK_STREAM);
if (s == TR_BAD_SOCKET) if (s == TR_BAD_SOCKET)
@ -350,6 +350,7 @@ tr_netBindTCPImpl (const tr_address * addr,
if (setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, (const void *) &optval, sizeof (optval)) == -1) if (setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, (const void *) &optval, sizeof (optval)) == -1)
if (sockerrno != ENOPROTOOPT) { /* if the kernel doesn't support it, ignore it */ if (sockerrno != ENOPROTOOPT) { /* if the kernel doesn't support it, ignore it */
*errOut = sockerrno; *errOut = sockerrno;
tr_netCloseSocket (fd);
return TR_BAD_SOCKET; return TR_BAD_SOCKET;
} }
#endif #endif