kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-03 06:06:09 +00:00
Code Issues Projects Releases Wiki Activity

FS-9775: Removed building of old dht code, renamed new dht code from dht2 to dht

Browse Source
This commit is contained in:
Shane Bryldt 2016-12-07 18:02:37 +00:00 committed by Mike Jerris
parent 253b808f1b
commit 88ee82a380
11 changed files with 313 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/libks/Makefile.am
View File

@ -9,7 +9,7 @@ AM_CPPFLAGS = $(AM_CFLAGS)
lib_LTLIBRARIES = libks.la lib_LTLIBRARIES = libks.la
libks_la_SOURCES = src/ks.c src/ks_string.c src/ks_json.c src/ks_thread.c src/ks_thread_pool.c src/ks_mutex.c src/ks_config.c libks_la_SOURCES = src/ks.c src/ks_string.c src/ks_json.c src/ks_thread.c src/ks_thread_pool.c src/ks_mutex.c src/ks_config.c
libks_la_SOURCES += src/ks_log.c src/ks_socket.c src/ks_buffer.c src/ks_pool.c src/simclist.c libks_la_SOURCES += src/ks_log.c src/ks_socket.c src/ks_buffer.c src/ks_pool.c src/simclist.c
libks_la_SOURCES += src/ks_time.c src/ks_printf.c src/ks_hash.c src/ks_q.c src/ks_dso.c src/ks_dht.c libks_la_SOURCES += src/ks_time.c src/ks_printf.c src/ks_hash.c src/ks_q.c src/ks_dso.c # src/ks_dht.c
libks_la_SOURCES += src/ks_ssl.c src/kws.c src/ks_rng.c 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_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/utp/utp_packedsockaddr.cpp src/utp/utp_utils.cpp src/ks_bencode.c
@ -26,7 +26,7 @@ library_includedir = $(prefix)/include
library_include_HEADERS = src/include/ks_config.h src/include/ks.h src/include/ks_threadmutex.h src/include/ks_json.h src/include/ks_buffer.h library_include_HEADERS = src/include/ks_config.h src/include/ks.h src/include/ks_threadmutex.h src/include/ks_json.h src/include/ks_buffer.h
library_include_HEADERS += src/include/ks_thread_pool.h library_include_HEADERS += src/include/ks_thread_pool.h
library_include_HEADERS += src/include/ks_pool.h src/include/simclist.h src/include/ks_time.h src/include/ks_q.h src/include/ks_socket.h library_include_HEADERS += src/include/ks_pool.h src/include/simclist.h src/include/ks_time.h src/include/ks_q.h src/include/ks_socket.h
library_include_HEADERS += src/include/ks_dso.h src/include/ks_dht.h src/include/ks_platform.h src/include/ks_types.h # src/include/ks_rng.h library_include_HEADERS += src/include/ks_dso.h src/include/ks_platform.h src/include/ks_types.h # src/include/ks_rng.h src/include/ks_dht.h
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/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_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/utp/utp_hash.h src/utp/utp_packedsockaddr.h src/utp/utp_utils.h src/include/ks_utp.h

68
libs/libks/src/dht/ks_dht-int.h
View File

