Fix connect attempts to further IP addresses of outgoing server links

[ngircd-alex.git] / src / ngircd / conn.c

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 78a20b055ea523a1692998a45e08c9d49bc1bd42..2d5e1295f4341b1675db274f0263f66fda92b3f8 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -207,7 +207,7 @@ cb_connserver(int sock, UNUSED short what)
 
                if (ng_ipaddr_af(&Conf_Server[server].dst_addr[0])) {
                        /* more addresses to try... */
-                       New_Server(res, &Conf_Server[server].dst_addr[0]);
+                       New_Server(server, &Conf_Server[server].dst_addr[0]);
                        /* connection to dst_addr[0] is now in progress, so
                         * remove this address... */
                        Conf_Server[server].dst_addr[0] =
@@ -477,11 +477,6 @@ Conn_InitListeners( void )
        unsigned int created = 0;
        char *copy, *listen_addr;
 
-       if (!io_library_init(CONNECTION_POOL)) {
-               Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
-               return -1;
-       }
-
        assert(Conf_ListenAddress);
 
        /* can't use Conf_ListenAddress directly, see below */
@@ -686,9 +681,11 @@ SSL_WantWrite(const CONNECTION *c)
 }
 #else
 static inline bool
-SSL_WantRead(UNUSED const CONNECTION *c) { return false; }
+SSL_WantRead(UNUSED const CONNECTION *c)
+{ return false; }
 static inline bool
-SSL_WantWrite(UNUSED const CONNECTION *c) { return false; }
+SSL_WantWrite(UNUSED const CONNECTION *c)
+{ return false; }
 #endif
 
 
@@ -715,10 +712,6 @@ Conn_Handler(void)
                Rendezvous_Handler();
 #endif
 
-               /* Should the configuration be reloaded? */
-               if (NGIRCd_SignalRehash)
-                       NGIRCd_Rehash();
-
                /* Check configured servers and established links */
                Check_Servers();
                Check_Connections();
@@ -2193,4 +2186,28 @@ Conn_UsesSSL(CONN_ID Idx)
 #endif
 
 
+#ifdef DEBUG
+
+GLOBAL void
+Conn_DebugDump(void)
+{
+       int i;
+
+       Log(LOG_DEBUG, "Connection status:");
+       for (i = 0; i < Pool_Size; i++) {
+               if (My_Connections[i].sock == NONE)
+                       continue;
+               Log(LOG_DEBUG,
+                   " - %d: host=%s, lastdata=%ld, lastping=%ld, delaytime=%ld, flag=%d, options=%d, bps=%d, client=%s",
+                   My_Connections[i].sock, My_Connections[i].host,
+                   My_Connections[i].lastdata, My_Connections[i].lastping,
+                   My_Connections[i].delaytime, My_Connections[i].flag,
+                   My_Connections[i].options, My_Connections[i].bps,
+                   My_Connections[i].client ? Client_ID(My_Connections[i].client) : "-");
+       }
+} /* Conn_DumpClients */
+
+#endif
+
+
 /* -eof- */