From 38f176ca9c1f21fc11b3ccc6aa45bd2f47e2eab7 Mon Sep 17 00:00:00 2001
From: Jesper Jensen <jesper@slashwin.dk>
Date: Sat, 16 Oct 2021 23:43:07 +0200
Subject: Flush in main

---
 src/proto.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/proto.c')

diff --git a/src/proto.c b/src/proto.c
index 8f4f737..196b912 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -180,7 +180,7 @@ PROCESS_TIMEOUT(getclient_timeout) {
 	size_t reqId = (typeof(dht->requestdata[0])*)((void*)cont - offsetof(typeof(dht->requestdata[0]), cont)) - dht->requestdata;
 
 	if(cont->ping.attempt >= 2) {
-		dbg("Timing out request %d after %d attempts", reqId, cont->ping.attempt);
+		dbg("Timing out request %ld after %d attempts", reqId, cont->ping.attempt);
 		if(cont->ping.is_new)
 			return 0;
 
@@ -190,7 +190,7 @@ PROCESS_TIMEOUT(getclient_timeout) {
 		return 0;
 	}
 
-	dbg("Retrying request %d", reqId);
+	dbg("Retrying request %ld", reqId);
 
 	if(*msgbuff->messages >= msgbuff->messages_end)
 		return PROTO_ENOREQ;
@@ -356,7 +356,6 @@ enum commandType {
 };
 
 void proto_begin(struct dht* dht, time_t now, struct message** output, const struct message* const output_end) {
-	routing_flush();
 	struct msgbuff msgbuff = {
 		output,
 		output_end,
@@ -367,7 +366,6 @@ void proto_begin(struct dht* dht, time_t now, struct message** output, const str
 		dht->reqalloc[i] = false;
 	}
 
-	routing_init(&dht->self);
 	dbgl_id(&dht->self);
 
 	dht->sfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -646,7 +644,7 @@ int proto_run(struct dht* dht, char* buff, size_t recv_len, struct sockaddr_in*
 			}
 		}
 
-		dbg("%d/%d requests pending", allocated, MAX_INFLIGHT);
+		dbg("%ld/%ld requests pending", allocated, MAX_INFLIGHT);
 	}
 	{
 		int filled;
-- 
cgit v1.2.3


From 42a627aab5e47c3f3e05460322b9c1c3f2c69214 Mon Sep 17 00:00:00 2001
From: Jesper Jensen <jesper@slashwin.dk>
Date: Wed, 27 Oct 2021 20:24:30 +0200
Subject: Increase payload size

---
 src/proto.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/proto.c')

diff --git a/src/proto.c b/src/proto.c
index 196b912..b518f79 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -320,6 +320,7 @@ PROCESS_REPONSE(getclient_response) {
 		}
 	} else {
 		struct entry* entry = routing_get(&id);
+		assert(entry != NULL);
 		entry->expire = now + PROTO_UNCTM;
 	}
 
@@ -457,7 +458,7 @@ int handle_packet(struct dht* dht, time_t now, enum commandType type, char* tran
 		assert(*msgbuff->messages < msgbuff->messages_end);
 		struct message* message = *msgbuff->messages;
 
-		char* end = message->payload+128;
+		char* end = message->payload+sizeof(message->payload);
 		char* cursor = message->payload;
 
 		int rc = snprintf(cursor, end-cursor , "d1:t%ld:", transaction_len);
-- 
cgit v1.2.3