Changeset eda0270

Timestamp:

2006-07-14T09:34:56Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

00a5270

Parents:

75a4b85 (diff), 6398094 (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 main.

Files:

• bitlbee.c (modified) (4 diffs)
• irc.c (modified) (4 diffs)
• protocols/msn/msn.c (modified) (1 diff)
• sock.h (modified) (1 diff)

bitlbee.c

@@ -39 +39 @@
 {
 #ifdef IPV6
-        struct sockaddr_in6 listen_addr;
-#else
+        int use_ipv6 = 1;
+        struct sockaddr_in6 listen_addr6;
+#endif
         struct sockaddr_in listen_addr;
-#endif
         int i;
         FILE *fp;
@@ -49 +49 @@
         log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
         
-        global.listen_socket = socket( AF_INETx, SOCK_STREAM, 0 );
+#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 )
         {
@@ -61 +69 @@
         
 #ifdef IPV6
-        listen_addr.sin6_family = AF_INETx;
-        listen_addr.sin6_port = htons( global.conf->port );
-        i = inet_pton( AF_INETx, ipv6_wrap( global.conf->iface ), &listen_addr.sin6_addr );
-#else
-        listen_addr.sin_family = AF_INETx;
-        listen_addr.sin_port = htons( global.conf->port );
-        i = inet_pton( AF_INETx, global.conf->iface, &listen_addr.sin_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
         
@@ -76 +92 @@
         }
         
-        i = bind( global.listen_socket, (struct sockaddr *) &listen_addr, sizeof( listen_addr ) );
+#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 )
         {

irc.c

@@ -47 +47 @@
         char buf[128];
 #ifdef IPV6
-        struct sockaddr_in6 sock[1];
-#else
+        struct sockaddr_in6 sock6[1];
+        unsigned int i6;
+#endif
         struct sockaddr_in sock[1];
-#endif
         
         irc = g_new0( irc_t, 1 );
@@ -70 +70 @@
         
         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*) sock, &i ) == 0 && sock->sin6_family == AF_INETx )
-        {
-                if( ( peer = gethostbyaddr( (char*) &sock->sin6_addr, sizeof( sock->sin6_addr ), AF_INETx ) ) )
+        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_INETx, &sock->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                else if( inet_ntop( AF_INET6, &sock6->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
                         irc->myhost = g_strdup( ipv6_unwrap( buf ) );
         }
-#else
-        else if( getsockname( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin_family == AF_INETx )
-        {
-                if( ( peer = gethostbyaddr( (char*) &sock->sin_addr, sizeof( sock->sin_addr ), AF_INETx ) ) )
+#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_INETx, &sock->sin_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                else if( inet_ntop( AF_INET, &sock->sin_addr, buf, sizeof( buf ) - 1 ) != NULL )
                         irc->myhost = g_strdup( buf );
         }
-#endif
         
         i = sizeof( *sock );
 #ifdef IPV6
-        if( getpeername( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin6_family == AF_INETx )
-        {
-                if( ( peer = gethostbyaddr( (char*) &sock->sin6_addr, sizeof( sock->sin6_addr ), AF_INETx ) ) )
+        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_INETx, &sock->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                else if( inet_ntop( AF_INET6, &sock6->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
                         irc->host = g_strdup( ipv6_unwrap( buf ) );
         }
-#else
-        if( getpeername( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin_family == AF_INETx )
-        {
-                if( ( peer = gethostbyaddr( (char*) &sock->sin_addr, sizeof( sock->sin_addr ), AF_INETx ) ) )
+        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_INETx, &sock->sin_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                else if( inet_ntop( AF_INET, &sock->sin_addr, buf, sizeof( buf ) - 1 ) != NULL )
                         irc->host = g_strdup( buf );
         }
-#endif
         
         /* Rare, but possible. */
@@ -621 +624 @@
         char namelist[385] = "";
         struct conversation *c = NULL;
+        char *ops = set_getstr( irc, "ops" );
         
         /* RFCs say there is no error reply allowed on NAMES, so when the
@@ -637 +641 @@
                         if( u->gc && !u->away && set_getbool( &irc->set, "away_devoice" ) )
                                 strcat( namelist, "+" );
+                        else if( ( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) == 0 ) ) ||
+                                 ( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) == 0 ) ) )
+                                strcat( namelist, "@" );
                         
                         strcat( namelist, u->nick );

protocols/msn/msn.c

@@ -105 +105 @@
                 }
                 
+                while( md->groupcount > 0 )
+                        g_free( md->grouplist[--md->groupcount] );
                 g_free( md->grouplist );
                 

sock.h

@@ -1 +1 @@
 #include <errno.h>
 #include <fcntl.h>
-
-/* To cut down on the ifdef stuff a little bit in other places */
-#ifdef IPV6
-#define AF_INETx AF_INET6
-#else
-#define AF_INETx AF_INET
-#endif
 
 #ifndef _WIN32