Changeset 2231302

Timestamp:

2007-11-05T22:59:49Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

be68d99

Parents:

5e2615a (diff), 7435ccf (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:

Merging from Jelmer.

Files:

• bitlbee.c (modified) (2 diffs)
• conf.c (modified) (3 diffs)
• conf.h (modified) (2 diffs)
• configure (modified) (3 diffs)
• crypting.h (modified) (1 diff)
• help.h (modified) (1 diff)
• irc.c (modified) (2 diffs)
• lib/misc.c (modified) (2 diffs)
• lib/proxy.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (3 diffs)
• storage.h (modified) (1 diff)

bitlbee.c

@@ -38 +38 @@
 int bitlbee_daemon_init()
 {
-#ifdef IPV6
-        int use_ipv6 = 1;
-        struct sockaddr_in6 listen_addr6;
-#endif
-        struct sockaddr_in listen_addr;
+        struct addrinfo *res, hints, *addrinfo_bind;
         int i;
         FILE *fp;
@@ -49 +45 @@
         log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
         
-#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 ) );
-        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
-                memset( &listen_addr, 0, sizeof( listen_addr ) );
-                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 );
-        }
-        
+        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 );
+
         i = listen( global.listen_socket, 10 );
         if( i == -1 )

conf.c

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

conf.h

@@ -33 +33 @@
 {
         char *iface;
-        signed int port;
+        char *port;
         int nofork;
         int verbose;
@@ -51 +51 @@
 } conf_t;
 
-conf_t *conf_load( int argc, char *argv[] );
+G_GNUC_MALLOC 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
@@ -71 +70 @@
 --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
@@ -134 +131 @@
 #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);
-char *hashpass (const char *password);
-char *obfucrypt (char *line, const char *password);
-char *deobfucrypt (char *line, const char *password);
+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);

help.h

@@ -43 +43 @@
 } help_t;
 
-help_t *help_init( help_t **help, const char *helpfile );
+G_GNUC_MALLOC 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 hostent *peer;
-        unsigned int i;
-        char buf[128];
-#ifdef IPV6
-        struct sockaddr_in6 sock6[1];
-        unsigned int i6;
-#endif
-        struct sockaddr_in sock[1];
+        struct sockaddr_storage sock;
+        socklen_t socklen = sizeof( sock );
         
         irc = g_new0( irc_t, 1 );
@@ -71 +65 @@
         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 );
-#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 )
+        }
+        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 ) );
-        }
-#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 )
+                }
+                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 )
+                {
                         irc->host = g_strdup( ipv6_unwrap( buf ) );
-        }
-        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." );
-
+                }
+                else
+                {
+                        /* Rare, but possible. */
+                        strncpy( irc->host, "localhost.localdomain", NI_MAXHOST );
+                }
+        }
+        
         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 );

lib/misc.c

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

lib/proxy.c

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

protocols/nogaim.c

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

storage.h

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