@ -8,64 +8,64 @@ KS_BEGIN_EXTERN_C
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_utility_compact_address(ks_sockaddr_t *address, KS_DECLARE(ks_status_t) ks_dht_utility_compact_address(ks_sockaddr_t *address,
uint8_t *buffer, uint8_t *buffer,
ks_size_t *buffer_length, ks_size_t *buffer_length,
ks_size_t buffer_size); ks_size_t buffer_size);
KS_DECLARE(ks_status_t) ks_dht2_utility_compact_node(ks_dht2_nodeid_t *nodeid, KS_DECLARE(ks_status_t) ks_dht_utility_compact_node(ks_dht_nodeid_t *nodeid,
ks_sockaddr_t *address, ks_sockaddr_t *address,
uint8_t *buffer, uint8_t *buffer,
ks_size_t *buffer_length, ks_size_t *buffer_length,
ks_size_t buffer_size); ks_size_t buffer_size);
/** /**
* *
*/ */
KS_DECLARE(void) ks_dht2_idle(ks_dht2_t *dht); KS_DECLARE(void) ks_dht_idle(ks_dht_t *dht);
KS_DECLARE(void) ks_dht2_idle_expirations(ks_dht2_t *dht); KS_DECLARE(void) ks_dht_idle_expirations(ks_dht_t *dht);
KS_DECLARE(void) ks_dht2_idle_send(ks_dht2_t *dht); KS_DECLARE(void) ks_dht_idle_send(ks_dht_t *dht);
KS_DECLARE(ks_status_t) ks_dht2_send(ks_dht2_t *dht, ks_dht2_message_t *message); KS_DECLARE(ks_status_t) ks_dht_send(ks_dht_t *dht, ks_dht_message_t *message);
KS_DECLARE(ks_status_t) ks_dht2_send_error(ks_dht2_t *dht, KS_DECLARE(ks_status_t) ks_dht_send_error(ks_dht_t *dht,
ks_sockaddr_t *raddr, ks_sockaddr_t *raddr,
uint8_t *transactionid, uint8_t *transactionid,
ks_size_t transactionid_length, ks_size_t transactionid_length,
long long errorcode, long long errorcode,
const char *errorstr); const char *errorstr);
KS_DECLARE(ks_status_t) ks_dht2_send_ping(ks_dht2_t *dht, ks_sockaddr_t *raddr); KS_DECLARE(ks_status_t) ks_dht_send_ping(ks_dht_t *dht, ks_sockaddr_t *raddr);
KS_DECLARE(ks_status_t) ks_dht2_send_findnode(ks_dht2_t *dht, ks_sockaddr_t *raddr, ks_dht2_nodeid_t *targetid); KS_DECLARE(ks_status_t) ks_dht_send_findnode(ks_dht_t *dht, ks_sockaddr_t *raddr, ks_dht_nodeid_t *targetid);
KS_DECLARE(ks_status_t) ks_dht2_process(ks_dht2_t *dht, ks_sockaddr_t *raddr); KS_DECLARE(ks_status_t) ks_dht_process(ks_dht_t *dht, ks_sockaddr_t *raddr);
KS_DECLARE(ks_status_t) ks_dht2_process_query(ks_dht2_t *dht, ks_dht2_message_t *message); KS_DECLARE(ks_status_t) ks_dht_process_query(ks_dht_t *dht, ks_dht_message_t *message);
KS_DECLARE(ks_status_t) ks_dht2_process_response(ks_dht2_t *dht, ks_dht2_message_t *message); KS_DECLARE(ks_status_t) ks_dht_process_response(ks_dht_t *dht, ks_dht_message_t *message);
KS_DECLARE(ks_status_t) ks_dht2_process_error(ks_dht2_t *dht, ks_dht2_message_t *message); KS_DECLARE(ks_status_t) ks_dht_process_error(ks_dht_t *dht, ks_dht_message_t *message);
KS_DECLARE(ks_status_t) ks_dht2_process_query_ping(ks_dht2_t *dht, ks_dht2_message_t *message); KS_DECLARE(ks_status_t) ks_dht_process_query_ping(ks_dht_t *dht, ks_dht_message_t *message);
KS_DECLARE(ks_status_t) ks_dht2_process_query_findnode(ks_dht2_t *dht, ks_dht2_message_t *message); KS_DECLARE(ks_status_t) ks_dht_process_query_findnode(ks_dht_t *dht, ks_dht_message_t *message);
KS_DECLARE(ks_status_t) ks_dht2_process_response_ping(ks_dht2_t *dht, ks_dht2_message_t *message); KS_DECLARE(ks_status_t) ks_dht_process_response_ping(ks_dht_t *dht, ks_dht_message_t *message);
KS_DECLARE(ks_status_t) ks_dht2_process_response_findnode(ks_dht2_t *dht, ks_dht2_message_t *message); KS_DECLARE(ks_status_t) ks_dht_process_response_findnode(ks_dht_t *dht, ks_dht_message_t *message);
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_endpoint_alloc(ks_dht2_endpoint_t **endpoint, ks_pool_t *pool); KS_DECLARE(ks_status_t) ks_dht_endpoint_alloc(ks_dht_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_dht_endpoint_prealloc(ks_dht_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_dht_endpoint_free(ks_dht_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_dht_endpoint_init(ks_dht_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_DECLARE(ks_status_t) ks_dht_endpoint_deinit(ks_dht_endpoint_t *endpoint);
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_node_alloc(ks_dht2_node_t **node, ks_pool_t *pool); KS_DECLARE(ks_status_t) ks_dht_node_alloc(ks_dht_node_t **node, ks_pool_t *pool);
KS_DECLARE(ks_status_t) ks_dht2_node_prealloc(ks_dht2_node_t *node, ks_pool_t *pool); KS_DECLARE(ks_status_t) ks_dht_node_prealloc(ks_dht_node_t *node, ks_pool_t *pool);
KS_DECLARE(ks_status_t) ks_dht2_node_free(ks_dht2_node_t *node); KS_DECLARE(ks_status_t) ks_dht_node_free(ks_dht_node_t *node);
KS_DECLARE(ks_status_t) ks_dht2_node_init(ks_dht2_node_t *node, const ks_dht2_nodeid_t *id, const ks_sockaddr_t *addr); KS_DECLARE(ks_status_t) ks_dht_node_init(ks_dht_node_t *node, const ks_dht_nodeid_t *id, const ks_sockaddr_t *addr);
KS_DECLARE(ks_status_t) ks_dht2_node_deinit(ks_dht2_node_t *node); KS_DECLARE(ks_status_t) ks_dht_node_deinit(ks_dht_node_t *node);
KS_END_EXTERN_C KS_END_EXTERN_C

272
libs/libks/src/dht/ks_dht.c
View File

@ -5,15 +5,15 @@
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_alloc(ks_dht2_t **dht, ks_pool_t *pool) KS_DECLARE(ks_status_t) ks_dht_alloc(ks_dht_t **dht, ks_pool_t *pool)
{ {
ks_bool_t pool_alloc = !pool; ks_bool_t pool_alloc = !pool;
ks_dht2_t *d; ks_dht_t *d;
ks_assert(dht); ks_assert(dht);
if (pool_alloc) ks_pool_open(&pool); if (pool_alloc) ks_pool_open(&pool);
*dht = d = ks_pool_alloc(pool, sizeof(ks_dht2_t)); *dht = d = ks_pool_alloc(pool, sizeof(ks_dht_t));
d->pool = pool; d->pool = pool;
d->pool_alloc = pool_alloc; d->pool_alloc = pool_alloc;
@ -24,7 +24,7 @@ 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_dht_prealloc(ks_dht_t *dht, ks_pool_t *pool)
{ {
ks_assert(dht); ks_assert(dht);
ks_assert(pool); ks_assert(pool);
@ -38,12 +38,12 @@ 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) KS_DECLARE(ks_status_t) ks_dht_free(ks_dht_t *dht)
{ {
ks_pool_t *pool = dht->pool; ks_pool_t *pool = dht->pool;
ks_bool_t pool_alloc = dht->pool_alloc; ks_bool_t pool_alloc = dht->pool_alloc;
ks_dht2_deinit(dht); ks_dht_deinit(dht);
ks_pool_free(pool, dht); ks_pool_free(pool, dht);
if (pool_alloc) { if (pool_alloc) {
ks_pool_close(&pool); ks_pool_close(&pool);
@ -56,7 +56,7 @@ 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_t *nodeid) KS_DECLARE(ks_status_t) ks_dht_init(ks_dht_t *dht, const ks_dht_nodeid_t *nodeid)
{ {
ks_assert(dht); ks_assert(dht);
ks_assert(dht->pool); ks_assert(dht->pool);
@ -71,13 +71,13 @@ KS_DECLARE(ks_status_t) ks_dht2_init(ks_dht2_t *dht, const ks_dht2_nodeid_t *nod
} }
ks_hash_create(&dht->registry_type, KS_HASH_MODE_DEFAULT, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK, dht->pool); ks_hash_create(&dht->registry_type, KS_HASH_MODE_DEFAULT, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK, dht->pool);
ks_dht2_register_type(dht, "q", ks_dht2_process_query); ks_dht_register_type(dht, "q", ks_dht_process_query);
ks_dht2_register_type(dht, "r", ks_dht2_process_response); ks_dht_register_type(dht, "r", ks_dht_process_response);
ks_dht2_register_type(dht, "e", ks_dht2_process_error); ks_dht_register_type(dht, "e", ks_dht_process_error);
ks_hash_create(&dht->registry_query, KS_HASH_MODE_DEFAULT, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK, dht->pool); ks_hash_create(&dht->registry_query, KS_HASH_MODE_DEFAULT, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK, dht->pool);
ks_dht2_register_query(dht, "ping", ks_dht2_process_query_ping); ks_dht_register_query(dht, "ping", ks_dht_process_query_ping);
ks_dht2_register_query(dht, "find_node", ks_dht2_process_query_findnode); ks_dht_register_query(dht, "find_node", ks_dht_process_query_findnode);
ks_hash_create(&dht->registry_error, KS_HASH_MODE_DEFAULT, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK, dht->pool); ks_hash_create(&dht->registry_error, KS_HASH_MODE_DEFAULT, KS_HASH_FLAG_RWLOCK | KS_HASH_FLAG_DUP_CHECK, dht->pool);
// @todo register 301 error for internal get/put CAS hash mismatch retry handler // @todo register 301 error for internal get/put CAS hash mismatch retry handler
@ -103,7 +103,7 @@ KS_DECLARE(ks_status_t) ks_dht2_init(ks_dht2_t *dht, const ks_dht2_nodeid_t *nod
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_deinit(ks_dht2_t *dht) KS_DECLARE(ks_status_t) ks_dht_deinit(ks_dht_t *dht)
{ {
ks_assert(dht); ks_assert(dht);
@ -114,23 +114,23 @@ KS_DECLARE(ks_status_t) ks_dht2_deinit(ks_dht2_t *dht)
} }
dht->recv_buffer_length = 0; dht->recv_buffer_length = 0;
if (dht->send_q) { if (dht->send_q) {
ks_dht2_message_t *msg; ks_dht_message_t *msg;
while (ks_q_pop_timeout(dht->send_q, (void **)&msg, 1) == KS_STATUS_SUCCESS && msg) { while (ks_q_pop_timeout(dht->send_q, (void **)&msg, 1) == KS_STATUS_SUCCESS && msg) {
ks_dht2_message_deinit(msg); ks_dht_message_deinit(msg);
ks_dht2_message_free(msg); ks_dht_message_free(msg);
} }
ks_q_destroy(&dht->send_q); ks_q_destroy(&dht->send_q);
dht->send_q = NULL; dht->send_q = NULL;
} }
if (dht->send_q_unsent) { if (dht->send_q_unsent) {
ks_dht2_message_deinit(dht->send_q_unsent); ks_dht_message_deinit(dht->send_q_unsent);
ks_dht2_message_free(dht->send_q_unsent); ks_dht_message_free(dht->send_q_unsent);
dht->send_q_unsent = NULL; dht->send_q_unsent = NULL;
} }
for (int32_t i = 0; i < dht->endpoints_size; ++i) { for (int32_t i = 0; i < dht->endpoints_size; ++i) {
ks_dht2_endpoint_t *ep = dht->endpoints[i]; ks_dht_endpoint_t *ep = dht->endpoints[i];
ks_dht2_endpoint_deinit(ep); ks_dht_endpoint_deinit(ep);
ks_dht2_endpoint_free(ep); ks_dht_endpoint_free(ep);
} }
dht->endpoints_size = 0; dht->endpoints_size = 0;
if (dht->endpoints) { if (dht->endpoints) {
@ -170,7 +170,7 @@ 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_dht_autoroute(ks_dht_t *dht, ks_bool_t autoroute, ks_port_t port)
{ {
ks_assert(dht); ks_assert(dht);
@ -189,7 +189,7 @@ KS_DECLARE(ks_status_t) ks_dht2_autoroute(ks_dht2_t *dht, ks_bool_t autoroute, k
/** /**
* *
*/ */
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_dht_register_type(ks_dht_t *dht, const char *value, ks_dht_message_callback_t callback)
{ {
ks_assert(dht); ks_assert(dht);
ks_assert(value); ks_assert(value);
@ -201,7 +201,7 @@ KS_DECLARE(ks_status_t) ks_dht2_register_type(ks_dht2_t *dht, const char *value,
/** /**
* *
*/ */
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_dht_register_query(ks_dht_t *dht, const char *value, ks_dht_message_callback_t callback)
{ {
ks_assert(dht); ks_assert(dht);
ks_assert(value); ks_assert(value);
@ -213,7 +213,7 @@ KS_DECLARE(ks_status_t) ks_dht2_register_query(ks_dht2_t *dht, const char *value
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_register_error(ks_dht2_t *dht, const char *value, ks_dht2_message_callback_t callback) KS_DECLARE(ks_status_t) ks_dht_register_error(ks_dht_t *dht, const char *value, ks_dht_message_callback_t callback)
{ {
ks_assert(dht); ks_assert(dht);
ks_assert(value); ks_assert(value);
@ -225,9 +225,9 @@ KS_DECLARE(ks_status_t) ks_dht2_register_error(ks_dht2_t *dht, const char *value
/** /**
* *
*/ */
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_dht_bind(ks_dht_t *dht, const ks_sockaddr_t *addr, ks_dht_endpoint_t **endpoint)
{ {
ks_dht2_endpoint_t *ep; ks_dht_endpoint_t *ep;
ks_socket_t sock; ks_socket_t sock;
int32_t epindex; int32_t epindex;
@ -243,7 +243,7 @@ KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr,
dht->bind_ipv4 |= addr->family == AF_INET; dht->bind_ipv4 |= addr->family == AF_INET;
dht->bind_ipv6 |= addr->family == AF_INET6; dht->bind_ipv6 |= addr->family == AF_INET6;
// @todo start of ks_dht2_endpoint_bind // @todo start of ks_dht_endpoint_bind
if ((sock = socket(addr->family, SOCK_DGRAM, IPPROTO_UDP)) == KS_SOCK_INVALID) { if ((sock = socket(addr->family, SOCK_DGRAM, IPPROTO_UDP)) == KS_SOCK_INVALID) {
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
@ -254,13 +254,13 @@ KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr,
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
if (ks_dht2_endpoint_alloc(&ep, dht->pool) != KS_STATUS_SUCCESS) { if (ks_dht_endpoint_alloc(&ep, dht->pool) != KS_STATUS_SUCCESS) {
ks_socket_close(&sock); ks_socket_close(&sock);
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
if (ks_dht2_endpoint_init(ep, addr, sock) != KS_STATUS_SUCCESS) { if (ks_dht_endpoint_init(ep, addr, sock) != KS_STATUS_SUCCESS) {
ks_dht2_endpoint_free(ep); ks_dht_endpoint_free(ep);
ks_socket_close(&sock); ks_socket_close(&sock);
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
@ -268,12 +268,12 @@ KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr,
ks_socket_option(ep->sock, SO_REUSEADDR, KS_TRUE); ks_socket_option(ep->sock, SO_REUSEADDR, KS_TRUE);
ks_socket_option(ep->sock, KS_SO_NONBLOCK, KS_TRUE); ks_socket_option(ep->sock, KS_SO_NONBLOCK, KS_TRUE);
// @todo end of ks_dht2_endpoint_bind // @todo end of ks_dht_endpoint_bind
epindex = dht->endpoints_size++; epindex = dht->endpoints_size++;
dht->endpoints = (ks_dht2_endpoint_t **)ks_pool_resize(dht->pool, dht->endpoints = (ks_dht_endpoint_t **)ks_pool_resize(dht->pool,
(void *)dht->endpoints, (void *)dht->endpoints,
sizeof(ks_dht2_endpoint_t *) * dht->endpoints_size); sizeof(ks_dht_endpoint_t *) * dht->endpoints_size);
dht->endpoints[epindex] = ep; dht->endpoints[epindex] = ep;
ks_hash_insert(dht->endpoints_hash, ep->addr.host, ep); ks_hash_insert(dht->endpoints_hash, ep->addr.host, ep);
@ -293,7 +293,7 @@ KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr,
/** /**
* *
*/ */
KS_DECLARE(void) ks_dht2_pulse(ks_dht2_t *dht, int32_t timeout) KS_DECLARE(void) ks_dht_pulse(ks_dht_t *dht, int32_t timeout)
{ {
int32_t result; int32_t result;
@ -315,22 +315,22 @@ KS_DECLARE(void) ks_dht2_pulse(ks_dht2_t *dht, int32_t timeout)
raddr.family = dht->endpoints[i]->addr.family; raddr.family = dht->endpoints[i]->addr.family;
if (ks_socket_recvfrom(dht->endpoints_poll[i].fd, dht->recv_buffer, &dht->recv_buffer_length, &raddr) == KS_STATUS_SUCCESS) { if (ks_socket_recvfrom(dht->endpoints_poll[i].fd, dht->recv_buffer, &dht->recv_buffer_length, &raddr) == KS_STATUS_SUCCESS) {
ks_dht2_process(dht, &raddr); ks_dht_process(dht, &raddr);
} }
} }
} }
} }
ks_dht2_idle(dht); ks_dht_idle(dht);
} }
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_utility_compact_address(ks_sockaddr_t *address, KS_DECLARE(ks_status_t) ks_dht_utility_compact_address(ks_sockaddr_t *address,
uint8_t *buffer, uint8_t *buffer,
ks_size_t *buffer_length, ks_size_t *buffer_length,
ks_size_t buffer_size) ks_size_t buffer_size)
{ {
ks_size_t required = sizeof(uint16_t); ks_size_t required = sizeof(uint16_t);
uint16_t port = 0; uint16_t port = 0;
@ -379,11 +379,11 @@ KS_DECLARE(ks_status_t) ks_dht2_utility_compact_address(ks_sockaddr_t *address,
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_utility_compact_node(ks_dht2_nodeid_t *nodeid, KS_DECLARE(ks_status_t) ks_dht_utility_compact_node(ks_dht_nodeid_t *nodeid,
ks_sockaddr_t *address, ks_sockaddr_t *address,
uint8_t *buffer, uint8_t *buffer,
ks_size_t *buffer_length, ks_size_t *buffer_length,
ks_size_t buffer_size) ks_size_t buffer_size)
{ {
ks_assert(address); ks_assert(address);
ks_assert(buffer); ks_assert(buffer);
@ -399,25 +399,25 @@ KS_DECLARE(ks_status_t) ks_dht2_utility_compact_node(ks_dht2_nodeid_t *nodeid,
memcpy(buffer + (*buffer_length), (void *)nodeid, KS_DHT_NODEID_SIZE); memcpy(buffer + (*buffer_length), (void *)nodeid, KS_DHT_NODEID_SIZE);
*buffer_length += KS_DHT_NODEID_SIZE; *buffer_length += KS_DHT_NODEID_SIZE;
return ks_dht2_utility_compact_address(address, buffer, buffer_length, buffer_size); return ks_dht_utility_compact_address(address, buffer, buffer_length, buffer_size);
} }
/** /**
* *
*/ */
KS_DECLARE(void) ks_dht2_idle(ks_dht2_t *dht) KS_DECLARE(void) ks_dht_idle(ks_dht_t *dht)
{ {
ks_assert(dht); ks_assert(dht);
ks_dht2_idle_expirations(dht); ks_dht_idle_expirations(dht);
ks_dht2_idle_send(dht); ks_dht_idle_send(dht);
} }
/** /**
* *
*/ */
KS_DECLARE(void) ks_dht2_idle_expirations(ks_dht2_t *dht) KS_DECLARE(void) ks_dht_idle_expirations(ks_dht_t *dht)
{ {
ks_hash_iterator_t *it = NULL; ks_hash_iterator_t *it = NULL;
ks_time_t now = ks_time_now_sec(); ks_time_t now = ks_time_now_sec();
@ -429,7 +429,7 @@ KS_DECLARE(void) ks_dht2_idle_expirations(ks_dht2_t *dht)
ks_hash_write_lock(dht->transactions_hash); ks_hash_write_lock(dht->transactions_hash);
for (it = ks_hash_first(dht->transactions_hash, KS_UNLOCKED); it; it = ks_hash_next(&it)) { for (it = ks_hash_first(dht->transactions_hash, KS_UNLOCKED); it; it = ks_hash_next(&it)) {
const void *key = NULL; const void *key = NULL;
ks_dht2_transaction_t *value = NULL; ks_dht_transaction_t *value = NULL;
ks_bool_t remove = KS_FALSE; ks_bool_t remove = KS_FALSE;
ks_hash_this(it, &key, NULL, (void **)&value); ks_hash_this(it, &key, NULL, (void **)&value);
@ -450,9 +450,9 @@ KS_DECLARE(void) ks_dht2_idle_expirations(ks_dht2_t *dht)
/** /**
* *
*/ */
KS_DECLARE(void) ks_dht2_idle_send(ks_dht2_t *dht) KS_DECLARE(void) ks_dht_idle_send(ks_dht_t *dht)
{ {
ks_dht2_message_t *message; ks_dht_message_t *message;
ks_bool_t bail = KS_FALSE; ks_bool_t bail = KS_FALSE;
ks_status_t ret = KS_STATUS_SUCCESS; ks_status_t ret = KS_STATUS_SUCCESS;
@ -468,12 +468,12 @@ KS_DECLARE(void) ks_dht2_idle_send(ks_dht2_t *dht)
bail = ks_q_pop_timeout(dht->send_q, (void **)&message, 1) != KS_STATUS_SUCCESS || !message; bail = ks_q_pop_timeout(dht->send_q, (void **)&message, 1) != KS_STATUS_SUCCESS || !message;
} }
if (!bail) { if (!bail) {
bail = (ret = ks_dht2_send(dht, message)) != KS_STATUS_SUCCESS; bail = (ret = ks_dht_send(dht, message)) != KS_STATUS_SUCCESS;
if (ret == KS_STATUS_BREAK) { if (ret == KS_STATUS_BREAK) {
dht->send_q_unsent = message; dht->send_q_unsent = message;
} else if (ret == KS_STATUS_SUCCESS) { } else if (ret == KS_STATUS_SUCCESS) {
ks_dht2_message_deinit(message); ks_dht_message_deinit(message);
ks_dht2_message_free(message); ks_dht_message_free(message);
} }
} }
} }
@ -482,11 +482,11 @@ KS_DECLARE(void) ks_dht2_idle_send(ks_dht2_t *dht)
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_send(ks_dht2_t *dht, ks_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_send(ks_dht_t *dht, ks_dht_message_t *message)
{ {
// @todo lookup standard def for IPV6 max size // @todo lookup standard def for IPV6 max size
char ip[48]; char ip[48];
ks_dht2_endpoint_t *ep; ks_dht_endpoint_t *ep;
// @todo calculate max IPV6 payload size? // @todo calculate max IPV6 payload size?
char buf[1000]; char buf[1000];
ks_size_t buf_len; ks_size_t buf_len;
@ -502,7 +502,7 @@ KS_DECLARE(ks_status_t) ks_dht2_send(ks_dht2_t *dht, ks_dht2_message_t *message)
if (!(ep = ks_hash_search(dht->endpoints_hash, ip, KS_UNLOCKED)) && dht->autoroute) { if (!(ep = ks_hash_search(dht->endpoints_hash, ip, KS_UNLOCKED)) && dht->autoroute) {
ks_sockaddr_t addr; ks_sockaddr_t addr;
ks_addr_set(&addr, ip, dht->autoroute_port, message->raddr.family); ks_addr_set(&addr, ip, dht->autoroute_port, message->raddr.family);
if (ks_dht2_bind(dht, &addr, &ep) != KS_STATUS_SUCCESS) { if (ks_dht_bind(dht, &addr, &ep) != KS_STATUS_SUCCESS) {
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
} }
@ -523,14 +523,14 @@ KS_DECLARE(ks_status_t) ks_dht2_send(ks_dht2_t *dht, ks_dht2_message_t *message)
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_send_error(ks_dht2_t *dht, KS_DECLARE(ks_status_t) ks_dht_send_error(ks_dht_t *dht,
ks_sockaddr_t *raddr, ks_sockaddr_t *raddr,
uint8_t *transactionid, uint8_t *transactionid,
ks_size_t transactionid_length, ks_size_t transactionid_length,
long long errorcode, long long errorcode,
const char *errorstr) const char *errorstr)
{ {
ks_dht2_message_t *error = NULL; ks_dht_message_t *error = NULL;
struct bencode *e = NULL; struct bencode *e = NULL;
ks_status_t ret = KS_STATUS_FAIL; ks_status_t ret = KS_STATUS_FAIL;
@ -539,15 +539,15 @@ KS_DECLARE(ks_status_t) ks_dht2_send_error(ks_dht2_t *dht,
ks_assert(transactionid); ks_assert(transactionid);
ks_assert(errorstr); ks_assert(errorstr);
if (ks_dht2_message_alloc(&error, dht->pool) != KS_STATUS_SUCCESS) { if (ks_dht_message_alloc(&error, dht->pool) != KS_STATUS_SUCCESS) {
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
if (ks_dht2_message_init(error, raddr, KS_TRUE) != KS_STATUS_SUCCESS) { if (ks_dht_message_init(error, raddr, KS_TRUE) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (ks_dht2_message_error(error, transactionid, transactionid_length, &e) != KS_STATUS_SUCCESS) { if (ks_dht_message_error(error, transactionid, transactionid_length, &e) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
@ -561,8 +561,8 @@ KS_DECLARE(ks_status_t) ks_dht2_send_error(ks_dht2_t *dht,
done: done:
if (ret != KS_STATUS_SUCCESS && error) { if (ret != KS_STATUS_SUCCESS && error) {
ks_dht2_message_deinit(error); ks_dht_message_deinit(error);
ks_dht2_message_free(error); ks_dht_message_free(error);
} }
return ret; return ret;
} }
@ -570,16 +570,16 @@ KS_DECLARE(ks_status_t) ks_dht2_send_error(ks_dht2_t *dht,
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_setup_query(ks_dht2_t *dht, KS_DECLARE(ks_status_t) ks_dht_setup_query(ks_dht_t *dht,
ks_sockaddr_t *raddr, ks_sockaddr_t *raddr,
const char *query, const char *query,
ks_dht2_message_callback_t callback, ks_dht_message_callback_t callback,
ks_dht2_message_t **message, ks_dht_message_t **message,
struct bencode **args) struct bencode **args)
{ {
uint32_t transactionid; uint32_t transactionid;
ks_dht2_transaction_t *trans = NULL; ks_dht_transaction_t *trans = NULL;
ks_dht2_message_t *msg = NULL; ks_dht_message_t *msg = NULL;
ks_status_t ret = KS_STATUS_FAIL; ks_status_t ret = KS_STATUS_FAIL;
ks_assert(dht); ks_assert(dht);
@ -593,23 +593,23 @@ KS_DECLARE(ks_status_t) ks_dht2_setup_query(ks_dht2_t *dht,
// @todo atomic increment or mutex // @todo atomic increment or mutex
transactionid = dht->transactionid_next++; transactionid = dht->transactionid_next++;
if (ks_dht2_transaction_alloc(&trans, dht->pool) != KS_STATUS_SUCCESS) { if (ks_dht_transaction_alloc(&trans, dht->pool) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (ks_dht2_transaction_init(trans, raddr, transactionid, callback) != KS_STATUS_SUCCESS) { if (ks_dht_transaction_init(trans, raddr, transactionid, callback) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (ks_dht2_message_alloc(&msg, dht->pool) != KS_STATUS_SUCCESS) { if (ks_dht_message_alloc(&msg, dht->pool) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (ks_dht2_message_init(msg, raddr, KS_TRUE) != KS_STATUS_SUCCESS) { if (ks_dht_message_init(msg, raddr, KS_TRUE) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (ks_dht2_message_query(msg, transactionid, query, args) != KS_STATUS_SUCCESS) { if (ks_dht_message_query(msg, transactionid, query, args) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
@ -622,12 +622,12 @@ KS_DECLARE(ks_status_t) ks_dht2_setup_query(ks_dht2_t *dht,
done: done:
if (ret != KS_STATUS_SUCCESS) { if (ret != KS_STATUS_SUCCESS) {
if (trans) { if (trans) {
ks_dht2_transaction_deinit(trans); ks_dht_transaction_deinit(trans);
ks_dht2_transaction_free(trans); ks_dht_transaction_free(trans);
} }
if (msg) { if (msg) {
ks_dht2_message_deinit(msg); ks_dht_message_deinit(msg);
ks_dht2_message_free(msg); ks_dht_message_free(msg);
} }
*message = NULL; *message = NULL;
} }
@ -637,15 +637,15 @@ KS_DECLARE(ks_status_t) ks_dht2_setup_query(ks_dht2_t *dht,
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_send_ping(ks_dht2_t *dht, ks_sockaddr_t *raddr) KS_DECLARE(ks_status_t) ks_dht_send_ping(ks_dht_t *dht, ks_sockaddr_t *raddr)
{ {
ks_dht2_message_t *message = NULL; ks_dht_message_t *message = NULL;
struct bencode *a = NULL; struct bencode *a = NULL;
ks_assert(dht); ks_assert(dht);
ks_assert(raddr); ks_assert(raddr);
if (ks_dht2_setup_query(dht, raddr, "ping", ks_dht2_process_response_ping, &message, &a) != KS_STATUS_SUCCESS) { if (ks_dht_setup_query(dht, raddr, "ping", ks_dht_process_response_ping, &message, &a) != KS_STATUS_SUCCESS) {
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
@ -660,16 +660,16 @@ KS_DECLARE(ks_status_t) ks_dht2_send_ping(ks_dht2_t *dht, ks_sockaddr_t *raddr)
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_send_findnode(ks_dht2_t *dht, ks_sockaddr_t *raddr, ks_dht2_nodeid_t *targetid) KS_DECLARE(ks_status_t) ks_dht_send_findnode(ks_dht_t *dht, ks_sockaddr_t *raddr, ks_dht_nodeid_t *targetid)
{ {
ks_dht2_message_t *message = NULL; ks_dht_message_t *message = NULL;
struct bencode *a = NULL; struct bencode *a = NULL;
ks_assert(dht); ks_assert(dht);
ks_assert(raddr); ks_assert(raddr);
ks_assert(targetid); ks_assert(targetid);
if (ks_dht2_setup_query(dht, raddr, "find_node", ks_dht2_process_response_findnode, &message, &a) != KS_STATUS_SUCCESS) { if (ks_dht_setup_query(dht, raddr, "find_node", ks_dht_process_response_findnode, &message, &a) != KS_STATUS_SUCCESS) {
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
@ -678,7 +678,7 @@ KS_DECLARE(ks_status_t) ks_dht2_send_findnode(ks_dht2_t *dht, ks_sockaddr_t *rad
ks_log(KS_LOG_DEBUG, "Sending message query find_node\n"); ks_log(KS_LOG_DEBUG, "Sending message query find_node\n");
ks_q_push(dht->send_q, (void *)message); ks_q_push(dht->send_q, (void *)message);
//ks_dht2_send(dht, raddr, message); //ks_dht_send(dht, raddr, message);
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
} }
@ -686,10 +686,10 @@ KS_DECLARE(ks_status_t) ks_dht2_send_findnode(ks_dht2_t *dht, ks_sockaddr_t *rad
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_process(ks_dht2_t *dht, ks_sockaddr_t *raddr) KS_DECLARE(ks_status_t) ks_dht_process(ks_dht_t *dht, ks_sockaddr_t *raddr)
{ {
ks_dht2_message_t message; ks_dht_message_t message;
ks_dht2_message_callback_t callback; ks_dht_message_callback_t callback;
ks_status_t ret = KS_STATUS_FAIL; ks_status_t ret = KS_STATUS_FAIL;
ks_assert(dht); ks_assert(dht);
@ -703,26 +703,26 @@ KS_DECLARE(ks_status_t) ks_dht2_process(ks_dht2_t *dht, ks_sockaddr_t *raddr)
// @todo blacklist check for bad actor nodes // @todo blacklist check for bad actor nodes
if (ks_dht2_message_prealloc(&message, dht->pool) != KS_STATUS_SUCCESS) { if (ks_dht_message_prealloc(&message, dht->pool) != KS_STATUS_SUCCESS) {
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
if (ks_dht2_message_init(&message, raddr, KS_FALSE) != KS_STATUS_SUCCESS) { if (ks_dht_message_init(&message, raddr, KS_FALSE) != KS_STATUS_SUCCESS) {
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
if (ks_dht2_message_parse(&message, dht->recv_buffer, dht->recv_buffer_length) != KS_STATUS_SUCCESS) { if (ks_dht_message_parse(&message, dht->recv_buffer, dht->recv_buffer_length) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (!(callback = (ks_dht2_message_callback_t)(intptr_t)ks_hash_search(dht->registry_type, message.type, KS_UNLOCKED))) { if (!(callback = (ks_dht_message_callback_t)(intptr_t)ks_hash_search(dht->registry_type, message.type, KS_UNLOCKED))) {
ks_log(KS_LOG_DEBUG, "Message type '%s' is not registered\n", message.type); ks_log(KS_LOG_DEBUG, "Message type '%s' is not registered\n", message.type);
} else { } else {
ret = callback(dht, &message); ret = callback(dht, &message);
} }
done: done:
ks_dht2_message_deinit(&message); ks_dht_message_deinit(&message);
return ret; return ret;
} }
@ -730,20 +730,20 @@ 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_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_process_query(ks_dht_t *dht, ks_dht_message_t *message)
{ {
struct bencode *q; struct bencode *q;
struct bencode *a; struct bencode *a;
const char *qv; const char *qv;
ks_size_t qv_len; ks_size_t qv_len;
char query[KS_DHT_MESSAGE_QUERY_MAX_SIZE]; char query[KS_DHT_MESSAGE_QUERY_MAX_SIZE];
ks_dht2_message_callback_t callback; ks_dht_message_callback_t callback;
ks_status_t ret = KS_STATUS_FAIL; ks_status_t ret = KS_STATUS_FAIL;
ks_assert(dht); ks_assert(dht);
ks_assert(message); ks_assert(message);
// @todo start of ks_dht2_message_parse_query // @todo start of ks_dht_message_parse_query
q = ben_dict_get_by_str(message->data, "q"); q = ben_dict_get_by_str(message->data, "q");
if (!q) { if (!q) {
ks_log(KS_LOG_DEBUG, "Message query missing required key 'q'\n"); ks_log(KS_LOG_DEBUG, "Message query missing required key 'q'\n");
@ -766,11 +766,11 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query(ks_dht2_t *dht, ks_dht2_message_t
ks_log(KS_LOG_DEBUG, "Message query missing required key 'a'\n"); ks_log(KS_LOG_DEBUG, "Message query missing required key 'a'\n");
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
// @todo end of ks_dht2_message_parse_query // @todo end of ks_dht_message_parse_query
message->args = a; message->args = a;
if (!(callback = (ks_dht2_message_callback_t)(intptr_t)ks_hash_search(dht->registry_query, query, KS_UNLOCKED))) { if (!(callback = (ks_dht_message_callback_t)(intptr_t)ks_hash_search(dht->registry_query, query, KS_UNLOCKED))) {
ks_log(KS_LOG_DEBUG, "Message query '%s' is not registered\n", query); ks_log(KS_LOG_DEBUG, "Message query '%s' is not registered\n", query);
} else { } else {
ret = callback(dht, message); ret = callback(dht, message);
@ -782,10 +782,10 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query(ks_dht2_t *dht, ks_dht2_message_t
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_process_response(ks_dht2_t *dht, ks_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_process_response(ks_dht_t *dht, ks_dht_message_t *message)
{ {
struct bencode *r; struct bencode *r;
ks_dht2_transaction_t *transaction; ks_dht_transaction_t *transaction;
uint32_t *tid; uint32_t *tid;
uint32_t transactionid; uint32_t transactionid;
ks_status_t ret = KS_STATUS_FAIL; ks_status_t ret = KS_STATUS_FAIL;
@ -793,13 +793,13 @@ KS_DECLARE(ks_status_t) ks_dht2_process_response(ks_dht2_t *dht, ks_dht2_message
ks_assert(dht); ks_assert(dht);
ks_assert(message); ks_assert(message);
// @todo start of ks_dht2_message_parse_response // @todo start of ks_dht_message_parse_response
r = ben_dict_get_by_str(message->data, "r"); r = ben_dict_get_by_str(message->data, "r");
if (!r) { if (!r) {
ks_log(KS_LOG_DEBUG, "Message response missing required key 'r'\n"); ks_log(KS_LOG_DEBUG, "Message response missing required key 'r'\n");
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
// todo end of ks_dht2_message_parse_response // todo end of ks_dht_message_parse_response
message->args = r; message->args = r;
@ -830,7 +830,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_response(ks_dht2_t *dht, ks_dht2_message
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_process_error(ks_dht2_t *dht, ks_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_process_error(ks_dht_t *dht, ks_dht_message_t *message)
{ {
struct bencode *e; struct bencode *e;
struct bencode *ec; struct bencode *ec;
@ -839,7 +839,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_error(ks_dht2_t *dht, ks_dht2_message_t
ks_size_t es_len; ks_size_t es_len;
long long errorcode; long long errorcode;
char error[KS_DHT_MESSAGE_ERROR_MAX_SIZE]; char error[KS_DHT_MESSAGE_ERROR_MAX_SIZE];
ks_dht2_transaction_t *transaction; ks_dht_transaction_t *transaction;
uint32_t *tid; uint32_t *tid;
uint32_t transactionid; uint32_t transactionid;
ks_status_t ret = KS_STATUS_FAIL; ks_status_t ret = KS_STATUS_FAIL;
@ -847,7 +847,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_error(ks_dht2_t *dht, ks_dht2_message_t
ks_assert(dht); ks_assert(dht);
ks_assert(message); ks_assert(message);
// @todo start of ks_dht2_message_parse_error // @todo start of ks_dht_message_parse_error
e = ben_dict_get_by_str(message->data, "e"); e = ben_dict_get_by_str(message->data, "e");
if (!e) { if (!e) {
ks_log(KS_LOG_DEBUG, "Message error missing required key 'e'\n"); ks_log(KS_LOG_DEBUG, "Message error missing required key 'e'\n");
@ -865,7 +865,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_error(ks_dht2_t *dht, ks_dht2_message_t
memcpy(error, et, es_len); memcpy(error, et, es_len);
error[es_len] = '\0'; error[es_len] = '\0';
// todo end of ks_dht2_message_parse_error // todo end of ks_dht_message_parse_error
message->args = e; message->args = e;
@ -886,10 +886,10 @@ KS_DECLARE(ks_status_t) ks_dht2_process_error(ks_dht2_t *dht, ks_dht2_message_t
transaction->raddr.port); transaction->raddr.port);
} else { } else {
// @todo mark transaction for later removal // @todo mark transaction for later removal
ks_dht2_message_callback_t callback; ks_dht_message_callback_t callback;
transaction->finished = KS_TRUE; transaction->finished = KS_TRUE;
if ((callback = (ks_dht2_message_callback_t)(intptr_t)ks_hash_search(dht->registry_error, error, KS_UNLOCKED))) { if ((callback = (ks_dht_message_callback_t)(intptr_t)ks_hash_search(dht->registry_error, error, KS_UNLOCKED))) {
ret = callback(dht, message); ret = callback(dht, message);
} else { } else {
ks_log(KS_LOG_DEBUG, "Message error received for transaction id %d, error %d: %s\n", transactionid, errorcode, error); ks_log(KS_LOG_DEBUG, "Message error received for transaction id %d, error %d: %s\n", transactionid, errorcode, error);
@ -903,12 +903,12 @@ KS_DECLARE(ks_status_t) ks_dht2_process_error(ks_dht2_t *dht, ks_dht2_message_t
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_process_query_ping(ks_dht2_t *dht, ks_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_process_query_ping(ks_dht_t *dht, ks_dht_message_t *message)
{ {
struct bencode *id; struct bencode *id;
//const char *idv; //const char *idv;
ks_size_t idv_len; ks_size_t idv_len;
ks_dht2_message_t *response = NULL; ks_dht_message_t *response = NULL;
struct bencode *r = NULL; struct bencode *r = NULL;
ks_status_t ret = KS_STATUS_FAIL; ks_status_t ret = KS_STATUS_FAIL;
@ -934,15 +934,15 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query_ping(ks_dht2_t *dht, ks_dht2_messa
ks_log(KS_LOG_DEBUG, "Message query ping is valid\n"); ks_log(KS_LOG_DEBUG, "Message query ping is valid\n");
if (ks_dht2_message_alloc(&response, dht->pool) != KS_STATUS_SUCCESS) { if (ks_dht_message_alloc(&response, dht->pool) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (ks_dht2_message_init(response, &message->raddr, KS_TRUE) != KS_STATUS_SUCCESS) { if (ks_dht_message_init(response, &message->raddr, KS_TRUE) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (ks_dht2_message_response(response, message->transactionid, message->transactionid_length, &r) != KS_STATUS_SUCCESS) { if (ks_dht_message_response(response, message->transactionid, message->transactionid_length, &r) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
@ -955,8 +955,8 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query_ping(ks_dht2_t *dht, ks_dht2_messa
done: done:
if (ret != KS_STATUS_SUCCESS && response) { if (ret != KS_STATUS_SUCCESS && response) {
ks_dht2_message_deinit(response); ks_dht_message_deinit(response);
ks_dht2_message_free(response); ks_dht_message_free(response);
} }
return ret; return ret;
} }
@ -964,7 +964,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query_ping(ks_dht2_t *dht, ks_dht2_messa
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_process_query_findnode(ks_dht2_t *dht, ks_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_process_query_findnode(ks_dht_t *dht, ks_dht_message_t *message)
{ {
struct bencode *id; struct bencode *id;
struct bencode *target; struct bencode *target;
@ -975,7 +975,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query_findnode(ks_dht2_t *dht, ks_dht2_m
ks_size_t targetv_len; ks_size_t targetv_len;
ks_bool_t want4 = KS_FALSE; ks_bool_t want4 = KS_FALSE;
ks_bool_t want6 = KS_FALSE; ks_bool_t want6 = KS_FALSE;
ks_dht2_message_t *response = NULL; ks_dht_message_t *response = NULL;
struct bencode *r = NULL; struct bencode *r = NULL;
uint8_t buffer[1000]; uint8_t buffer[1000];
ks_size_t buffer_length = 0; ks_size_t buffer_length = 0;
@ -1040,20 +1040,20 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query_findnode(ks_dht2_t *dht, ks_dht2_m
// @todo get closest nodes to target from route table // @todo get closest nodes to target from route table
// @todo compact into buffer // @todo compact into buffer
if (ks_dht2_utility_compact_node((ks_dht2_nodeid_t *)idv, &message->raddr, buffer, &buffer_length, sizeof(buffer)) != KS_STATUS_SUCCESS) { if (ks_dht_utility_compact_node((ks_dht_nodeid_t *)idv, &message->raddr, buffer, &buffer_length, sizeof(buffer)) != KS_STATUS_SUCCESS) {
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
if (ks_dht2_message_alloc(&response, dht->pool) != KS_STATUS_SUCCESS) { if (ks_dht_message_alloc(&response, dht->pool) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (ks_dht2_message_init(response, &message->raddr, KS_TRUE) != KS_STATUS_SUCCESS) { if (ks_dht_message_init(response, &message->raddr, KS_TRUE) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
if (ks_dht2_message_response(response, message->transactionid, message->transactionid_length, &r) != KS_STATUS_SUCCESS) { if (ks_dht_message_response(response, message->transactionid, message->transactionid_length, &r) != KS_STATUS_SUCCESS) {
goto done; goto done;
} }
@ -1068,8 +1068,8 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query_findnode(ks_dht2_t *dht, ks_dht2_m
done: done:
if (ret != KS_STATUS_SUCCESS && response) { if (ret != KS_STATUS_SUCCESS && response) {
ks_dht2_message_deinit(response); ks_dht_message_deinit(response);
ks_dht2_message_free(response); ks_dht_message_free(response);
} }
return ret; return ret;
} }
@ -1077,7 +1077,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query_findnode(ks_dht2_t *dht, ks_dht2_m
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_process_response_ping(ks_dht2_t *dht, ks_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_process_response_ping(ks_dht_t *dht, ks_dht_message_t *message)
{ {
ks_assert(dht); ks_assert(dht);
ks_assert(message); ks_assert(message);
@ -1092,7 +1092,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_response_ping(ks_dht2_t *dht, ks_dht2_me
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_process_response_findnode(ks_dht2_t *dht, ks_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_process_response_findnode(ks_dht_t *dht, ks_dht_message_t *message)
{ {
ks_assert(dht); ks_assert(dht);
ks_assert(message); ks_assert(message);

104
libs/libks/src/dht/ks_dht.h
View File

@ -20,28 +20,26 @@ KS_BEGIN_EXTERN_C
#define KS_DHT_TRANSACTION_EXPIRATION_DELAY 30 #define KS_DHT_TRANSACTION_EXPIRATION_DELAY 30
typedef struct ks_dht2_s ks_dht2_t; typedef struct ks_dht_s ks_dht_t;
//typedef struct ks_dht2_nodeid_s ks_dht2_nodeid_t; typedef uint8_t ks_dht_nodeid_t[KS_DHT_NODEID_SIZE];
//typedef struct ks_dht2_nodeid_raw_s ks_dht2_nodeid_raw_t; typedef struct ks_dht_node_s ks_dht_node_t;
typedef uint8_t ks_dht2_nodeid_t[KS_DHT_NODEID_SIZE]; typedef struct ks_dht_message_s ks_dht_message_t;
typedef struct ks_dht2_node_s ks_dht2_node_t; typedef struct ks_dht_endpoint_s ks_dht_endpoint_t;
typedef struct ks_dht2_message_s ks_dht2_message_t; typedef struct ks_dht_transaction_s ks_dht_transaction_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_dht2_message_t *message); typedef ks_status_t (*ks_dht_message_callback_t)(ks_dht_t *dht, ks_dht_message_t *message);
struct ks_dht2_node_s { struct ks_dht_node_s {
ks_pool_t *pool; ks_pool_t *pool;
ks_dht2_nodeid_t id; ks_dht_nodeid_t id;
ks_sockaddr_t *addr4; ks_sockaddr_t *addr4;
ks_sockaddr_t *addr6; ks_sockaddr_t *addr6;
ks_size_t addr4_length; ks_size_t addr4_length;
ks_size_t addr6_length; ks_size_t addr6_length;
}; };
struct ks_dht2_message_s { struct ks_dht_message_s {
ks_pool_t *pool; ks_pool_t *pool;
ks_sockaddr_t raddr; ks_sockaddr_t raddr;
struct bencode *data; struct bencode *data;
@ -51,30 +49,30 @@ struct ks_dht2_message_s {
struct bencode *args; struct bencode *args;
}; };
struct ks_dht2_endpoint_s { struct ks_dht_endpoint_s {
ks_pool_t *pool; ks_pool_t *pool;
ks_sockaddr_t addr; ks_sockaddr_t addr;
ks_socket_t sock; ks_socket_t sock;
}; };
struct ks_dht2_transaction_s { struct ks_dht_transaction_s {
ks_pool_t *pool; ks_pool_t *pool;
ks_sockaddr_t raddr; ks_sockaddr_t raddr;
uint32_t transactionid; uint32_t transactionid;
ks_dht2_message_callback_t callback; ks_dht_message_callback_t callback;
ks_time_t expiration; ks_time_t expiration;
ks_bool_t finished; ks_bool_t finished;
}; };
struct ks_dht2_s { struct ks_dht_s {
ks_pool_t *pool; ks_pool_t *pool;
ks_bool_t pool_alloc; ks_bool_t pool_alloc;
ks_bool_t autoroute; ks_bool_t autoroute;
ks_port_t autoroute_port; ks_port_t autoroute_port;
ks_dht2_nodeid_t nodeid; ks_dht_nodeid_t nodeid;
ks_hash_t *registry_type; ks_hash_t *registry_type;
ks_hash_t *registry_query; ks_hash_t *registry_query;
@ -83,13 +81,13 @@ struct ks_dht2_s {
ks_bool_t bind_ipv4; ks_bool_t bind_ipv4;
ks_bool_t bind_ipv6; ks_bool_t bind_ipv6;
ks_dht2_endpoint_t **endpoints; ks_dht_endpoint_t **endpoints;
int32_t endpoints_size; int32_t endpoints_size;
ks_hash_t *endpoints_hash; ks_hash_t *endpoints_hash;
struct pollfd *endpoints_poll; struct pollfd *endpoints_poll;
ks_q_t *send_q; ks_q_t *send_q;
ks_dht2_message_t *send_q_unsent; ks_dht_message_t *send_q_unsent;
uint8_t recv_buffer[KS_DHT_RECV_BUFFER_SIZE]; uint8_t recv_buffer[KS_DHT_RECV_BUFFER_SIZE];
ks_size_t recv_buffer_length; ks_size_t recv_buffer_length;
@ -100,47 +98,47 @@ struct ks_dht2_s {
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_alloc(ks_dht2_t **dht, ks_pool_t *pool); KS_DECLARE(ks_status_t) ks_dht_alloc(ks_dht_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_dht_prealloc(ks_dht_t *dht, ks_pool_t *pool);
KS_DECLARE(ks_status_t) ks_dht2_free(ks_dht2_t *dht); KS_DECLARE(ks_status_t) ks_dht_free(ks_dht_t *dht);
KS_DECLARE(ks_status_t) ks_dht2_init(ks_dht2_t *dht, const ks_dht2_nodeid_t *nodeid); KS_DECLARE(ks_status_t) ks_dht_init(ks_dht_t *dht, const ks_dht_nodeid_t *nodeid);
KS_DECLARE(ks_status_t) ks_dht2_deinit(ks_dht2_t *dht); KS_DECLARE(ks_status_t) ks_dht_deinit(ks_dht_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_dht_autoroute(ks_dht_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_dht2_endpoint_t **endpoint); KS_DECLARE(ks_status_t) ks_dht_bind(ks_dht_t *dht, const ks_sockaddr_t *addr, ks_dht_endpoint_t **endpoint);
KS_DECLARE(void) ks_dht2_pulse(ks_dht2_t *dht, int32_t timeout); KS_DECLARE(void) ks_dht_pulse(ks_dht_t *dht, int32_t timeout);
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_dht_register_type(ks_dht_t *dht, const char *value, ks_dht_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_dht_register_query(ks_dht_t *dht, const char *value, ks_dht_message_callback_t callback);
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_message_alloc(ks_dht2_message_t **message, ks_pool_t *pool); KS_DECLARE(ks_status_t) ks_dht_message_alloc(ks_dht_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_dht_message_prealloc(ks_dht_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_dht_message_free(ks_dht_message_t *message);
KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, ks_sockaddr_t *raddr, ks_bool_t alloc_data); KS_DECLARE(ks_status_t) ks_dht_message_init(ks_dht_message_t *message, ks_sockaddr_t *raddr, 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_dht_message_deinit(ks_dht_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_dht_message_parse(ks_dht_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, KS_DECLARE(ks_status_t) ks_dht_message_query(ks_dht_message_t *message,
uint32_t transactionid, uint32_t transactionid,
const char *query, const char *query,
struct bencode **args); struct bencode **args);
KS_DECLARE(ks_status_t) ks_dht2_message_response(ks_dht2_message_t *message, KS_DECLARE(ks_status_t) ks_dht_message_response(ks_dht_message_t *message,
uint8_t *transactionid, uint8_t *transactionid,
ks_size_t transactionid_length, ks_size_t transactionid_length,
struct bencode **args); struct bencode **args);
KS_DECLARE(ks_status_t) ks_dht2_message_error(ks_dht2_message_t *message, KS_DECLARE(ks_status_t) ks_dht_message_error(ks_dht_message_t *message,
uint8_t *transactionid, uint8_t *transactionid,
ks_size_t transactionid_length, ks_size_t transactionid_length,
struct bencode **args); struct bencode **args);
/** /**
* *
@ -149,15 +147,15 @@ KS_DECLARE(ks_status_t) ks_dht2_message_error(ks_dht2_message_t *message,
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_transaction_alloc(ks_dht2_transaction_t **transaction, ks_pool_t *pool); KS_DECLARE(ks_status_t) ks_dht_transaction_alloc(ks_dht_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_dht_transaction_prealloc(ks_dht_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_dht_transaction_free(ks_dht_transaction_t *transaction);
KS_DECLARE(ks_status_t) ks_dht2_transaction_init(ks_dht2_transaction_t *transaction, KS_DECLARE(ks_status_t) ks_dht_transaction_init(ks_dht_transaction_t *transaction,
ks_sockaddr_t *raddr, ks_sockaddr_t *raddr,
uint32_t transactionid, uint32_t transactionid,
ks_dht2_message_callback_t callback); ks_dht_message_callback_t callback);
KS_DECLARE(ks_status_t) ks_dht2_transaction_deinit(ks_dht2_transaction_t *transaction); KS_DECLARE(ks_status_t) ks_dht_transaction_deinit(ks_dht_transaction_t *transaction);
KS_END_EXTERN_C KS_END_EXTERN_C

16
libs/libks/src/dht/ks_dht_endpoint.c
View File

@ -4,14 +4,14 @@
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_endpoint_alloc(ks_dht2_endpoint_t **endpoint, ks_pool_t *pool) KS_DECLARE(ks_status_t) ks_dht_endpoint_alloc(ks_dht_endpoint_t **endpoint, ks_pool_t *pool)
{ {
ks_dht2_endpoint_t *ep; ks_dht_endpoint_t *ep;
ks_assert(endpoint); ks_assert(endpoint);
ks_assert(pool); ks_assert(pool);
*endpoint = ep = ks_pool_alloc(pool, sizeof(ks_dht2_endpoint_t)); *endpoint = ep = ks_pool_alloc(pool, sizeof(ks_dht_endpoint_t));
ep->pool = pool; ep->pool = pool;
ep->sock = KS_SOCK_INVALID; ep->sock = KS_SOCK_INVALID;
@ -21,7 +21,7 @@ KS_DECLARE(ks_status_t) ks_dht2_endpoint_alloc(ks_dht2_endpoint_t **endpoint, ks
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_endpoint_prealloc(ks_dht2_endpoint_t *endpoint, ks_pool_t *pool) KS_DECLARE(ks_status_t) ks_dht_endpoint_prealloc(ks_dht_endpoint_t *endpoint, ks_pool_t *pool)
{ {
ks_assert(endpoint); ks_assert(endpoint);
ks_assert(pool); ks_assert(pool);
@ -35,11 +35,11 @@ KS_DECLARE(ks_status_t) ks_dht2_endpoint_prealloc(ks_dht2_endpoint_t *endpoint,
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_endpoint_free(ks_dht2_endpoint_t *endpoint) KS_DECLARE(ks_status_t) ks_dht_endpoint_free(ks_dht_endpoint_t *endpoint)
{ {
ks_assert(endpoint); ks_assert(endpoint);
ks_dht2_endpoint_deinit(endpoint); ks_dht_endpoint_deinit(endpoint);
ks_pool_free(endpoint->pool, endpoint); ks_pool_free(endpoint->pool, endpoint);
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
@ -49,7 +49,7 @@ 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_dht_endpoint_init(ks_dht_endpoint_t *endpoint, const ks_sockaddr_t *addr, ks_socket_t sock)
{ {
ks_assert(endpoint); ks_assert(endpoint);
ks_assert(endpoint->pool); ks_assert(endpoint->pool);
@ -65,7 +65,7 @@ KS_DECLARE(ks_status_t) ks_dht2_endpoint_init(ks_dht2_endpoint_t *endpoint, cons
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_endpoint_deinit(ks_dht2_endpoint_t *endpoint) KS_DECLARE(ks_status_t) ks_dht_endpoint_deinit(ks_dht_endpoint_t *endpoint)
{ {
ks_assert(endpoint); ks_assert(endpoint);

44
libs/libks/src/dht/ks_dht_message.c
View File

@ -4,14 +4,14 @@
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_message_alloc(ks_dht2_message_t **message, ks_pool_t *pool) KS_DECLARE(ks_status_t) ks_dht_message_alloc(ks_dht_message_t **message, ks_pool_t *pool)
{ {
ks_dht2_message_t *msg; ks_dht_message_t *msg;
ks_assert(message); ks_assert(message);
ks_assert(pool); ks_assert(pool);
*message = msg = ks_pool_alloc(pool, sizeof(ks_dht2_message_t)); *message = msg = ks_pool_alloc(pool, sizeof(ks_dht_message_t));
msg->pool = pool; msg->pool = pool;
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
@ -20,7 +20,7 @@ KS_DECLARE(ks_status_t) ks_dht2_message_alloc(ks_dht2_message_t **message, ks_po
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_message_prealloc(ks_dht2_message_t *message, ks_pool_t *pool) KS_DECLARE(ks_status_t) ks_dht_message_prealloc(ks_dht_message_t *message, ks_pool_t *pool)
{ {
ks_assert(message); ks_assert(message);
ks_assert(pool); ks_assert(pool);
@ -33,11 +33,11 @@ KS_DECLARE(ks_status_t) ks_dht2_message_prealloc(ks_dht2_message_t *message, ks_
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_message_free(ks_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_message_free(ks_dht_message_t *message)
{ {
ks_assert(message); ks_assert(message);
ks_dht2_message_deinit(message); ks_dht_message_deinit(message);
ks_pool_free(message->pool, message); ks_pool_free(message->pool, message);
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
@ -47,7 +47,7 @@ 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_sockaddr_t *raddr, ks_bool_t alloc_data) KS_DECLARE(ks_status_t) ks_dht_message_init(ks_dht_message_t *message, ks_sockaddr_t *raddr, ks_bool_t alloc_data)
{ {
ks_assert(message); ks_assert(message);
ks_assert(message->pool); ks_assert(message->pool);
@ -67,7 +67,7 @@ KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, ks_sock
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_message_deinit(ks_dht2_message_t *message) KS_DECLARE(ks_status_t) ks_dht_message_deinit(ks_dht_message_t *message)
{ {
ks_assert(message); ks_assert(message);
@ -86,7 +86,7 @@ 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_dht_message_parse(ks_dht_message_t *message, const uint8_t *buffer, ks_size_t buffer_length)
{ {
struct bencode *t; struct bencode *t;
struct bencode *y; struct bencode *y;
@ -147,17 +147,17 @@ KS_DECLARE(ks_status_t) ks_dht2_message_parse(ks_dht2_message_t *message, const
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
failure: failure:
ks_dht2_message_deinit(message); ks_dht_message_deinit(message);
return KS_STATUS_FAIL; return KS_STATUS_FAIL;
} }
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_message_query(ks_dht2_message_t *message, KS_DECLARE(ks_status_t) ks_dht_message_query(ks_dht_message_t *message,
uint32_t transactionid, uint32_t transactionid,
const char *query, const char *query,
struct bencode **args) struct bencode **args)
{ {
struct bencode *a; struct bencode *a;
uint32_t tid; uint32_t tid;
@ -185,10 +185,10 @@ KS_DECLARE(ks_status_t) ks_dht2_message_query(ks_dht2_message_t *message,
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_message_response(ks_dht2_message_t *message, KS_DECLARE(ks_status_t) ks_dht_message_response(ks_dht_message_t *message,
uint8_t *transactionid, uint8_t *transactionid,
ks_size_t transactionid_length, ks_size_t transactionid_length,
struct bencode **args) struct bencode **args)
{ {
struct bencode *r; struct bencode *r;
@ -212,10 +212,10 @@ KS_DECLARE(ks_status_t) ks_dht2_message_response(ks_dht2_message_t *message,
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_message_error(ks_dht2_message_t *message, KS_DECLARE(ks_status_t) ks_dht_message_error(ks_dht_message_t *message,
uint8_t *transactionid, uint8_t *transactionid,
ks_size_t transactionid_length, ks_size_t transactionid_length,
struct bencode **args) struct bencode **args)
{ {
struct bencode *e; struct bencode *e;

16
libs/libks/src/dht/ks_dht_node.c
View File

@ -5,14 +5,14 @@
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_node_alloc(ks_dht2_node_t **node, ks_pool_t *pool) KS_DECLARE(ks_status_t) ks_dht_node_alloc(ks_dht_node_t **node, ks_pool_t *pool)
{ {
ks_dht2_node_t *n; ks_dht_node_t *n;
ks_assert(node); ks_assert(node);
ks_assert(pool); ks_assert(pool);
*node = n = ks_pool_alloc(pool, sizeof(ks_dht2_node_t)); *node = n = ks_pool_alloc(pool, sizeof(ks_dht_node_t));
n->pool = pool; n->pool = pool;
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
@ -21,7 +21,7 @@ KS_DECLARE(ks_status_t) ks_dht2_node_alloc(ks_dht2_node_t **node, ks_pool_t *poo
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_node_prealloc(ks_dht2_node_t *node, ks_pool_t *pool) KS_DECLARE(ks_status_t) ks_dht_node_prealloc(ks_dht_node_t *node, ks_pool_t *pool)
{ {
ks_assert(node); ks_assert(node);
ks_assert(pool); ks_assert(pool);
@ -34,11 +34,11 @@ KS_DECLARE(ks_status_t) ks_dht2_node_prealloc(ks_dht2_node_t *node, ks_pool_t *p
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_node_free(ks_dht2_node_t *node) KS_DECLARE(ks_status_t) ks_dht_node_free(ks_dht_node_t *node)
{ {
ks_assert(node); ks_assert(node);
ks_dht2_node_deinit(node); ks_dht_node_deinit(node);
ks_pool_free(node->pool, node); ks_pool_free(node->pool, node);
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
@ -48,7 +48,7 @@ KS_DECLARE(ks_status_t) ks_dht2_node_free(ks_dht2_node_t *node)
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_node_init(ks_dht2_node_t *node, const ks_dht2_nodeid_t *id, const ks_sockaddr_t *addr) KS_DECLARE(ks_status_t) ks_dht_node_init(ks_dht_node_t *node, const ks_dht_nodeid_t *id, const ks_sockaddr_t *addr)
{ {
ks_assert(node); ks_assert(node);
ks_assert(node->pool); ks_assert(node->pool);
@ -61,7 +61,7 @@ KS_DECLARE(ks_status_t) ks_dht2_node_init(ks_dht2_node_t *node, const ks_dht2_no
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_node_deinit(ks_dht2_node_t *node) KS_DECLARE(ks_status_t) ks_dht_node_deinit(ks_dht_node_t *node)
{ {
ks_assert(node); ks_assert(node);

22
libs/libks/src/dht/ks_dht_transaction.c
View File

@ -4,14 +4,14 @@
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_transaction_alloc(ks_dht2_transaction_t **transaction, ks_pool_t *pool) KS_DECLARE(ks_status_t) ks_dht_transaction_alloc(ks_dht_transaction_t **transaction, ks_pool_t *pool)
{ {
ks_dht2_transaction_t *tran; ks_dht_transaction_t *tran;
ks_assert(transaction); ks_assert(transaction);
ks_assert(pool); ks_assert(pool);
*transaction = tran = ks_pool_alloc(pool, sizeof(ks_dht2_transaction_t)); *transaction = tran = ks_pool_alloc(pool, sizeof(ks_dht_transaction_t));
tran->pool = pool; tran->pool = pool;
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
@ -20,7 +20,7 @@ KS_DECLARE(ks_status_t) ks_dht2_transaction_alloc(ks_dht2_transaction_t **transa
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_transaction_prealloc(ks_dht2_transaction_t *transaction, ks_pool_t *pool) KS_DECLARE(ks_status_t) ks_dht_transaction_prealloc(ks_dht_transaction_t *transaction, ks_pool_t *pool)
{ {
ks_assert(transaction); ks_assert(transaction);
ks_assert(pool); ks_assert(pool);
@ -33,11 +33,11 @@ KS_DECLARE(ks_status_t) ks_dht2_transaction_prealloc(ks_dht2_transaction_t *tran
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_transaction_free(ks_dht2_transaction_t *transaction) KS_DECLARE(ks_status_t) ks_dht_transaction_free(ks_dht_transaction_t *transaction)
{ {
ks_assert(transaction); ks_assert(transaction);
ks_dht2_transaction_deinit(transaction); ks_dht_transaction_deinit(transaction);
ks_pool_free(transaction->pool, transaction); ks_pool_free(transaction->pool, transaction);
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
@ -47,10 +47,10 @@ KS_DECLARE(ks_status_t) ks_dht2_transaction_free(ks_dht2_transaction_t *transact
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_transaction_init(ks_dht2_transaction_t *transaction, KS_DECLARE(ks_status_t) ks_dht_transaction_init(ks_dht_transaction_t *transaction,
ks_sockaddr_t *raddr, ks_sockaddr_t *raddr,
uint32_t transactionid, uint32_t transactionid,
ks_dht2_message_callback_t callback) ks_dht_message_callback_t callback)
{ {
ks_assert(transaction); ks_assert(transaction);
ks_assert(raddr); ks_assert(raddr);
@ -69,7 +69,7 @@ KS_DECLARE(ks_status_t) ks_dht2_transaction_init(ks_dht2_transaction_t *transact
/** /**
* *
*/ */
KS_DECLARE(ks_status_t) ks_dht2_transaction_deinit(ks_dht2_transaction_t *transaction) KS_DECLARE(ks_status_t) ks_dht_transaction_deinit(ks_dht_transaction_t *transaction)
{ {
ks_assert(transaction); ks_assert(transaction);

2
libs/libks/src/include/ks.h
View File

@ -123,7 +123,7 @@ KS_DECLARE(void) ks_random_string(char *buf, uint16_t len, char *set);
#include "ks_time.h" #include "ks_time.h"
#include "ks_socket.h" #include "ks_socket.h"
#include "ks_dso.h" #include "ks_dso.h"
#include "ks_dht.h" //#include "ks_dht.h"
#include "ks_utp.h" #include "ks_utp.h"
#include "simclist.h" #include "simclist.h"
#include "ks_ssl.h" #include "ks_ssl.h"

32
libs/libks/test/Makefile.am
View File

@ -49,30 +49,30 @@ testwebsock_SOURCES = testwebsock.c tap.c
testwebsock_CFLAGS = $(AM_CFLAGS) testwebsock_CFLAGS = $(AM_CFLAGS)
testwebsock_LDADD = $(TEST_LDADD) testwebsock_LDADD = $(TEST_LDADD)
check_PROGRAMS += testdht #check_PROGRAMS += testdht
testdht_SOURCES = testdht.c tap.c #testdht_SOURCES = testdht.c tap.c
testdht_CFLAGS = $(AM_CFLAGS) #testdht_CFLAGS = $(AM_CFLAGS)
testdht_LDADD = $(TEST_LDADD) #testdht_LDADD = $(TEST_LDADD)
check_PROGRAMS += testdht2 check_PROGRAMS += testdht2
testdht2_SOURCES = testdht2.c tap.c testdht2_SOURCES = testdht2.c tap.c
testdht2_CFLAGS = $(AM_CFLAGS) testdht2_CFLAGS = $(AM_CFLAGS)
testdht2_LDADD = $(TEST_LDADD) testdht2_LDADD = $(TEST_LDADD)
check_PROGRAMS += testdht_net #check_PROGRAMS += testdht_net
testdht_net_SOURCES = testdht-net.c tap.c #testdht_net_SOURCES = testdht-net.c tap.c
testdht_net_CFLAGS = $(AM_CFLAGS) #testdht_net_CFLAGS = $(AM_CFLAGS)
testdht_net_LDADD = $(TEST_LDADD) #testdht_net_LDADD = $(TEST_LDADD)
check_PROGRAMS += testdht_msg #check_PROGRAMS += testdht_msg
testdht_msg_SOURCES = testdht-msg.c tap.c #testdht_msg_SOURCES = testdht-msg.c tap.c
testdht_msg_CFLAGS = $(AM_CFLAGS) #testdht_msg_CFLAGS = $(AM_CFLAGS)
testdht_msg_LDADD = $(TEST_LDADD) #testdht_msg_LDADD = $(TEST_LDADD)
check_PROGRAMS += dht_example #check_PROGRAMS += dht_example
dht_example_SOURCES = dht-example.c #dht_example_SOURCES = dht-example.c
dht_example_CFLAGS = $(AM_CFLAGS) #dht_example_CFLAGS = $(AM_CFLAGS)
dht_example_LDADD = $(abs_top_builddir)/libks.la $(openssl_LIBS) -ledit -lpthread #dht_example_LDADD = $(abs_top_builddir)/libks.la $(openssl_LIBS) -ledit -lpthread
#check_PROGRAMS += libtorrent_example #check_PROGRAMS += libtorrent_example
#libtorrent_example_SOURCES = libtorrent-example.c #libtorrent_example_SOURCES = libtorrent-example.c

48
libs/libks/test/testdht2.c
View File

@ -6,11 +6,11 @@
#define TEST_DHT1_REGISTER_TYPE_BUFFER "d1:ad2:id20:12345678901234567890e1:q4:ping1:t2:421:y1:ze" #define TEST_DHT1_REGISTER_TYPE_BUFFER "d1:ad2:id20:12345678901234567890e1:q4:ping1:t2:421:y1:ze"
#define TEST_DHT1_PROCESS_QUERY_PING_BUFFER "d1:ad2:id20:12345678901234567890e1:q4:ping1:t2:421:y1:qe" #define TEST_DHT1_PROCESS_QUERY_PING_BUFFER "d1:ad2:id20:12345678901234567890e1:q4:ping1:t2:421:y1:qe"
ks_status_t dht_z_callback(ks_dht2_t *dht, ks_dht2_message_t *message) ks_status_t dht_z_callback(ks_dht_t *dht, ks_dht_message_t *message)
{ {
diag("dht_z_callback\n"); diag("dht_z_callback\n");
ok(message->transactionid[0] == '4' && message->transactionid[1] == '2'); ok(message->transactionid[0] == '4' && message->transactionid[1] == '2');
ks_dht2_send_error(dht, &message->raddr, message->transactionid, message->transactionid_length, 201, "Generic test error"); ks_dht_send_error(dht, &message->raddr, message->transactionid, message->transactionid_length, 201, "Generic test error");
return KS_STATUS_SUCCESS; return KS_STATUS_SUCCESS;
} }
@ -18,8 +18,8 @@ int main() {
ks_size_t buflen; ks_size_t buflen;
ks_status_t err; ks_status_t err;
int mask = 0; int mask = 0;
ks_dht2_t *dht1 = NULL; ks_dht_t *dht1 = NULL;
ks_dht2_t dht2; ks_dht_t dht2;
ks_bool_t have_v4, have_v6; ks_bool_t have_v4, have_v6;
char v4[48] = {0}, v6[48] = {0}; char v4[48] = {0}, v6[48] = {0};
ks_sockaddr_t addr; ks_sockaddr_t addr;
@ -47,31 +47,31 @@ int main() {
diag("Binding to %s on ipv6\n", v6); diag("Binding to %s on ipv6\n", v6);
} }
err = ks_dht2_alloc(&dht1, NULL); err = ks_dht_alloc(&dht1, NULL);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_dht2_init(dht1, NULL); err = ks_dht_init(dht1, NULL);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_dht2_prealloc(&dht2, dht1->pool); err = ks_dht_prealloc(&dht2, dht1->pool);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_dht2_init(&dht2, NULL); err = ks_dht_init(&dht2, NULL);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
ks_dht2_register_type(dht1, "z", dht_z_callback); ks_dht_register_type(dht1, "z", dht_z_callback);
if (have_v4) { if (have_v4) {
err = ks_addr_set(&addr, v4, KS_DHT_DEFAULT_PORT, AF_INET); err = ks_addr_set(&addr, v4, KS_DHT_DEFAULT_PORT, AF_INET);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_dht2_bind(dht1, &addr, NULL); err = ks_dht_bind(dht1, &addr, NULL);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_addr_set(&addr, v4, KS_DHT_DEFAULT_PORT + 1, AF_INET); err = ks_addr_set(&addr, v4, KS_DHT_DEFAULT_PORT + 1, AF_INET);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_dht2_bind(&dht2, &addr, NULL); err = ks_dht_bind(&dht2, &addr, NULL);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
raddr = addr; raddr = addr;
@ -81,13 +81,13 @@ int main() {
err = ks_addr_set(&addr, v6, KS_DHT_DEFAULT_PORT, AF_INET6); err = ks_addr_set(&addr, v6, KS_DHT_DEFAULT_PORT, AF_INET6);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_dht2_bind(dht1, &addr, NULL); err = ks_dht_bind(dht1, &addr, NULL);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_addr_set(&addr, v6, KS_DHT_DEFAULT_PORT + 1, AF_INET6); err = ks_addr_set(&addr, v6, KS_DHT_DEFAULT_PORT + 1, AF_INET6);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_dht2_bind(&dht2, &addr, NULL); err = ks_dht_bind(&dht2, &addr, NULL);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
} }
@ -97,43 +97,43 @@ int main() {
memcpy(dht1->recv_buffer, TEST_DHT1_REGISTER_TYPE_BUFFER, buflen); memcpy(dht1->recv_buffer, TEST_DHT1_REGISTER_TYPE_BUFFER, buflen);
dht1->recv_buffer_length = buflen; dht1->recv_buffer_length = buflen;
err = ks_dht2_process(dht1, &raddr); err = ks_dht_process(dht1, &raddr);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
ks_dht2_pulse(dht1, 100); ks_dht_pulse(dht1, 100);
ks_dht2_pulse(&dht2, 100); ks_dht_pulse(&dht2, 100);
//buflen = strlen(TEST_DHT1_PROCESS_QUERY_PING_BUFFER); //buflen = strlen(TEST_DHT1_PROCESS_QUERY_PING_BUFFER);
//memcpy(dht1->recv_buffer, TEST_DHT1_PROCESS_QUERY_PING_BUFFER, buflen); //memcpy(dht1->recv_buffer, TEST_DHT1_PROCESS_QUERY_PING_BUFFER, buflen);
//dht1->recv_buffer_length = buflen; //dht1->recv_buffer_length = buflen;
//err = ks_dht2_process(dht1, &raddr); //err = ks_dht_process(dht1, &raddr);
//ok(err == KS_STATUS_SUCCESS); //ok(err == KS_STATUS_SUCCESS);
diag("Ping tests\n"); diag("Ping tests\n");
ks_dht2_send_ping(dht1, &raddr); ks_dht_send_ping(dht1, &raddr);
ks_dht2_pulse(dht1, 100); ks_dht_pulse(dht1, 100);
ks_dht2_pulse(&dht2, 100); ks_dht_pulse(&dht2, 100);
ks_dht2_pulse(dht1, 100); ks_dht_pulse(dht1, 100);
diag("Cleanup\n"); diag("Cleanup\n");
/* Cleanup and shutdown */ /* Cleanup and shutdown */
err = ks_dht2_deinit(&dht2); err = ks_dht_deinit(&dht2);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_dht2_deinit(dht1); err = ks_dht_deinit(dht1);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_dht2_free(dht1); err = ks_dht_free(dht1);
ok(err == KS_STATUS_SUCCESS); ok(err == KS_STATUS_SUCCESS);
err = ks_shutdown(); err = ks_shutdown();