Changeset 164

Timestamp:

Mar 24, 2006, 12:18:38 PM (17 years ago)

Author:

titer

Message:

Adds non-blocking (threaded) DNS resolution

Location:

trunk/libtransmission

Files:

• net.c (modified) (2 diffs)
• net.h (modified) (2 diffs)
• tracker.c (modified) (3 diffs)

trunk/libtransmission/net.c

@@ -1 +1 @@
 /******************************************************************************
- * Copyright (c) 2005 Eric Petit
+ * Copyright (c) 2005-2006 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -59 +59 @@
 }
 
+struct tr_resolve_s
+{
+    int            status;
+    char           * address;
+    struct in_addr addr;
+
+    tr_lock_t      lock;
+    tr_thread_t    thread;
+};
+
+static void resolveFunc( void * _r )
+{
+    tr_resolve_t * r = _r;
+    struct hostent * host;
+
+    tr_lockLock( &r->lock );
+    r->addr.s_addr = inet_addr( r->address );
+    if( r->addr.s_addr != 0xFFFFFFFF )
+    {
+        r->status = TR_RESOLVE_OK;
+        tr_lockUnlock( &r->lock );
+        return;
+    }
+    tr_lockUnlock( &r->lock );
+
+    if( !( host = gethostbyname( r->address ) ) )
+    {
+        tr_lockLock( &r->lock );
+        r->status = TR_RESOLVE_ERROR;
+        tr_lockUnlock( &r->lock );
+        return;
+    }
+    tr_lockLock( &r->lock );
+    memcpy( &r->addr, host->h_addr, host->h_length );
+    r->status = TR_RESOLVE_OK;
+    tr_lockUnlock( &r->lock );
+}
+
+tr_resolve_t * tr_netResolveInit( char * address )
+{
+    tr_resolve_t * r = malloc( sizeof( tr_resolve_t ) );
+
+    r->status  = TR_RESOLVE_WAIT;
+    r->address = address;
+
+    tr_lockInit( &r->lock );
+    tr_threadCreate( &r->thread, resolveFunc, r );
+
+    return r;
+}
+
+int tr_netResolvePulse( tr_resolve_t * r, struct in_addr * addr )
+{
+    int ret;
+
+    tr_lockLock( &r->lock );
+    ret = r->status;
+    if( ret == TR_RESOLVE_OK )
+    {
+        *addr = r->addr;
+    }
+    tr_lockUnlock( &r->lock );
+
+    return ret;
+}
+
+void tr_netResolveClose( tr_resolve_t * r )
+{
+    tr_threadJoin( &r->thread );
+    tr_lockClose( &r->lock );
+    free( r );
+}
+
+/* Blocking version */
 int tr_netResolve( char * address, struct in_addr * addr )
 {
-    struct hostent * host;
-
-    addr->s_addr = inet_addr( address );
-    if( addr->s_addr != 0xFFFFFFFF )
-    {
-        return 0;
-    }
-
-    if( !( host = gethostbyname( address ) ) )
-    {
-        tr_err( "Could not resolve (%s)", address );
-        return -1;
-    }
-    memcpy( addr, host->h_addr, host->h_length );
-
-    return 0;
+    tr_resolve_t * r = tr_netResolveInit( address );
+    int ret;
+
+    for( ;; )
+    {
+        ret = tr_netResolvePulse( r, addr );
+        if( ret != TR_RESOLVE_WAIT )
+        {
+            break;
+        }
+        tr_wait( 20 );
+    }
+
+    tr_netResolveClose( r );
+    return ( ret != TR_RESOLVE_OK );
 }
 

trunk/libtransmission/net.h

@@ -1 +1 @@
 /******************************************************************************
- * Copyright (c) 2005 Eric Petit
+ * Copyright (c) 2005-2006 Transmission authors and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -21 +21 @@
  *****************************************************************************/
 
+#define TR_RESOLVE_WAIT  0
+#define TR_RESOLVE_ERROR 1
+#define TR_RESOLVE_OK    2
+typedef struct tr_resolve_s tr_resolve_t;
+tr_resolve_t * tr_netResolveInit( char * );
+int            tr_netResolvePulse( tr_resolve_t *, struct in_addr * );
+void           tr_netResolveClose( tr_resolve_t * );
+
 int  tr_netResolve ( char *, struct in_addr * );
 int  tr_netOpen    ( struct in_addr addr, in_port_t port );

trunk/libtransmission/tracker.c

@@ -42 +42 @@
 
 #define TC_STATUS_IDLE    1
-#define TC_STATUS_CONNECT 2
-#define TC_STATUS_RECV    4
+#define TC_STATUS_RESOLVE 2
+#define TC_STATUS_CONNECT 4
+#define TC_STATUS_RECV    8
     char           status;
 
+    tr_resolve_t * resolve;
     int            socket;
     uint8_t      * buf;
@@ -137 +139 @@
     if( ( tc->status & TC_STATUS_IDLE ) && shouldConnect( tc ) )
     {
-        struct in_addr addr;
-
-        if( tr_fdSocketWillCreate( tor->fdlimit, 1 ) )
-        {
-            return 0;
-        }
-
-        if( tr_netResolve( inf->trackerAddress, &addr ) )
-        {
-            tr_fdSocketClosed( tor->fdlimit, 1 );
-            return 0;
-        }
-
-        tc->socket = tr_netOpen( addr, htons( inf->trackerPort ) );
-        if( tc->socket < 0 )
-        {
-            tr_fdSocketClosed( tor->fdlimit, 1 );
-            return 0;
-        }
+        tc->resolve = tr_netResolveInit( inf->trackerAddress );
 
         tr_inf( "Tracker: connecting to %s:%d (%s)",
@@ -165 +149 @@
                       "getting peers" ) ) ) );
 
-        tc->status  = TC_STATUS_CONNECT;
+        tc->status  = TC_STATUS_RESOLVE;
         tc->dateTry = tr_date();
+    }
+
+    if( tc->status & TC_STATUS_RESOLVE )
+    {
+        int ret;
+        struct in_addr addr;
+
+        ret = tr_netResolvePulse( tc->resolve, &addr );
+        if( ret == TR_RESOLVE_WAIT )
+        {
+            return 0;
+        }
+        else
+        {
+            tr_netResolveClose( tc->resolve );
+        }
+        
+        if( ret == TR_RESOLVE_ERROR )
+        {
+            tc->status = TC_STATUS_IDLE;
+            return 0;
+        }
+
+        if( tr_fdSocketWillCreate( tor->fdlimit, 1 ) )
+        {
+            return 0;
+        }
+
+        tc->socket = tr_netOpen( addr, htons( inf->trackerPort ) );
+        if( tc->socket < 0 )
+        {
+            tr_fdSocketClosed( tor->fdlimit, 1 );
+            return 0;
+        }
+
+        tc->status = TC_STATUS_CONNECT;
     }