Fix "Connection from (null)" log message.

diff --git a/src/connection.h b/src/connection.h
index acab448490830755920c83a27d95403e873f94c4..9b272dc88741879e0e291405be05db0694e1717b 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -57,7 +57,6 @@ typedef struct connection_t {
        char *name;                     /* name he claims to have */
 
        union sockaddr_t address;       /* his real (internet) ip */
-       char *hostname;                 /* the hostname of its real ip */
        int protocol_major;             /* used protocol */
        int protocol_minor;             /* used protocol */
 

diff --git a/src/net_socket.c b/src/net_socket.c
index 01ef942983d610636866f0ffc9ad030114788f56..1e981af6b2a61e48357e32b23a83dbbfa613cacf 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -545,7 +545,7 @@ begin:
        }
 
        if(c->socket == -1) {
-               logger(mesh, MESHLINK_ERROR, "Creating socket for %s at %s failed: %s", c->name, c->hostname, sockstrerror(sockerrno));
+               logger(mesh, MESHLINK_ERROR, "Creating socket for %s at %s failed: %s", c->name, hostname, sockstrerror(sockerrno));
                free_connection(c);
                free(hostname);
                goto begin;
@@ -725,7 +725,7 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
        c->last_ping_time = mesh->loop.now.tv_sec;
 
        char *hostname = sockaddr2hostname(&sa);
-       logger(mesh, MESHLINK_INFO, "Connection from %s", c->hostname);
+       logger(mesh, MESHLINK_INFO, "Connection from %s", hostname);
        free(hostname);
 
        io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ);