Changeset c27a923 for protocols


Ignore:
Timestamp:
2014-10-11T02:20:52Z (5 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:
3 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/jabber.c

    r168d3bb rc27a923  
    148148                jd->fd = jd->r_inpa = jd->w_inpa = -1;
    149149               
    150                 if( strstr( jd->server, ".live.com" ) )
    151                         jd->oauth2_service = &oauth2_service_mslive;
    152                 else if( strstr( jd->server, ".facebook.com" ) )
     150                if( strstr( jd->server, ".facebook.com" ) )
    153151                        jd->oauth2_service = &oauth2_service_facebook;
    154152                else
  • protocols/jabber/jabber.h

    r168d3bb rc27a923  
    338338extern const struct oauth2_service oauth2_service_google;
    339339extern const struct oauth2_service oauth2_service_facebook;
    340 extern const struct oauth2_service oauth2_service_mslive;
    341340
    342341/* conference.c */
  • protocols/jabber/sasl.c

    r168d3bb rc27a923  
    4747        "4b100f0f244d620bf3f15f8b217d4c32",
    4848};
    49 const struct oauth2_service oauth2_service_mslive =
    50 {
    51         "https://oauth.live.com/authorize",
    52         "https://oauth.live.com/token",
    53         "http://www.bitlbee.org/main.php/Messenger/oauth2.html",
    54         "wl.offline_access%20wl.messenger",
    55         "000000004C06FCD1",
    56         "IRKlBPzJJAWcY-TbZjiTEJu9tn7XCFaV",
    57 };
    5849
    5950xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data )
     
    6354        struct xt_node *c, *reply;
    6455        char *s;
    65         int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_ms = 0;
     56        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
    6657        int want_oauth = FALSE;
    6758        GString *mechs;
     
    9889                else if( c->text && g_strcasecmp( c->text, "X-FACEBOOK-PLATFORM" ) == 0 )
    9990                        sup_fb = 1;
    100                 else if( c->text && g_strcasecmp( c->text, "X-MESSENGER-OAUTH2" ) == 0 )
    101                         sup_ms = 1;
    10291               
    10392                if( c->text )
     
    10998        if( !want_oauth && !sup_plain && !sup_digest )
    11099        {
    111                 if( !sup_gtalk && !sup_fb && !sup_ms )
     100                if( !sup_gtalk && !sup_fb )
    112101                        imcb_error( ic, "This server requires OAuth "
    113102                                        "(supported schemes:%s)", mechs->str );
     
    141130                reply->text_len = strlen( reply->text );
    142131                g_free( s );
    143         }
    144         else if( sup_ms && want_oauth )
    145         {
    146                 xt_add_attr( reply, "mechanism", "X-MESSENGER-OAUTH2" );
    147                 reply->text = g_strdup( jd->oauth2_access_token );
    148                 reply->text_len = strlen( jd->oauth2_access_token );
    149132        }
    150133        else if( sup_fb && want_oauth )
Note: See TracChangeset for help on using the changeset viewer.