Changeset bae0617 for protocols/msn/msn.c

Timestamp:

2010-09-03T21:24:58Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4aa8a04

Parents:

64768d4

Message:

Rearrange things a bit to support multiple NS connections. This is apparently
needed for refreshing auth. tokens.

File:

• protocols/msn/msn.c (modified) (3 diffs)

protocols/msn/msn.c

@@ -53 +53 @@
         
         ic->proto_data = md;
-        md->fd = -1;
         
         if( strchr( acc->user, '@' ) == NULL )
@@ -62 +61 @@
         }
         
-        imcb_log( ic, "Connecting" );
-        
-        md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, ic );
-        if( md->fd < 0 )
-        {
-                imcb_error( ic, "Could not connect to server" );
-                imc_logout( ic, TRUE );
-                return;
-        }
-        
         md->ic = ic;
         md->away_state = msn_away_state_list;
         md->domaintree = g_tree_new( msn_domaintree_cmp );
         
-        msn_connections = g_slist_append( msn_connections, ic );
+        msn_connections = g_slist_prepend( msn_connections, ic );
+        
+        imcb_log( ic, "Connecting" );
+        msn_ns_connect( ic, md->ns, MSN_NS_HOST, MSN_NS_PORT );
 }
 
@@ -93 +85 @@
                 */
                 
-                if( md->fd >= 0 )
-                        closesocket( md->fd );
-                
-                if( md->handler )
-                {
-                        if( md->handler->rxq ) g_free( md->handler->rxq );
-                        if( md->handler->cmd_text ) g_free( md->handler->cmd_text );
-                        g_free( md->handler );
-                }
+                msn_ns_close( md->ns );
+                msn_ns_close( md->auth );
                 
                 while( md->switchboards )