Changeset 632627e

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.

Files:

• configure (modified) (3 diffs)
• lib/Makefile (modified) (1 diff)
• lib/misc.c (modified) (2 diffs)
• lib/misc.h (modified) (1 diff)
• lib/ns_parse.c (added)

configure

@@ -341 +341 @@
 int main()
 {
+
+        res_query( NULL, 0, 0, NULL, 0);
+        dn_expand( NULL, NULL, NULL, NULL, 0);
+        dn_skipname( NULL, NULL);
+}
+'
+RESOLV_NS_TESTCODE='
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h> 
+
+int main()
+{
         ns_initparse( NULL, 0, NULL );
         ns_parserr( NULL, ns_s_an, 0, NULL );
 }
 '
+RESOLV_NS_TYPES_TESTCODE='
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+
+int main()
+{
+        ns_msg nsh;
+        ns_rr rr;
+
+        ns_initparse( NULL, 0, NULL );
+        ns_parserr( NULL, ns_s_an, 0, NULL );
+}
+'
 
 detect_resolv_dynamic()
 {
         case "$arch" in
+        OpenBSD )
+                # In FreeBSD res_*/dn_* routines are present in libc.so
+                LIBRESOLV=;;
         FreeBSD )
-                # In FreeBSD res_* routines are present in libc.so
+                # In FreeBSD res_*/dn_* routines are present in libc.so
+                LIBRESOLV=;;
+        CYGWIN* )
+                # In Cygwin res_*/dn_* routines are present in libc.so
                 LIBRESOLV=;;
         * )
@@ -385 +419 @@
 }
 
+detect_resolv_ns_dynamic()
+{
+        case "$arch" in
+        FreeBSD )
+                # In FreeBSD ns_ routines are present in libc.so
+                LIBRESOLV=;;
+        * )
+                LIBRESOLV=-lresolv;;
+        esac
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        ret=1
+        echo "$RESOLV_NS_TESTCODE" | $CC -o $TMPFILE -x c - $LIBRESOLV >/dev/null 2>/dev/null
+        if [ "$?" = "0" ]; then
+                ret=0
+        fi
+
+        rm -f $TMPFILE
+        return $ret
+}
+
+detect_resolv_ns_static()
+{
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        ret=1
+        for i in $systemlibdirs; do
+                if [ -f $i/libresolv.a ]; then
+                        echo "$RESOLV_NS_TESTCODE" | $CC -o $TMPFILE -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
+                        if [ "$?" = "0" ]; then
+                                ret=0
+                        fi
+                fi
+        done
+
+        rm -f $TMPFILE
+        return $ret
+}
+
+detect_nameser_has_ns_types()
+{
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        case "$arch" in
+        FreeBSD )
+                # In FreeBSD ns_ routines are present in libc.so
+                LIBRESOLV=;;
+        * )
+                LIBRESOLV=-lresolv;;
+        esac
+        ret=1
+    if detect_resolv_ns_dynamic; then
+            echo "$RESOLV_NS_TYPES_TESTCODE" | $CC -o $TMPFILE -x c $LIBRESOLV -  >/dev/null 2>/dev/null
+        if [ "$?" = "0" ]; then
+            ret=0
+        fi
+    elif detect_resolv_ns_static; then
+            for i in $systemlibdirs; do
+                    if [ -f $i/libresolv.a ]; then
+                            echo "$RESOLV_NS_TYPES_TESTCODE" | $CC -o $TMPFILE -x c -  >/dev/null 2>/dev/null
+                    if [ "$?" = "0" ]; then
+                        ret=0
+                    fi
+                    fi
+            done
+    fi
+
+        rm -f $TMPFILE
+        return $ret
+}
+
 if [ "$ssl" = "auto" ]; then
         detect_gnutls
@@ -440 +542 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
+if detect_nameser_has_ns_types; then
+        echo '#define NAMESER_HAS_NS_TYPES' >> config.h
+fi
 if detect_resolv_dynamic || detect_resolv_static; then
         echo '#define HAVE_RESOLV_A' >> config.h
-fi
+    if detect_resolv_ns_dynamic || detect_resolv_ns_static; then
+            echo '#define HAVE_RESOLV_A_WITH_NS' >> config.h
+    fi
+else
+    echo 'Insufficient resolv routines. Jabber server must be set explicitly'
+fi
+
 
 STORAGES="xml"

lib/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
 
 LFLAGS += -r

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];

lib/misc.h

@@ -38 +38 @@
 };
 
+#ifndef NAMESER_HAS_NS_TYPES
+
+#define NS_MAXDNAME 1025
+#define NS_INT16SZ  2
+#define NS_INT32SZ  4
+
+#define NS_GET16(s, cp) do { \
+        register const unsigned char *t_cp = (const unsigned char*)(cp); \
+        (s) = ((guint16)t_cp[0] << 8) \
+            | ((guint16)t_cp[1]) \
+            ; \
+        (cp) += NS_INT16SZ; \
+} while(0)
+
+#define NS_GET32(s, cp) do { \
+        register const unsigned char *t_cp = (const unsigned char*)(cp); \
+        (s) = ((guint16)t_cp[0] << 24) \
+            | ((guint16)t_cp[1] << 16) \
+            | ((guint16)t_cp[2] << 8) \
+            | ((guint16)t_cp[3]) \
+            ; \
+        (cp) += NS_INT32SZ; \
+} while(0)
+
+#define ns_rr_rdlen(rr) ((rr).rdlength + 0)
+#define ns_rr_rdata(rr) ((rr).rdata + 0)
+
+struct _ns_flagdata { int mask, shift; };
+
+typedef struct __ns_rr {
+        char name[NS_MAXDNAME];
+        guint16 type;
+        guint16 rr_class;
+        guint32 ttl;
+        guint16 rdlength;
+        const unsigned char* rdata;
+} ns_rr;
+
+typedef enum __ns_sect {
+        ns_s_qd = 0,
+        ns_s_zn = 0,
+        ns_s_an = 1,
+        ns_s_pr = 1,
+        ns_s_ns = 2,
+        ns_s_ud = 2,
+        ns_s_ar = 3,
+        ns_s_max =4
+} ns_sect;
+
+typedef struct __ns_msg
+{
+        const unsigned char* _msg;
+        const unsigned char* _eom;
+        guint16 _id;
+        guint16 _flags;
+        guint16 _counts[ns_s_max];
+        const unsigned char* _sections[ns_s_max];
+        ns_sect _sect;
+        int _rrnum;
+        const unsigned char* _msg_ptr;
+} ns_msg;
+
+typedef enum __ns_class {
+        ns_c_invalid = 0,
+        ns_c_in = 1,
+        ns_c_2 = 2,
+        ns_c_chaos = 3,
+        ns_c_hs = 4,
+        ns_c_none = 254,
+        ns_c_any = 255,
+        ns_c_max = 65536
+} ns_class;
+
+
+/* TODO : fill out the rest */
+typedef enum __ns_type {
+        ns_t_srv = 33
+} ns_type;
+
+#endif /* NAMESER_HAS_NS_INITPARSE */
+
 G_MODULE_EXPORT void strip_linefeed( gchar *text );
 G_MODULE_EXPORT char *add_cr( char *text );