Changes in / [2231302:7435ccf]

Files:

• bitlbee.c (modified) (2 diffs)
• debian/postinst (modified) (1 diff)
• debian/prerm (modified) (1 diff)
• irc.c (modified) (3 diffs)
• lib/misc.c (modified) (1 diff)
• lib/misc.h (modified) (1 diff)

bitlbee.c

@@ -52 +52 @@
         i = getaddrinfo( global.conf->iface, global.conf->port, &hints, 
                                                 &addrinfo_bind );
-        if( i )
-        {
+        if ( i ) {
                 log_message( LOGLVL_ERROR, "Couldn't parse address `%s': %s", 
                                          global.conf->iface, gai_strerror(i) );
@@ -61 +60 @@
         global.listen_socket = -1;
 
-        for( res = addrinfo_bind; res; res = res->ai_next )
-        {
+        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 )
+                if ( global.listen_socket < 0 )
                         continue;
 

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

irc.c

@@ -66 +66 @@
         
         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 )
-                {
-                        irc->myhost = g_strdup( ipv6_unwrap( buf ) );
-                }
-                else
-                {
+                irc->myhost = g_new0( char, NI_MAXHOST );
+
+                if (getnameinfo( (struct sockaddr *) &sock, socklen, irc->myhost, 
+                                                NI_MAXHOST, NULL, -1, 0) ) {
                         /* Rare, but possible. */
-                        strncpy( irc->myhost, "localhost.localdomain", NI_MAXHOST );
+                        strncpy( irc->myhost, "localhost.", NI_MAXHOST );
                 }
         }
@@ -87 +80 @@
         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 )
-                {
-                        irc->host = g_strdup( ipv6_unwrap( buf ) );
-                }
-                else
-                {
+                irc->host = g_new0( char, NI_MAXHOST );
+
+                if ( getnameinfo( (struct sockaddr *)&sock, socklen, irc->host, 
+                                                NI_MAXHOST, NULL, -1, 0 ) ) {
                         /* Rare, but possible. */
-                        strncpy( irc->host, "localhost.localdomain", NI_MAXHOST );
+                        strncpy( irc->myhost, "localhost.", NI_MAXHOST );
                 }
         }
@@ -726 +714 @@
         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 @@
 }
 
-/* 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 );
-}
-
 /* Convert from one charset to another.
    

lib/misc.h

@@ -52 +52 @@
 G_MODULE_EXPORT void http_encode( char *s );
 
-G_MODULE_EXPORT char *ipv6_wrap( char *src );
-G_MODULE_EXPORT char *ipv6_unwrap( char *src );
-
 G_MODULE_EXPORT signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf );