Get rid of ->hostname.

[meshlink] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 84a2531c8fe6a9feab8892dfcfb450f923d4e3dd..8948bb2e6082d42cdc8fc18faedc879cd64ba044 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -45,13 +45,11 @@ bool status_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        char statusstring[MAX_STRING_SIZE];
 
        if(sscanf(request, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "STATUS",
-                          c->name, c->hostname);
+               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "STATUS", c->name);
                return false;
        }
 
-       logger(DEBUG_STATUS, LOG_NOTICE, "Status message from %s (%s): %d: %s",
-                          c->name, c->hostname, statusno, statusstring);
+       logger(mesh, MESHLINK_INFO, "Status message from %s: %d: %s", c->name, statusno, statusstring);
 
        return true;
 }
@@ -68,13 +66,11 @@ bool error_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        char errorstring[MAX_STRING_SIZE];
 
        if(sscanf(request, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ERROR",
-                          c->name, c->hostname);
+               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "ERROR", c->name);
                return false;
        }
 
-       logger(DEBUG_ERROR, LOG_NOTICE, "Error message from %s (%s): %d: %s",
-                          c->name, c->hostname, err, errorstring);
+       logger(mesh, MESHLINK_INFO, "Error message from %s: %d: %s", c->name, err, errorstring);
 
        return false;
 }
@@ -125,7 +121,7 @@ bool send_tcppacket(meshlink_handle_t *mesh, connection_t *c, const vpn_packet_t
        /* If there already is a lot of data in the outbuf buffer, discard this packet.
           We use a very simple Random Early Drop algorithm. */
 
-       if(2.0 * c->outbuf.len / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX)
+       if(2.0 * c->outbuf.len / (float)maxoutbufsize - 1 > (float)rand() / (float)RAND_MAX)
                return true;
 
        if(!send_request(mesh, c, "%d %hd", PACKET, packet->len))
@@ -138,8 +134,7 @@ bool tcppacket_h(meshlink_handle_t *mesh, connection_t *c, const char *request)
        short int len;
 
        if(sscanf(request, "%*d %hd", &len) != 1) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "PACKET", c->name,
-                          c->hostname);
+               logger(mesh, MESHLINK_ERROR, "Got bad %s from %s", "PACKET", c->name);
                return false;
        }