FS-9775: Initial work towards sending messages, refactored into less headers, test updated

libs/libks/Makefile.am

@@ -13,7 +13,7 @@ libks_la_SOURCES += src/ks_time.c src/ks_printf.c src/ks_hash.c src/ks_q.c src/k
 libks_la_SOURCES += src/ks_ssl.c src/kws.c src/ks_rng.c
 libks_la_SOURCES += src/utp/utp_api.cpp src/utp/utp_callbacks.cpp src/utp/utp_hash.cpp src/utp/utp_internal.cpp
 libks_la_SOURCES += src/utp/utp_packedsockaddr.cpp src/utp/utp_utils.cpp src/ks_bencode.c
-libks_la_SOURCES += src/dht/ks_dht.c src/dht/ks_dht_endpoint.c src/dht/ks_dht_nodeid.c src/dht/ks_dht_message.c
+libks_la_SOURCES += src/dht/ks_dht.c src/dht/ks_dht_endpoint.c src/dht/ks_dht_nodeid.c src/dht/ks_dht_message.c src/dht/ks_dht_transaction.c
 libks_la_SOURCES += crypt/aeskey.c crypt/aestab.c crypt/sha2.c crypt/twofish.c crypt/aes_modes.c crypt/aescrypt.c crypt/twofish_cfb.c 
 #aes.h aescpp.h brg_endian.h aesopt.h aestab.h brg_types.h sha2.h twofish.h
 
@@ -29,8 +29,7 @@ library_include_HEADERS += src/include/ks_dso.h src/include/ks_dht.h src/include
 library_include_HEADERS += src/include/ks_printf.h src/include/ks_hash.h src/include/ks_ssl.h src/include/kws.h
 library_include_HEADERS += src/utp/utp_internal.h src/utp/utp.h src/utp/utp_types.h src/utp/utp_callbacks.h src/utp/utp_templates.h
 library_include_HEADERS += src/utp/utp_hash.h src/utp/utp_packedsockaddr.h src/utp/utp_utils.h src/include/ks_utp.h
-library_include_HEADERS += src/dht/ks_dht.h src/dht/ks_dht-int.h src/dht/ks_dht_endpoint.h src/dht/ks_dht_endpoint-int.h
-library_include_HEADERS += src/dht/ks_dht_nodeid.h src/dht/ks_dht_message.h
+library_include_HEADERS += src/dht/ks_dht.h src/dht/ks_dht-int.h
 
 tests: libks.la
 	$(MAKE) -C test tests

libs/libks/src/dht/ks_dht-int.h

@@ -5,12 +5,35 @@
 
 KS_BEGIN_EXTERN_C
 
-
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_send(ks_dht2_t *dht, ks_sockaddr_t *raddr, ks_dht2_message_t *message);
 KS_DECLARE(ks_status_t) ks_dht2_idle(ks_dht2_t *dht);
 KS_DECLARE(ks_status_t) ks_dht2_process(ks_dht2_t *dht, ks_sockaddr_t *raddr);
 
 KS_DECLARE(ks_status_t) ks_dht2_process_query(ks_dht2_t *dht, ks_sockaddr_t *raddr, ks_dht2_message_t *message);
+KS_DECLARE(ks_status_t) ks_dht2_process_response(ks_dht2_t *dht, ks_sockaddr_t *raddr, ks_dht2_message_t *message);
+
 KS_DECLARE(ks_status_t) ks_dht2_process_query_ping(ks_dht2_t *dht, ks_sockaddr_t *raddr, ks_dht2_message_t *message);
+KS_DECLARE(ks_status_t) ks_dht2_process_response_ping(ks_dht2_t *dht, ks_sockaddr_t *raddr, ks_dht2_message_t *message);
+
+KS_DECLARE(ks_status_t) ks_dht2_send_query_ping(ks_dht2_t *dht, ks_sockaddr_t *raddr);
+KS_DECLARE(ks_status_t) ks_dht2_send_response_ping(ks_dht2_t *dht,
+												   ks_sockaddr_t *raddr,
+												   uint8_t *transactionid,
+												   ks_size_t transactionid_length);
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_endpoint_alloc(ks_dht2_endpoint_t **endpoint, ks_pool_t *pool);
+KS_DECLARE(ks_status_t) ks_dht2_endpoint_prealloc(ks_dht2_endpoint_t *endpoint, ks_pool_t *pool);
+KS_DECLARE(ks_status_t) ks_dht2_endpoint_free(ks_dht2_endpoint_t *endpoint);
+
+KS_DECLARE(ks_status_t) ks_dht2_endpoint_init(ks_dht2_endpoint_t *endpoint, const ks_sockaddr_t *addr, ks_socket_t sock);
+KS_DECLARE(ks_status_t) ks_dht2_endpoint_deinit(ks_dht2_endpoint_t *endpoint);
+
 
 KS_END_EXTERN_C
 

