1 files changed, 22 insertions, 5 deletions
diff --git a/src/proto.h b/src/proto.h
index 85dd310..0e85918 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -9,26 +9,43 @@
 #define MAX_DISC 32
 #define MAX_INFLIGHT 32
 
-struct dht;
-struct msgbuff;
-typedef void (*cont)(struct dht* dht, struct nodeid* self, char* packet, size_t packet_len, int socket, struct sockaddr* remote, socklen_t remote_len, struct msgbuff* msgbuff);
+#define UNCERTAIN_TIME 900
+#define PROTO_TMOUT 60
 
 struct discovery {
+	struct in_addr addr;
 	uint16_t port;
 	struct nodeid expected_id;
 };
 
+union message_cont {
+	struct discovery discovery;
+};
+
+struct dht;
+struct msgbuff;
+
+#define PROCESS_REPONSE(NAME) int NAME(struct dht* dht, time_t now, union message_cont* cont, char* packet, size_t packet_len, int socket, struct sockaddr* remote, socklen_t remote_len, struct msgbuff* msgbuff)
+typedef PROCESS_REPONSE(cont);
+
+#define PROCESS_TIMEOUT(NAME) int NAME(struct dht* dht, struct nodeid* self, time_t now, union message_cont* cont, struct msgbuff* msgbuff)
+typedef PROCESS_TIMEOUT(tmout);
+
 struct dht {
 	struct nodeid self;
 	int sfd;
 
 	struct in_addr addrs[MAX_DISC];
 	struct discovery pending_discover[MAX_DISC];
+	bool pause;
 
 	bool reqalloc[MAX_INFLIGHT];
 	struct {
 		struct sockaddr_storage addr;
 		cont fun;
+		time_t timeout;
+		tmout timeout_fun;
+		union message_cont cont;
 	} requestdata[MAX_INFLIGHT];
 };
 
@@ -39,6 +56,6 @@ struct message {
 	socklen_t dest_len;
 };
 
-void proto_begin(struct dht* dht, struct message** output, const struct message* const output_end);
-int proto_run(struct dht* dht, char* buffer, size_t buffer_len, struct sockaddr_in* remote, socklen_t remote_len, struct message** output, const struct message* const output_end);
+void proto_begin(struct dht* dht, time_t now, struct message** output, const struct message* const output_end);
+int proto_run(struct dht* dht, char* buffer, size_t buffer_len, struct sockaddr_in* remote, socklen_t remote_len, time_t now, struct message** output, const struct message* const output_end);
 void proto_end(struct dht* dht);