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

Print Source address and port details in verbose logging #553

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −0
Open

Print Source address and port details in verbose logging #553

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
26 changes: 26 additions & 0 deletions sshconnect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,8 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
int oerrno, sock = -1, attempt;
char ntop[NI_MAXHOST], strport[NI_MAXSERV];
struct addrinfo *ai;
struct sockaddr_storage local_addr;
socklen_t addr_len = sizeof(local_addr);

debug3_f("entering");
memset(ntop, 0, sizeof(ntop));
Expand Down Expand Up @@ -529,6 +531,30 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,

debug("Connection established.");

/*print Local Address and port once connection is established*/
if (getsockname(sock, (struct sockaddr *)&local_addr, &addr_len) == 0) {
char addr_str[INET6_ADDRSTRLEN];
int source_port = 0;
switch(local_addr.ss_family) {
case AF_INET:
struct sockaddr_in *local_addr_in = (struct sockaddr_in *)&local_addr;
inet_ntop(AF_INET, &(local_addr_in->sin_addr), addr_str, sizeof(addr_str));
source_port = ntohs(local_addr_in->sin_port);
break;
case AF_INET6:
struct sockaddr_in6 *local_addr_in6 = (struct sockaddr_in6 *)&local_addr;
inet_ntop(AF_INET6, &(local_addr_in6->sin6_addr), addr_str, sizeof(addr_str));
source_port = ntohs(local_addr_in6->sin6_port);
break;
default:
strncpy(addr_str, "unknown", sizeof(addr_str));
}

debug3("Connection from [%s] port %d", addr_str, source_port);
} else {
debug("Unable to retrieve source address and port: %s", strerror(errno));
}

/* Set SO_KEEPALIVE if requested. */
if (want_keepalive &&
setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&on,
Expand Down
Loading