Changeset aefaac3a

Timestamp:

2008-04-06T15:34:25Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

99f929c

Parents:

aa31117

Message:

Added ClientInterface configuration option to make BitlBee bind() to a
specific interface before connecting to a remote host.

Files:

• bitlbee.c (modified) (1 diff)
• bitlbee.conf (modified) (1 diff)
• conf.c (modified) (4 diffs)
• conf.h (modified) (1 diff)
• lib/proxy.c (modified) (2 diffs)

bitlbee.c

@@ -54 +54 @@
         ;
 
-        i = getaddrinfo( global.conf->iface, global.conf->port, &hints, &addrinfo_bind );
+        i = getaddrinfo( global.conf->iface_in, global.conf->port, &hints, &addrinfo_bind );
         if( i )
         {
                 log_message( LOGLVL_ERROR, "Couldn't parse address `%s': %s",
-                                           global.conf->iface, gai_strerror(i) );
+                                           global.conf->iface_in, gai_strerror(i) );
                 return -1;
         }

bitlbee.conf

@@ -34 +34 @@
 # DaemonInterface = 0.0.0.0
 # DaemonPort = 6667
+
+## ClientInterface:
+##
+## If for any reason, you want BitlBee to use a specific address/interface
+## for outgoing traffic (IM connections, HTTP(S), etc.), set it here.
+##
+# ClientInterface = 0.0.0.0
 
 ## AuthMode

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;
@@ -82 +83 @@
                 if( opt == 'i' )
                 {
-                        conf->iface = g_strdup( optarg );
+                        conf->iface_in = g_strdup( optarg );
                 }
                 else if( opt == 'p' )
@@ -202 +203 @@
                         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 )
@@ -209 +210 @@
                                 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 )

conf.h

@@ -32 +32 @@
 typedef struct conf
 {
-        char *iface;
+        char *iface_in, *iface_out;
         char *port;
         int nofork;

lib/proxy.c

@@ -114 +114 @@
 {
         struct sockaddr_in *sin;
+        struct sockaddr_in me;
         int fd = -1;
 
@@ -127 +128 @@
 
         sock_make_nonblocking(fd);
+        
+        if( global.conf->iface_out )
+        {
+                me.sin_family = AF_INET;
+                me.sin_port = 0;
+                me.sin_addr.s_addr = inet_addr( global.conf->iface_out );
+                
+                if( bind( fd, (struct sockaddr *) &me, sizeof( me ) ) != 0 )
+                        event_debug( "bind( %d, \"%s\" ) failure\n", fd, global.conf->iface_out );
+        }
         
         event_debug("proxy_connect_none( \"%s\", %d ) = %d\n", host, port, fd);