Changeset 36e9f62 for protocols

Timestamp:

2006-10-07T17:46:28Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

038d17f

Parents:

090f1cb

Message:

Added SRV lookups to automatically find out the correct server for a
domain.

Location:

protocols/jabber

Files:

• jabber.c (modified) (2 diffs)
• presence.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -59 +59 @@
         struct gaim_connection *gc = new_gaim_conn( acc );
         struct jabber_data *jd = g_new0( struct jabber_data, 1 );
+        struct ns_srv_reply *srv = NULL;
+        char *connect_to;
         
         jd->gc = gc;
@@ -79 +81 @@
         jd->node_cache = xt_new_node( "cache", NULL, NULL );
         
+        /* Figure out the hostname to connect to. */
+        if( acc->server )
+                connect_to = acc->server;
+        else if( ( srv = srv_lookup( "xmpp-client", "tcp", jd->server ) ) ||
+                 ( srv = srv_lookup( "jabber-client", "tcp", jd->server ) ) )
+                connect_to = srv->name;
+        else
+                connect_to = jd->server;
+        
+        /* For non-SSL connections we can try to use the port # from the SRV
+           reply, but let's not do that when using SSL, SSL usually runs on
+           non-standard ports... */
         if( set_getbool( &acc->set, "ssl" ) )
         {
-                jd->ssl = ssl_connect( acc->server ? acc->server : jd->server, set_getint( &acc->set, "port" ), jabber_connected_ssl, gc );
+                jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), jabber_connected_ssl, gc );
                 jd->fd = ssl_getfd( jd->ssl );
         }
         else
         {
-                jd->fd = proxy_connect( acc->server ? acc->server : jd->server, set_getint( &acc->set, "port" ), jabber_connected_plain, gc );
-        }
+                jd->fd = proxy_connect( connect_to, srv ? srv->port : set_getint( &acc->set, "port" ), jabber_connected_plain, gc );
+        }
+        
+        g_free( srv );
 }
 

protocols/jabber/presence.c

@@ -38 +38 @@
                 *s = 0;
         
+        /* Will implement better parsing of away states/msgs when we
+           finally do those API changes. Which will probably be after
+           merging this module into the main tree. */
         if( type == NULL )
                 serv_got_update( gc, from, 1, 0, 0, 0, 0, 0 );
@@ -84 +87 @@
         
         node = jabber_make_packet( "presence", NULL, NULL, NULL );
+        xt_add_child( node, xt_new_node( "priority", set_getstr( &gc->acc->set, "priority" ), NULL ) );
         if( show && *show )
                 xt_add_child( node, xt_new_node( "show", show, NULL ) );
         if( status )
                 xt_add_child( node, xt_new_node( "status", status, NULL ) );
-        /* if( set_getint( &gc->acc->set, "priority" ) != 0 ) */
-        /* Let's just send this every time... */
-                xt_add_child( node, xt_new_node( "priority", set_getstr( &gc->acc->set, "priority" ), NULL ) );
         
         st = jabber_write_packet( gc, node );