Get rid of ->hostname.

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index a51df8dd182f40ce44f261063fe7393ca13e50ce..2d30840314d802be9b50ace3c2d77570c1efdc80 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -49,8 +49,7 @@ bool send_meta(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int
                abort();
        }
 
-       logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s (%s)", length,
-                          c->name, c->hostname);
+       logger(mesh, MESHLINK_DEBUG, "Sending %d bytes of metadata to %s", length, c->name);
 
        if(c->allow_request == ID) {
                buffer_add(&c->outbuf, buffer, length);
@@ -111,17 +110,15 @@ bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
        int inlen;
        char inbuf[MAXBUFSIZE];
 
-       inlen = recv(c->socket, inbuf, sizeof inbuf, 0);
+       inlen = recv(c->socket, inbuf, sizeof(inbuf), 0);
 
        if(inlen <= 0) {
                if(!inlen || !errno) {
-                       logger(mesh, MESHLINK_INFO, "Connection closed by %s (%s)",
-                                          c->name, c->hostname);
+                       logger(mesh, MESHLINK_INFO, "Connection closed by %s", c->name);
                } else if(sockwouldblock(sockerrno))
                        return true;
                else
-                       logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s (%s): %s",
-                                  c->name, c->hostname, sockstrerror(sockerrno));
+                       logger(mesh, MESHLINK_ERROR, "Metadata socket read error for %s: %s", c->name, sockstrerror(sockerrno));
                return false;
        }
 
@@ -142,12 +139,11 @@ bool receive_meta(meshlink_handle_t *mesh, connection_t *c) {
                                return true;
                }
 
-               if(c->inbuf.len >= sizeof inbuf) {
-                       logger(mesh, MESHLINK_ERROR, "Input buffer full for %s (%s)", c->name, c->hostname);
+               if(c->inbuf.len >= sizeof(inbuf)) {
+                       logger(mesh, MESHLINK_ERROR, "Input buffer full for %s", c->name);
                        return false;
-               } else {
+               } else
                        return true;
-               }
        }
 
        return sptps_receive_data(&c->sptps, inbuf, inlen);