Get rid of ->hostname.

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index e22053c79148758fa2c4360f3397df284052ca14..fb0aa9ca12b0ff26b2e467d2815ac48810bcc71e 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -31,22 +31,22 @@
 /* Jumptable for the request handlers */
 
 static bool (*request_handlers[])(meshlink_handle_t *, connection_t *, const char *) = {
-               id_h, NULL, NULL, NULL /* metakey_h, challenge_h, chal_reply_h */, ack_h,
-               status_h, error_h, termreq_h,
-               ping_h, pong_h,
-               NULL, NULL, //add_subnet_h, del_subnet_h,
-               add_edge_h, del_edge_h,
-               key_changed_h, req_key_h, ans_key_h, tcppacket_h, NULL, //control_h,
+       id_h, NULL, NULL, NULL /* metakey_h, challenge_h, chal_reply_h */, ack_h,
+       status_h, error_h, termreq_h,
+       ping_h, pong_h,
+       NULL, NULL, //add_subnet_h, del_subnet_h,
+       add_edge_h, del_edge_h,
+       key_changed_h, req_key_h, ans_key_h, tcppacket_h, NULL, //control_h,
 };
 
 /* Request names */
 
 static char (*request_name[]) = {
-               "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
-               "STATUS", "ERROR", "TERMREQ",
-               "PING", "PONG",
-               "ADD_SUBNET", "DEL_SUBNET",
-               "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
+       "ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
+       "STATUS", "ERROR", "TERMREQ",
+       "PING", "PONG",
+       "ADD_SUBNET", "DEL_SUBNET",
+       "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
 };
 
 bool check_id(const char *id) {
@@ -54,7 +54,7 @@ bool check_id(const char *id) {
                return false;
 
        for(; *id; id++)
-               if(!isalnum(*id) && *id != '_')
+               if(!isalnum(*id) && *id != '_' && *id != '-')
                        return false;
 
        return true;
@@ -77,12 +77,11 @@ 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';
 
@@ -94,14 +93,14 @@ bool send_request(meshlink_handle_t *mesh, connection_t *c, const char *format,
 }
 
 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) {
@@ -123,25 +122,24 @@ 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;
        }
 
@@ -174,7 +172,9 @@ static void age_past_requests(event_loop_t *loop, void *data) {
                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){10, rand() % 100000});
+               timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval) {
+               10, rand() % 100000
+       });
 }
 
 bool seen_request(meshlink_handle_t *mesh, const char *request) {
@@ -186,11 +186,13 @@ bool seen_request(meshlink_handle_t *mesh, const char *request) {
                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);
-               timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
+               timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timeval) {
+                       10, rand() % 100000
+               });
                return false;
        }
 }