io: add io_cloexec to set close-on-exec flag.

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

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 58a3cbfd20d7159903776a3d6060258becbb4aae..78a20b055ea523a1692998a45e08c9d49bc1bd42 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1139,32 +1139,32 @@ Conn_CountAccepted(void)
 } /* Conn_CountAccepted */
 
 
+/**
+ * Synchronize established connections and configured server structures
+ * after a configuration update and store the correct connection IDs, if any.
+ */
 GLOBAL void
-Conn_SyncServerStruct( void )
+Conn_SyncServerStruct(void)
 {
-       /* Synchronize server structures (connection IDs):
-        * connections <-> configuration */
-
        CLIENT *client;
        CONN_ID i;
        int c;
 
-       for( i = 0; i < Pool_Size; i++ ) {
-               /* Established connection? */
-               if (My_Connections[i].sock < 0)
+       for (i = 0; i < Pool_Size; i++) {
+               if (My_Connections[i].sock == NONE)
                        continue;
 
-               /* Server connection? */
-               client = Conn_GetClient( i );
-               if(( ! client ) || ( Client_Type( client ) != CLIENT_SERVER )) continue;
+               /* Server link? */
+               client = Conn_GetClient(i);
+               if (!client || Client_Type(client) != CLIENT_SERVER)
+                       continue;
 
-               for( c = 0; c < MAX_SERVERS; c++ )
-               {
+               for (c = 0; c < MAX_SERVERS; c++) {
                        /* Configured server? */
-                       if( ! Conf_Server[c].host[0] ) continue;
+                       if (!Conf_Server[c].host[0])
+                               continue;
 
-                       /* Duplicate? */
-                       if( strcmp( Conf_Server[c].name, Client_ID( client )) == 0 )
+                       if (strcasecmp(Conf_Server[c].name, Client_ID(client)) == 0)
                                Conf_Server[c].conn_id = i;
                }
        }
@@ -1507,7 +1507,7 @@ Read_Request( CONN_ID Idx )
         * registered as a user, server or service connection. Don't update
         * otherwise, so users have at least Conf_PongTimeout seconds time to
         * register with the IRC server -- see Check_Connections().
-        * Set "lastping", too, so we can handle time shifts backwards ... */
+        * Update "lastping", too, if time shifted backwards ... */
        c = Conn_GetClient(Idx);
        if (c && (Client_Type(c) == CLIENT_USER
                  || Client_Type(c) == CLIENT_SERVER
@@ -1517,7 +1517,8 @@ Read_Request( CONN_ID Idx )
                        My_Connections[Idx].bps = 0;
 
                My_Connections[Idx].lastdata = t;
-               My_Connections[Idx].lastping = My_Connections[Idx].lastdata;
+               if (My_Connections[Idx].lastping > t)
+                       My_Connections[Idx].lastping = t;
        }
 
        /* Look at the data in the (read-) buffer of this connection */
@@ -1685,11 +1686,14 @@ Handle_Buffer(CONN_ID Idx)
 } /* Handle_Buffer */
 
 
+/**
+ * Check whether established connections are still alive or not.
+ * If not, play PING-PONG first; and if that doesn't help either,
+ * disconnect the respective peer.
+ */
 static void
 Check_Connections(void)
 {
-       /* check if connections are alive. if not, play PING-PONG first.
-        * if this doesn't help either, disconnect client. */
        CLIENT *c;
        CONN_ID i;
        char msg[64];
@@ -1741,42 +1745,47 @@ Check_Connections(void)
 } /* Check_Connections */
 
 
+/**
+ * Check if further server links should be established.
+ */
 static void
-Check_Servers( void )
+Check_Servers(void)
 {
-       /* Check if we can establish further server links */
-
        int i, n;
        time_t time_now;
 
+       time_now = time(NULL);
+
        /* Check all configured servers */
-       for( i = 0; i < MAX_SERVERS; i++ ) {
-               /* Valid outgoing server which isn't already connected or disabled? */
-               if(( ! Conf_Server[i].host[0] ) || ( ! Conf_Server[i].port > 0 ) ||
-                       ( Conf_Server[i].conn_id > NONE ) || ( Conf_Server[i].flags & CONF_SFLAG_DISABLED ))
-                               continue;
+       for (i = 0; i < MAX_SERVERS; i++) {
+               if (Conf_Server[i].conn_id != NONE)
+                       continue;       /* Already establishing or connected */
+               if (!Conf_Server[i].host[0] || !Conf_Server[i].port > 0)
+                       continue;       /* No host and/or port configured */
+               if (Conf_Server[i].flags & CONF_SFLAG_DISABLED)
+                       continue;       /* Disabled configuration entry */
+               if (Conf_Server[i].lasttry > (time_now - Conf_ConnectRetry))
+                       continue;       /* We have to wait a little bit ... */
 
                /* Is there already a connection in this group? */
-               if( Conf_Server[i].group > NONE ) {
+               if (Conf_Server[i].group > NONE) {
                        for (n = 0; n < MAX_SERVERS; n++) {
-                               if (n == i) continue;
+                               if (n == i)
+                                       continue;
                                if ((Conf_Server[n].conn_id != NONE) &&
-                                       (Conf_Server[n].group == Conf_Server[i].group))
-                                               break;
+                                   (Conf_Server[n].group == Conf_Server[i].group))
+                                       break;
                        }
-                       if (n < MAX_SERVERS) continue;
+                       if (n < MAX_SERVERS)
+                               continue;
                }
 
-               /* Check last connect attempt? */
-               time_now = time(NULL);
-               if( Conf_Server[i].lasttry > (time_now - Conf_ConnectRetry))
-                       continue;
-
                /* Okay, try to connect now */
                Conf_Server[i].lasttry = time_now;
                Conf_Server[i].conn_id = SERVER_WAIT;
                assert(Proc_GetPipeFd(&Conf_Server[i].res_stat) < 0);
-               Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host, cb_Connect_to_Server);
+               Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host,
+                            cb_Connect_to_Server);
        }
 } /* Check_Servers */