Skip to content

Enhance error logging for failed connect #1843

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

Open
michaelortmann wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Enhance error logging for failed connect #1843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a13fb2
Also log port for failed connect
michaelortmann Oct 19, 2025
f6bb63d
New function print_ip_ssl_port(), which makes it simple to print ip:[…
michaelortmann Oct 19, 2025
921a73e
ip can also be hostname, so rename and fix buffer size
michaelortmann Oct 19, 2025
f2034bf
Make it void
michaelortmann Jan 19, 2026
43ac367
Merge remote-tracking branch 'upstream/develop' into log.port
michaelortmann Jan 25, 2026
6602df6
Propagate getsockopt error to errno error logging, and filter EINPROG…
michaelortmann Jan 25, 2026
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
88 changes: 60 additions & 28 deletions src/mod/server.mod/servmsg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1921,15 +1921,39 @@ static cmd_t my_isupport_binds[] = {
static void server_resolve_success(int);
static void server_resolve_failure(int);

#ifdef TLS
static void print_host_ssl_port(char *str, size_t size, char *host, int ssl,
int port) {
#else
static void print_host_ssl_port(char *str, size_t size, char *host, int port) {
#endif
char buf[sizeof(struct in6_addr)];

#ifdef IPV6
if (inet_pton(AF_INET6, host, buf)) {
#ifdef TLS
snprintf(str, size, "[%s]:%s%d", host, use_ssl ? "+" : "", port);
#else
snprintf(str, size, "[%s]:%d", host, port);
#endif /* TLS */
} else {
#endif /* IPV6 */
#ifdef TLS
snprintf(str, size, "%s:%s%d", host, use_ssl ? "+" : "", port);
#else
snprintf(str, size, "%s:%d", host, port);
#endif
#ifdef IPV6
}
#endif
}

/* Hook up to a server
*/
static void connect_server(void)
{
char pass[NEWSERVERPASSMAX], botserver[NEWSERVERMAX], s[1024];
#ifdef IPV6
char buf[sizeof(struct in6_addr)];
#endif
int servidx, len = 0;
char pass[NEWSERVERPASSMAX], botserver[NEWSERVERMAX], s[512];
int servidx;
unsigned int botserverport = 0;

lastpingcheck = 0;
Expand Down Expand Up @@ -1971,24 +1995,14 @@ static void connect_server(void)
check_tcl_event("connect-server");
next_server(&curserv, botserver, &botserverport, pass);

#ifdef IPV6
if (inet_pton(AF_INET6, botserver, buf)) {
len += egg_snprintf(s, sizeof s, "%s [%s]", IRC_SERVERTRY, botserver);
} else {
#endif
len += egg_snprintf(s, sizeof s, "%s %s", IRC_SERVERTRY, botserver);
#ifdef IPV6
}
#endif

#ifdef TLS
len += egg_snprintf(s + len, sizeof s - len, ":%s%d",
use_ssl ? "+" : "", botserverport);
print_host_ssl_port(s, sizeof s, botserver, use_ssl, botserverport);
dcc[servidx].ssl = use_ssl;
#else
len += egg_snprintf(s + len, sizeof s - len, ":%d", botserverport);
print_host_ssl_port(s, sizeof s, botserver, botserverport);
#endif
putlog(LOG_SERV, "*", "%s", s);

putlog(LOG_SERV, "*", "%s %s", IRC_SERVERTRY, s);
dcc[servidx].port = botserverport;
strcpy(dcc[servidx].nick, "(server)");
strlcpy(dcc[servidx].host, botserver, UHOSTLEN);
Expand Down Expand Up @@ -2028,17 +2042,24 @@ static void connect_server(void)

static void server_resolve_failure(int servidx)
{
char s[512];
serv = -1;
resolvserv = 0;
putlog(LOG_SERV, "*", "%s %s (%s)", IRC_FAILEDCONNECT, dcc[servidx].host,
IRC_DNSFAILED);
#ifdef TLS
print_host_ssl_port(s, sizeof s, dcc[servidx].host, dcc[servidx].ssl,
dcc[servidx].port);
#else
print_host_ssl_port(s, sizeof s, dcc[servidx].host, dcc[servidx].port);
#endif

putlog(LOG_SERV, "*", "%s %s (%s)", IRC_FAILEDCONNECT, s, IRC_DNSFAILED);
check_tcl_event("fail-server");
lostdcc(servidx);
}

static void server_resolve_success(int servidx)
{
char pass[121], errstr2[128];
char pass[121], errstr2[128], s[512];

resolvserv = 0;
strlcpy(pass, dcc[servidx].u.dns->cbuf, sizeof pass);
Expand All @@ -2057,21 +2078,32 @@ static void server_resolve_success(int servidx)
errstr = strerror(errno);
snprintf(errstr2, sizeof errstr2, " prefer-ipv6 %i", pref_af);
#endif
} else {
} else if (errno != EINPROGRESS) {
errstr = strerror(errno);
}
putlog(LOG_SERV, "*", "%s %s (%s ip %s port %i %s)", IRC_FAILEDCONNECT,
dcc[servidx].host, errstr, iptostr(&dcc[servidx].sockname.addr.sa),
dcc[servidx].port, errno == ENETUNREACH ? errstr2 : "");

#ifdef TLS
print_host_ssl_port(s, sizeof s, dcc[servidx].host, dcc[servidx].ssl,
dcc[servidx].port);
#else
print_host_ssl_port(s, sizeof s, dcc[servidx].host, dcc[servidx].port);
#endif
putlog(LOG_SERV, "*", "%s %s (%s ip %s%s)", IRC_FAILEDCONNECT,
s, errstr, iptostr(&dcc[servidx].sockname.addr.sa),
errno == ENETUNREACH ? errstr2 : "");
check_tcl_event("fail-server");
lostdcc(servidx);
return;
}
#ifdef TLS
if (dcc[servidx].ssl && ssl_handshake(serv, TLS_CONNECT, tls_vfyserver,
LOG_SERV, dcc[servidx].host, NULL)) {
putlog(LOG_SERV, "*", "%s %s (%s)", IRC_FAILEDCONNECT, dcc[servidx].host,
#ifdef TLS
print_host_ssl_port(s, sizeof s, dcc[servidx].host, dcc[servidx].ssl,
dcc[servidx].port);
#else
print_host_ssl_port(s, sizeof s, dcc[servidx].host, dcc[servidx].port);
#endif
putlog(LOG_SERV, "*", "%s %s (%s)", IRC_FAILEDCONNECT, s,
"TLS negotiation failure");
check_tcl_event("fail-server");
lostdcc(servidx);
Expand Down
1 change: 1 addition & 0 deletions src/net.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ int open_telnet_raw(int sock, sockname_t *addr)
}
if (res != 0) {
debug1("net: getsockopt error %d", res);
errno = res;
return -1;
}
return sock; /* async success! */
Expand Down
Loading