libs/libks/src/dht/ks_dht.h

@@ -4,9 +4,6 @@
 #include "ks.h"
 #include "ks_bencode.h"
 
-#include "ks_dht_endpoint.h"
-#include "ks_dht_message.h"
-#include "ks_dht_nodeid.h"
 
 KS_BEGIN_EXTERN_C
 
@@ -14,11 +11,62 @@ KS_BEGIN_EXTERN_C
 #define KS_DHT_DEFAULT_PORT 5309
 #define KS_DHT_RECV_BUFFER_SIZE 0xFFFF
 
+#define KS_DHT_NODEID_LENGTH 20
+
+#define KS_DHT_MESSAGE_TRANSACTIONID_MAX_SIZE 20
+#define KS_DHT_MESSAGE_TYPE_MAX_SIZE 20
+#define KS_DHT_MESSAGE_QUERY_MAX_SIZE 20
+
+
 typedef struct ks_dht2_s ks_dht2_t;
+typedef struct ks_dht2_nodeid_s ks_dht2_nodeid_t;
+typedef struct ks_dht2_nodeid_raw_s ks_dht2_nodeid_raw_t;
+typedef struct ks_dht2_message_s ks_dht2_message_t;
+typedef struct ks_dht2_endpoint_s ks_dht2_endpoint_t;
+typedef struct ks_dht2_transaction_s ks_dht2_transaction_t;
+
+
+typedef ks_status_t (*ks_dht2_message_callback_t)(ks_dht2_t *dht, ks_sockaddr_t *raddr, ks_dht2_message_t *message);
+
+struct ks_dht2_nodeid_raw_s {
+	uint8_t id[KS_DHT_NODEID_LENGTH];
+};
+
+struct ks_dht2_nodeid_s {
+	ks_pool_t *pool;
+	uint8_t id[KS_DHT_NODEID_LENGTH];
+};
+
+struct ks_dht2_message_s {
+	ks_pool_t *pool;
+	struct bencode *data;
+	uint8_t transactionid[KS_DHT_MESSAGE_TRANSACTIONID_MAX_SIZE];
+	ks_size_t transactionid_length;
+	char type[KS_DHT_MESSAGE_TYPE_MAX_SIZE];
+	struct bencode *args;
+};
+
+struct ks_dht2_endpoint_s {
+	ks_pool_t *pool;
+	ks_sockaddr_t addr;
+	ks_socket_t sock;
+};
+
+struct ks_dht2_transaction_s {
+	ks_pool_t *pool;
+	uint16_t transactionid;
+	ks_dht2_message_callback_t callback;
+	// @todo expiration data
+};
+
+
 struct ks_dht2_s {
 	ks_pool_t *pool;
 	ks_bool_t pool_alloc;
 
+	ks_bool_t autoroute;
+	ks_port_t autoroute_port;
+	
 	ks_dht2_nodeid_t nodeid;
 
 	ks_hash_t *registry_type;
@@ -34,11 +82,14 @@ struct ks_dht2_s {
 
 	uint8_t recv_buffer[KS_DHT_RECV_BUFFER_SIZE];
 	ks_size_t recv_buffer_length;
-};
-
-typedef ks_status_t (*ks_dht2_registry_callback_t)(ks_dht2_t *dht, ks_sockaddr_t *raddr, ks_dht2_message_t *message);
 
+	uint16_t transactionid_next;
+	ks_hash_t *transactions_hash;
+};
 
+/**
+ *
+ */
 KS_DECLARE(ks_status_t) ks_dht2_alloc(ks_dht2_t **dht, ks_pool_t *pool);
 KS_DECLARE(ks_status_t) ks_dht2_prealloc(ks_dht2_t *dht, ks_pool_t *pool);
 KS_DECLARE(ks_status_t) ks_dht2_free(ks_dht2_t *dht);
@@ -47,15 +98,62 @@ KS_DECLARE(ks_status_t) ks_dht2_free(ks_dht2_t *dht);
 KS_DECLARE(ks_status_t) ks_dht2_init(ks_dht2_t *dht, const ks_dht2_nodeid_raw_t *nodeid);
 KS_DECLARE(ks_status_t) ks_dht2_deinit(ks_dht2_t *dht);
 
