mirror/opentracker
1
0
Fork 0
mirror of git://erdgeist.org/opentracker synced 2025-10-20 20:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sync loss bug

Browse Source
This commit is contained in:
erdgeist 2010-08-15 01:59:09 +00:00
parent 4fe2f35595
commit 3e30fa32aa
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
proxy.c
View File

@ -606,14 +606,13 @@ static void * streamsync_worker( void * args ) {
case 2: count_two++; break; case 2: count_two++; break;
case 1: count_one++; break; case 1: count_one++; break;
case 0: break; case 0: break;
default: default: count_def++;
count_peers += peer_list->peer_count; count_peers += peer_list->peer_count;
count_def += 1 + ( peer_list->peer_count >> 8 );
} }
} }
/* Maximal memory requirement: max 3 blocks, max torrents * 20 + max peers * 7 */ /* Maximal memory requirement: max 3 blocks, max torrents * 20 + max peers * 7 */
mem = 3 * ( 4 + 1 + 1 + 2 ) + ( count_one + count_two ) * 19 + count_def * ( 19 + 6 ) + mem = 3 * ( 4 + 1 + 1 + 2 ) + ( count_one + count_two ) * 19 + count_def * ( 19 + 8 ) +
( count_one + 2 * count_two + count_peers ) * 7; ( count_one + 2 * count_two + count_peers ) * 7;
fprintf( stderr, "Mem: %zd\n", mem ); fprintf( stderr, "Mem: %zd\n", mem );
@ -781,7 +780,6 @@ static void process_indata( proxy_peer * peer ) {
printf( "type: %hhu, prefix: %02X, torrentcount: %zd\n", peer->packet_type, peer->packet_tprefix, peer->packet_tcount ); printf( "type: %hhu, prefix: %02X, torrentcount: %zd\n", peer->packet_type, peer->packet_tprefix, peer->packet_tcount );
} }
next_torrent:
/* Ensure size for a minimal torrent block */ /* Ensure size for a minimal torrent block */
if( data + sizeof(ot_hash) + OT_IP_SIZE + 3 > dataend ) break; if( data + sizeof(ot_hash) + OT_IP_SIZE + 3 > dataend ) break;
@ -800,14 +798,11 @@ next_torrent:
/* Ensure enough data being read to hold all peers */ /* Ensure enough data being read to hold all peers */
if( data + (OT_IP_SIZE + 3) * peers > dataend ) break; if( data + (OT_IP_SIZE + 3) * peers > dataend ) break;
printf( "peers: %zd\n", peers );
while( peers-- ) { while( peers-- ) {
livesync_proxytell( peer->packet_tprefix, hash, data ); livesync_proxytell( peer->packet_tprefix, hash, data );
data += OT_IP_SIZE + 3; data += OT_IP_SIZE + 3;
} }
if( --peer->packet_tcount ) --peer->packet_tcount;
goto next_torrent;
} }
consumed = data - peer->indata; consumed = data - peer->indata;