Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

(trunk libT) #4212 "excessive UDP logfile entries in debug mode" -- fixed.

Browse Source
This commit is contained in:
Jordan Lee
2011-04-28 02:51:07 +00:00
parent 2ecca714f1
commit 1bddadf1c6
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libtransmission/tr-udp.c
View File

@@ -200,30 +200,26 @@ event_callback(int s, short type UNUSED, void *sv)
rc = recvfrom(s, buf, 4096 - 1, 0,
(struct sockaddr*)&from, &fromlen);
/* Test for the different packet types based on frequency:
µTP will be the most common, then DHT, then UDP trackers. */
if( rc > 0 )
{
#ifdef WITH_UTP
if( ss->isUTPEnabled && tr_utpPacket( buf, rc, (struct sockaddr*)&from, fromlen, ss ) )
{
tr_ndbg( "UDP", "Handled uTP packet" );
}
else
#endif
if( ss->isDHTEnabled && ( *buf == 'd' ) ) /* DHT */
{
buf[rc] = '\0'; /* required by the DHT code */
tr_dhtCallback( buf, rc, (struct sockaddr*)&from, fromlen, sv );
tr_ndbg( "UDP", "Handled DHT packet" );
}
else if( tau_handle_message( ss, buf, rc ) )
{
tr_ndbg( "UDP", "Handled UDP tracker packet" );
}
else
{
tr_ndbg( "UDP", "Unexpected UDP packet" );
/* Since most packets we receive here are µTP, make quick inline
checks for the other protocols. The logic is as follows:
- all DHT packets start with 'd';
- all UDP tracker packets start with a 32-bit (!) "action", which
is between 0 and 3;
- the above cannot be µTP packets, since these start with a 4-bit
version number (1). */
if(rc > 0) {
if( buf[0] == 'd' ) {
buf[rc] = '\0'; /* required by the DHT code */
tr_dhtCallback(buf, rc, (struct sockaddr*)&from, fromlen, sv);
} else if( rc >= 8 &&
buf[0] == 0 && buf[1] == 0 && buf[2] == 0 && buf[3] <= 3 ) {
rc = tau_handle_message( ss, buf, rc );
if( !rc )
tr_ndbg("UDP", "Couldn't parse UDP tracker packet.");
} else {
rc = tr_utpPacket(buf, rc, (struct sockaddr*)&from, fromlen, ss);
if( !rc )
tr_ndbg("UDP", "Unexpected UDP packet");
}
}
}