mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-12 23:23:54 +00:00
Code Issues Releases Wiki Activity

(trunk libT) #3681 "tr-lpd.c's lpd_configureSocket() function is redundant" -- fixed.

Browse source
This commit is contained in:
Charles Kerr 2010-10-28 23:19:53 +00:00
parent a9e740cb2c
commit 417f3fd3b0
1 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
libtransmission/tr-lpd.c
View file

@ -28,7 +28,6 @@ THE SOFTWARE.
#include <signal.h> /* sig_atomic_t */ #include <signal.h> /* sig_atomic_t */
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> /* close() */ #include <unistd.h> /* close() */
#include <fcntl.h> /* fcntl(), O_NONBLOCK */
#include <ctype.h> /* toupper() */ #include <ctype.h> /* toupper() */
#ifdef WIN32 #ifdef WIN32
#include <w32api.h> #include <w32api.h>
@ -36,8 +35,6 @@ THE SOFTWARE.
#include <inttypes.h> #include <inttypes.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
typedef uint16_t in_port_t; /* all missing */ typedef uint16_t in_port_t; /* all missing */
extern int fcntl (int fd, int cmd, ...);
#define O_NONBLOCK 04000
#else #else
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> /* socket(), bind() */ #include <sys/socket.h> /* socket(), bind() */
@ -46,6 +43,7 @@ THE SOFTWARE.
/* third party */ /* third party */
#include <event.h> #include <event.h>
#include <evutil.h>
/* libT */ /* libT */
#include "transmission.h" #include "transmission.h"
@ -251,33 +249,6 @@ static int lpd_extractParam( const char* const str, const char* const name, int
/** /**
* @} */ * @} */
/**
* @brief Configures additional capabilities for a socket */
static int
lpd_configureSocket( int sock, int add )
{
#ifdef WIN32
unsigned long flags = 1;
if (add != O_NONBLOCK)
return -1; /* not supported */
if (ioctlsocket(sock, FIONBIO, &flags) == SOCKET_ERROR)
return -1;
#else
/* read-modify-write socket flags */
int flags = fcntl( sock, F_GETFL );
if( flags < 0 )
return -1;
if( fcntl( sock, F_SETFL, add | flags ) == -1 )
return -1;
#endif
return add;
}
/** /**
* @brief Initializes Local Peer Discovery for this node * @brief Initializes Local Peer Discovery for this node
* *
@ -310,8 +281,7 @@ int tr_lpdInit( tr_session* ss, tr_address* tr_addr UNUSED )
if( lpd_socket < 0 ) if( lpd_socket < 0 )
goto fail; goto fail;
/* enable non-blocking operation */ if( evutil_make_socket_nonblocking( lpd_socket ) < 0 )
if( lpd_configureSocket( lpd_socket, O_NONBLOCK ) < 0 )
goto fail; goto fail;
if( setsockopt( lpd_socket, SOL_SOCKET, SO_REUSEADDR, if( setsockopt( lpd_socket, SOL_SOCKET, SO_REUSEADDR,
@ -350,8 +320,7 @@ int tr_lpdInit( tr_session* ss, tr_address* tr_addr UNUSED )
if( lpd_socket2 < 0 ) if( lpd_socket2 < 0 )
goto fail; goto fail;
/* enable non-blocking operation */ if( evutil_make_socket_nonblocking( lpd_socket2 ) < 0 )
if( lpd_configureSocket( lpd_socket2, O_NONBLOCK ) < 0 )
goto fail; goto fail;
/* configure outbound multicast TTL */ /* configure outbound multicast TTL */