Get rid of ->hostname.

[meshlink] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index ec2cde4a539ad997fd4bf1a86e9db66c1e4f83c2..6384eb3979d9d92154e963913a4763693f13dd1b 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -46,8 +46,7 @@ bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request
        node_t *n;
 
        if(sscanf(request, "%*d %*x " MAX_STRING, name) != 1) {
-               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "KEY_CHANGED",
-                      c->name, c->hostname);
+               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "KEY_CHANGED", c->name);
                return false;
        }
 
@@ -57,8 +56,7 @@ bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request
        n = lookup_node(mesh, name);
 
        if(!n) {
-               logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) origin %s which does not exist",
-                      "KEY_CHANGED", c->name, c->hostname, name);
+               logger(mesh, MESHLINK_ERROR, "Got %s from %s origin %s which does not exist", "KEY_CHANGED", c->name, name);
                return true;
        }
 
@@ -80,7 +78,7 @@ static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data
 
 bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
        if(!node_read_ecdsa_public_key(mesh, to)) {
-               logger(mesh, MESHLINK_DEBUG, "No ECDSA key known for %s (%s)", to->name, to->hostname);
+               logger(mesh, MESHLINK_DEBUG, "No ECDSA key known for %s", to->name);
                send_request(mesh, to->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
                return true;
        }
@@ -88,14 +86,14 @@ bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
        if(to->sptps.label)
                logger(mesh, MESHLINK_DEBUG, "send_req_key(%s) called while sptps->label != NULL!", to->name);
 
-       char label[sizeof meshlink_udp_label + strlen(mesh->self->name) + strlen(to->name) + 2];
-       snprintf(label, sizeof label, "%s %s %s", meshlink_udp_label, mesh->self->name, to->name);
+       char label[sizeof(meshlink_udp_label) + strlen(mesh->self->name) + strlen(to->name) + 2];
+       snprintf(label, sizeof(label), "%s %s %s", meshlink_udp_label, mesh->self->name, to->name);
        sptps_stop(&to->sptps);
        to->status.validkey = false;
        to->status.waitingforkey = true;
        to->last_req_key = mesh->loop.now.tv_sec;
        to->incompression = mesh->self->incompression;
-       return sptps_start(&to->sptps, to, true, true, mesh->self->connection->ecdsa, to->ecdsa, label, sizeof label - 1, send_initial_sptps_data, receive_sptps_record);
+       return sptps_start(&to->sptps, to, true, true, mesh->self->connection->ecdsa, to->ecdsa, label, sizeof(label) - 1, send_initial_sptps_data, receive_sptps_record);
 }
 
 /* REQ_KEY is overloaded to allow arbitrary requests to be routed between two nodes. */
@@ -111,24 +109,24 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
 
        case ANS_PUBKEY: {
                if(node_read_ecdsa_public_key(mesh, from)) {
-                       logger(mesh, MESHLINK_WARNING, "Got ANS_PUBKEY from %s (%s) even though we already have his pubkey", from->name, from->hostname);
+                       logger(mesh, MESHLINK_WARNING, "Got ANS_PUBKEY from %s even though we already have his pubkey", from->name);
                        return true;
                }
 
                char pubkey[MAX_STRING_SIZE];
                if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, pubkey) != 1 || !(from->ecdsa = ecdsa_set_base64_public_key(pubkey))) {
-                       logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ANS_PUBKEY", from->name, from->hostname, "invalid pubkey");
+                       logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ANS_PUBKEY", from->name, "invalid pubkey");
                        return true;
                }
 
-               logger(mesh, MESHLINK_INFO, "Learned ECDSA public key from %s (%s)", from->name, from->hostname);
+               logger(mesh, MESHLINK_INFO, "Learned ECDSA public key from %s", from->name);
                append_config_file(mesh, from->name, "ECDSAPublicKey", pubkey);
                return true;
        }
 
        case REQ_KEY: {
                if(!node_read_ecdsa_public_key(mesh, from)) {
-                       logger(mesh, MESHLINK_DEBUG, "No ECDSA key known for %s (%s)", from->name, from->hostname);
+                       logger(mesh, MESHLINK_DEBUG, "No ECDSA key known for %s", from->name);
                        send_request(mesh, from->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, from->name, REQ_PUBKEY);
                        return true;
                }
@@ -145,31 +143,31 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
                int len;
 
                if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode(buf, buf, strlen(buf)))) {
-                       logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "REQ_SPTPS_START", from->name, from->hostname, "invalid SPTPS data");
+                       logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "REQ_SPTPS_START", from->name, "invalid SPTPS data");
                        return true;
                }
 
-               char label[sizeof meshlink_udp_label + strlen(from->name) + strlen(mesh->self->name) + 2];
-               snprintf(label, sizeof label, "%s %s %s", meshlink_udp_label, from->name, mesh->self->name);
+               char label[sizeof(meshlink_udp_label) + strlen(from->name) + strlen(mesh->self->name) + 2];
+               snprintf(label, sizeof(label), "%s %s %s", meshlink_udp_label, from->name, mesh->self->name);
                sptps_stop(&from->sptps);
                from->status.validkey = false;
                from->status.waitingforkey = true;
                from->last_req_key = mesh->loop.now.tv_sec;
