From 176489286dd8330948385eb3dc344339bd934d20 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Thu, 6 Dec 2007 22:45:26 +0100 Subject: [PATCH] Mention vhost in serverlog connect log message. --- src/s_serv.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/s_serv.c b/src/s_serv.c index df8dfe4..d460e2d 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -1476,6 +1476,7 @@ serv_connect(struct server_conf *server_p, struct Client *by) struct Client *client_p; struct irc_sockaddr_storage myipnum; int fd; + char vhoststr[HOSTIPLEN]; s_assert(server_p != NULL); if(server_p == NULL) @@ -1565,13 +1566,6 @@ serv_connect(struct server_conf *server_p, struct Client *by) SetConnecting(client_p); dlinkAddTail(client_p, &client_p->node, &global_client_list); - /* log */ - ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port, -#ifdef IPV6 - server_p->aftype == AF_INET6 ? "IPv6" : -#endif - (server_p->aftype == AF_INET ? "IPv4" : "?")); - if(ServerConfVhosted(server_p)) { memcpy(&myipnum, &server_p->my_ipnum, sizeof(myipnum)); @@ -1598,6 +1592,13 @@ serv_connect(struct server_conf *server_p, struct Client *by) #endif else { + /* log */ + ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port, +#ifdef IPV6 + server_p->aftype == AF_INET6 ? "IPv6" : +#endif + (server_p->aftype == AF_INET ? "IPv4" : "?")); + comm_connect_tcp(client_p->localClient->fd, server_p->host, server_p->port, NULL, 0, serv_connect_callback, client_p, server_p->aftype, @@ -1605,6 +1606,15 @@ serv_connect(struct server_conf *server_p, struct Client *by) return 1; } + /* log */ + inetntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr); + ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", server_p->name, server_p->host, server_p->port, +#ifdef IPV6 + server_p->aftype == AF_INET6 ? "IPv6" : +#endif + (server_p->aftype == AF_INET ? "IPv4" : "?"), vhoststr); + + comm_connect_tcp(client_p->localClient->fd, server_p->host, server_p->port, (struct sockaddr *) &myipnum, GET_SS_LEN(myipnum), serv_connect_callback, client_p,