From 6e6829ad209550fbac0e363f9421c1fba78915b5 Mon Sep 17 00:00:00 2001
From: Jesper Jensen <jesper@slashwin.dk>
Date: Tue, 5 Oct 2021 22:48:37 +0200
Subject: Add getclient timeout

---
 src/main.c | 53 ++++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 5094c8c..3cffa29 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,12 +17,12 @@ void flush_messages(int sfd, struct message* cursor, const struct message* const
 }
 
 int main(int argc, char** argv) {
-	struct message outbuff[10] = {0};
+	struct message outbuff[32] = {0};
 
 	struct dht dht;
-	dht.self = (struct nodeid){.inner={0x0034048f, 0x08000020, 0x00888880, 0x02008460, 0x0ab00521}};
+	dht.self = (struct nodeid){.inner={0xebe9bbf1, 0x3cdba6b3, 0x993e0c87, 0x900d5e25}};
 	struct message* message_cursor = outbuff;
-	proto_begin(&dht, time(NULL), &message_cursor, outbuff+10);
+	proto_begin(&dht, time(NULL), &message_cursor, outbuff+32);
 	flush_messages(dht.sfd, outbuff, message_cursor);
 
 
@@ -34,42 +34,41 @@ int main(int argc, char** argv) {
 		fflush(stdout);
 
 		bool timedout = false;
+		time_t next = 0;
 		if(!dht.pause){
-			time_t next = 0;
 
 			struct entry* oldest;
 			routing_oldest(&oldest);
 			if(oldest != NULL)
 				next = oldest->expire;
 
-			for(int i = 0; i < MAX_INFLIGHT; i++) {
-				if(!dht.reqalloc[i])
-					continue;
+		} else {
+			dbg("DHT timeout is paused");
+		}
 
-				time_t timeout = dht.requestdata[i].timeout;
-				if(next == 0 || (timeout != 0 && difftime(timeout, next) < 0))
-					next = timeout;
-			}
+		for(int i = 0; i < MAX_INFLIGHT; i++) {
+			if(!dht.reqalloc[i])
+				continue;
 
-			if(next != 0) {
-				time_t sleepfor = next - time(NULL);
-				dbg("Set timeout to %ld", sleepfor);
-				struct timeval tv = {
-					.tv_sec = sleepfor,
-					.tv_usec = 0,
-				};
-				if(tv.tv_sec <= 0) {
-					timedout = true;
-				} else {
-					setsockopt(dht.sfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
-				}
+			time_t timeout = dht.requestdata[i].timeout;
+			if(next == 0 || (timeout != 0 && difftime(timeout, next) < 0))
+				next = timeout;
+		}
+
+		if(next != 0) {
+			time_t sleepfor = next - time(NULL);
+			dbg("Set timeout to %ld", sleepfor);
+			struct timeval tv = {
+				.tv_sec = sleepfor,
+				.tv_usec = 0,
+			};
+			if(tv.tv_sec <= 0) {
+				timedout = true;
 			} else {
-				fatal("We have to wait some amount of time right now");
+				setsockopt(dht.sfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
 			}
-
-		} else {
-			printf("DHT timeout is paused");
 		}
+
 		// Try to receive some data, this is a blocking call
 		struct sockaddr_storage remote;
 		socklen_t remote_len = sizeof(remote);
-- 
cgit v1.2.3