[WIP] libntoh: switch from broken htable to uthash

examples/c/ipv4/example.c

@@ -77,7 +77,7 @@ void shandler ( int sign )
 /**
  * @brief Returns the name of a protocol
  */
-inline char *get_proto_description ( unsigned short proto )
+char *get_proto_description ( unsigned short proto )
 {
 	switch ( proto )
 	{
@@ -135,7 +135,7 @@ void ipv4_callback ( pntoh_ipv4_flow_t flow , pntoh_ipv4_tuple4_t tuple , unsign
 	unsigned int i = 0;
 
 	fprintf( stderr, "\n\n[i] Got an IPv4 datagram! (%s) %s --> ", ntoh_get_reason(reason) , inet_ntoa( *(struct in_addr*) &tuple->source ) );
-	fprintf( stderr, "%s | %zu/%zu bytes - Key: %04x - ID: %02x - Proto: %d (%s)\n\n", inet_ntoa( *(struct in_addr*) &tuple->destination ), len, flow->total , flow->key, ntohs( tuple->id ), tuple->protocol, get_proto_description( tuple->protocol ) );
+	fprintf( stderr, "%s | %zu/%zu bytes - ID: %02x - Proto: %d (%s)\n\n", inet_ntoa( *(struct in_addr*) &tuple->destination ), len, flow->total , ntohs( tuple->id ), tuple->protocol, get_proto_description( tuple->protocol ) );
 
 	for ( i = 0; i < flow->total ; i++ )
 		fprintf( stderr, "%02x ", data[i] );

examples/c/ipv6/example.c

@@ -83,7 +83,7 @@ void shandler ( int sign )
 /**
  * @brief Returns the name of a protocol
  */
-inline char *get_proto_description ( unsigned short proto )
+char *get_proto_description ( unsigned short proto )
 {
 	switch ( proto )
 	{
@@ -146,7 +146,7 @@ void ipv6_callback ( pntoh_ipv6_flow_t flow , pntoh_ipv6_tuple4_t tuple , unsign
 	inet_ntop ( AF_INET6 , (void*) &tuple->destination , src , INET6_ADDRSTRLEN );
 
 	fprintf( stderr, "\n\n[i] Got an IPv6 datagram! (%s - %d) %s --> ", ntoh_get_reason(reason) , reason , src );
-	fprintf( stderr, "%s | %zu/%zu bytes - Key: %04x - ID: %02x - Proto: %d (%s)\n\n", dst , len, flow->total , flow->key, ntohs( tuple->id ), tuple->protocol, get_proto_description( tuple->protocol ) );
+	fprintf( stderr, "%s | %zu/%zu bytes - ID: %02x - Proto: %d (%s)\n\n", dst , len, flow->total , ntohs( tuple->id ), tuple->protocol, get_proto_description( tuple->protocol ) );
 
 	for ( i = 0; i < flow->total ; i++ )
 		fprintf( stderr, "%02x ", data[i] );

examples/c/tcp_ipv4/example.c

@@ -337,7 +337,7 @@ void ipv4_callback ( pntoh_ipv4_flow_t flow , pntoh_ipv4_tuple4_t tuple , unsign
 	unsigned int i = 0;
 
 	fprintf( stderr, "\n\n[i] Got an IPv4 datagram! (%s) %s --> ", ntoh_get_reason(reason) , inet_ntoa( *(struct in_addr*) &tuple->source ) );
-	fprintf( stderr, "%s | %zu/%zu bytes - Key: %04x - ID: %02x - Proto: %d (%s)\n\n", inet_ntoa( *(struct in_addr*) &tuple->destination ), len, flow->total , flow->key, ntohs( tuple->id ), tuple->protocol, get_proto_description( tuple->protocol ) );
+	fprintf( stderr, "%s | %zu/%zu bytes - ID: %02x - Proto: %d (%s)\n\n", inet_ntoa( *(struct in_addr*) &tuple->destination ), len, flow->total , ntohs( tuple->id ), tuple->protocol, get_proto_description( tuple->protocol ) );
 
 	if ( tuple->protocol == IPPROTO_TCP )
 		send_tcp_segment ( (struct ip*) data , &tcp_callback );

examples/c/tcp_ipv6/example.c

@@ -137,7 +137,7 @@ void free_peer_info ( ppeer_info_t pinfo )
 /**
  * @brief Returns the name of a protocol
  */
-inline char *get_proto_description ( unsigned short proto )
+char *get_proto_description ( unsigned short proto )
 {
 	switch ( proto )
 	{
@@ -360,7 +360,7 @@ void ipv6_callback ( pntoh_ipv6_flow_t flow , pntoh_ipv6_tuple4_t tuple , unsign
         inet_ntop ( AF_INET6 , (void*) &tuple->destination , dst , INET6_ADDRSTRLEN );
 
 	fprintf( stderr, "\n\n[i] Got an IPv4 datagram! (%s - %d) %s --> ", ntoh_get_reason(reason) , reason , src );
-	fprintf( stderr, "%s | %zu/%zu bytes - Key: %04x - ID: %02x - Proto: %d (%s)\n\n", dst , len, flow->total , flow->key, ntohs( tuple->id ), tuple->protocol, get_proto_description( tuple->protocol ) );
+	fprintf( stderr, "%s | %zu/%zu bytes - ID: %02x - Proto: %d (%s)\n\n", dst , len, flow->total , ntohs( tuple->id ), tuple->protocol, get_proto_description( tuple->protocol ) );
 
 	if ( tuple->protocol == IPPROTO_TCP )
 		send_tcp_segment ( (struct ip6_hdr*) data , &tcp_callback );

src/CMakeLists.txt

@@ -35,7 +35,9 @@ INCLUDE_DIRECTORIES ( ${CMAKE_INCLUDE_PATH})
 
 # set target from source
 ADD_LIBRARY( ${OUTPUT_LIB} SHARED ${LIBNTOH_SRCS} )
-#ADD_LIBRARY( ${OUTPUT_LIB} STATIC ${LIBNTOH_SRCS} ) // static: comment the line above and uncomment this one to compile as static library (contrib by Di3)
+ADD_LIBRARY( ${OUTPUT_LIB}_static STATIC ${LIBNTOH_SRCS} )
+SET_PROPERTY(TARGET ${OUTPUT_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
+SET_PROPERTY(TARGET ${OUTPUT_LIB}_static PROPERTY POSITION_INDEPENDENT_CODE 1)
 
 # pkgconfig file
 CONFIGURE_FILE ( ntoh.pc.in ntoh.pc @ONLY )
@@ -48,7 +50,7 @@ TARGET_LINK_LIBRARIES( ${OUTPUT_LIB} ${CMAKE_THREAD_LIBS_INIT})
 ###########################
 # library
 INSTALL ( TARGETS ${OUTPUT_LIB} LIBRARY DESTINATION lib )
-#INSTALL ( TARGETS ${OUTPUT_LIB} ARCHIVE DESTINATION lib )// static: comment the line above and uncomment this one to compile as static library (contrib by Di3)
+INSTALL ( TARGETS ${OUTPUT_LIB}_static ARCHIVE DESTINATION lib )
 # headers
 INSTALL ( FILES ${LIBNTOH_INC}/libntoh.h ${LIBNTOH_INC}/tcpreassembly.h ${LIBNTOH_INC}/sfhash.h ${LIBNTOH_INC}/ipv4defrag.h ${LIBNTOH_INC}/ipv6defrag.h ${LIBNTOH_INC}/common.h DESTINATION include/libntoh )
 # pkconfig file

src/common.c

@@ -30,208 +30,6 @@
 
 #include <stdlib.h>
 #include <libntoh.h>
-#include <ipv4defrag.h>
-
-// Uniqueness test for IP fragments, using their tuples
-// @contrib: Eosis - https://github.com/Eosis
-/*_HIDDEN inline int ipv4_tuple4_equals_to(pntoh_ipv4_tuple4_t x, pntoh_ipv4_tuple4_t y)
-{
-	if (x->source != y->source)
-		return 0;
-
-	if (x->destination != y->destination)
-		return 0;
-
-	if (x->protocol != y->protocol)
-		return 0;
-
-	if (x->id != y->id)
-		return 0;
-
-	return 1;
-}*/
-
-/****************/
-/** HASH TABLE **/
-/****************/
-/* map the hash table */
-_HIDDEN phtable_t htable_map ( size_t size , fcmp_t *equal_func )
-{
-	phtable_t ret = 0;
-
-	if ( !size )
-		return 0;
-
-	ret = (phtable_t) calloc ( 1 , sizeof ( htable_t ) );
-	ret->table = (phtnode_t*) calloc ( size , sizeof ( phtnode_t ) );
-	ret->table_size = size;
-	ret->equals = equal_func;
-
-	return ret;
-}
-
-/* insert a pair key-value into the hash table */
-_HIDDEN int htable_insert ( phtable_t ht  , unsigned int key , void *val )
-{
-	phtnode_t	node = 0;
-	phtnode_t	aux = 0;
-	unsigned int	index = 0;
-
-	if ( !ht || !val )
-		return 0;
-
-	node = (phtnode_t) calloc ( 1 , sizeof ( htnode_t ) );
-	node->key = key;
-	node->val = val;
-
-	index = key % ht->table_size;
-
-	if ( ht->table[index] == NULL )
-	{
-		ht->table[index] = node;
-		return 1;
-	}
-
-	/* collision resolution by chaining */
-	aux = ht->table[index];
-	while ( aux->next != 0 )
-		aux = aux->next;
-
-	aux->next = node;
-
-	return 1;
-}
-
-/* returns the value associated to the given key */
-_HIDDEN void *htable_find ( phtable_t ht , unsigned int key, void* ip_tuple4 )
-{
-	unsigned int	index = 0;
-	phtnode_t	node = 0;
-
-	if ( !ht )
-		return 0;
-
-	index = key % ht->table_size;
-
-	node = ht->table[index];
-
-	// @contrib: Eosis - https://github.com/Eosis
-	if ( ip_tuple4 != 0 ) //if not null
-		while( node != 0 && ! ht->equals ( ip_tuple4 , node->val ) ) //!(ipv4_tuple4_equals_to((pntoh_ipv4_tuple4_t)ip_tuple4, &(((pntoh_ipv4_flow_t)(node->val))->ident))) )
-			node = node->next;
-	else
-		while ( node != 0 && node->key != key )
-			node = node->next;
-
-	if ( !node )
-		return 0;
-
-	return node->val;
-}
-
-/* removes a key-value pair from the hash table */
-_HIDDEN void *htable_remove ( phtable_t ht , unsigned int key, void* ip_tuple4 )
-{
-	unsigned int	index = 0;
-	phtnode_t	node = 0;
-	phtnode_t	aux = 0;
-	void		*ret = 0;
-
-	if ( !ht )
-		return 0;
-
-	index = key % ht->table_size;
-	node = ht->table[index];
-
-	if ( node->key == key )
-		ht->table[index] = node->next;
-	else
-	{
-		while ( node->next != 0 && node->next->key != key )
-			node = node->next;
-
-		// @contrib: Eosis - https://github.com/Eosis
-		if (ip_tuple4 != 0 ) //if not null
-			while( node->next != 0 && ! ht->equals ( ip_tuple4 , node->next->val ) ) //!(ipv4_tuple4_equals_to((pntoh_ipv4_tuple4_t)ip_tuple4, &(((pntoh_ipv4_flow_t)(node->next->val))->ident))) )
-				node = node->next;
-		else
-			while ( node->next != 0 && node->next->key != key )
-				node = node->next;
-
-		if ( node->next != 0 )
-		{
-			aux = node;
-			node = node->next;
-			aux->next = node->next;
-		}
-	}
-
-	if ( !node )
-		return 0;
-
-	ret = node->val;
-	free ( node );
-
-	return ret;
-}
-
-/* count the key-value pairs in a hash table */
-_HIDDEN unsigned int htable_count ( phtable_t ht )
-{
-	unsigned int	i = 0;
-	unsigned int	ret = 0;
-	phtnode_t	aux = 0;
-
-	if ( !ht )
-		return ret;
-
-	for ( i = 0 ; i < ht->table_size ; i++ )
-		for ( aux = ht->table[i] ; aux != 0 ; ret++ , aux = aux->next );
-
-	return ret;
-}
-
-/* gets the first key in a hash table */
-_HIDDEN unsigned int htable_first ( phtable_t ht )
-{
-	unsigned int ret = 0;
-	unsigned int i = 0;
-
-	if ( ! ht )
-		return ret;
-
-	for ( i = 0 ; i < ht->table_size && ht->table[i] == 0 ; i++ );
-
-	if ( i < ht->table_size )
-		ret = ht->table[i]->key;
-
-	return ret;
-}
-
-/* destroys entire hash table */
-_HIDDEN void htable_destroy ( phtable_t *ht )
-{
-	unsigned int	i = 0;
-	phtnode_t	aux = 0;
-
-	if ( !ht || !(*ht) )
-		return;
-
-	for ( i = 0 ; i < (*ht)->table_size ; i++ )
-		while ( (*ht)->table[i] != 0 )
-		{
-			aux = (*ht)->table[i]->next;
-			free ( (*ht)->table[i] );
-			(*ht)->table[i] = aux;
-		}
-
-	free ( (*ht)->table );
-	free ( *ht );
-
-	*ht = 0;
-
-	return;
-}
 
 /********************/
 /** ACCESS LOCKING **/

src/inc/common.h

@@ -35,36 +35,6 @@
 # define _HIDDEN __attribute__((visibility("hidden")))
 #endif
 
-/* linked list */
-typedef struct _hash_node_
-{
-	struct _hash_node_	*next;
-	void			*val;
-	unsigned int		key;
-} htnode_t , *phtnode_t;
-
-typedef unsigned short fcmp_t (void *a, void *b);
-
-/* hash table definition */
-typedef struct
-{
-	size_t		table_size;
-	phtnode_t	*table;
-	fcmp_t		*equals;
-} htable_t , *phtable_t;
-
-/******************************************************************/
-/** Hash Table implementation (collision resolution by chaining) **/
-/******************************************************************/
-phtable_t htable_map ( size_t size , fcmp_t *equal_func );
-int htable_insert ( phtable_t ht  , unsigned int key , void *val );
-void *htable_find ( phtable_t ht , unsigned int key, void *ip_tuple4 );
-void *htable_remove ( phtable_t ht , unsigned int key, void *ip_tuple4 );
-unsigned int htable_count ( phtable_t ht );
-unsigned int htable_first ( phtable_t ht );
-void htable_destroy ( phtable_t *ht );
-
-
 /** @brief Access locking **/
 void lock_access ( pntoh_lock_t lock );
 /** @brief Access unlocking **/

src/inc/ipv4defrag.h

@@ -35,6 +35,8 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
+#include <uthash.h>
+
 /// macro to verify if an IP datagram is part of a fragmented datagram
 #define NTOH_IPV4_IS_FRAGMENT(off)	( ( (8*(ntohs(off) & 0x1FFF)) > 0 || (ntohs(off) & 0x2000) ) && !(ntohs(off) & 0x4000) )
 
@@ -71,8 +73,6 @@ typedef struct
 {
 	/// flow identification data
 	ntoh_ipv4_tuple4_t 		ident;
-	/// flow key
-	ntoh_ipv4_key_t 		key;
 	/// fragments list
 	pntoh_ipv4_fragment_t 		fragments;
 	/// total amount of received data
@@ -88,11 +88,9 @@ typedef struct
 	/// user-defined data
 	void 				*udata;
 	ntoh_lock_t 			lock;
+	UT_hash_handle			hh;
 } ntoh_ipv4_flow_t, *pntoh_ipv4_flow_t;
 
-typedef htable_t ipv4_flows_table_t;
-typedef phtable_t pipv4_flows_table_t;
-
 /** @brief Structure to store global parameters */
 typedef struct _ipv4_session_
 {
@@ -102,11 +100,11 @@ typedef struct _ipv4_session_
 	sem_t 				max_flows;
 	sem_t 				max_fragments;
 	/// hash table to store IP flows
-	pipv4_flows_table_t 		flows;
+	pntoh_ipv4_flow_t		flows;
 	/// connection tables related
 	pthread_t 			tID;
 	ntoh_lock_t 			lock;
-}ntoh_ipv4_session_t , *pntoh_ipv4_session_t ;
+}ntoh_ipv4_session_t , *pntoh_ipv4_session_t;
 
 typedef struct
 {