X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol.c;h=785e20b534b83213f9ed28b01941cce34b494e86;hb=dc0e52cb3e42620c3139e713b373d130aa30b698;hp=b51c66b792ba46f98a230e7feead83ee0efb4520;hpb=196806f90f40fcc0cf727abd4bed6bc5aefff5ff;p=meshlink

diff --git a/src/protocol.c b/src/protocol.c
index b51c66b7..785e20b5 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,6 +1,6 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -50,12 +50,14 @@ static char (*request_name[]) = {
 };
 
 bool check_id(const char *id) {
-	if(!id || !*id)
+	if(!id || !*id) {
 		return false;
+	}
 
 	for(; *id; id++)
-		if(!isalnum(*id) && *id != '_' && *id != '-')
+		if(!isalnum(*id) && *id != '_' && *id != '-') {
 			return false;
+		}
 
 	return true;
 }
@@ -77,37 +79,39 @@ bool send_request(meshlink_handle_t *mesh, connection_t *c, const char *format,
 	va_end(args);
 
 	if(len < 0 || len > MAXBUFSIZE - 1) {
-		logger(mesh, MESHLINK_ERROR, "Output buffer overflow while sending request to %s (%s)",
-		       c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Output buffer overflow while sending request to %s", c->name);
 		return false;
 	}
 
-	logger(mesh, MESHLINK_DEBUG, "Sending %s to %s (%s): %s", request_name[atoi(request)], c->name, c->hostname, request);
+	logger(mesh, MESHLINK_DEBUG, "Sending %s to %s: %s", request_name[atoi(request)], c->name, request);
 
 	request[len++] = '\n';
 
 	if(c == mesh->everyone) {
 		broadcast_meta(mesh, NULL, request, len);
 		return true;
-	} else
+	} else {
 		return send_meta(mesh, c, request, len);
+	}
 }
 
 void forward_request(meshlink_handle_t *mesh, connection_t *from, const char *request) {
-	logger(mesh, MESHLINK_DEBUG, "Forwarding %s from %s (%s): %s", request_name[atoi(request)], from->name, from->hostname, request);
+	logger(mesh, MESHLINK_DEBUG, "Forwarding %s from %s: %s", request_name[atoi(request)], from->name, request);
 
 	// Create a temporary newline-terminated copy of the request
 	int len = strlen(request);
 	char tmp[len + 1];
 	memcpy(tmp, request, len);
 	tmp[len] = '\n';
-	broadcast_meta(mesh, from, tmp, sizeof tmp);
+	broadcast_meta(mesh, from, tmp, sizeof(tmp));
 }
 
 bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	if(c->outgoing && mesh->proxytype == PROXY_HTTP && c->allow_request == ID) {
-		if(!request[0] || request[0] == '\r')
+		if(!request[0] || request[0] == '\r') {
 			return true;
+		}
+
 		if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
 			if(!strncmp(request + 9, "200", 3)) {
 				logger(mesh, MESHLINK_DEBUG, "Proxy request granted");
@@ -123,24 +127,25 @@ bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *reque
 
 	if(reqno || *request == '0') {
 		if((reqno < 0) || (reqno >= LAST) || !request_handlers[reqno]) {
-			logger(mesh, MESHLINK_DEBUG, "Unknown request from %s (%s): %s", c->name, c->hostname, request);
+			logger(mesh, MESHLINK_DEBUG, "Unknown request from %s: %s", c->name, request);
 			return false;
-		} else
-			logger(mesh, MESHLINK_DEBUG, "Got %s from %s (%s): %s", request_name[reqno], c->name, c->hostname, request);
+		} else {
+			logger(mesh, MESHLINK_DEBUG, "Got %s from %s: %s", request_name[reqno], c->name, request);
+		}
 
 		if((c->allow_request != ALL) && (c->allow_request != reqno)) {
-			logger(mesh, MESHLINK_ERROR, "Unauthorized request from %s (%s)", c->name, c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Unauthorized request from %s", c->name);
 			return false;
 		}
 
 		if(!request_handlers[reqno](mesh, c, request)) {
 			/* Something went wrong. Probably scriptkiddies. Terminate. */
 
-			logger(mesh, MESHLINK_ERROR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Error while processing %s from %s", request_name[reqno], c->name);
 			return false;
 		}
 	} else {
-		logger(mesh, MESHLINK_ERROR, "Bogus data received from %s (%s)", c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Bogus data received from %s", c->name);
 		return false;
 	}
 
@@ -152,25 +157,29 @@ static int past_request_compare(const past_request_t *a, const past_request_t *b
 }
 
 static void free_past_request(past_request_t *r) {
-	if(r->request)
+	if(r->request) {
 		free((void *)r->request);
+	}
 
 	free(r);
 }
 
 static void age_past_requests(event_loop_t *loop, void *data) {
+	(void)data;
 	meshlink_handle_t *mesh = loop->data;
 	int left = 0, deleted = 0;
 
 	for splay_each(past_request_t, p, mesh->past_request_tree) {
-		if(p->firstseen + mesh->pinginterval <= mesh->loop.now.tv_sec)
+		if(p->firstseen + mesh->pinginterval <= mesh->loop.now.tv_sec) {
 			splay_delete_node(mesh->past_request_tree, node), deleted++;
-		else
+		} else {
 			left++;
+		}
 	}
 
-	if(left || deleted)
+	if(left || deleted) {
 		logger(mesh, MESHLINK_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
+	}
 
 	if(left)
 		timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval) {
@@ -179,15 +188,13 @@ static void age_past_requests(event_loop_t *loop, void *data) {
 }
 
 bool seen_request(meshlink_handle_t *mesh, const char *request) {
-	past_request_t *new, p = {NULL};
-
-	p.request = request;
+	past_request_t *new, p = {.request = request};
 
 	if(splay_search(mesh->past_request_tree, &p)) {
 		logger(mesh, MESHLINK_DEBUG, "Already seen request");
 		return true;
 	} else {
-		new = xmalloc(sizeof *new);
+		new = xmalloc(sizeof(*new));
 		new->request = xstrdup(request);
 		new->firstseen = mesh->loop.now.tv_sec;
 		splay_insert(mesh->past_request_tree, new);
@@ -203,8 +210,10 @@ void init_requests(meshlink_handle_t *mesh) {
 }
 
 void exit_requests(meshlink_handle_t *mesh) {
-	if(mesh->past_request_tree)
+	if(mesh->past_request_tree) {
 		splay_delete_tree(mesh->past_request_tree);
+	}
+
 	mesh->past_request_tree = NULL;
 
 	timeout_del(&mesh->loop, &mesh->past_request_timeout);