Changes in / [ebb95b6:a6df0b5]

Files:

• bitlbee.c (modified) (3 diffs)
• conf.c (modified) (3 diffs)
• conf.h (modified) (2 diffs)
• configure (modified) (3 diffs)
• crypting.h (modified) (1 diff)
• debian/postinst (modified) (1 diff)
• debian/prerm (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (1 diff)
• help.h (modified) (1 diff)
• irc.c (modified) (3 diffs)
• lib/misc.c (modified) (2 diffs)
• lib/proxy.c (modified) (2 diffs)
• protocols/jabber/io.c (modified) (2 diffs)
• protocols/jabber/presence.c (modified) (1 diff)
• protocols/jabber/xmltree.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/oscar/oscar.c (modified) (1 diff)
• storage.h (modified) (1 diff)

bitlbee.c

@@ -38 +38 @@
 int bitlbee_daemon_init()
 {
-        struct addrinfo *res, hints, *addrinfo_bind;
+#ifdef IPV6
+        int use_ipv6 = 1;
+        struct sockaddr_in6 listen_addr6;
+#endif
+        struct sockaddr_in listen_addr;
         int i;
         FILE *fp;
@@ -45 +49 @@
         log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
         
-        memset( &hints, 0, sizeof( hints ) );
-        hints.ai_family = PF_UNSPEC;
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
-
-        i = getaddrinfo( global.conf->iface, global.conf->port, &hints, 
-                                                &addrinfo_bind );
-        if( i )
-        {
-                log_message( LOGLVL_ERROR, "Couldn't parse address `%s': %s", 
-                                         global.conf->iface, gai_strerror(i) );
-                return -1;
-        }
-
-        global.listen_socket = -1;
-
-        for( res = addrinfo_bind; res; res = res->ai_next )
-        {
-                global.listen_socket = socket( res->ai_family, res->ai_socktype, 
-                                                                           res->ai_protocol );
-                if( global.listen_socket < 0 )
-                        continue;
-
-                /* TIME_WAIT (?) sucks.. */
-                i = 1;
-                setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i, 
-                                        sizeof( i ) );
-
-                i = bind( global.listen_socket, res->ai_addr, res->ai_addrlen );
-                if( i == -1 )
-                {
-                        log_error( "bind" );
-                        return( -1 );
-                }
-
-                break;
-        }
-
-        freeaddrinfo( addrinfo_bind );
-
+#ifdef IPV6
+        if( ( global.listen_socket = socket( AF_INET6, SOCK_STREAM, 0 ) ) == -1 )
+        {
+                use_ipv6 = 0;
+#endif
+                global.listen_socket = socket( AF_INET, SOCK_STREAM, 0 );
+#ifdef IPV6
+        }
+#endif
+        if( global.listen_socket == -1 )
+        {
+                log_error( "socket" );
+                return( -1 );
+        }
+        
+        /* TIME_WAIT (?) sucks.. */
+        i = 1;
+        setsockopt( global.listen_socket, SOL_SOCKET, SO_REUSEADDR, &i, sizeof( i ) );
+        
+#ifdef IPV6
+        memset( &listen_addr6, 0, sizeof( listen_addr6 ) );
+        memset( &listen_addr, 0, sizeof( listen_addr ) );
+        listen_addr6.sin6_family = AF_INET6;
+        listen_addr6.sin6_port = htons( global.conf->port );
+        if( ( i = inet_pton( AF_INET6, ipv6_wrap( global.conf->iface ), &listen_addr6.sin6_addr ) ) != 1 )
+        {
+                /* Forget about IPv6 in this function. */
+                use_ipv6 = 0;
+#endif
+                listen_addr.sin_family = AF_INET;
+                listen_addr.sin_port = htons( global.conf->port );
+                if( strcmp( global.conf->iface, "::" ) == 0 )
+                        i = inet_pton( AF_INET, "0.0.0.0", &listen_addr.sin_addr );
+                else
+                        i = inet_pton( AF_INET, global.conf->iface, &listen_addr.sin_addr );
+#ifdef IPV6
+        }
+#endif
+        
+        if( i != 1 )
+        {
+                log_message( LOGLVL_ERROR, "Couldn't parse address `%s'", global.conf->iface );
+                return( -1 );
+        }
+        
+#ifdef IPV6
+        if( !use_ipv6 || ( i = bind( global.listen_socket, (struct sockaddr *) &listen_addr6, sizeof( listen_addr6 ) ) ) == -1 )
+#endif
+                i = bind( global.listen_socket, (struct sockaddr *) &listen_addr, sizeof( listen_addr ) );
+        if( i == -1 )
+        {
+                log_error( "bind" );
+                return( -1 );
+        }
+        
         i = listen( global.listen_socket, 10 );
         if( i == -1 )
@@ -106 +125 @@
                         exit( 0 );
                 
-                chdir( "/" );
+//              chdir( "/" );
                 
                 /* Sometimes std* are already closed (for example when we're in a RESTARTed

conf.c

@@ -47 +47 @@
         conf = g_new0( conf_t, 1 );
         
-        conf->iface = NULL;
-        conf->port = "6667";
+#ifdef IPV6
+        conf->iface = "::";
+#else
+        conf->iface = "0.0.0.0";
+#endif
+        conf->port = 6667;
         conf->nofork = 0;
         conf->verbose = 0;
@@ -85 +89 @@
                 else if( opt == 'p' )
                 {
-                        g_free( conf->port );
-                        conf->port = g_strdup( optarg );
+                        if( ( sscanf( optarg, "%d", &i ) != 1 ) || ( i <= 0 ) || ( i > 65535 ) )
+                        {
+                                fprintf( stderr, "Invalid port number: %s\n", optarg );
+                                return( NULL );
+                        }
+                        conf->port = i;
                 }
                 else if( opt == 'P' )
@@ -196 +204 @@
                         else if( g_strcasecmp( ini->key, "daemonport" ) == 0 )
                         {
-                                conf->port = g_strdup( ini->value );
+                                if( ( sscanf( ini->value, "%d", &i ) != 1 ) || ( i <= 0 ) || ( i > 65535 ) )
+                                {
+                                        fprintf( stderr, "Invalid port number: %s\n", ini->value );
+                                        return( 0 );
+                                }
+                                conf->port = i;
                         }
                         else if( g_strcasecmp( ini->key, "authmode" ) == 0 )

conf.h

@@ -33 +33 @@
 {
         char *iface;
-        char *port;
+        signed int port;
         int nofork;
         int verbose;
@@ -51 +51 @@
 } conf_t;
 
-G_GNUC_MALLOC conf_t *conf_load( int argc, char *argv[] );
+conf_t *conf_load( int argc, char *argv[] );
 void conf_loaddefaults( irc_t *irc );
 

configure

@@ -30 +30 @@
 gcov=0
 plugins=1
+ipv6=1
 
 events=glib
@@ -70 +71 @@
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
 --plugins=0/1   Disable/enable plugins support          $plugins
+
+--ipv6=0/1      IPv6 socket support                     $ipv6
 
 --events=...    Event handler (glib, libevent)          $events
@@ -131 +134 @@
 #define CPU "$cpu"
 EOF
+
+if [ "$ipv6" = "1" ]; then
+        echo '#define IPV6' >> config.h
+fi
 
 if [ "$debug" = "1" ]; then

crypting.h

@@ -25 +25 @@
 
 int checkpass (const char *password, const char *md5sum);
-G_GNUC_MALLOC char *hashpass (const char *password);
-G_GNUC_MALLOC char *obfucrypt (char *line, const char *password);
-G_GNUC_MALLOC char *deobfucrypt (char *line, const char *password);
+char *hashpass (const char *password);
+char *obfucrypt (char *line, const char *password);
+char *deobfucrypt (char *line, const char *password);

debian/postinst

@@ -46 +46 @@
 db_stop
 
-## Restore the helpfile in case we weren't upgrading but just reconfiguring:
-if [ -e /usr/share/bitlbee/help.upgrading ]; then
-        if [ -e /usr/share/bitlbee/help.txt ]; then
-                rm -f /usr/share/bitlbee/help.upgrading
-        else
-                mv /usr/share/bitlbee/help.upgrading /usr/share/bitlbee/help.txt
-        fi
-fi
-
 if [ -n "$2" -a "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
         /etc/init.d/bitlbee restart

debian/prerm

@@ -2 +2 @@
 
 if [ "$1" = "upgrade" ]; then
-        ## To prevent the help function from breaking in currently running
-        ## BitlBee processes. Have to do it like this because dpkg-reconfigure
-        ## looks a lot like an upgrade and we don't want to lose help.txt...
-        if [ -e /usr/share/bitlbee/help.txt ]; then
-                rm -f /usr/share/bitlbee/help.upgrading
-                mv /usr/share/bitlbee/help.txt /usr/share/bitlbee/help.upgrading
-        fi
+        ## To prevent the help function from breaking in currently running BitlBee processes
+        rm -f /usr/share/bitlbee/help.txt
 else
         /etc/init.d/bitlbee stop || exit 0

doc/user-guide/commands.xml

@@ -836 +836 @@
         <bitlbee-command name="join_chat">
                 <short-description>Join a named groupchat/conference room</short-description>
-                <syntax>join_chat &lt;connection&gt; &lt;room name&gt; [&lt;channel name&gt;] [&lt;room nickname&gt;] [&lt;password&gt;]</syntax>
+                <syntax>import_buddies &lt;connection&gt; &lt;room name&gt; [&lt;channel name&gt;] [&lt;room nickname&gt;] [&lt;password&gt;]</syntax>
 
                 <description>

help.h

@@ -43 +43 @@
 } help_t;
 
-G_GNUC_MALLOC help_t *help_init( help_t **help, const char *helpfile );
+help_t *help_init( help_t **help, const char *helpfile );
 char *help_get( help_t **help, char *string );
 

irc.c

@@ -45 +45 @@
 {
         irc_t *irc;
-        struct sockaddr_storage sock;
-        socklen_t socklen = sizeof( sock );
+        struct hostent *peer;
+        unsigned int i;
+        char buf[128];
+#ifdef IPV6
+        struct sockaddr_in6 sock6[1];
+        unsigned int i6;
+#endif
+        struct sockaddr_in sock[1];
         
         irc = g_new0( irc_t, 1 );
@@ -65 +71 @@
         irc->channel = g_strdup( ROOT_CHAN );
         
+        i = sizeof( *sock );
+#ifdef IPV6
+        i6 = sizeof( *sock6 );
+#endif
+        
         if( global.conf->hostname )
-        {
                 irc->myhost = g_strdup( global.conf->hostname );
-        }
-        else if( getsockname( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0 ) 
-        {
-                char buf[NI_MAXHOST+1];
-
-                if( getnameinfo( (struct sockaddr *) &sock, socklen, buf,
-                                 NI_MAXHOST, NULL, -1, 0 ) == 0 )
-                {
+#ifdef IPV6
+        else if( getsockname( irc->fd, (struct sockaddr*) sock6, &i6 ) == 0 && sock6->sin6_family == AF_INET6 )
+        {
+                if( ( peer = gethostbyaddr( (char*) &sock6->sin6_addr, sizeof( sock6->sin6_addr ), AF_INET6 ) ) )
+                        irc->myhost = g_strdup( peer->h_name );
+                else if( inet_ntop( AF_INET6, &sock6->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
                         irc->myhost = g_strdup( ipv6_unwrap( buf ) );
-                }
-                else
-                {
-                        /* Rare, but possible. */
-                        strncpy( irc->myhost, "localhost.localdomain", NI_MAXHOST );
-                }
-        }
-        
-        if( getpeername( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0 )
-        {
-                char buf[NI_MAXHOST+1];
-
-                if( getnameinfo( (struct sockaddr *)&sock, socklen, buf,
-                                 NI_MAXHOST, NULL, -1, 0 ) == 0 )
-                {
+        }
+#endif
+        else if( getsockname( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin_family == AF_INET )
+        {
+                if( ( peer = gethostbyaddr( (char*) &sock->sin_addr, sizeof( sock->sin_addr ), AF_INET ) ) )
+                        irc->myhost = g_strdup( peer->h_name );
+                else if( inet_ntop( AF_INET, &sock->sin_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                        irc->myhost = g_strdup( buf );
+        }
+        
+        i = sizeof( *sock );
+#ifdef IPV6
+        i6 = sizeof( *sock6 );
+        if( getpeername( irc->fd, (struct sockaddr*) sock6, &i6 ) == 0 && sock6->sin6_family == AF_INET6 )
+        {
+                if( ( peer = gethostbyaddr( (char*) &sock6->sin6_addr, sizeof( sock6->sin6_addr ), AF_INET6 ) ) )
+                        irc->host = g_strdup( peer->h_name );
+                else if( inet_ntop( AF_INET6, &sock6->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
                         irc->host = g_strdup( ipv6_unwrap( buf ) );
-                }
-                else
-                {
-                        /* Rare, but possible. */
-                        strncpy( irc->host, "localhost.localdomain", NI_MAXHOST );
-                }
-        }
-        
+        }
+        else
+#endif
+        if( getpeername( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin_family == AF_INET )
+        {
+                if( ( peer = gethostbyaddr( (char*) &sock->sin_addr, sizeof( sock->sin_addr ), AF_INET ) ) )
+                        irc->host = g_strdup( peer->h_name );
+                else if( inet_ntop( AF_INET, &sock->sin_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                        irc->host = g_strdup( buf );
+        }
+        
+        /* Rare, but possible. */
+        if( !irc->host ) irc->host = g_strdup( "localhost." );
+        if( !irc->myhost ) irc->myhost = g_strdup( "localhost." );
+
         if( global.conf->ping_interval > 0 && global.conf->ping_timeout > 0 )
                 irc->ping_source_id = b_timeout_add( global.conf->ping_interval * 1000, irc_userping, irc );
@@ -726 +744 @@
         irc_spawn( irc, u );
         
-        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQs are answered there." );
+        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQ's are answered there." );
         
         if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )

lib/misc.c

@@ -322 +322 @@
 }
 
+#ifdef IPV6
 /* Wrap an IPv4 address into IPv6 space. Not thread-safe... */
 char *ipv6_wrap( char *src )
@@ -359 +360 @@
         return ( src + 7 );
 }
+#endif
 
 /* Convert from one charset to another.

lib/proxy.c

@@ -211 +211 @@
         }
 
-        if (strlen(proxyuser) > 0) {
+        if (proxyuser && *proxyuser) {
                 char *t1, *t2;
                 t1 = g_strdup_printf("%s:%s", proxyuser, proxypass);
@@ -539 +539 @@
         phb->data = data;
         
-        if ((proxytype == PROXY_NONE) || strlen(proxyhost) > 0 || !proxyport || (proxyport == -1))
+        if ((proxytype == PROXY_NONE) || !proxyhost || !proxyhost[0] || !proxyport || (proxyport == -1))
                 return proxy_connect_none(host, port, phb);
         else if (proxytype == PROXY_HTTP)

protocols/jabber/io.c

@@ -470 +470 @@
 }
 
+static xt_status jabber_pkt_misc( struct xt_node *node, gpointer data )
+{
+        printf( "Received unknown packet:\n" );
+        xt_print( node );
+        
+        return XT_HANDLED;
+}
+
 static xt_status jabber_xmlconsole( struct xt_node *node, gpointer data )
 {
@@ -501 +509 @@
         { "success",            "stream:stream",        sasl_pkt_result },
         { "failure",            "stream:stream",        sasl_pkt_result },
+        { NULL,                 "stream:stream",        jabber_pkt_misc },
         { NULL,                 NULL,                   NULL }
 };

protocols/jabber/presence.c

@@ -170 +170 @@
                 /* What else to do with it? */
         }
+        else
+        {
+                printf( "Received PRES from %s:\n", from );
+                xt_print( node );
+        }
         
         return XT_HANDLED;

protocols/jabber/xmltree.c

@@ -305 +305 @@
 }
 
-#ifdef DEBUG
 void xt_print( struct xt_node *node )
 {
@@ -356 +355 @@
         printf( "</%s>\n", node->name );
 }
-#endif
 
 struct xt_node *xt_dup( struct xt_node *node )

protocols/nogaim.c

@@ -36 +36 @@
 #include <ctype.h>
 
-static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
+static int remove_chat_buddy_silent( struct groupchat *b, char *handle );
 
 GSList *connections;
@@ -578 +578 @@
                 /* Remove him/her from the groupchats to prevent PART messages after he/she QUIT already */
                 for( c = ic->groupchats; c; c = c->next )
-                        remove_chat_buddy_silent( c, handle );
+                        remove_chat_buddy_silent( c, (char*) handle );
         }
         
@@ -849 +849 @@
 }
 
-static int remove_chat_buddy_silent( struct groupchat *b, const char *handle )
+static int remove_chat_buddy_silent( struct groupchat *b, char *handle )
 {
         GList *i;

protocols/oscar/oscar.c

@@ -1066 +1066 @@
                         g_snprintf(tmp, BUF_LONG, "%s", args->msg);
                 }
-        } else if (args->mpmsg.numparts == 0) {
+        } else
                 g_snprintf(tmp, BUF_LONG, "%s", args->msg);
-        } else {
-                int i;
-                
-                *tmp = 0;
-                for (i = 0; i < args->mpmsg.numparts; i ++) {
-                        g_strlcat(tmp, (char*) args->mpmsg.parts[i].data, BUF_LONG);
-                        g_strlcat(tmp, "\n", BUF_LONG);
-                }
-        }
         
         strip_linefeed(tmp);

storage.h

@@ -62 +62 @@
 
 void register_storage_backend(storage_t *);
-G_GNUC_MALLOC GList *storage_init(const char *primary, char **migrate);
+GList *storage_init(const char *primary, char **migrate);
 
 #endif /* __STORAGE_H__ */