config: deprecate NoXX-Options

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

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index d74f2511e4414e97a38a9d4f4a45fa9cdd518b58..6a1c056e21cf715128c2871f590af76cfdb01fce 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -82,6 +82,7 @@
 
 #define MAX_COMMANDS 3
 #define MAX_COMMANDS_SERVER 10
+#define MAX_COMMANDS_SERVICE MAX_COMMANDS_SERVER
 
 
 static bool Handle_Write PARAMS(( CONN_ID Idx ));
@@ -207,7 +208,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] =
@@ -681,9 +682,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
 
 
@@ -1378,10 +1381,10 @@ New_Connection(int Sock)
 
        identsock = new_sock;
 #ifdef IDENTAUTH
-       if (Conf_NoIdent)
+       if (!Conf_Ident)
                identsock = -1;
 #endif
-       if (!Conf_NoDNS)
+       if (Conf_DNS)
                Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr,
                             identsock, cb_Read_Resolver_Result);
 
@@ -1515,6 +1518,8 @@ Read_Request( CONN_ID Idx )
        /* Look at the data in the (read-) buffer of this connection */
        My_Connections[Idx].bps += Handle_Buffer(Idx);
        if (Client_Type(c) != CLIENT_SERVER
+           && Client_Type(c) != CLIENT_UNKNOWNSERVER
+           && Client_Type(c) != CLIENT_SERVICE
            && My_Connections[Idx].bps >= maxbps) {
                LogDebug("Throttling connection %d: BPS exceeded! (%u >= %u)",
                         Idx, My_Connections[Idx].bps, maxbps);
@@ -1526,7 +1531,7 @@ Read_Request( CONN_ID Idx )
 /**
  * Handle all data in the connection read-buffer.
  * Data is processed until no complete command is left in the read buffer,
- * or MAX_COMMANDS[_SERVER] commands were processed.
+ * or MAX_COMMANDS[_SERVER|_SERVICE] commands were processed.
  * When a fatal error occurs, the connection is shut down.
  * @param Idx Index of the connection.
  * @return number of bytes processed.
@@ -1551,8 +1556,12 @@ Handle_Buffer(CONN_ID Idx)
 
        /* Servers do get special command limits, so they can process
         * all the messages that are required while peering. */
-       if (Client_Type(c) == CLIENT_SERVER)
-               maxcmd = MAX_COMMANDS_SERVER;
+       switch (Client_Type(c)) {
+           case CLIENT_SERVER:
+               maxcmd = MAX_COMMANDS_SERVER; break;
+           case CLIENT_SERVICE:
+               maxcmd = MAX_COMMANDS_SERVICE; break;
+       }
 
        starttime = time(NULL);
        for (i=0; i < maxcmd; i++) {
@@ -1772,6 +1781,9 @@ Check_Servers(void)
                }
 
                /* Okay, try to connect now */
+               Log(LOG_NOTICE,
+                   "Preparing to establish a new server link for \"%s\" ...",
+                   Conf_Server[i].name);
                Conf_Server[i].lasttry = time_now;
                Conf_Server[i].conn_id = SERVER_WAIT;
                assert(Proc_GetPipeFd(&Conf_Server[i].res_stat) < 0);
@@ -1796,8 +1808,9 @@ New_Server( int Server , ng_ipaddr_t *dest)
                return;
        }
 
-       Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ",
-                       Conf_Server[Server].host, ip_str, Conf_Server[Server].port );
+       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);
@@ -1929,8 +1942,8 @@ Init_Socket( int Sock )
        LogDebug("Setting IP_TOS on socket %d to IPTOS_LOWDELAY.", Sock);
        if (setsockopt(Sock, IPPROTO_IP, IP_TOS, &value,
                       (socklen_t) sizeof(value))) {
-               Log(LOG_ERR, "Can't set socket option IP_TOS: %s!",
-                   strerror(errno));
+               LogDebug("Can't set socket option IP_TOS: %s!",
+                        strerror(errno));
                /* ignore this error */
        }
 #endif
@@ -1966,8 +1979,11 @@ cb_Connect_to_Server(int fd, UNUSED short events)
 
        /* Read result from pipe */
        len = Proc_Read(&Conf_Server[i].res_stat, dest_addrs, sizeof(dest_addrs));
-       if (len == 0)
+       if (len == 0) {
+               /* Error resolving hostname: reset server structure */
+               Conf_Server[i].conn_id = NONE;
                return;
+       }
 
        assert((len % sizeof(ng_ipaddr_t)) == 0);