Changeset 85023c6

Timestamp:

2007-07-15T15:47:34Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1baaef8

Parents:

1ffb46f

Message:

Added imcb_clean_handle() to sanitize handles properly (without putting
IRC-specific stuff into the Jabber module). Only using this in the MUC
code for now because this only works if the IM module can somehow convert
the cleaned up handle back to the original one.

Location:

protocols

Files:

• jabber/conference.c (modified) (1 diff)
• nogaim.c (modified) (2 diffs)
• nogaim.h (modified) (1 diff)

protocols/jabber/conference.c

@@ -180 +180 @@
                                         if( bud->ext_jid[i] == '=' || bud->ext_jid[i] == '@' )
                                                 bud->ext_jid[i] = '_';
+                                
+                                /* Some program-specific restrictions. */
+                                imcb_clean_handle( ic, bud->ext_jid );
                         }
                         bud->flags |= JBFLAG_IS_ANONYMOUS;

protocols/nogaim.c

@@ -99 +99 @@
 }
 
- 
 struct prpl *find_protocol(const char *name)
 {
@@ -1114 +1113 @@
         ic->acc->prpl->rem_deny( ic, handle );
 }
+
+void imcb_clean_handle( struct im_connection *ic, char *handle )
+{
+        /* Accepts a handle and does whatever is necessary to make it
+           BitlBee-friendly. Currently this means removing everything
+           outside 33-127 (ASCII printable excl spaces), @ (only one
+           is allowed) and ! and : */
+        char out[strlen(handle)+1];
+        int s, d;
+        
+        s = d = 0;
+        while( handle[s] )
+        {
+                if( handle[s] > ' ' && handle[s] != '!' && handle[s] != ':' &&
+                    ( handle[s] & 0x80 ) == 0 )
+                {
+                        if( handle[s] == '@' )
+                        {
+                                /* See if we got an @ already? */
+                                out[d] = 0;
+                                if( strchr( out, '@' ) )
+                                        continue;
+                        }
+                        
+                        out[d++] = handle[s];
+                }
+                s ++;
+        }
+        out[d] = handle[s];
+        
+        strcpy( handle, out );
+}

protocols/nogaim.h

@@ -201 +201 @@
 G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, u_int32_t flags, time_t sent_at );
 G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, char *handle, u_int32_t flags );
+G_MODULE_EXPORT void imcb_clean_handle( struct im_connection *ic, char *handle );
 
 /* Groupchats */