Changeset c27a923 for protocols/jabber

Timestamp:

2014-10-11T02:20:52Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0e35ff6

Parents:

168d3bb

Message:

Remove MSNXMPP specific code

The MSN XMPP gateway was shutdown december 2013 and isn't coming back.

Location:

protocols/jabber

Files:

• jabber.c (modified) (1 diff)
• jabber.h (modified) (1 diff)
• sasl.c (modified) (5 diffs)

protocols/jabber/jabber.c

@@ -148 +148 @@
                 jd->fd = jd->r_inpa = jd->w_inpa = -1;
                 
-                if( strstr( jd->server, ".live.com" ) )
-                        jd->oauth2_service = &oauth2_service_mslive;
-                else if( strstr( jd->server, ".facebook.com" ) )
+                if( strstr( jd->server, ".facebook.com" ) )
                         jd->oauth2_service = &oauth2_service_facebook;
                 else

protocols/jabber/jabber.h

@@ -338 +338 @@
 extern const struct oauth2_service oauth2_service_google;
 extern const struct oauth2_service oauth2_service_facebook;
-extern const struct oauth2_service oauth2_service_mslive;
 
 /* conference.c */

protocols/jabber/sasl.c

@@ -47 +47 @@
         "4b100f0f244d620bf3f15f8b217d4c32",
 };
-const struct oauth2_service oauth2_service_mslive =
-{
-        "https://oauth.live.com/authorize",
-        "https://oauth.live.com/token",
-        "http://www.bitlbee.org/main.php/Messenger/oauth2.html",
-        "wl.offline_access%20wl.messenger",
-        "000000004C06FCD1",
-        "IRKlBPzJJAWcY-TbZjiTEJu9tn7XCFaV",
-};
 
 xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data )
@@ -63 +54 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_ms = 0;
+        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
         int want_oauth = FALSE;
         GString *mechs;
@@ -98 +89 @@
                 else if( c->text && g_strcasecmp( c->text, "X-FACEBOOK-PLATFORM" ) == 0 )
                         sup_fb = 1;
-                else if( c->text && g_strcasecmp( c->text, "X-MESSENGER-OAUTH2" ) == 0 )
-                        sup_ms = 1;
                 
                 if( c->text )
@@ -109 +98 @@
         if( !want_oauth && !sup_plain && !sup_digest )
         {
-                if( !sup_gtalk && !sup_fb && !sup_ms )
+                if( !sup_gtalk && !sup_fb )
                         imcb_error( ic, "This server requires OAuth "
                                         "(supported schemes:%s)", mechs->str );
@@ -141 +130 @@
                 reply->text_len = strlen( reply->text );
                 g_free( s );
-        }
-        else if( sup_ms && want_oauth )
-        {
-                xt_add_attr( reply, "mechanism", "X-MESSENGER-OAUTH2" );
-                reply->text = g_strdup( jd->oauth2_access_token );
-                reply->text_len = strlen( jd->oauth2_access_token );
         }
         else if( sup_fb && want_oauth )