Stub out UTP_Create in non-uTP builds.

This commit is contained in:
Juliusz Chroboczek 2011-02-18 16:01:52 +00:00
parent d7c1cf3b4b
commit e7fc697c90
4 changed files with 10 additions and 6 deletions

View File

@ -351,7 +351,6 @@ tr_netOpenPeerSocket( tr_session * session,
return s;
}
#ifdef WITH_UTP
struct UTPSocket *
tr_netOpenPeerUTPSocket( tr_session * session,
const tr_address * addr,
@ -365,7 +364,6 @@ tr_netOpenPeerUTPSocket( tr_session * session,
return UTP_Create( tr_utpSendTo, (void*)session,
(struct sockaddr*)&ss, sslen );
}
#endif
static int
tr_netBindTCPImpl( const tr_address * addr, tr_port port, tr_bool suppressMsgs, int * errOut )

View File

@ -102,13 +102,11 @@ int tr_netOpenPeerSocket( tr_session * session,
tr_port port,
tr_bool clientIsSeed );
#ifdef WITH_UTP
struct UTPSocket *
tr_netOpenPeerUTPSocket( tr_session * session,
const tr_address * addr,
tr_port port,
tr_bool clientIsSeed);
#endif
int tr_netBindTCP( const tr_address * addr,
tr_port port,

View File

@ -636,10 +636,9 @@ tr_peerIoNewOutgoing( tr_session * session,
assert( tr_isAddress( addr ) );
assert( torrentHash );
#ifdef WITH_UTP
if( utp )
utp_socket = tr_netOpenPeerUTPSocket( session, addr, port, isSeed );
#endif
if( !utp_socket ) {
fd = tr_netOpenPeerSocket( session, addr, port, isSeed );
dbgmsg( NULL, "tr_netOpenPeerSocket returned fd %d", fd );

View File

@ -75,6 +75,15 @@ int tr_utpPacket(const unsigned char *buf UNUSED, size_t buflen UNUSED,
const struct sockaddr *from UNUSED, socklen_t fromlen UNUSED,
tr_session *ss UNUSED) { return -1; }
struct UTPSocket *UTP_Create(SendToProc *send_to_proc UNUSED,
void *send_to_userdata UNUSED,
const struct sockaddr *addr UNUSED,
socklen_t addrlen UNUSED)
{
errno = ENOSYS;
return NULL;
}
void tr_utpClose( tr_session * ss UNUSED ) { }
void tr_utpSendTo(void *closure UNUSED,