X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=69507b7750a66459296847ab09882ca80d426f75;hb=f79cc0e0bba16a3aa42a5fa13098cda714623205;hp=c748ead7afc469063c30091a0cac68b74429e728;hpb=196806f90f40fcc0cf727abd4bed6bc5aefff5ff;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index c748ead7..69507b77 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,6 +1,6 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
-    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
@@ -65,9 +65,9 @@ static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
 		memcpy(s4req + 4, &c->address.in.sin_addr, 4);
 		if(mesh->proxyuser)
 			memcpy(s4req + 8, mesh->proxyuser, strlen(mesh->proxyuser));
-		s4req[sizeof s4req - 1] = 0;
+		s4req[sizeof(s4req) - 1] = 0;
 		c->tcplen = 8;
-		return send_meta(mesh, c, s4req, sizeof s4req);
+		return send_meta(mesh, c, s4req, sizeof(s4req));
 	}
 	case PROXY_SOCKS5: {
 		int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
@@ -113,7 +113,7 @@ static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
 		}
 		if(i > len)
 			abort();
-		return send_meta(mesh, c, s5req, sizeof s5req);
+		return send_meta(mesh, c, s5req, sizeof(s5req));
 	}
 	case PROXY_SOCKS4A:
 		logger(mesh, MESHLINK_ERROR, "Proxy type not implemented yet");
@@ -138,16 +138,17 @@ bool send_id(meshlink_handle_t *mesh, connection_t *c) {
 }
 
 static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data, uint16_t len) {
+	(void)len;
 	if(strchr(data, '\n')) {
-		logger(mesh, MESHLINK_ERROR, "Received invalid key from invited node %s (%s)!\n", c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Received invalid key from invited node %s!\n", c->name);
 		return false;
 	}
 
 	// Create a new host config file
 	char filename[PATH_MAX];
-	snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name);
+	snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name);
 	if(!access(filename, F_OK)) {
-		logger(mesh, MESHLINK_ERROR, "Host config file for %s (%s) already exists!\n", c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Host config file for %s already exists!\n", c->name);
 		return false;
 	}
 
@@ -160,7 +161,7 @@ static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const
 	fprintf(f, "ECDSAPublicKey = %s\n", (const char *)data);
 	fclose(f);
 
-	logger(mesh, MESHLINK_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname);
+	logger(mesh, MESHLINK_INFO, "Key succesfully received from %s", c->name);
 
 	//TODO: callback to application to inform of an accepted invitation
 
@@ -190,19 +191,19 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 	char hashbuf[18 + strlen(fingerprint)];
 	char cookie[25];
 	memcpy(hashbuf, data, 18);
-	memcpy(hashbuf + 18, fingerprint, sizeof hashbuf - 18);
-	sha512(hashbuf, sizeof hashbuf, hash);
+	memcpy(hashbuf + 18, fingerprint, sizeof(hashbuf) - 18);
+	sha512(hashbuf, sizeof(hashbuf), hash);
 	b64encode_urlsafe(hash, cookie, 18);
 	free(fingerprint);
 
 	char filename[PATH_MAX], usedname[PATH_MAX];
-	snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookie);
-	snprintf(usedname, sizeof usedname, "%s" SLASH "invitations" SLASH "%s.used", mesh->confbase, cookie);
+	snprintf(filename, sizeof(filename), "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookie);
+	snprintf(usedname, sizeof(usedname), "%s" SLASH "invitations" SLASH "%s.used", mesh->confbase, cookie);
 
 	// Atomically rename the invitation file
 	if(rename(filename, usedname)) {
 		if(errno == ENOENT)
-			logger(mesh, MESHLINK_ERROR, "Peer %s tried to use non-existing invitation %s\n", c->hostname, cookie);
+			logger(mesh, MESHLINK_ERROR, "Peer %s tried to use non-existing invitation %s\n", c->name, cookie);
 		else
 			logger(mesh, MESHLINK_ERROR, "Error trying to rename invitation %s\n", cookie);
 		return false;
@@ -217,7 +218,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 
 	// Read the new node's Name from the file
 	char buf[1024];
-	fgets(buf, sizeof buf, f);
+	fgets(buf, sizeof(buf), f);
 	if(*buf)
 		buf[strlen(buf) - 1] = 0;
 
@@ -242,7 +243,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 	// Send the node the contents of the invitation file
 	rewind(f);
 	size_t result;
-	while((result = fread(buf, 1, sizeof buf, f)))
+	while((result = fread(buf, 1, sizeof(buf), f)))
 		sptps_send_record(&c->sptps, 0, buf, result);
 	sptps_send_record(&c->sptps, 1, buf, 0);
 	fclose(f);
@@ -250,7 +251,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 
 	c->status.invitation_used = true;
 
-	logger(mesh, MESHLINK_INFO, "Invitation %s succesfully sent to %s (%s)", cookie, c->name, c->hostname);
+	logger(mesh, MESHLINK_INFO, "Invitation %s succesfully sent to %s", cookie, c->name);
 	return true;
 }
 
@@ -258,8 +259,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char name[MAX_STRING_SIZE];
 
 	if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
-		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ID", c->name,
-		       c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ID", c->name);
 		return false;
 	}
 
