commit d3ef2239e1d0f3477a4b7f0f7a31ef3bb36ef1e7
from: Alexander Barton <alex@barton.de>
date: Sun Jan 16 22:24:41 2011 UTC

Add connection/socket information to some log messages

commit - a57748e1a14dc6fa51291d31dae92c9a5abdd7c0
commit + d3ef2239e1d0f3477a4b7f0f7a31ef3bb36ef1e7
blob - b798e6e75cd51b44eccf2c5c9e553505b77c0d81
blob + 98a054344031d57c0c9e82b98fd4a66d46d3d200
--- src/ngircd/conn.c
+++ 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);
@@ -1764,15 +1766,18 @@ New_Server( int Server , ng_ipaddr_t *dest)
 		Log(LOG_WARNING, "New_Server: Could not convert IP to string");
 		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;
 	}
 
blob - 381dd201b675c9a8ca6985380c23b90361c64b33
blob + 73dd8d1f99fee375edca2d8591e02de1d96f9cac
--- src/ngircd/irc-login.c
+++ 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);
 	}