Changeset 07874be for lib

Timestamp:

2010-08-14T13:44:35Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e5854a8

Parents:

5848675 (diff), 136c2bb (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 stuff.

Location:

lib

Files:

• misc.c (modified) (3 diffs)
• misc.h (modified) (1 diff)

lib/misc.c

@@ -505 +505 @@
 }
 
-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];
@@ -514 +515 @@
         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 );
@@ -524 +525 @@
                 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 );