cleanup

Author: mwarning

src/kad.c

@@ -384,16 +384,16 @@ int kad_announce_once( const uint8_t id[], int port ) {
 /*
 * Add a new value to the announcement list or refresh an announcement.
 */
-int kad_announce( const char query_raw[], int port, time_t lifetime ) {
-	char query[QUERY_MAX_SIZE];
+int kad_announce( const char query[], int port, time_t lifetime ) {
+	char hostname[QUERY_MAX_SIZE];
 
 	// Remove .p2p suffix and convert to lowercase
-	if( query_sanitize( query, sizeof(query), query_raw ) != 0 ) {
+	if( query_sanitize( hostname, sizeof(hostname), query ) != 0 ) {
 		return -1;
 	}
 
 	// Store query to call kad_announce_once() later/multiple times
-	return announces_add( query, port, lifetime ) ? 0 : -2;
+	return announces_add( hostname, port, lifetime ) ? 0 : -2;
 }
 
 // Lookup known nodes that are nearest to the given id
@@ -403,18 +403,18 @@ int kad_lookup( const char query[], IP addr_array[], size_t addr_num ) {
 
 	// Trim spaces, remove .p2p suffix and convert to lowercase
 	if( query_sanitize( hostname, sizeof(hostname), query ) != 0 ) {
-		log_debug( "query_sanitize error" );
+		log_debug( "KAD: query_sanitize error" );
 		return -1;
 	}
 
-	log_debug( "Lookup identifier: %s", hostname );
+	log_debug( "KAD: Lookup identifier: %s", hostname );
 
 	// Find existing or create new search
 	search = searches_start( hostname );
 
 	if( search == NULL ) {
 		// Failed to create a new search
-		log_debug("searches_start error");
+		log_debug( "KAD: searches_start error" );
 		return -1;
 	}
 
@@ -569,7 +569,7 @@ void kad_debug_storage( int fd ) {
 
 	s = storage;
 	for( j = 0; s; ++j ) {
-		dprintf( fd, " id: %s\n", str_id(s->id ));
+		dprintf( fd, " id: %s\n", str_id( s->id ));
 		for( i = 0; i < s->numpeers; ++i ) {
 			p = &s->peers[i];
 			to_addr( &addr, &p->ip, p->len, htons( p->port ) );

src/searches.c

@@ -47,7 +47,7 @@ static const char *str_state( int state ) {
 		case AUTH_WAITING: return "WAITING";
 		default:
 			log_err( "Invalid state: %d", state );
-			exit(1);
+			exit( 1 );
 	}
 }
 
@@ -127,6 +127,7 @@ static struct search_t *find_next_search( auth_callback *callback ) {
 	return NULL;
 }
 
+// Find query/IP-address to authenticate; callback is used as a marker.
 struct result_t *searches_get_auth_target( char query[], IP *addr, auth_callback *callback ) {
 	struct search_t *search;
 	struct result_t *result;
@@ -150,6 +151,7 @@ struct result_t *searches_get_auth_target( char query[], IP *addr, auth_callback
 	return result;
 }
 
+// Set the authentication state of a result
 void searches_set_auth_state( const char query[], const IP *addr, const int state ) {
 	struct search_t *search;
 	struct result_t *result;

src/utils.c

@@ -20,7 +20,7 @@
 int hex_get_id( uint8_t id[], size_t len, const char query[] ) {
 	size_t query_len = strlen( query );
 	if( str_isHex( query, query_len ) ) {
-		memset( id, 0, len ); // Fill up id with random numbers?
+		memset( id, 0, len );
 		bytes_from_hex( id, query, MIN( 2 * len, query_len ) );
 		return 1;
 	}
@@ -43,14 +43,9 @@ int is_suffix( const char str[], const char suffix[] ) {
 	}
 }
 
-void* memdup( const void* src, size_t size ) {
-	void* out = malloc(size);
-	return memcpy( out, src, size );
-}
-
 /*
-* Sanitize query.
-* Convert to lowercase and removing  TLDs if it matches --query-tld.
+* Sanitize a query string.
+* Convert to lowercase and remove the TLD if it matches --query-tld.
 *
 * example.com.p2p => example.com
 * example.com => example.com
@@ -176,10 +171,10 @@ int id_equal( const uint8_t id1[], const uint8_t id2[] ) {
 }
 
 // Check if string consist of hexdecimal characters
-int str_isHex( const char str[], size_t size ) {
+int str_isHex( const char str[], size_t len ) {
 	size_t i = 0;
 
-	for( i = 0; i < size; i++ ) {
+	for( i = 0; i < len; i++ ) {
 		const char c = str[i];
 		if( (c >= '0' && c <= '9')
 				|| (c >= 'A' && c <= 'F')
@@ -190,8 +185,8 @@ int str_isHex( const char str[], size_t size ) {
 		}
 	}
 
-	// Return 1 if size is even
-	return !(size & 1);
+	// Return 1 if len is even
+	return !(len & 1);
 }
 
 // Matches [0-9a-zA-Z._-]*
@@ -261,8 +256,7 @@ const char *str_addr( const IP *addr ) {
 	return addrbuf;
 }
 
-int addr_is_localhost( const IP *addr )
-{
+int addr_is_localhost( const IP *addr ) {
 	// 127.0.0.1
 	const uint32_t inaddr_loopback = htonl( INADDR_LOOPBACK );
 
@@ -276,8 +270,7 @@ int addr_is_localhost( const IP *addr )
 	}
 }
 
-int addr_is_multicast( const IP *addr )
-{
+int addr_is_multicast( const IP *addr ) {
 	switch( addr->ss_family ) {
 		case AF_INET:
 			return IN_MULTICAST(ntohl(((IP4*) addr)->sin_addr.s_addr));

src/utils.h

@@ -8,9 +8,11 @@
 // Number of elements in an array
 #define N_ELEMS(x)  (sizeof(x) / sizeof(x[0]))
 
+// Typical min/max methods
 #define MAX(x, y) ((x) >= (y) ? (x) : (y))
 #define MIN(x, y) ((x) <= (y) ? (x) : (y))
 
+// Make a symbol into a string literal
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
 
@@ -24,7 +26,6 @@
 int hex_get_id( uint8_t id[], size_t len, const char query[] );
 
 int is_suffix( const char str[], const char suffix[] );
-void* memdup(const void* src, size_t size);
 
 int query_sanitize( char buf[], size_t buflen, const char query[] );