diff --git a/opentracker.c b/opentracker.c index 9f99363..2108a98 100644 --- a/opentracker.c +++ b/opentracker.c @@ -48,7 +48,7 @@ static char * g_serverdir; static char * g_serveruser; static unsigned int g_udp_workers; -static void panic( const char *routing ) __attribute__ ((noreturn)); +static void panic( const char *routine ) __attribute__ ((noreturn)); static void panic( const char *routine ) { fprintf( stderr, "%s: %s\n", routine, strerror(errno) ); exit( 111 ); @@ -118,9 +118,9 @@ static void help( char *name ) { usage( name ); HELPLINE("-f config","include and execute the config file"); - HELPLINE("-i ip","specify ip to bind to (default: *, you may specify more than one)"); - HELPLINE("-p port","specify tcp port to bind to (default: 6969, you may specify more than one)"); - HELPLINE("-P port","specify udp port to bind to (default: 6969, you may specify more than one)"); + HELPLINE("-i ip","specify ip to bind to with next -[pP] (default: any, overrides preceeding ones)"); + HELPLINE("-p port","do bind to tcp port (default: 6969, you may specify more than one)"); + HELPLINE("-P port","do bind to udp port (default: 6969, you may specify more than one)"); HELPLINE("-r redirecturl","specify url where / should be redirected to (default none)"); HELPLINE("-d dir","specify directory to try to chroot to (default: \".\")"); HELPLINE("-u user","specify user under whose privileges opentracker should run (default: \"nobody\")"); @@ -132,6 +132,9 @@ static void help( char *name ) { #endif fprintf( stderr, "\nExample: ./opentracker -i 127.0.0.1 -p 6969 -P 6969 -f ./opentracker.conf -i 10.1.1.23 -p 2710 -p 80\n" ); + fprintf( stderr, " Here -i 127.0.0.1 selects the ip address for the next -p 6969 and -P 6969.\n"); + fprintf( stderr, " If no port is bound from config file or command line, the last address given\n"); + fprintf( stderr, " (or ::1 if none is set) will be used on port 6969.\n"); } #undef HELPLINE diff --git a/proxy.c b/proxy.c index 0270073..c25611b 100644 --- a/proxy.c +++ b/proxy.c @@ -61,7 +61,7 @@ int g_self_pipe[2]; /* So after each bucket wait 1 / OT_BUCKET_COUNT intervals */ #define OT_SYNC_SLEEP ( ( ( OT_SYNC_INTERVAL_MINUTES ) * 60 * 1000000 ) / ( OT_BUCKET_COUNT ) ) -enum { OT_SYNC_PEER }; +enum { OT_SYNC_PEER4, OT_SYNC_PEER6 }; enum { FLAG_SERVERSOCKET = 1 }; /* For incoming packets */ @@ -120,13 +120,15 @@ void livesync_bind_mcast( ot_ip6 ip, uint16_t port) { socket_mcloop4(g_socket_out, 1); } -size_t add_peer_to_torrent_proxy( ot_hash hash, ot_peer *peer ) { - int exactmatch; - ot_torrent *torrent; - ot_peer *peer_dest; - ot_vector *torrents_list = mutex_bucket_lock_by_hash( hash ); +size_t add_peer_to_torrent_proxy( ot_hash hash, ot_peer *peer, size_t peer_size ) { + int exactmatch; + ot_torrent *torrent; + ot_peerlist *peer_list; + ot_peer *peer_dest; + ot_vector *torrents_list = mutex_bucket_lock_by_hash( hash ); + size_t compare_size = OT_PEER_COMPARE_SIZE_FROM_PEER_SIZE(peer_size); - torrent = vector_find_or_insert( torrents_list, (void*)hash, sizeof( ot_torrent ), OT_HASH_COMPARE_SIZE, &exactmatch ); + torrent = vector_find_or_insert( torrents_list, (void*)hash, sizeof( ot_torrent ), compare_size, &exactmatch ); if( !torrent ) return -1; @@ -134,43 +136,47 @@ size_t add_peer_to_torrent_proxy( ot_hash hash, ot_peer *peer ) { /* Create a new torrent entry, then */ memcpy( torrent->hash, hash, sizeof(ot_hash) ); - if( !( torrent->peer_list = malloc( sizeof (ot_peerlist) ) ) ) { + if( !( torrent->peer_list6 = malloc( sizeof (ot_peerlist) ) ) || + !( torrent->peer_list4 = malloc( sizeof (ot_peerlist) ) ) ) { vector_remove_torrent( torrents_list, torrent ); mutex_bucket_unlock_by_hash( hash, 0 ); return -1; } - byte_zero( torrent->peer_list, sizeof( ot_peerlist ) ); + byte_zero( torrent->peer_list6, sizeof( ot_peerlist ) ); + byte_zero( torrent->peer_list4, sizeof( ot_peerlist ) ); } + peer_list = peer_size == OT_PEER_SIZE6 ? torrent->peer_list6 : torrent->peer_list4; + /* Check for peer in torrent */ - peer_dest = vector_find_or_insert_peer( &(torrent->peer_list->peers), peer, &exactmatch ); + peer_dest = vector_find_or_insert_peer( &(peer_list->peers), peer, peer_size, &exactmatch ); if( !peer_dest ) { mutex_bucket_unlock_by_hash( hash, 0 ); return -1; } /* Tell peer that it's fresh */ - OT_PEERTIME( peer ) = 0; + OT_PEERTIME( peer, peer_size ) = 0; /* If we hadn't had a match create peer there */ if( !exactmatch ) { - torrent->peer_list->peer_count++; - if( OT_PEERFLAG(peer) & PEER_FLAG_SEEDING ) - torrent->peer_list->seed_count++; + peer_list->peer_count++; + if( OT_PEERFLAG_D(peer, peer_size) & PEER_FLAG_SEEDING ) + peer_list->seed_count++; } - memcpy( peer_dest, peer, sizeof(ot_peer) ); + memcpy( peer_dest, peer, peer_size ); mutex_bucket_unlock_by_hash( hash, 0 ); return 0; } -size_t remove_peer_from_torrent_proxy( ot_hash hash, ot_peer *peer ) { +size_t remove_peer_from_torrent_proxy( ot_hash hash, ot_peer *peer, size_t peer_size ) { int exactmatch; ot_vector *torrents_list = mutex_bucket_lock_by_hash( hash ); ot_torrent *torrent = binary_search( hash, torrents_list->data, torrents_list->size, sizeof( ot_torrent ), OT_HASH_COMPARE_SIZE, &exactmatch ); if( exactmatch ) { - ot_peerlist *peer_list = torrent->peer_list; - switch( vector_remove_peer( &peer_list->peers, peer ) ) { + ot_peerlist *peer_list = peer_list = peer_size == OT_PEER_SIZE6 ? torrent->peer_list6 : torrent->peer_list4; + switch( vector_remove_peer( &peer_list->peers, peer, peer_size ) ) { case 2: peer_list->seed_count--; /* Intentional fallthrough */ case 1: peer_list->peer_count--; /* Intentional fallthrough */ default: break; @@ -194,21 +200,21 @@ void free_peerlist( ot_peerlist *peer_list ) { free( peer_list ); } -static void livesync_handle_peersync( ssize_t datalen ) { +static void livesync_handle_peersync( ssize_t datalen, size_t peer_size ) { int off = sizeof( g_tracker_id ) + sizeof( uint32_t ); fprintf( stderr, "." ); - while( off + (ssize_t)sizeof( ot_hash ) + (ssize_t)sizeof( ot_peer ) <= datalen ) { + while( (ssize_t)(off + sizeof( ot_hash ) + peer_size) <= datalen ) { ot_peer *peer = (ot_peer*)(g_inbuffer + off + sizeof(ot_hash)); ot_hash *hash = (ot_hash*)(g_inbuffer + off); - if( OT_PEERFLAG(peer) & PEER_FLAG_STOPPED ) - remove_peer_from_torrent_proxy( *hash, peer ); + if( OT_PEERFLAG_D(peer, peer_size) & PEER_FLAG_STOPPED ) + remove_peer_from_torrent_proxy( *hash, peer, peer_size ); else - add_peer_to_torrent_proxy( *hash, peer ); + add_peer_to_torrent_proxy( *hash, peer, peer_size ); - off += sizeof( ot_hash ) + sizeof( ot_peer ); + off += sizeof( ot_hash ) + peer_size; } } @@ -469,7 +475,7 @@ static void server_mainloop() { int64 sock; /* inlined livesync_init() */ - memset( g_peerbuffer_start, 0, sizeof( g_peerbuffer_start ) ); + memset( g_peerbuffer_start, 0, sizeof( g_peerbuffer_start ) ); g_peerbuffer_pos = g_peerbuffer_start; memcpy( g_peerbuffer_pos, &g_tracker_id, sizeof( g_tracker_id ) ); uint32_pack_big( (char*)g_peerbuffer_pos + sizeof( g_tracker_id ), OT_SYNC_PEER); @@ -477,7 +483,7 @@ static void server_mainloop() { g_next_packet_time = time(NULL) + LIVESYNC_MAXDELAY; while(1) { - /* See, if we need to connect to anyone */ + /* See if we need to connect to anyone */ if( time(NULL) > g_connection_reconn ) handle_reconnects( ); @@ -834,9 +840,12 @@ static void * livesync_worker( void * args ) { /* drop packet coming from ourselves */ continue; } - switch( uint32_read_big( sizeof( g_tracker_id ) + (char*)g_inbuffer ) ) { - case OT_SYNC_PEER: - livesync_handle_peersync( datalen ); + switch( uint32_read_big( (char*)g_inbuffer + sizeof( g_tracker_id ) ) ) { + case OT_SYNC_PEER4: + livesync_handle_peersync( datalen, OT_PEER_SIZE4 ); + break; + case OT_SYNC_PEER6: + livesync_handle_peersync( datalen, OT_PEER_SIZE6 ); break; default: // fprintf( stderr, "Received an unknown live sync packet type %u.\n", uint32_read_big( sizeof( g_tracker_id ) + (char*)g_inbuffer ) );