diff --git a/src/netlog/netlog-dtls.c b/src/netlog/netlog-dtls.c index 90e0b16..675146f 100644 --- a/src/netlog/netlog-dtls.c +++ b/src/netlog/netlog-dtls.c @@ -88,14 +88,14 @@ int dtls_connect(DTLSManager *m, SocketAddress *address) { if (fd < 0) return log_error_errno(errno, "Failed to allocate socket: %m");; - r = connect(fd, &address->sockaddr.sa, salen); - if (r < 0 && errno != EINPROGRESS) - return log_error_errno(errno, "Failed to connect DTLS socket: %m");; - r = sockaddr_pretty(&address->sockaddr.sa, salen, true, true, &pretty); if (r < 0) return r; + r = connect(fd, &address->sockaddr.sa, salen); + if (r < 0 && errno != EINPROGRESS) + return log_error_errno(errno, "Failed to connect to remote server='%s': %m", pretty);; + log_debug("Connected to remote server: '%s'", pretty); ctx = SSL_CTX_new(DTLS_method()); diff --git a/src/netlog/netlog-network.c b/src/netlog/netlog-network.c index 7ede091..1f3323b 100644 --- a/src/netlog/netlog-network.c +++ b/src/netlog/netlog-network.c @@ -359,14 +359,14 @@ int manager_network_connect_socket(Manager *m) { return -EAFNOSUPPORT; } - r = connect(m->socket, &m->address.sockaddr.sa, salen); - if (r < 0 && errno != EINPROGRESS) - return -errno; - r = sockaddr_pretty(&m->address.sockaddr.sa, salen, true, true, &pretty); if (r < 0) return r; + r = connect(m->socket, &m->address.sockaddr.sa, salen); + if (r < 0 && errno != EINPROGRESS) + return log_error_errno(errno, "Failed to connect to remote server='%s'", pretty); + log_debug("Connected to remote server: '%s'", pretty); return 0; @@ -420,10 +420,8 @@ int manager_open_network_socket(Manager *m) { } r = manager_network_connect_socket(m); - if (r < 0) { - log_error_errno(errno, "Failed to connect: %m"); + if (r < 0) goto fail; - } log_debug("Succesfully created socket with fd='%d'", m->socket); diff --git a/src/netlog/netlog-tls.c b/src/netlog/netlog-tls.c index 676b2d1..a48aee7 100644 --- a/src/netlog/netlog-tls.c +++ b/src/netlog/netlog-tls.c @@ -84,14 +84,14 @@ int tls_connect(TLSManager *m, SocketAddress *address) { if (fd < 0) return log_error_errno(errno, "Failed to allocate socket: %m");; - r = connect(fd, &address->sockaddr.sa, salen); - if (r < 0 && errno != EINPROGRESS) - return log_error_errno(errno, "Failed to connect TLS socket: %m");; - r = sockaddr_pretty(&address->sockaddr.sa, salen, true, true, &pretty); if (r < 0) return r; + r = connect(fd, &address->sockaddr.sa, salen); + if (r < 0 && errno != EINPROGRESS) + return log_error_errno(errno, "Failed to connect to remote server='%s': %m", pretty);; + log_debug("Connected to remote server: '%s'", pretty); ctx = SSL_CTX_new(SSLv23_client_method());