X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=8b62916b523505cebb6c4f10a06c0eef11bbfc8f;hb=8ac096b5bf9da1b3961a3ac4a03d083629222a63;hp=e866e3165ef19f3e3c29686365d024dff6e03e7f;hpb=79e46d08a46f2fef2ee4e8eac7ba487007160564;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index e866e316..8b62916b 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -30,6 +30,7 @@
 
 bool tunnelserver = false;
 bool strictsubnets = false;
+bool experimental = false;
 
 /* Jumptable for the request handlers */
 
@@ -79,23 +80,16 @@ bool send_request(connection_t *c, const char *format, ...) {
 	va_end(args);
 
 	if(len < 0 || len > MAXBUFSIZE - 1) {
-		logger(LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
 			   c->name, c->hostname);
 		return false;
 	}
 
-	ifdebug(PROTOCOL) {
-		ifdebug(META)
-			logger(LOG_DEBUG, "Sending %s to %s (%s): %s",
-				   request_name[atoi(request)], c->name, c->hostname, request);
-		else
-			logger(LOG_DEBUG, "Sending %s to %s (%s)", request_name[atoi(request)],
-				   c->name, c->hostname);
-	}
+	logger(DEBUG_META, LOG_DEBUG, "Sending %s to %s (%s): %s", request_name[atoi(request)], c->name, c->hostname, request);
 
 	request[len++] = '\n';
 
-	if(c == broadcast) {
+	if(c == everyone) {
 		broadcast_meta(NULL, request, len);
 		return true;
 	} else
@@ -104,14 +98,7 @@ bool send_request(connection_t *c, const char *format, ...) {
 
 void forward_request(connection_t *from, char *request) {
 	/* Note: request is not zero terminated anymore after a call to this function! */
-	ifdebug(PROTOCOL) {
-		ifdebug(META)
-			logger(LOG_DEBUG, "Forwarding %s from %s (%s): %s",
-				   request_name[atoi(request)], from->name, from->hostname, request);
-		else
-			logger(LOG_DEBUG, "Forwarding %s from %s (%s)",
-				   request_name[atoi(request)], from->name, from->hostname);
-	}
+	logger(DEBUG_META, LOG_DEBUG, "Forwarding %s from %s (%s): %s", request_name[atoi(request)], from->name, from->hostname, request);
 
 	int len = strlen(request);
 	request[len++] = '\n';
@@ -123,41 +110,25 @@ bool receive_request(connection_t *c, char *request) {
 
 	if(reqno || *request == '0') {
 		if((reqno < 0) || (reqno >= LAST) || !request_handlers[reqno]) {
-			ifdebug(META)
-				logger(LOG_DEBUG, "Unknown request from %s (%s): %s",
-					   c->name, c->hostname, request);
-			else
-				logger(LOG_ERR, "Unknown request from %s (%s)",
-					   c->name, c->hostname);
-
+			logger(DEBUG_META, LOG_DEBUG, "Unknown request from %s (%s): %s", c->name, c->hostname, request);
 			return false;
 		} else {
-			ifdebug(PROTOCOL) {
-				ifdebug(META)
-					logger(LOG_DEBUG, "Got %s from %s (%s): %s",
-						   request_name[reqno], c->name, c->hostname, request);
-				else
-					logger(LOG_DEBUG, "Got %s from %s (%s)",
-						   request_name[reqno], c->name, c->hostname);
-			}
+			logger(DEBUG_META, LOG_DEBUG, "Got %s from %s (%s): %s", request_name[reqno], c->name, c->hostname, request);
 		}
 
 		if((c->allow_request != ALL) && (c->allow_request != reqno)) {
-			logger(LOG_ERR, "Unauthorized request from %s (%s)", c->name,
-				   c->hostname);
+			logger(DEBUG_ALWAYS, LOG_ERR, "Unauthorized request from %s (%s)", c->name, c->hostname);
 			return false;
 		}
 
 		if(!request_handlers[reqno](c, request)) {
 			/* Something went wrong. Probably scriptkiddies. Terminate. */
 
-			logger(LOG_ERR, "Error while processing %s from %s (%s)",
-				   request_name[reqno], c->name, c->hostname);
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
 			return false;
 		}
 	} else {
-		logger(LOG_ERR, "Bogus data received from %s (%s)",
-			   c->name, c->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Bogus data received from %s (%s)", c->name, c->hostname);
 		return false;
 	}
 
@@ -178,12 +149,12 @@ static void free_past_request(past_request_t *r) {
 static struct event past_request_event;
 
 bool seen_request(char *request) {
-	past_request_t *new, p = {0};
+	past_request_t *new, p = {NULL};
 
 	p.request = request;
 
 	if(splay_search(past_request_tree, &p)) {
-		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Already seen request");
+		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Already seen request");
 		return true;
 	} else {
 		new = xmalloc(sizeof *new);
@@ -195,7 +166,7 @@ bool seen_request(char *request) {
 	}
 }
 
-void age_past_requests(int fd, short events, void *data) {
+static void age_past_requests(int fd, short events, void *data) {
 	splay_node_t *node, *next;
 	past_request_t *p;
 	int left = 0, deleted = 0;
@@ -205,14 +176,14 @@ void age_past_requests(int fd, short events, void *data) {
 		next = node->next;
 		p = node->data;
 
-		if(p->firstseen + pinginterval < now)
+		if(p->firstseen + pinginterval <= now)
 			splay_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",
+		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d",
 			   deleted, left);
 
 	if(left)
@@ -228,5 +199,6 @@ void init_requests(void) {
 void exit_requests(void) {
 	splay_delete_tree(past_request_tree);
 
-	event_del(&past_request_event);
+	if(timeout_initialized(&past_request_event))
+		event_del(&past_request_event);
 }