Changes in protocols/msn/msn_util.c [e0e1546:4255320]

File:

• protocols/msn/msn_util.c (modified) (13 diffs)

protocols/msn/msn_util.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2004 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -26 +26 @@
 #include "nogaim.h"
 #include "msn.h"
-#include "md5.h"
-#include "soap.h"
 #include <ctype.h>
 
@@ -34 +32 @@
         struct msn_data *md = ic->proto_data;
         int st;
-        
-        if( getenv( "BITLBEE_DEBUG" ) )
-        {
-                write( 2, "->NS:", 5 );
-                write( 2, s, len );
-        }
         
         st = write( md->fd, s, len );
@@ -59 +51 @@
 }
 
-static char *adlrml_entry( const char *handle_, msn_buddy_flags_t list )
-{
-        char *domain, handle[strlen(handle_)+1];
-        
-        strcpy( handle, handle_ );
-        if( ( domain = strchr( handle, '@' ) ) )
-                *(domain++) = '\0';
-        else
-                return NULL;
-        
-        return g_markup_printf_escaped( "<ml><d n=\"%s\"><c n=\"%s\" l=\"%d\" t=\"1\"/></d></ml>",
-                domain, handle, list );
-}
-
-int msn_buddy_list_add( struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *realname, const char *group )
+int msn_buddy_list_add( struct im_connection *ic, const char *list, const char *who, const char *realname_, const char *group )
 {
         struct msn_data *md = ic->proto_data;
-        char buf[1024], groupid[8];
-        bee_user_t *bu;
-        struct msn_buddy_data *bd;
-        char *adl;
+        char buf[1024], *realname, groupid[8];
         
         *groupid = '\0';
-#if 0
         if( group )
         {
@@ -113 +87 @@
                         if( l == NULL )
                         {
-                                char groupname[strlen(group)+1];
-                                strcpy( groupname, group );
-                                http_encode( groupname );
+                                char *groupname = msn_http_encode( group );
                                 g_snprintf( buf, sizeof( buf ), "ADG %d %s %d\r\n", ++md->trId, groupname, 0 );
+                                g_free( groupname );
                                 return msn_write( ic, buf, strlen( buf ) );
                         }
@@ -128 +101 @@
                 }
         }
-#endif
-        
-        if( !( ( bu = bee_user_by_handle( ic->bee, ic, who ) ) ||
-               ( bu = bee_user_new( ic->bee, ic, who, 0 ) ) ) ||
-            !( bd = bu->data ) || bd->flags & list )
-                return 1;
-        
-        bd->flags |= list;
-        
-        if( list == MSN_BUDDY_FL )
-                msn_soap_ab_contact_add( ic, bu );
-        else
-                msn_soap_memlist_edit( ic, who, TRUE, list );
-        
-        if( ( adl = adlrml_entry( who, list ) ) )
-        {
-                g_snprintf( buf, sizeof( buf ), "ADL %d %zd\r\n%s",
-                            ++md->trId, strlen( adl ), adl );
-                g_free( adl );
-                
-                return msn_write( ic, buf, strlen( buf ) );
-        }
-        
-        return 1;
-}
-
-int msn_buddy_list_remove( struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *group )
+        
+        realname = msn_http_encode( realname_ );
+        g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s%s\r\n", ++md->trId, list, who, realname, groupid );
+        g_free( realname );
+        
+        return msn_write( ic, buf, strlen( buf ) );
+}
+
+int msn_buddy_list_remove( struct im_connection *ic, char *list, const char *who, const char *group )
 {
         struct msn_data *md = ic->proto_data;
         char buf[1024], groupid[8];
-        bee_user_t *bu;
-        struct msn_buddy_data *bd;
-        char *adl;
         
         *groupid = '\0';
-#if 0
         if( group )
         {
@@ -174 +125 @@
                         }
         }
-#endif
-        
-        if( !( bu = bee_user_by_handle( ic->bee, ic, who ) ) ||
-            !( bd = bu->data ) || !( bd->flags & list ) )
-                return 1;
-        
-        bd->flags &= ~list;
-        
-        if( list == MSN_BUDDY_FL )
-                msn_soap_ab_contact_del( ic, bu );
-        else
-                msn_soap_memlist_edit( ic, who, FALSE, list );
-        
-        if( ( adl = adlrml_entry( who, list ) ) )
-        {
-                g_snprintf( buf, sizeof( buf ), "RML %d %zd\r\n%s",
-                            ++md->trId, strlen( adl ), adl );
-                g_free( adl );
-                
-                return msn_write( ic, buf, strlen( buf ) );
-        }
-        
-        return 1;
+        
+        g_snprintf( buf, sizeof( buf ), "REM %d %s %s%s\r\n", ++md->trId, list, who, groupid );
+        if( msn_write( ic, buf, strlen( buf ) ) )
+                return( 1 );
+        
+        return( 0 );
 }
 
@@ -210 +144 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, MSN_BUDDY_AL, bla->handle, bla->realname, NULL );
+        msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname, NULL );
         
         imcb_ask_add( bla->ic, bla->handle, NULL );
@@ -223 +157 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, MSN_BUDDY_BL, bla->handle, bla->realname, NULL );
+        msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname, NULL );
         
         g_free( bla->handle );
@@ -230 +164 @@
 }
 
