Changeset 0e7ab64

Timestamp:

2007-04-23T02:58:44Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2d317bb

Parents:

43671b9

Message:

Got rid of one HORRIBLE stupidity called chat_by_channel(), which still
used the GLOBAL IM connections list, allowing user A to interfere with
user B's groupchats if running in daemon mode. I can't believe this was
still there...

Files:

• irc.c (modified) (4 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (3 diffs)
• protocols/jabber/conference.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (1 diff)
• protocols/nogaim.h (modified) (1 diff)
• root_commands.c (modified) (2 diffs)

irc.c

@@ -658 +658 @@
                 }
         }
-        else if( ( c = chat_by_channel( channel ) ) )
+        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
         {
                 GList *l;
@@ -811 +811 @@
         else
         {
-                struct groupchat *c = chat_by_channel( channel );
+                struct groupchat *c = irc_chat_by_channel( irc, channel );
                 
                 if( c )
@@ -949 +949 @@
         if( *nick == '#' || *nick == '&' )
         {
-                if( !( c = chat_by_channel( nick ) ) )
+                if( !( c = irc_chat_by_channel( irc, nick ) ) )
                 {
                         irc_reply( irc, 403, "%s :Channel does not exist", nick );
@@ -1215 +1215 @@
         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 )
+        {
+                for( c = a->ic->groupchats; c && g_strcasecmp( c->channel, channel ) != 0; c = c->next );
+                if( c )
+                        return c;
+        }
+        
+        return NULL;
+}

irc.h

@@ -140 +140 @@
 
 void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags );
+struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel );
 
 #endif

irc_commands.c

@@ -144 +144 @@
                 irc_join( irc, u, irc->channel );
         }
-        else if( ( c = chat_by_channel( cmd[1] ) ) )
+        else if( ( c = irc_chat_by_channel( irc, cmd[1] ) ) )
         {
                 user_t *u = user_find( irc, irc->nick );
@@ -201 +201 @@
 {
         char *nick = cmd[1], *channel = cmd[2];
-        struct groupchat *c = chat_by_channel( channel );
+        struct groupchat *c = irc_chat_by_channel( irc, channel );
         user_t *u = user_find( irc, nick );
         
@@ -287 +287 @@
                         u = u->next;
                 }
-        else if( ( c = chat_by_channel( channel ) ) )
+        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
                 for( l = c->in_room; l; l = l->next )
                 {

protocols/jabber/conference.c

@@ -102 +102 @@
 
 /* Not really the same syntax as the normal pkt_ functions, but this isn't
-   called by the xmltree parser exactly and this way I can add some extra
+   called by the xmltree parser directly and this way I can add some extra
    parameters so we won't have to repeat too many things done by the caller
    already. */
@@ -151 +151 @@
                 if( s ) *s = '/';
         }
-        else if( type ) /* This only gets called if type=="unavailable" */
+        else if( type ) /* This only gets called if type is NULL or "unavailable" */
         {
                 /* Won't handle this for now. */

protocols/nogaim.c

@@ -856 +856 @@
 /* Misc. BitlBee stuff which shouldn't really be here */
 
-struct groupchat *chat_by_channel( char *channel )
-{
-        struct im_connection *ic;
-        struct groupchat *c;
-        GSList *l;
-        
-        /* This finds the connection which has a conversation which belongs to this channel */
-        for( l = connections; l; l = l->next )
-        {
-                ic = l->data;
-                for( c = ic->groupchats; c && g_strcasecmp( c->channel, channel ) != 0; c = c->next );
-                if( c )
-                        return c;
-        }
-        
-        return NULL;
-}
-
 char *set_eval_away_devoice( set_t *set, char *value )
 {

protocols/nogaim.h

@@ -207 +207 @@
 G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, char *who, char *msg, u_int32_t flags, time_t sent_at );
 G_MODULE_EXPORT void imcb_chat_free( struct groupchat *c );
-struct groupchat *chat_by_channel( char *channel );
 
 /* Actions, or whatever. */

root_commands.c

@@ -918 +918 @@
                 char *s;
                 
-                channel = g_strdup( chat );
+                channel = g_strdup_printf( "&%s", chat );
                 if( ( s = strchr( channel, '@' ) ) )
                         *s = 0;
@@ -928 +928 @@
         if( cmd[3] && cmd[4] && cmd[5] )
                 password = cmd[5];
+        
+        if( channel[0] != '#' && channel[0] != '&' )
+        {
+                irc_usermsg( irc, "Invalid channel name: %s", channel );
+                g_free( channel );
+                return;
+        }
+        else if( g_strcasecmp( channel, irc->channel ) == 0 || irc_chat_by_channel( irc, channel ) )
+        {
+                irc_usermsg( irc, "Channel already exists: %s", channel );
+                g_free( channel );
+                return;
+        }
         
         if( ( c = a->prpl->chat_join( ic, chat, nick, password ) ) )