Changeset c6fc24a

Timestamp:

2012-09-17T21:42:27Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9c77fbf

Parents:

a325ebd (diff), daf544a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

File:

• protocols/jabber/io.c (modified) (1 diff)

protocols/jabber/io.c

@@ -453 +453 @@
 {
         struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         int allow_reconnect = TRUE;
         struct jabber_error *err;
+        struct xt_node *host;
+        
+        if( !( ic->flags & OPT_LOGGED_IN ) &&
+            ( host = xt_find_node( node->children, "see-other-host" ) ) &&
+            host->text )
+        {
+                char *s;
+                int port = set_getint( &ic->acc->set, "port" );
+                
+                /* Let's try to obey this request, if we're not logged
+                   in yet (i.e. not have too much state yet). */
+                if( jd->ssl )
+                        ssl_disconnect( jd->ssl );
+                closesocket( jd->fd );
+                b_event_remove( jd->r_inpa );
+                b_event_remove( jd->w_inpa );
+                
+                jd->ssl = NULL;
+                jd->r_inpa = jd->w_inpa = 0;
+                jd->flags &= JFLAG_XMLCONSOLE;
+                
+                s = strchr( host->text, ':' );
+                if( s != NULL )
+                        sscanf( s + 1, "%d", &port );
+                
+                imcb_log( ic, "Redirected to %s", host->text );
+                jd->fd = proxy_connect( host->text, port, jabber_connected_plain, ic );
+                
+                return XT_ABORT;
+        }
         
         err = jabber_error_parse( node, XMLNS_STREAM_ERROR );