+KS_DECLARE(ks_status_t) ks_dht2_autoroute(ks_dht2_t *dht, ks_bool_t autoroute, ks_port_t port);
 
-KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr);
+KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr, ks_dht2_endpoint_t **endpoint);
 KS_DECLARE(ks_status_t) ks_dht2_pulse(ks_dht2_t *dht, int32_t timeout);
 
 
-KS_DECLARE(ks_status_t) ks_dht2_register_type(ks_dht2_t *dht, const char *value, ks_dht2_registry_callback_t callback);
-KS_DECLARE(ks_status_t) ks_dht2_register_query(ks_dht2_t *dht, const char *value, ks_dht2_registry_callback_t callback);
+KS_DECLARE(ks_status_t) ks_dht2_register_type(ks_dht2_t *dht, const char *value, ks_dht2_message_callback_t callback);
+KS_DECLARE(ks_status_t) ks_dht2_register_query(ks_dht2_t *dht, const char *value, ks_dht2_message_callback_t callback);
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_nodeid_alloc(ks_dht2_nodeid_t **nodeid, ks_pool_t *pool);
+KS_DECLARE(ks_status_t) ks_dht2_nodeid_prealloc(ks_dht2_nodeid_t *nodeid, ks_pool_t *pool);
+KS_DECLARE(ks_status_t) ks_dht2_nodeid_free(ks_dht2_nodeid_t *nodeid);
 
+KS_DECLARE(ks_status_t) ks_dht2_nodeid_init(ks_dht2_nodeid_t *nodeid, const ks_dht2_nodeid_raw_t *id);
+KS_DECLARE(ks_status_t) ks_dht2_nodeid_deinit(ks_dht2_nodeid_t *nodeid);
 
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_message_alloc(ks_dht2_message_t **message, ks_pool_t *pool);
+KS_DECLARE(ks_status_t) ks_dht2_message_prealloc(ks_dht2_message_t *message, ks_pool_t *pool);
+KS_DECLARE(ks_status_t) ks_dht2_message_free(ks_dht2_message_t *message);
+
+KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, ks_bool_t alloc_data);
+KS_DECLARE(ks_status_t) ks_dht2_message_deinit(ks_dht2_message_t *message);
+
+KS_DECLARE(ks_status_t) ks_dht2_message_parse(ks_dht2_message_t *message, const uint8_t *buffer, ks_size_t buffer_length);
+
+KS_DECLARE(ks_status_t) ks_dht2_message_query(ks_dht2_message_t *message,
+											  uint16_t transactionid,
+											  const char *query,
+											  struct bencode **args);
+KS_DECLARE(ks_status_t) ks_dht2_message_response(ks_dht2_message_t *message,
+												 uint8_t *transactionid,
+												 ks_size_t transactionid_length,
+												 struct bencode **args);
+
+/**
+ *
+ */
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_transaction_alloc(ks_dht2_transaction_t **transaction, ks_pool_t *pool);
+KS_DECLARE(ks_status_t) ks_dht2_transaction_prealloc(ks_dht2_transaction_t *trasnaction, ks_pool_t *pool);
+KS_DECLARE(ks_status_t) ks_dht2_transaction_free(ks_dht2_transaction_t *transaction);
+
+KS_DECLARE(ks_status_t) ks_dht2_transaction_init(ks_dht2_transaction_t *transaction,
+												 uint16_t transactionid,
+												 ks_dht2_message_callback_t callback);
+KS_DECLARE(ks_status_t) ks_dht2_transaction_deinit(ks_dht2_transaction_t *transaction);
+																																				
 KS_END_EXTERN_C
 
 #endif /* KS_DHT_H */

libs/libks/src/dht/ks_dht_endpoint-int.h

