From: Alexander Barton <alex@barton.de>
Date: Sun, 16 Jan 2011 22:24:41 +0000 (+0100)
Subject: Add connection/socket information to some log messages
X-Git-Tag: rel-18-rc1~79
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=d3ef2239e1d0f3477a4b7f0f7a31ef3bb36ef1e7;hp=a57748e1a14dc6fa51291d31dae92c9a5abdd7c0

Add connection/socket information to some log messages
---

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index b798e6e7..98a05434 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -238,8 +238,10 @@ cb_connserver(int sock, UNUSED short what)
 static void
 server_login(CONN_ID idx)
 {
-	Log( LOG_INFO, "Connection %d with \"%s:%d\" established. Now logging in ...", idx,
-			My_Connections[idx].host, Conf_Server[Conf_GetServer( idx )].port );
+	Log(LOG_INFO,
+	    "Connection %d (socket %d) with \"%s:%d\" established. Now logging in ...",
+	    idx, My_Connections[idx].sock, My_Connections[idx].host,
+	    Conf_Server[Conf_GetServer(idx)].port);
 
 	io_event_setcb( My_Connections[idx].sock, cb_clientserver);
 	io_event_add( My_Connections[idx].sock, IO_WANTREAD|IO_WANTWRITE);
@@ -1765,14 +1767,17 @@ New_Server( int Server , ng_ipaddr_t *dest)
 		return;
 	}
 
-	Log(LOG_INFO, "Establishing connection for \"%s\" to \"%s\" (%s) port %d ... ",
-	    Conf_Server[Server].name, Conf_Server[Server].host, ip_str,
-	    Conf_Server[Server].port);
-
 	af_dest = ng_ipaddr_af(dest);
 	new_sock = socket(af_dest, SOCK_STREAM, 0);
+
+	Log(LOG_INFO,
+	    "Establishing connection for \"%s\" to \"%s:%d\" (%s), socket %d ...",
+	    Conf_Server[Server].name, Conf_Server[Server].host,
+	    Conf_Server[Server].port, ip_str, new_sock);
+
 	if (new_sock < 0) {
-		Log( LOG_CRIT, "Can't create socket (af %d) : %s!", af_dest, strerror( errno ));
+		Log(LOG_CRIT, "Can't create socket (af %d): %s!",
+		    af_dest, strerror(errno));
 		return;
 	}
 
diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 381dd201..73dd8d1f 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -151,8 +151,9 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 			} else
 				flags = "";
 			Log(LOG_INFO,
-			    "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").",
-			    impl, serverver, protohigh, protolow, flags);
+			    "Peer on conenction %d announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").",
+			    Client_Conn(Client), impl, serverver,
+			    protohigh, protolow, flags);
 		} else {
 			/* The peer seems to be a server supporting the
 			 * "original" IRC protocol (RFC 2813). */
@@ -161,8 +162,9 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 			else
 				flags = "";
 			Log(LOG_INFO,
-			    "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").",
-			    impl, protohigh, protolow, flags);
+			    "Peer on connection %d announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").",
+			    Client_Conn(Client), impl,
+			    protohigh, protolow, flags);
 		}
 		Client_SetFlags(Client, flags);
 	}