-               sptps_start(&from->sptps, from, false, true, mesh->self->connection->ecdsa, from->ecdsa, label, sizeof label - 1, send_sptps_data, receive_sptps_record);
+               sptps_start(&from->sptps, from, false, true, mesh->self->connection->ecdsa, from->ecdsa, label, sizeof(label) - 1, send_sptps_data, receive_sptps_record);
                sptps_receive_data(&from->sptps, buf, len);
                return true;
        }
 
        case REQ_SPTPS: {
                if(!from->status.validkey) {
-                       logger(mesh, MESHLINK_ERROR, "Got REQ_SPTPS from %s (%s) but we don't have a valid key yet", from->name, from->hostname);
+                       logger(mesh, MESHLINK_ERROR, "Got REQ_SPTPS from %s but we don't have a valid key yet", from->name);
                        return true;
                }
 
                char buf[MAX_STRING_SIZE];
                int len;
                if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode(buf, buf, strlen(buf)))) {
-                       logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "REQ_SPTPS", from->name, from->hostname, "invalid SPTPS data");
+                       logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "REQ_SPTPS", from->name, "invalid SPTPS data");
                        return true;
                }
                sptps_receive_data(&from->sptps, buf, len);
@@ -177,7 +175,7 @@ static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *
        }
 
        default:
-               logger(mesh, MESHLINK_ERROR, "Unknown extended REQ_KEY request from %s (%s): %s", from->name, from->hostname, request);
+               logger(mesh, MESHLINK_ERROR, "Unknown extended REQ_KEY request from %s: %s", from->name, request);
                return true;
        }
 }
@@ -189,29 +187,28 @@ bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        int reqno = 0;
 
        if(sscanf(request, "%*d " MAX_STRING " " MAX_STRING " %d", from_name, to_name, &reqno) < 2) {
-               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "REQ_KEY", c->name,
-                      c->hostname);
+               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "REQ_KEY", c->name);
                return false;
        }
 
        if(!check_id(from_name) || !check_id(to_name)) {
-               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "REQ_KEY", c->name, c->hostname, "invalid name");
+               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "REQ_KEY", c->name, "invalid name");
                return false;
        }
 
        from = lookup_node(mesh, from_name);
 
        if(!from) {
-               logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
-                      "REQ_KEY", c->name, c->hostname, from_name);
+               logger(mesh, MESHLINK_ERROR, "Got %s from %s origin %s which does not exist in our connection list",
+                      "REQ_KEY", c->name, from_name);
                return true;
        }
 
        to = lookup_node(mesh, to_name);
 
        if(!to) {
-               logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
-                      "REQ_KEY", c->name, c->hostname, to_name);
+               logger(mesh, MESHLINK_ERROR, "Got %s from %s destination %s which does not exist in our connection list",
+                      "REQ_KEY", c->name, to_name);
                return true;
        }
 
@@ -226,8 +223,8 @@ bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                send_ans_key(mesh, from);
        } else {
                if(!to->status.reachable) {
-                       logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
-                              "REQ_KEY", c->name, c->hostname, to_name);
+                       logger(mesh, MESHLINK_WARNING, "Got %s from %s destination %s which is not reachable",
+                              "REQ_KEY", c->name, to_name);
                        return true;
                }
 
@@ -253,29 +250,28 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d "MAX_STRING" "MAX_STRING,
                        from_name, to_name, key, &cipher, &digest, &maclength,
                        &compression, address, port) < 7) {
-               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ANS_KEY", c->name,
-                      c->hostname);
+               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ANS_KEY", c->name);
                return false;
        }
 
        if(!check_id(from_name) || !check_id(to_name)) {
-               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s): %s", "ANS_KEY", c->name, c->hostname, "invalid name");
+               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ANS_KEY", c->name, "invalid name");
                return false;
        }
 
        from = lookup_node(mesh, from_name);
 
        if(!from) {
-               logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
-                      "ANS_KEY", c->name, c->hostname, from_name);
+               logger(mesh, MESHLINK_ERROR, "Got %s from %s origin %s which does not exist in our connection list",
+                      "ANS_KEY", c->name, from_name);
                return true;
        }
 
        to = lookup_node(mesh, to_name);
 
        if(!to) {
-               logger(mesh, MESHLINK_ERROR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
-                      "ANS_KEY", c->name, c->hostname, to_name);
+               logger(mesh, MESHLINK_ERROR, "Got %s from %s destination %s which does not exist in our connection list",
+                      "ANS_KEY", c->name, to_name);
                return true;
        }
 
@@ -283,8 +279,8 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
        if(to != mesh->self) {
                if(!to->status.reachable) {
-                       logger(mesh, MESHLINK_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
-                              "ANS_KEY", c->name, c->hostname, to_name);
+                       logger(mesh, MESHLINK_WARNING, "Got %s from %s destination %s which is not reachable",
+                              "ANS_KEY", c->name, to_name);
                        return true;
                }
 
@@ -304,8 +300,9 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        /* Don't use key material until every check has passed. */
        from->status.validkey = false;
 
-       if(compression < 0 || compression > 11) {
-               logger(mesh, MESHLINK_ERROR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
+       /* Compression is not supported. */
+       if(compression != 0) {
+               logger(mesh, MESHLINK_ERROR, "Node %s uses bogus compression level!", from->name);
                return true;
        }
 
@@ -317,7 +314,7 @@ bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        int len = b64decode(key, buf, strlen(key));
 
        if(!len || !sptps_receive_data(&from->sptps, buf, len))
-               logger(mesh, MESHLINK_ERROR, "Error processing SPTPS data from %s (%s)", from->name, from->hostname);
+               logger(mesh, MESHLINK_ERROR, "Error processing SPTPS data from %s", from->name);
 
        if(from->status.validkey) {
                if(*address && *port) {