X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=0fbf2a9679ca3e229f1ef36821ec69bc3e30816b;hb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;hp=ad7c57d78dd1ac3197df0b900fb793c8cb338f72;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index ad7c57d7..0fbf2a96 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2001 Ivo Timmermans <ivo@o2w.nl>,
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.142 2003/07/22 20:55:20 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -30,6 +30,8 @@
 #include "utils.h"
 #include "xalloc.h"
 
+bool tunnelserver = false;
+
 /* Jumptable for the request handlers */
 
 static bool (*request_handlers[])(connection_t *) = {
@@ -53,12 +55,9 @@ static char (*request_name[]) = {
 
 static avl_tree_t *past_request_tree;
 
-bool check_id(char *id)
-{
-	int i;
-
-	for(i = 0; i < strlen(id); i++)
-		if(!isalnum(id[i]) && id[i] != '_')
+bool check_id(const char *id) {
+	for(; *id; id++)
+		if(!isalnum(*id) && *id != '_')
 			return false;
 
 	return true;
@@ -67,8 +66,7 @@ bool check_id(char *id)
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-bool send_request(connection_t *c, const char *format, ...)
-{
+bool send_request(connection_t *c, const char *format, ...) {
 	va_list args;
 	char buffer[MAXBUFSIZE];
 	int len, request;
@@ -108,8 +106,7 @@ bool send_request(connection_t *c, const char *format, ...)
 		return send_meta(c, buffer, len);
 }
 
-void forward_request(connection_t *from)
-{
+void forward_request(connection_t *from) {
 	int request;
 
 	cp();
@@ -130,8 +127,7 @@ void forward_request(connection_t *from)
 	broadcast_meta(from, from->buffer, from->reqlen);
 }
 
-bool receive_request(connection_t *c)
-{
+bool receive_request(connection_t *c) {
 	int request;
 
 	cp();
@@ -180,13 +176,11 @@ bool receive_request(connection_t *c)
 	return true;
 }
 
-static int past_request_compare(past_request_t *a, past_request_t *b)
-{
+static int past_request_compare(const past_request_t *a, const past_request_t *b) {
 	return strcmp(a->request, b->request);
 }
 
-static void free_past_request(past_request_t *r)
-{
+static void free_past_request(past_request_t *r) {
 	cp();
 
 	if(r->request)
@@ -195,23 +189,10 @@ static void free_past_request(past_request_t *r)
 	free(r);
 }
 
-void init_requests(void)
-{
-	cp();
-
-	past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
-}
-
-void exit_requests(void)
-{
-	cp();
-
-	avl_delete_tree(past_request_tree);
-}
+static struct event past_request_event;
 
-bool seen_request(char *request)
-{
-	past_request_t p, *new;
+bool seen_request(char *request) {
+	past_request_t *new, p = {0};
 
 	cp();
 
@@ -221,33 +202,53 @@ bool seen_request(char *request)
 		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Already seen request"));
 		return true;
 	} else {
-		new = (past_request_t *) xmalloc(sizeof(*new));
+		new = xmalloc(sizeof(*new));
 		new->request = xstrdup(request);
-		new->firstseen = now;
+		new->firstseen = time(NULL);
 		avl_insert(past_request_tree, new);
+		event_add(&past_request_event, &(struct timeval){10, 0});
 		return false;
 	}
 }
 
-void age_past_requests(void)
-{
+void age_past_requests(int fd, short events, void *data) {
 	avl_node_t *node, *next;
 	past_request_t *p;
 	int left = 0, deleted = 0;
+	time_t now = time(NULL);
 
 	cp();
 
 	for(node = past_request_tree->head; node; node = next) {
 		next = node->next;
-		p = (past_request_t *) node->data;
+		p = node->data;
 
-		if(p->firstseen + pingtimeout < now)
+		if(p->firstseen + pinginterval < now)
 			avl_delete_node(past_request_tree, node), deleted++;
 		else
 			left++;
 	}
 
 	if(left || deleted)
-		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"),
+		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d"),
 			   deleted, left);
+
+	if(left)
+		event_add(&past_request_event, &(struct timeval){10, 0});
+}
+
+void init_requests(void) {
+	cp();
+
+	past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
+
+	timeout_set(&past_request_event, age_past_requests, NULL);
+}
+
+void exit_requests(void) {
+	cp();
+
+	avl_delete_tree(past_request_tree);
+
+	event_del(&past_request_event);
 }