Clean up duplicate servers correctly.

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index c12658d9e17329a8c3cfe9408cced78b9b938cac..4cc78fe20bb99a1d373cde763cddc685db015891 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conf.c,v 1.52 2002/12/30 00:01:45 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.54 2003/03/27 01:21:38 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -196,7 +196,7 @@ Conf_UnsetServer( CONN_ID Idx )
                /* Gotcha! Mark server configuration as "unused": */
                Conf_Server[i].conn_id = NONE;
 
-               if( Conf_Server[i].once )
+               if( Conf_Server[i].flags & CONF_SFLAG_ONCE )
                {
                        /* Delete configuration here */
                        Init_Server_Struct( &Conf_Server[i] );
@@ -210,7 +210,6 @@ Conf_UnsetServer( CONN_ID Idx )
                                Conf_Server[i].lasttry = time( NULL ) - Conf_ConnectRetry + RECONNECT_DELAY;
                        }
                }
-               break;
        }
 } /* Conf_UnsetServer */
 
@@ -244,6 +243,84 @@ Conf_GetServer( CONN_ID Idx )
 } /* Conf_GetServer */
 
 
+GLOBAL BOOLEAN
+Conf_EnableServer( CHAR *Name, INT Port )
+{
+       /* Enable specified server and adjust port */
+
+       INT i;
+
+       assert( Name != NULL );
+
+       for( i = 0; i < MAX_SERVERS; i++ )
+       {
+               if( strcasecmp( Conf_Server[i].name, Name ) == 0 )
+               {
+                       /* Gotcha! Set port and enable server: */
+                       Conf_Server[i].port = Port;
+                       Conf_Server[i].flags &= ~CONF_SFLAG_DISABLED;
+                       return TRUE;
+               }
+       }
+       return FALSE;
+} /* Conf_EnableServer */
+
+
+GLOBAL BOOLEAN
+Conf_DisableServer( CHAR *Name )
+{
+       /* Enable specified server and adjust port */
+
+       INT i;
+
+       assert( Name != NULL );
+
+       for( i = 0; i < MAX_SERVERS; i++ )
+       {
+               if( strcasecmp( Conf_Server[i].name, Name ) == 0 )
+               {
+                       /* Gotcha! Disable and disconnect server: */
+                       Conf_Server[i].flags |= CONF_SFLAG_DISABLED;
+                       if( Conf_Server[i].conn_id > NONE ) Conn_Close( Conf_Server[i].conn_id, NULL, "Server link terminated on operator request", TRUE );
+                       return TRUE;
+               }
+       }
+       return FALSE;
+} /* Conf_DisableServer */
+
+
+GLOBAL BOOLEAN
+Conf_AddServer( CHAR *Name, INT Port, CHAR *Host, CHAR *MyPwd, CHAR *PeerPwd )
+{
+       /* Add new server to configuration */
+
+       INT i;
+
+       assert( Name != NULL );
+       assert( Host != NULL );
+       assert( MyPwd != NULL );
+       assert( PeerPwd != NULL );
+
+       /* Search unused item in server configuration structure */
+       for( i = 0; i < MAX_SERVERS; i++ )
+       {
+               /* Is this item used? */
+               if( ! Conf_Server[i].name[0] ) break;
+       }
+       if( i >= MAX_SERVERS ) return FALSE;
+
+       Init_Server_Struct( &Conf_Server[i] );
+       strlcpy( Conf_Server[i].name, Name, sizeof( Conf_Server[i].name ));
+       strlcpy( Conf_Server[i].host, Host, sizeof( Conf_Server[i].host ));
+       strlcpy( Conf_Server[i].pwd_out, MyPwd, sizeof( Conf_Server[i].pwd_out ));
+       strlcpy( Conf_Server[i].pwd_in, PeerPwd, sizeof( Conf_Server[i].pwd_in ));
+       Conf_Server[i].port = Port;
+       Conf_Server[i].flags = CONF_SFLAG_ONCE;
+       
+       return TRUE;
+} /* Conf_AddServer */
+
+
 LOCAL VOID
 Set_Defaults( BOOLEAN InitServers )
 {
@@ -290,7 +367,7 @@ Read_Config( VOID )
        /* Read configuration file. */
 
        CHAR section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr;
-       INT line, i;
+       INT line, i, n;
        FILE *fd;
 
        /* Open configuration file */
@@ -307,11 +384,37 @@ Read_Config( VOID )
 
        /* Clean up server configuration structure: mark all already
         * configured servers as "once" so that they are deleted
-        * after the next disconnect and delete all unused servers. */
+        * after the next disconnect and delete all unused servers.
+        * And delete all servers which are "duplicates" of servers
+        * that are already marked as "once" (such servers have been
+        * created by the last rehash but are now useless). */
        for( i = 0; i < MAX_SERVERS; i++ )
        {
                if( Conf_Server[i].conn_id == NONE ) Init_Server_Struct( &Conf_Server[i] );
-               else Conf_Server[i].once = TRUE;
+               else
+               {
+                       /* This structure is in use ... */
+                       if( Conf_Server[i].flags & CONF_SFLAG_ONCE )
+                       {
+                               /* Check for duplicates */
+                               for( n = 0; n < MAX_SERVERS; n++ )
+                               {
+                                       if( n == i ) continue;
+
+                                       if( Conf_Server[i].conn_id == Conf_Server[n].conn_id )
+                                       {
+                                               Init_Server_Struct( &Conf_Server[n] );
+                                               Log( LOG_DEBUG, "Deleted unused duplicate server %d (kept %d).", n, i );
+                                       }
+                               }
+                       }
+                       else
+                       {
+                               /* Mark server as "once" */
+                               Conf_Server[i].flags |= CONF_SFLAG_ONCE;
+                               Log( LOG_DEBUG, "Market server %d as \"once\"", i );
+                       }
+               }
        }
 
        /* Initialize variables */
@@ -770,7 +873,7 @@ Validate_Config( BOOLEAN Configtest )
                if( Conf_Server[i].name[0] )
                {
                        servers++;
-                       if( Conf_Server[i].once ) servers_once++;
+                       if( Conf_Server[i].flags & CONF_SFLAG_ONCE ) servers_once++;
                }
        }
        Log( LOG_DEBUG, "Configuration: Operators=%d, Servers=%d[%d], Channels=%d", Conf_Oper_Count, servers, servers_once, Conf_Channel_Count );
@@ -826,7 +929,8 @@ Init_Server_Struct( CONF_SERVER *Server )
        Server->group = NONE;
        Server->lasttry = time( NULL ) - Conf_ConnectRetry + STARTUP_DELAY;
        Server->res_stat = NULL;
-       Server->once = FALSE;
+       if( NGIRCd_Passive ) Server->flags = CONF_SFLAG_DISABLED;
+       else Server->flags = 0;
        Server->conn_id = NONE;
 } /* Init_Server_Struct */