Changeset 632627e for lib/misc.c

Timestamp:

2014-07-24T03:51:07Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

f93fd2d

Parents:

59e66ff

git-author:

jcopenha <jcopenha@…> (24-07-14 03:51:07)

git-committer:

dequis <dx@…> (24-07-14 03:51:07)

Message:

srv_lookup: Portability fixes, handle compressed responses

srv_lookup works on cygwin and openbsd now.

Provide ns_initparse, friends, and types where they aren't provided by
platform.

Use dn_expandname instead of custom parser so compressed DNS responses
are handled correctly.

File:

• lib/misc.c (modified) (2 diffs)

lib/misc.c

@@ -525 +525 @@
         ns_msg nsh;
         ns_rr rr;
-        int i, n, len, size;
+        int n, len, size;
         
         g_snprintf( name, sizeof( name ), "_%s._%s.%s", service, protocol, domain );
@@ -538 +538 @@
         while( ns_parserr( &nsh, ns_s_an, n, &rr ) == 0 )
         {
-                size = ns_rr_rdlen( rr );
+                char name[NS_MAXDNAME];
+
+                if( ns_rr_rdlen( rr ) < 7)
+                    break;
+
                 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 )
+                if( dn_expand(querybuf, querybuf + size, &buf[6], name, NS_MAXDNAME) == -1 )
                         break;
+
+                len = strlen(name) + 1;
                 
                 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;
-                }
+                memcpy( reply->name, name, len );
                 
                 reply->prio = ( buf[0] << 8 ) | buf[1];