diff --git a/src/netlog/netlog-dtls.c b/src/netlog/netlog-dtls.c index 859e425..2ca4026 100644 --- a/src/netlog/netlog-dtls.c +++ b/src/netlog/netlog-dtls.c @@ -93,7 +93,7 @@ int dtls_connect(DTLSManager *m, SocketAddress *address) { if (r < 0) return r; - log_debug("Connected to remote server'%s'", pretty); + log_debug("Connected to remote server: '%s'", pretty); ctx = SSL_CTX_new(DTLS_method()); if (!ctx) diff --git a/src/netlog/netlog-network.c b/src/netlog/netlog-network.c index a631163..57cc623 100644 --- a/src/netlog/netlog-network.c +++ b/src/netlog/netlog-network.c @@ -5,6 +5,7 @@ #include #include +#include "alloc-util.h" #include "fd-util.h" #include "io-util.h" #include "netlog-manager.h" @@ -316,16 +317,17 @@ int manager_push_to_network(Manager *m, void manager_close_network_socket(Manager *m) { assert(m); - if (m->protocol == SYSLOG_TRANSMISSION_PROTOCOL_TCP) { + if (m->protocol == SYSLOG_TRANSMISSION_PROTOCOL_TCP && m->socket >= 0) { int r = shutdown(m->socket, SHUT_RDWR); if (r < 0) - log_error_errno(r, "Failed to shutdown netlog socket: %m"); + log_error_errno(errno, "Failed to shutdown netlog socket: %m"); } m->socket = safe_close(m->socket); } int manager_network_connect_socket(Manager *m) { + _cleanup_free_ char *pretty = NULL; union sockaddr_union sa; socklen_t salen; int r; @@ -357,6 +359,12 @@ int manager_network_connect_socket(Manager *m) { if (r < 0 && errno != EINPROGRESS) return -errno; + r = sockaddr_pretty(&m->address.sockaddr.sa, salen, true, true, &pretty); + if (r < 0) + return r; + + log_debug("Connected to remote server: '%s'", pretty); + return 0; } diff --git a/src/netlog/netlog-tls.c b/src/netlog/netlog-tls.c index 9e08be9..0c8d190 100644 --- a/src/netlog/netlog-tls.c +++ b/src/netlog/netlog-tls.c @@ -89,7 +89,7 @@ int tls_connect(TLSManager *m, SocketAddress *address) { if (r < 0) return r; - log_debug("Connected to remote server'%s'", pretty); + log_debug("Connected to remote server: '%s'", pretty); ctx = SSL_CTX_new(SSLv23_client_method()); if (!ctx)