-#ifndef KS_DHT_ENDPOINT_INT_H
-#define KS_DHT_ENDPOINT_INT_H
-
-#include "ks.h"
-
-KS_BEGIN_EXTERN_C
-
-KS_DECLARE(ks_status_t) ks_dht2_endpoint_alloc(ks_dht2_endpoint_t **endpoint, ks_pool_t *pool);
-KS_DECLARE(ks_status_t) ks_dht2_endpoint_prealloc(ks_dht2_endpoint_t *endpoint, ks_pool_t *pool);
-KS_DECLARE(ks_status_t) ks_dht2_endpoint_free(ks_dht2_endpoint_t *endpoint);
-
-KS_DECLARE(ks_status_t) ks_dht2_endpoint_init(ks_dht2_endpoint_t *endpoint, const ks_sockaddr_t *addr, ks_socket_t sock);
-KS_DECLARE(ks_status_t) ks_dht2_endpoint_deinit(ks_dht2_endpoint_t *endpoint);
-						
-KS_END_EXTERN_C
-
-#endif /* KS_DHT_ENDPOINT_H */
-
-
-/* For Emacs:
-* Local Variables:
-* mode:c
-* indent-tabs-mode:t
-* tab-width:4
-* c-basic-offset:4
-* End:
-* For VIM:
-* vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
-*/

libs/libks/src/dht/ks_dht_endpoint.c

-#include "ks_dht_endpoint.h"
-#include "ks_dht_endpoint-int.h"
+#include "ks_dht.h"
+#include "ks_dht-int.h"
 
 /**
  *

libs/libks/src/dht/ks_dht_endpoint.h

-#ifndef KS_DHT_ENDPOINT_H
-#define KS_DHT_ENDPOINT_H
-
-#include "ks.h"
-
-KS_BEGIN_EXTERN_C
-
-typedef struct ks_dht2_endpoint_s ks_dht2_endpoint_t;
-struct ks_dht2_endpoint_s {
-	ks_pool_t *pool;
-	ks_sockaddr_t addr;
-	ks_socket_t sock;
-};
-
-KS_END_EXTERN_C
-
-#endif /* KS_DHT_ENDPOINT_H */
-
-
-/* For Emacs:
-* Local Variables:
-* mode:c
-* indent-tabs-mode:t
-* tab-width:4
-* c-basic-offset:4
-* End:
-* For VIM:
-* vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
-*/

libs/libks/src/dht/ks_dht_message.c

 #include "ks_dht.h"
+#include "ks_dht-int.h"
 
 /**
  *
@@ -46,7 +47,44 @@ KS_DECLARE(ks_status_t) ks_dht2_message_free(ks_dht2_message_t *message)
 /**
  *
  */
-KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, const uint8_t *buffer, ks_size_t buffer_length)
+KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, ks_bool_t alloc_data)
+{
+	ks_assert(message);
+	ks_assert(message->pool);
+
+	message->data = NULL;
+	message->args = NULL;
+	message->transactionid_length = 0;
+	message->type[0] = '\0';
+	if (alloc_data) {
+		message->data = ben_dict();
+	}
+
+	return KS_STATUS_SUCCESS;
+}
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_message_deinit(ks_dht2_message_t *message)
+{
+	ks_assert(message);
+
+	message->args = NULL;
+	message->type[0] = '\0';
+	message->transactionid_length = 0;
+	if (message->data) {
+		ben_free(message->data);
+		message->data = NULL;
+	}
+
+	return KS_STATUS_SUCCESS;
+}
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_message_parse(ks_dht2_message_t *message, const uint8_t *buffer, ks_size_t buffer_length)
 {
 	struct bencode *t;
 	struct bencode *y;
@@ -58,8 +96,7 @@ KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, const u
 	ks_assert(message);
 	ks_assert(message->pool);
 	ks_assert(buffer);
-
-	message->args = NULL;
+	ks_assert(!message->data);
 
     message->data = ben_decode((const void *)buffer, buffer_length);
 	if (!message->data) {
@@ -115,16 +152,56 @@ KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, const u
 /**
  *
  */
-KS_DECLARE(ks_status_t) ks_dht2_message_deinit(ks_dht2_message_t *message)
+KS_DECLARE(ks_status_t) ks_dht2_message_query(ks_dht2_message_t *message,
+											  uint16_t transactionid,
+											  const char *query,
+											  struct bencode **args)
 {
+	struct bencode *a;
+	uint16_t tid;
+	
 	ks_assert(message);
+	ks_assert(query);
 
-	message->args = NULL;
-	message->type[0] = '\0';
-	message->transactionid_length = 0;
-	if (message->data) {
-		ben_free(message->data);
-		message->data = NULL;
+	tid = htons(transactionid);
+	
+    ben_dict_set(message->data, ben_blob("t", 1), ben_blob((uint8_t *)&tid, 2));
+	ben_dict_set(message->data, ben_blob("y", 1), ben_blob("q", 1));
+	ben_dict_set(message->data, ben_blob("q", 1), ben_blob(query, strlen(query)));
+
+	// @note r joins message->data and will be freed with it
+	a = ben_dict();
+	ben_dict_set(message->data, ben_blob("a", 1), a);
+
+	if (args) {
+		*args = a;
+	}
+
+	return KS_STATUS_SUCCESS;
+}
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_message_response(ks_dht2_message_t *message,
+												 uint8_t *transactionid,
+												 ks_size_t transactionid_length,
+												 struct bencode **args)
+{
+	struct bencode *r;
+	
+	ks_assert(message);
+	ks_assert(transactionid);
+	
+    ben_dict_set(message->data, ben_blob("t", 1), ben_blob(transactionid, transactionid_length));
+	ben_dict_set(message->data, ben_blob("y", 1), ben_blob("r", 1));
+	
+	// @note r joins message->data and will be freed with it
+	r = ben_dict();
+	ben_dict_set(message->data, ben_blob("r", 1), r);
+
+	if (args) {
+		*args = r;
 	}
 
 	return KS_STATUS_SUCCESS;

libs/libks/src/dht/ks_dht_message.h

-#ifndef KS_DHT_MESSAGE_H
-#define KS_DHT_MESSAGE_H
-
-#include "ks.h"
-
-KS_BEGIN_EXTERN_C
-
-#define KS_DHT_MESSAGE_TRANSACTIONID_MAX_SIZE 20
-#define KS_DHT_MESSAGE_TYPE_MAX_SIZE 20
-#define KS_DHT_MESSAGE_QUERY_MAX_SIZE 20
-
-typedef struct ks_dht2_message_s ks_dht2_message_t;
-struct ks_dht2_message_s {
-	ks_pool_t *pool;
-	struct bencode *data;
-    uint8_t transactionid[KS_DHT_MESSAGE_TRANSACTIONID_MAX_SIZE];
-	ks_size_t transactionid_length;
-	char type[KS_DHT_MESSAGE_TYPE_MAX_SIZE];
-	struct bencode *args;
-};
-
-KS_DECLARE(ks_status_t) ks_dht2_message_alloc(ks_dht2_message_t **message, ks_pool_t *pool);
-KS_DECLARE(ks_status_t) ks_dht2_message_prealloc(ks_dht2_message_t *message, ks_pool_t *pool);
-KS_DECLARE(ks_status_t) ks_dht2_message_free(ks_dht2_message_t *message);
-
-KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, const uint8_t *buffer, ks_size_t buffer_length);
-KS_DECLARE(ks_status_t) ks_dht2_message_deinit(ks_dht2_message_t *message);
-
-KS_END_EXTERN_C
-
-#endif /* KS_DHT_MESSAGE_H */
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
-

libs/libks/src/dht/ks_dht_nodeid.c

-#include "ks_dht_nodeid.h"
+#include "ks_dht.h"
+#include "ks_dht-int.h"
 #include "sodium.h"
 
 /**

libs/libks/src/dht/ks_dht_nodeid.h

-#ifndef KS_DHT_NODEID_H
-#define KS_DHT_NODEID_H
-
-#include "ks.h"
-
-KS_BEGIN_EXTERN_C
-
-#define KS_DHT_NODEID_LENGTH 20
-
-typedef struct ks_dht2_nodeid_raw_s ks_dht2_nodeid_raw_t;
-struct ks_dht2_nodeid_raw_s {
-    uint8_t id[KS_DHT_NODEID_LENGTH];
-};
-
-typedef struct ks_dht2_nodeid_s ks_dht2_nodeid_t;
-struct ks_dht2_nodeid_s {
-	ks_pool_t *pool;
-    uint8_t id[KS_DHT_NODEID_LENGTH];
-};
-
-KS_DECLARE(ks_status_t) ks_dht2_nodeid_alloc(ks_dht2_nodeid_t **nodeid, ks_pool_t *pool);
-KS_DECLARE(ks_status_t) ks_dht2_nodeid_prealloc(ks_dht2_nodeid_t *nodeid, ks_pool_t *pool);
-KS_DECLARE(ks_status_t) ks_dht2_nodeid_free(ks_dht2_nodeid_t *nodeid);
-
-KS_DECLARE(ks_status_t) ks_dht2_nodeid_init(ks_dht2_nodeid_t *nodeid, const ks_dht2_nodeid_raw_t *id);
-KS_DECLARE(ks_status_t) ks_dht2_nodeid_deinit(ks_dht2_nodeid_t *nodeid);
-
-KS_END_EXTERN_C
-
-#endif /* KS_DHT_NODEID_H */
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
- */
-

libs/libks/src/dht/ks_dht_transaction.c

+#include "ks_dht.h"
+#include "ks_dht-int.h"
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_transaction_alloc(ks_dht2_transaction_t **transaction, ks_pool_t *pool)
+{
+	ks_dht2_transaction_t *tran;
+
+	ks_assert(transaction);
+	ks_assert(pool);
+	
+	*transaction = tran = ks_pool_alloc(pool, sizeof(ks_dht2_transaction_t));
+	tran->pool = pool;
+
+	return KS_STATUS_SUCCESS;
+}
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_transaction_prealloc(ks_dht2_transaction_t *transaction, ks_pool_t *pool)
+{
+	ks_assert(transaction);
+	ks_assert(pool);
+	
+	transaction->pool = pool;
+
+	return KS_STATUS_SUCCESS;
+}
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_transaction_free(ks_dht2_transaction_t *transaction)
+{
+	ks_assert(transaction);
+
+	ks_dht2_transaction_deinit(transaction);
+	ks_pool_free(transaction->pool, transaction);
+
+	return KS_STATUS_SUCCESS;
+}
+												
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_transaction_init(ks_dht2_transaction_t *transaction,
+												 uint16_t transactionid,
+												 ks_dht2_message_callback_t callback)
+{
+	ks_assert(transaction);
+	ks_assert(transaction->pool);
+	ks_assert(callback);
+
+	transaction->transactionid = transactionid;
+	transaction->callback = callback;
+
+	return KS_STATUS_SUCCESS;
+}
+
+/**
+ *
+ */
+KS_DECLARE(ks_status_t) ks_dht2_transaction_deinit(ks_dht2_transaction_t *transaction)
+{
+	ks_assert(transaction);
+
+	transaction->transactionid = 0;
+	transaction->callback = NULL;
+
+	return KS_STATUS_SUCCESS;
+}
+
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet:
+ */

libs/libks/test/testdht2.c

 #include <ks.h>
 #include <../dht/ks_dht.h>
 #include <../dht/ks_dht-int.h>
-#include <../dht/ks_dht_endpoint-int.h>
 #include <tap.h>
 
 #define TEST_DHT1_REGISTER_TYPE_BUFFER "d1:ad2:id20:12345678901234567890e1:q4:ping1:t2:421:y1:ze"
@@ -65,13 +64,13 @@ int main() {
     err = ks_addr_set(&addr, v4, KS_DHT_DEFAULT_PORT, AF_INET);
 	ok(err == KS_STATUS_SUCCESS);
 	
-    err = ks_dht2_bind(dht1, &addr);
+    err = ks_dht2_bind(dht1, &addr, NULL);
     ok(err == KS_STATUS_SUCCESS);
 
 	err = ks_addr_set(&addr, v4, KS_DHT_DEFAULT_PORT + 1, AF_INET);
 	ok(err == KS_STATUS_SUCCESS);
 	
-	err = ks_dht2_bind(&dht2, &addr);
+	err = ks_dht2_bind(&dht2, &addr, NULL);
 	ok(err == KS_STATUS_SUCCESS);
 
 	raddr = addr;
@@ -81,13 +80,13 @@ int main() {
 	err = ks_addr_set(&addr, v6, KS_DHT_DEFAULT_PORT, AF_INET6);
 	ok(err == KS_STATUS_SUCCESS);
 	  
-    err = ks_dht2_bind(dht1, &addr);
+    err = ks_dht2_bind(dht1, &addr, NULL);
     ok(err == KS_STATUS_SUCCESS);
 
 	err = ks_addr_set(&addr, v6, KS_DHT_DEFAULT_PORT + 1, AF_INET6);
 	ok(err == KS_STATUS_SUCCESS);
 
-	err = ks_dht2_bind(&dht2, &addr);
+	err = ks_dht2_bind(&dht2, &addr, NULL);
 	ok(err == KS_STATUS_SUCCESS);
   }
 
@@ -105,8 +104,11 @@ int main() {
 
   err = ks_dht2_process(dht1, &raddr);
   ok(err == KS_STATUS_SUCCESS);
-  
 
+  err = ks_dht2_pulse(&dht2, 1000);
+  ok(err == KS_STATUS_SUCCESS);
+
+  diag("Cleanup\n");
   /* Cleanup and shutdown */
 
   err = ks_dht2_deinit(&dht2);