@@ -267,13 +267,13 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	if(name[0] == '?') {
 		if(!mesh->invitation_key) {
-			logger(mesh, MESHLINK_ERROR, "Got invitation from %s but we don't have an invitation key", c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Got invitation from %s but we don't have an invitation key", c->name);
 			return false;
 		}
 
 		c->ecdsa = ecdsa_set_base64_public_key(name + 1);
 		if(!c->ecdsa) {
-			logger(mesh, MESHLINK_ERROR, "Got bad invitation from %s", c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Got bad invitation from %s", c->name);
 			return false;
 		}
 
@@ -288,14 +288,13 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		c->protocol_minor = 2;
 		c->allow_request = 1;
 
-		return sptps_start(&c->sptps, c, false, false, mesh->invitation_key, c->ecdsa, meshlink_invitation_label, sizeof meshlink_invitation_label, send_meta_sptps, receive_invitation_sptps);
+		return sptps_start(&c->sptps, c, false, false, mesh->invitation_key, c->ecdsa, meshlink_invitation_label, sizeof(meshlink_invitation_label), send_meta_sptps, receive_invitation_sptps);
 	}
 
 	/* Check if identity is a valid name */
 
 	if(!check_id(name)) {
-		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ID", c->name,
-		       c->hostname, "invalid name");
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ID", c->name, "invalid name");
 		return false;
 	}
 
@@ -303,8 +302,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	if(c->outgoing) {
 		if(strcmp(c->name, name)) {
-			logger(mesh, MESHLINK_ERROR, "Peer %s is %s instead of %s", c->hostname, name,
-			       c->name);
+			logger(mesh, MESHLINK_ERROR, "Peer is %s instead of %s", name, c->name);
 			return false;
 		}
 	} else {
@@ -316,8 +314,8 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	/* Check if version matches */
 
 	if(c->protocol_major != mesh->self->connection->protocol_major) {
-		logger(mesh, MESHLINK_ERROR, "Peer %s (%s) uses incompatible version %d.%d",
-		       c->name, c->hostname, c->protocol_major, c->protocol_minor);
+		logger(mesh, MESHLINK_ERROR, "Peer %s uses incompatible version %d.%d",
+		       c->name, c->protocol_major, c->protocol_minor);
 		return false;
 	}
 
@@ -325,7 +323,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		init_configuration(&c->config_tree);
 
 		if(!read_host_config(mesh, c->config_tree, c->name)) {
-			logger(mesh, MESHLINK_ERROR, "Peer %s had unknown identity (%s)", c->hostname, c->name);
+			logger(mesh, MESHLINK_ERROR, "Peer %s has unknown identity", c->name);
 			return false;
 		}
 	}
@@ -333,11 +331,11 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	read_ecdsa_public_key(mesh, c);
 
 	if(!ecdsa_active(c->ecdsa)) {
-		logger(mesh, MESHLINK_ERROR, "No key known for peer %s (%s)", c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "No key known for peer %s", c->name);
 
 		node_t *n = lookup_node(mesh, c->name);
 		if(n && !n->status.waitingforkey) {
-			logger(mesh, MESHLINK_INFO, "Requesting key from peer %s (%s)", c->name, c->hostname);
+			logger(mesh, MESHLINK_INFO, "Requesting key from peer %s", c->name);
 			send_req_key(mesh, n);
 		}
 
@@ -347,20 +345,20 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	/* Forbid version rollback for nodes whose ECDSA key we know */
 
 	if(ecdsa_active(c->ecdsa) && c->protocol_minor < 2) {
-		logger(mesh, MESHLINK_ERROR, "Peer %s (%s) tries to roll back protocol version to %d.%d",
-		       c->name, c->hostname, c->protocol_major, c->protocol_minor);
+		logger(mesh, MESHLINK_ERROR, "Peer %s tries to roll back protocol version to %d.%d",
+		       c->name, c->protocol_major, c->protocol_minor);
 		return false;
 	}
 
 	c->allow_request = ACK;
-	char label[sizeof meshlink_tcp_label + strlen(mesh->self->name) + strlen(c->name) + 2];
+	char label[sizeof(meshlink_tcp_label) + strlen(mesh->self->name) + strlen(c->name) + 2];
 
 	if(c->outgoing)
-		snprintf(label, sizeof label, "%s %s %s", meshlink_tcp_label, mesh->self->name, c->name);
+		snprintf(label, sizeof(label), "%s %s %s", meshlink_tcp_label, mesh->self->name, c->name);
 	else
-		snprintf(label, sizeof label, "%s %s %s", meshlink_tcp_label, c->name, mesh->self->name);
+		snprintf(label, sizeof(label), "%s %s %s", meshlink_tcp_label, c->name, mesh->self->name);
 
-	return sptps_start(&c->sptps, c, c->outgoing, false, mesh->self->connection->ecdsa, c->ecdsa, label, sizeof label - 1, send_meta_sptps, receive_meta_sptps);
+	return sptps_start(&c->sptps, c, c->outgoing, false, mesh->self->connection->ecdsa, c->ecdsa, label, sizeof(label) - 1, send_meta_sptps, receive_meta_sptps);
 }
 
 bool send_ack(meshlink_handle_t *mesh, connection_t *c) {
@@ -390,14 +388,12 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	node_t *n;
 
 	if(sscanf(request, "%*d " MAX_STRING " %d %x", hisport, &devclass, &options) != 3) {
-		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ACK", c->name,
-		       c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ACK", c->name);
 		return false;
 	}
 
 	if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
-		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ACK", c->name,
-		       c->hostname, "devclass invalid");
+		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ACK", c->name, "devclass invalid");
 		return false;
 	}
 
@@ -412,7 +408,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	} else {
 		if(n->connection) {
 			/* Oh dear, we already have a connection to this node. */
-			logger(mesh, MESHLINK_DEBUG, "Established a second connection with %s (%s), closing old connection", n->connection->name, n->connection->hostname);
+			logger(mesh, MESHLINK_DEBUG, "Established a second connection with %s, closing old connection", n->connection->name);
 
 			if(n->connection->outgoing) {
 				if(c->outgoing)
@@ -447,8 +443,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	c->allow_request = ALL;
 	c->status.active = true;
 
-	logger(mesh, MESHLINK_INFO, "Connection with %s (%s) activated", c->name,
-	       c->hostname);
+	logger(mesh, MESHLINK_INFO, "Connection with %s activated", c->name);
 
 	/* Send him everything we know */