Changeset ffdf2e7

Timestamp:

2010-08-10T11:18:09Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

72176c1

Parents:

f32c14c

Message:

When doing SRV lookups, return an array with all RRs instead of just the
first one. The first isn't always the best one and this is currently causing
GTalk issues when talk2.l.google.com (which is currently dead) is first.

Files:

• lib/misc.c (modified) (3 diffs)
• lib/misc.h (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (3 diffs)

lib/misc.c

@@ -508 +508 @@
 }
 
-struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain )
+struct ns_srv_reply **srv_lookup( char *service, char *protocol, char *domain )
 {       
+        struct ns_srv_reply **replies = NULL;
+#ifdef HAVE_RESOLV_A
         struct ns_srv_reply *reply = NULL;
-#ifdef HAVE_RESOLV_A
         char name[1024];
         unsigned char querybuf[1024];
@@ -517 +518 @@
         ns_msg nsh;
         ns_rr rr;
-        int i, len, size;
+        int i, n, len, size;
         
         g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain );
@@ -527 +528 @@
                 return NULL;
         
-        if( ns_parserr( &nsh, ns_s_an, 0, &rr ) != 0 )
-                return NULL;
-        
-        size = ns_rr_rdlen( rr );
-        buf = ns_rr_rdata( rr );
-        
-        len = 0;
-        for( i = 6; i < size && buf[i]; i += buf[i] + 1 )
-                len += buf[i] + 1;
-        
-        if( i > size )
-                return NULL;
-        
-        reply = g_malloc( sizeof( struct ns_srv_reply ) + len );
-        memcpy( reply->name, buf + 7, len );
-        
-        for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 )
-                reply->name[i] = '.';
-        
-        if( i > len )
-        {
-                g_free( reply );
-                return NULL;
-        }
-        
-        reply->prio = ( buf[0] << 8 ) | buf[1];
-        reply->weight = ( buf[2] << 8 ) | buf[3];
-        reply->port = ( buf[4] << 8 ) | buf[5];
+        n = 0;
+        while( ns_parserr( &nsh, ns_s_an, n, &rr ) == 0 )
+        {
+                size = ns_rr_rdlen( rr );
+                buf = ns_rr_rdata( rr );
+                
+                len = 0;
+                for( i = 6; i < size && buf[i]; i += buf[i] + 1 )
+                        len += buf[i] + 1;
+                
+                if( i > size )
+                        break;
+                
+                reply = g_malloc( sizeof( struct ns_srv_reply ) + len );
+                memcpy( reply->name, buf + 7, len );
+                
+                for( i = buf[6]; i < len && buf[7+i]; i += buf[7+i] + 1 )
+                        reply->name[i] = '.';
+                
+                if( i > len )
+                {
+                        g_free( reply );
+                        break;
+                }
+                
+                reply->prio = ( buf[0] << 8 ) | buf[1];
+                reply->weight = ( buf[2] << 8 ) | buf[3];
+                reply->port = ( buf[4] << 8 ) | buf[5];
+                
+                n ++;
+                replies = g_renew( struct ns_srv_reply *, replies, n + 1 );
+                replies[n-1] = reply;
+        }
+        if( replies )
+                replies[n] = NULL;
 #endif
         
-        return reply;
+        return replies;
+}
+
+void srv_free( struct ns_srv_reply **srv )
+{
+        int i;
+        
+        if( srv == NULL )
+                return;
+        
+        for( i = 0; srv[i]; i ++ )
+                g_free( srv[i] );
+        g_free( srv );
 }
 

lib/misc.h

@@ -61 +61 @@
 G_MODULE_EXPORT int bool2int( char *value );
 
-G_MODULE_EXPORT struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain );
+G_MODULE_EXPORT struct ns_srv_reply **srv_lookup( char *service, char *protocol, char *domain );
+G_MODULE_EXPORT void srv_free( struct ns_srv_reply **srv );
 
 G_MODULE_EXPORT char *word_wrap( const char *msg, int line_len );

protocols/jabber/jabber.c

@@ -96 +96 @@
         struct im_connection *ic = imcb_new( acc );
         struct jabber_data *jd = g_new0( struct jabber_data, 1 );
-        struct ns_srv_reply *srv = NULL;
+        struct ns_srv_reply **srvl = NULL, *srv;
         char *connect_to, *s;
         int i;
@@ -196 +196 @@
         if( acc->server && *acc->server )
                 connect_to = acc->server;
-        else if( ( srv = srv_lookup( "xmpp-client", "tcp", jd->server ) ) ||
-                 ( srv = srv_lookup( "jabber-client", "tcp", jd->server ) ) )
+        else if( ( srvl = srv_lookup( "xmpp-client", "tcp", jd->server ) ) ||
+                 ( srvl = srv_lookup( "jabber-client", "tcp", jd->server ) ) )
+        {
+                /* Find the lowest-priority one. These usually come
+                   back in random/shuffled order. Not looking at
+                   weights etc for now. */
+                srv = *srvl;
+                for( i = 1; srvl[i]; i ++ )
+                        if( srvl[i]->prio < srv->prio )
+                                srv = srvl[i];
+                
                 connect_to = srv->name;
+        }
         else
                 connect_to = jd->server;
@@ -227 +237 @@
                 jd->fd = proxy_connect( connect_to, srv ? srv->port : set_getint( &acc->set, "port" ), jabber_connected_plain, ic );
         }
-        g_free( srv );
+        srv_free( srvl );
         
         if( jd->fd == -1 )