Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve connect logging #65

Merged
merged 1 commit into from
May 10, 2024
Merged

Improve connect logging #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/netlog/netlog-dtls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
12 changes: 5 additions & 7 deletions src/netlog/netlog-network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions src/netlog/netlog-tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down