FS-9775: Tweaks, bug fixes, etc. Committing in preparation for introducing into libblade.

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

@@ -21,6 +21,14 @@ KS_BEGIN_EXTERN_C
  */
 KS_DECLARE(ks_status_t) ks_dht_autoroute_check(ks_dht_t *dht, const ks_sockaddr_t *raddr, ks_dht_endpoint_t **endpoint);
 
+/**
+ * Called internally to receive datagrams from endpoints.
+ * Handles datagrams by dispatching each through a threadpool.
+ * @param dht pointer to the dht instance
+ * @param timeout time in ms to wait for an incoming datagram on any endpoint
+ */
+KS_DECLARE(void) ks_dht_pulse_endpoints(ks_dht_t *dht, int32_t timeout);
+
 /**
  * Called internally to expire or reannounce storage item data.
  * Handles reannouncing and purging of expiring storage items.
@@ -334,14 +342,6 @@ KS_DECLARE(void) ks_dht_message_destroy(ks_dht_message_t **message);
  */
 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_dht_message_response(ks_dht_message_t *message,
-												uint8_t *transactionid,
-												ks_size_t transactionid_length,
-												struct bencode **args);
-
 																								
 /**
  *

libs/libks/src/dht/ks_dht.h

@@ -150,7 +150,6 @@ struct ks_dht_job_s {
 	int64_t query_cas;
 	ks_dht_token_t query_token;
 	ks_dht_storageitem_t *query_storageitem;
-    int32_t query_family;
 
 	// error response parameters
 	int64_t error_code;

libs/libks/src/dht/ks_dht_message.c

@@ -110,29 +110,6 @@ KS_DECLARE(ks_status_t) ks_dht_message_parse(ks_dht_message_t *message, const ui
 	return KS_STATUS_SUCCESS;
 }
 
-KS_DECLARE(ks_status_t) ks_dht_message_response(ks_dht_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();
-	ks_assert(r);
-	ben_dict_set(message->data, ben_blob("r", 1), r);
-
-	if (args) *args = r;
-
-	return KS_STATUS_SUCCESS;
-}
-
 /* For Emacs:
  * Local Variables:
  * mode:c

libs/libks/test/testdht2.c

@@ -93,7 +93,7 @@ int main() {
   err = ks_init();
   ok(!err);
 
-  ks_global_set_default_logger(7);
+  ks_global_set_default_logger(KS_LOG_LEVEL_INFO);
 
   err = ks_find_local_ip(v4, sizeof(v4), &mask, AF_INET, NULL);
   ok(err == KS_STATUS_SUCCESS);
@@ -172,7 +172,7 @@ int main() {
   ks_dht_ping(dht2, &raddr1, NULL, NULL); // (QUERYING)
 
   ks_dht_pulse(dht2, 100); // Send queued ping from dht2 to dht1 (RESPONDING)
-  
+
   ks_dht_pulse(dht1, 100); // Receive and process ping query from dht2, queue and send ping response
 
   ok(ks_dhtrt_find_node(dht1->rt_ipv4, ep2->nodeid) == NULL); // The node should be dubious, and thus not be returned as good yet