Changes in irc.c [50e1776:5e2615a]

File:

• irc.c (modified) (6 diffs)

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 );
@@ -641 +659 @@
                 }
         }
-        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
+        else if( ( c = chat_by_channel( channel ) ) )
         {
                 GList *l;
@@ -788 +806 @@
 void irc_topic( irc_t *irc, char *channel )
 {
-        struct groupchat *c = irc_chat_by_channel( irc, channel );
-        
-        if( c && c->topic )
-                irc_reply( irc, 332, "%s :%s", channel, c->topic );
-        else if( g_strcasecmp( channel, irc->channel ) == 0 )
+        if( g_strcasecmp( channel, irc->channel ) == 0 )
+        {
                 irc_reply( irc, 332, "%s :%s", channel, CONTROL_TOPIC );
+        }
         else
-                irc_reply( irc, 331, "%s :No topic for this channel", channel );
+        {
+                struct groupchat *c = chat_by_channel( channel );
+                
+                if( c )
+                        irc_reply( irc, 332, "%s :BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", channel, c->title );
+                else
+                        irc_reply( irc, 331, "%s :No topic for this channel", channel );
+        }
 }
 
@@ -927 +950 @@
         if( *nick == '#' || *nick == '&' )
         {
-                if( !( c = irc_chat_by_channel( irc, nick ) ) )
+                if( !( c = chat_by_channel( nick ) ) )
                 {
                         irc_reply( irc, 403, "%s :Channel does not exist", nick );
@@ -1193 +1216 @@
         return TRUE;
 }
-
-struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel )
-{
-        struct groupchat *c;
-        account_t *a;
-        
-        /* This finds the connection which has a conversation which belongs to this channel */
-        for( a = irc->accounts; a; a = a->next )
-        {
-                if( a->ic == NULL )
-                        continue;
-                
-                c = a->ic->groupchats;
-                while( c )
-                {
-                        if( c->channel && g_strcasecmp( c->channel, channel ) == 0 )
-                                return c;
-                        
-                        c = c->next;
-                }
-        }
-        
-        return NULL;
-}