small refactoring

Author: mwarning

src/kad.c

@@ -64,23 +64,13 @@ typedef struct {
 
 // This callback is called when a search result arrives or a search completes
 void dht_callback_func( void *closure, int event, const uint8_t *info_hash, const void *data, size_t data_len ) {
-	struct search_t **searches;
 	struct search_t *search;
 	dht_addr4_t *data4;
 	dht_addr6_t *data6;
 	IP addr;
 	size_t i;
 
-	// Find search
-	search = NULL;
-	searches = searches_get();
-	while( *searches ) {
-		if( memcmp( (*searches)->id, info_hash, SHA1_BIN_LENGTH ) == 0 ) {
-			search = *searches;
-			break;
-		}
-		searches++;
-	}
+	search = searches_find_by_id( info_hash );
 
 	if( search == NULL ) {
 		return;

src/searches.c

@@ -51,13 +51,22 @@ static const char *str_state( int state ) {
 	}
 }
 
-// External access to all current results
-struct search_t** searches_get( void ) {
-	return &g_searches[0];
+struct search_t *searches_find_by_id( const uint8_t id[] ) {
+	struct search_t **searches;
+
+	searches = &g_searches[0];
+	while( *searches ) {
+		if( memcmp( (*searches)->id, id, SHA1_BIN_LENGTH ) == 0 ) {
+			return *searches;
+		}
+		searches++;
+	}
+
+	return NULL;
 }
 
-// Find a value search result
-static struct search_t *searches_find( const char query[] ) {
+
+static struct search_t *searches_find_by_query( const char query[] ) {
 	struct search_t **search;
 	struct search_t *searches;
 
@@ -108,7 +117,7 @@ static struct result_t *find_next_result( struct search_t *search ) {
 static struct search_t *find_next_search( auth_callback *callback ) {
 	struct search_t **searches;
 
-	searches = searches_get();
+	searches = &g_searches[0];
 	while( *searches ) {
 		if( !(*searches)->done && (*searches)->callback == callback ) {
 			return *searches;
@@ -147,7 +156,7 @@ void searches_set_auth_state( const char query[], const IP *addr, const int stat
 
 	log_debug( "SRC: Set authentication state for %s: %s", query, str_state( state ) );
 
-	search = searches_find( query );
+	search = searches_find_by_query( query );
 
 	if( search ) {
 		// Search and set authentication state of result
@@ -253,7 +262,7 @@ struct search_t* searches_start( const char query[] ) {
 	struct search_t* new;
 
 	// Find existing search
-	if( (search = searches_find( query )) != NULL ) {
+	if( (search = searches_find_by_query( query )) != NULL ) {
 		// Restart search after half of search lifetime
 		if( (time_now_sec() - search->start_time) > (MAX_SEARCH_LIFETIME / 2) ) {
 			search_restart( search );

src/searches.h

@@ -34,9 +34,6 @@ struct search_t {
 	auth_callback *callback;
 };
 
-// used only in kad.c to insert local values..?
-struct search_t **searches_get( void );
-
 void searches_set_auth_state( const char query[], const IP *addr, const int state );
 struct result_t *searches_get_auth_target( char query[], IP *addr, auth_callback *callback );
 
@@ -46,6 +43,9 @@ void searches_free( void );
 // Start a search
 struct search_t *searches_start( const char query[] );
 
+// Find a search by infohash, so we can add results
+struct search_t *searches_find_by_id( const uint8_t id[] );
+
 // Add an address to a result bucket
 int searches_add_addr( struct search_t *search, const IP *addr );