-void msn_buddy_ask( bee_user_t *bu )
-{
-        struct msn_buddy_ask_data *bla;
-        struct msn_buddy_data *bd = bu->data;
+void msn_buddy_ask( struct im_connection *ic, char *handle, char *realname )
+{
+        struct msn_buddy_ask_data *bla = g_new0( struct msn_buddy_ask_data, 1 );
         char buf[1024];
         
-        if( ( bd->flags & 30 ) != 8 && ( bd->flags & 30 ) != 16 )
-                return;
-        
-        bla = g_new0( struct msn_buddy_ask_data, 1 );
-        bla->ic = bu->ic;
-        bla->handle = g_strdup( bu->handle );
-        bla->realname = g_strdup( bu->fullname );
+        bla->ic = ic;
+        bla->handle = g_strdup( handle );
+        bla->realname = g_strdup( realname );
         
         g_snprintf( buf, sizeof( buf ),
                     "The user %s (%s) wants to add you to his/her buddy list.",
-                    bu->handle, bu->fullname );
-        imcb_ask( bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
+                    handle, realname );
+        imcb_ask( ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
 }
 
@@ -350 +279 @@
         if( st <= 0 )
                 return( -1 );
-        
-        if( getenv( "BITLBEE_DEBUG" ) )
-        {
-                write( 2, "->C:", 4 );
-                write( 2, h->rxq + h->rxlen - st, st );
-        }
         
         while( st )
@@ -444 +367 @@
 }
 
+/* The difference between this function and the normal http_encode() function
+   is that this one escapes every 7-bit ASCII character because this is said
+   to avoid some lame server-side checks when setting a real-name. Also,
+   non-ASCII characters are not escaped because MSN servers don't seem to
+   appreciate that! */
+char *msn_http_encode( const char *input )
+{
+        char *ret, *s;
+        int i;
+        
+        ret = s = g_new0( char, strlen( input ) * 3 + 1 );
+        for( i = 0; input[i]; i ++ )
+                if( input[i] & 128 )
+                {
+                        *s = input[i];
+                        s ++;
+                }
+                else
+                {
+                        g_snprintf( s, 4, "%%%02X", input[i] );
+                        s += 3;
+                }
+        
+        return ret;
+}
+
 void msn_msgq_purge( struct im_connection *ic, GSList **list )
 {
@@ -484 +433 @@
 }
 
-/* Copied and heavily modified from http://tmsnc.sourceforge.net/chl.c */
-char *msn_p11_challenge( char *challenge )
-{
-        char *output, buf[256];
-        md5_state_t md5c;
-        unsigned char md5Hash[16], *newHash;
-        unsigned int *md5Parts, *chlStringParts, newHashParts[5];
-        long long nHigh = 0, nLow = 0;
-        int i, n;
-
-        /* Create the MD5 hash */
-        md5_init(&md5c);
-        md5_append(&md5c, (unsigned char*) challenge, strlen(challenge));
-        md5_append(&md5c, (unsigned char*) MSNP11_PROD_KEY, strlen(MSNP11_PROD_KEY));
-        md5_finish(&md5c, md5Hash);
-
-        /* Split it into four integers */
-        md5Parts = (unsigned int *)md5Hash;
-        for (i = 0; i < 4; i ++)
-        {  
-                md5Parts[i] = GUINT32_TO_LE(md5Parts[i]);
-                
-                /* & each integer with 0x7FFFFFFF */
-                /* and save one unmodified array for later */
-                newHashParts[i] = md5Parts[i];
-                md5Parts[i] &= 0x7FFFFFFF;
-        }
-        
-        /* make a new string and pad with '0' */
-        n = g_snprintf(buf, sizeof(buf)-5, "%s%s00000000", challenge, MSNP11_PROD_ID);
-        /* truncate at an 8-byte boundary */
-        buf[n&=~7] = '\0';
-        
-        /* split into integers */
-        chlStringParts = (unsigned int *)buf;
-        
-        /* this is magic */
-        for (i = 0; i < (n / 4) - 1; i += 2)
-        {
-                long long temp;
-
-                chlStringParts[i]   = GUINT32_TO_LE(chlStringParts[i]);
-                chlStringParts[i+1] = GUINT32_TO_LE(chlStringParts[i+1]);
-
-                temp  = (md5Parts[0] * (((0x0E79A9C1 * (long long)chlStringParts[i]) % 0x7FFFFFFF)+nHigh) + md5Parts[1])%0x7FFFFFFF;
-                nHigh = (md5Parts[2] * (((long long)chlStringParts[i+1]+temp) % 0x7FFFFFFF) + md5Parts[3]) % 0x7FFFFFFF;
-                nLow  = nLow + nHigh + temp;
-        }
-        nHigh = (nHigh+md5Parts[1]) % 0x7FFFFFFF;
-        nLow = (nLow+md5Parts[3]) % 0x7FFFFFFF;
-        
-        newHashParts[0] ^= nHigh;
-        newHashParts[1] ^= nLow;
-        newHashParts[2] ^= nHigh;
-        newHashParts[3] ^= nLow;
-        
-        /* swap more bytes if big endian */
-        for (i = 0; i < 4; i ++)
-                newHashParts[i] = GUINT32_TO_LE(newHashParts[i]); 
-        
-        /* make a string of the parts */
-        newHash = (unsigned char *)newHashParts;
-        
-        /* convert to hexadecimal */
-        output = g_new(char, 33);
-        for (i = 0; i < 16; i ++)
-                sprintf(output + i * 2, "%02x", newHash[i]);
-        
-        return output;
-}
-
-gint msn_domaintree_cmp( gconstpointer a_, gconstpointer b_ )
-{
-        const char *a = a_, *b = b_;
-        gint ret;
-        
-        if( !( a = strchr( a, '@' ) ) || !( b = strchr( b, '@' ) ) ||
-            ( ret = strcmp( a, b ) ) == 0 )
-                ret = strcmp( a_, b_ );
-        
-        return ret;
-}
-
-struct msn_group *msn_group_by_name( struct im_connection *ic, const char *name )
-{
+gboolean msn_set_display_name( struct im_connection *ic, const char *rawname )
+{
+        char *fn = msn_http_encode( rawname );
         struct msn_data *md = ic->proto_data;
-        GSList *l;
-        
-        for( l = md->groups; l; l = l->next )
-        {
-                struct msn_group *mg = l->data;
-                
-                if( g_strcasecmp( mg->name, name ) == 0 )
-                        return mg;
-        }
-        
-        return NULL;
-}
-
-struct msn_group *msn_group_by_id( struct im_connection *ic, const char *id )
-{
-        struct msn_data *md = ic->proto_data;
-        GSList *l;
-        
-        for( l = md->groups; l; l = l->next )
-        {
-                struct msn_group *mg = l->data;
-                
-                if( g_strcasecmp( mg->id, id ) == 0 )
-                        return mg;
-        }
-        
-        return NULL;
-}
-
-int msn_ns_set_display_name( struct im_connection *ic, const char *value )
-{
-        struct msn_data *md = ic->proto_data;
-        char fn[strlen(value)*3+1];
-        char buf[512];
-        
-        strcpy( fn, value );
-        http_encode( fn );
-        g_snprintf( buf, sizeof( buf ), "PRP %d MFN %s\r\n",
-                    ++md->trId, fn );
-        
-        /* Note: We don't actually know if the server accepted the new name,
-           and won't give proper feedback yet if it doesn't. */
-        return msn_write( ic, buf, strlen( buf ) );
-}
+        char buf[1024];
+        
+        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );
+        g_free( fn );
+        
+        return msn_write( ic, buf, strlen( buf ) ) != 0;
+}