Changeset 2a6ca4f

Timestamp:

2006-01-04T11:16:58Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0196c47

Parents:

13c4cd3

Message:

Better handling of IPv4 connections in IPv6 mode. (Wrapping/Unwrapping of ::ffff:style addresses.)

Files:

• bitlbee.c (modified) (1 diff)
• bitlbee.conf (modified) (2 diffs)
• conf.c (modified) (1 diff)
• irc.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• util.c (modified) (1 diff)

bitlbee.c

@@ -89 +89 @@
         listen_addr.sin6_family = AF_INETx;
         listen_addr.sin6_port = htons( global.conf->port );
-        i = inet_pton( AF_INETx, global.conf->iface, &listen_addr.sin6_addr );
+        i = inet_pton( AF_INETx, ipv6_wrap( global.conf->iface ), &listen_addr.sin6_addr );
 #else
         listen_addr.sin_family = AF_INETx;

bitlbee.conf

@@ -22 +22 @@
 ## DaemonPort/DaemonInterface:
 ##
-## For RunMode=Daemon, here you can specify on what interface and port the
-## daemon should be listening for connections.
+## For daemon mode, you can specify on what interface and port the daemon
+## should be listening for connections.
 ##
 # DaemonInterface = 0.0.0.0
@@ -55 +55 @@
 ## Normally, BitlBee gets a hostname using getsockname(). If you have a nicer
 ## alias for your BitlBee daemon, you can set it here and BitlBee will identify
-## itself with that name instead. Leave it commented out if you want BitlBee to
-## use getsockname() to get a hostname.
+## itself with that name instead.
 ##
 # HostName = localhost

conf.c

@@ -46 +46 @@
         conf = g_new0( conf_t, 1 );
         
+#ifdef IPV6
+        conf->iface = "::";
+#else
         conf->iface = "0.0.0.0";
+#endif
         conf->port = 6667;
         conf->nofork = 0;

irc.c

@@ -83 +83 @@
                         irc->myhost = g_strdup( peer->h_name );
                 else if( inet_ntop( AF_INETx, &sock->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
-                        irc->myhost = g_strdup( buf );
+                        irc->myhost = g_strdup( ipv6_unwrap( buf ) );
         }
 #else
@@ -102 +102 @@
                         irc->host = g_strdup( peer->h_name );
                 else if( inet_ntop( AF_INETx, &sock->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
-                        irc->host = g_strdup( buf );
+                        irc->host = g_strdup( ipv6_unwrap( buf ) );
         }
 #else
@@ -114 +114 @@
 #endif
         
+        /* Rare, but possible. */
         if( !irc->host ) irc->host = g_strdup( "localhost." );
         if( !irc->myhost ) irc->myhost = g_strdup( "localhost." );

protocols/nogaim.h

@@ -288 +288 @@
 G_MODULE_EXPORT void serv_got_chat_in( struct gaim_connection *gc, int id, char *who, int whisper, char *msg, time_t mtime );
 G_MODULE_EXPORT void serv_got_chat_left( struct gaim_connection *gc, int id );
-/* void serv_finish_login( struct gaim_connection *gc ); */
 
 /* util.c */
@@ -299 +298 @@
 G_MODULE_EXPORT char *escape_html( const char *html );
 G_MODULE_EXPORT void info_string_append(GString *str, char *newline, char *name, char *value);
+G_MODULE_EXPORT char *ipv6_wrap( char *src );
+G_MODULE_EXPORT char *ipv6_unwrap( char *src );
 
 /* prefs.c */

util.c

@@ -403 +403 @@
         return source;
 }
+
+#ifdef IPV6
+/* Wrap an IPv4 address into IPv6 space. Not thread-safe... */
+char *ipv6_wrap( char *src )
+{
+        static char dst[64];
+        int i;
+        
+        for( i = 0; src[i]; i ++ )
+                if( ( src[i] < '0' || src[i] > '9' ) && src[i] != '.' )
+                        break;
+        
+        /* Hmm, it's not even an IP... */
+        if( src[i] )
+                return src;
+        
+        g_snprintf( dst, sizeof( dst ), "::ffff:%s", src );
+        
+        return dst;
+}
+
+/* Unwrap an IPv4 address into IPv6 space. Thread-safe, because it's very simple. :-) */
+char *ipv6_unwrap( char *src )
+{
+        int i;
+        
+        if( g_strncasecmp( src, "::ffff:", 7 ) != 0 )
+                return src;
+        
+        for( i = 7; src[i]; i ++ )
+                if( ( src[i] < '0' || src[i] > '9' ) && src[i] != '.' )
+                        break;
+        
+        /* Hmm, it's not even an IP... */
+        if( src[i] )
+                return src;
+        
+        return ( src + 7 );
+}
+#endif