Changeset c821e8a for conf.c

Timestamp:

2008-06-02T12:58:57Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

3355a82

Parents:

cce0450 (diff), de8e584 (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:

merged in upstream r384. No conflicts.

File:

• conf.c (modified) (5 diffs)

conf.c

@@ -45 +45 @@
         conf = g_new0( conf_t, 1 );
         
-        conf->iface = NULL;
+        conf->iface_in = NULL;
+        conf->iface_out = NULL;
         conf->port = g_strdup( "6667" );
         conf->nofork = 0;
@@ -83 +84 @@
                 if( opt == 'i' )
                 {
-                        conf->iface = g_strdup( optarg );
+                        conf->iface_in = g_strdup( optarg );
                 }
                 else if( opt == 'p' )
@@ -132 +133 @@
                                 "\n"
                                 "  -I  Classic/InetD mode. (Default)\n"
-                                "  -D  Daemon mode. (Still EXPERIMENTAL!)\n"
+                                "  -D  Daemon mode. (one process serves all)\n"
                                 "  -F  Forking daemon. (one process per client)\n"
                                 "  -u  Run daemon as specified user.\n"
@@ -203 +204 @@
                         else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )
                         {
-                                g_free( conf->iface );
-                                conf->iface = g_strdup( ini->value );
+                                g_free( conf->iface_in );
+                                conf->iface_in = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "daemonport" ) == 0 )
@@ -210 +211 @@
                                 g_free( conf->port );
                                 conf->port = g_strdup( ini->value );
+                        }
+                        else if( g_strcasecmp( ini->key, "clientinterface" ) == 0 )
+                        {
+                                g_free( conf->iface_out );
+                                conf->iface_out = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "authmode" ) == 0 )