Changeset 5ebe625 for conf.c

Timestamp:

2006-02-12T07:26:20Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f665dab

Parents:

a323a22 (diff), 58bc4e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

File:

• conf.c (modified) (10 diffs)

conf.c

@@ -32 +32 @@
 #include "ini.h"
 #include "url.h"
+#include "ipc.h"
 
 #include "protocols/proxy.h"
@@ -46 +47 @@
         conf = g_new0( conf_t, 1 );
         
+#ifdef IPV6
+        conf->iface = "::";
+#else
         conf->iface = "0.0.0.0";
+#endif
         conf->port = 6667;
         conf->nofork = 0;
@@ -53 +58 @@
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
-        conf->password = NULL;
+        conf->auth_pass = NULL;
+        conf->oper_pass = NULL;
         conf->configdir = g_strdup( CONFIG );
         conf->plugindir = g_strdup( PLUGINDIR );
+        conf->pidfile = g_strdup( "/var/run/bitlbee.pid" );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
+        proxytype = 0;
         
         i = conf_loadini( conf, CONF_FILE );
@@ -71 +79 @@
         }
         
-        while( ( opt = getopt( argc, argv, "i:p:nvIDc:d:h" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:" ) ) >= 0 )
+        /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
                 if( opt == 'i' )
@@ -86 +95 @@
                         conf->port = i;
                 }
+                else if( opt == 'p' )
+                {
+                        g_free( conf->pidfile );
+                        conf->pidfile = g_strdup( optarg );
+                }
                 else if( opt == 'n' )
-                        conf->nofork=1;
+                        conf->nofork = 1;
                 else if( opt == 'v' )
-                        conf->verbose=1;
+                        conf->verbose = 1;
                 else if( opt == 'I' )
-                        conf->runmode=RUNMODE_INETD;
+                        conf->runmode = RUNMODE_INETD;
                 else if( opt == 'D' )
-                        conf->runmode=RUNMODE_DAEMON;
+                        conf->runmode = RUNMODE_DAEMON;
+                else if( opt == 'F' )
+                        conf->runmode = RUNMODE_FORKDAEMON;
                 else if( opt == 'c' )
                 {
@@ -101 +117 @@
                                 CONF_FILE = g_strdup( optarg );
                                 g_free( conf );
+                                /* Re-evaluate arguments. Don't use this option twice, 
+                                   you'll end up in an infinite loop! Hope this trick
+                                   works with all libcs BTW.. */
+                                optind = 1;
                                 return( conf_load( argc, argv ) );
                         }
@@ -118 +138 @@
                                 "  -I  Classic/InetD mode. (Default)\n"
                                 "  -D  Daemon mode. (Still EXPERIMENTAL!)\n"
+                                "  -F  Forking daemon. (one process per client)\n"
                                 "  -i  Specify the interface (by IP address) to listen on.\n"
                                 "      (Default: 0.0.0.0 (any interface))\n"
@@ -128 +149 @@
                         return( NULL );
                 }
+                else if( opt == 'R' )
+                {
+                        /* We can't load the statefile yet (and should make very sure we do this
+                           only once), so set the filename here and load the state information
+                           when initializing ForkDaemon. (This option only makes sense in that
+                           mode anyway!) */
+                        ipc_master_set_statefile( optarg );
+                }
         }
         
@@ -157 +186 @@
                                 if( g_strcasecmp( ini->value, "daemon" ) == 0 )
                                         conf->runmode = RUNMODE_DAEMON;
+                                else if( g_strcasecmp( ini->value, "forkdaemon" ) == 0 )
+                                        conf->runmode = RUNMODE_FORKDAEMON;
                                 else
                                         conf->runmode = RUNMODE_INETD;
+                        }
+                        else if( g_strcasecmp( ini->key, "pidfile" ) == 0 )
+                        {
+                                g_free( conf->pidfile );
+                                conf->pidfile = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )
@@ -184 +220 @@
                         else if( g_strcasecmp( ini->key, "authpassword" ) == 0 )
                         {
-                                conf->password = g_strdup( ini->value );
+                                conf->auth_pass = g_strdup( ini->value );
+                        }
+                        else if( g_strcasecmp( ini->key, "operpassword" ) == 0 )
+                        {
+                                conf->oper_pass = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "hostname" ) == 0 )