Changeset 7741

Timestamp:

Jan 17, 2009, 11:34:00 PM (12 years ago)

Author:

charles

Message:

(1.5x) copy r7739 and r7740 to 1.5x

Location:

branches/1.5x

Files:

• configure.ac (modified) (3 diffs)
• libtransmission/net.c (modified) (3 diffs)
• libtransmission/net.h (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (1 diff)
• libtransmission/web.c (modified) (2 diffs)

branches/1.5x/configure.ac

@@ -20 +20 @@
 AC_PROG_LIBTOOL
 
-if test m4_substr(peer_id_prefix,6,1) = "X"; then
-  AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
+if test m4_substr(peer_id_prefix,6,1) = "0"; then
+  supported_build=yes
+  CFLAGS="$CFLAGS -g -O3 -funroll-loops "
+  CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops "
+  AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
+else
   supported_build=no
-elif test m4_substr(peer_id_prefix,6,1) = "Z"; then
-  AC_DEFINE(TR_NIGHTLY_RELEASE, 1, [Define to 1 if this is a nightly release of Transmission])
-  supported_build=no
-else
-  AC_DEFINE(TR_STABLE_RELEASE, 1, [Define to 1 if this is a stable release of Transmission])
-  supported_build=yes
+  CFLAGS="$CFLAGS -g -O0"
+  CXXFLAGS="$CXXFLAGS -g -O0"
+  if test m4_substr(peer_id_prefix,6,1) = "X"; then
+    AC_DEFINE(TR_BETA_RELEASE, 1, [Define to 1 if this is a beta release of Transmission])
+  else
+    AC_DEFINE(TR_NIGHTLY_RELEASE, 1, [Define to 1 if this is a nightly release of Transmission])
+  fi
 fi
 AM_CONDITIONAL(TR_UNSTABLE, test "x$supported_build" = "xno")
@@ -94 +99 @@
     )
 ])
-
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl  debugging support
-AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug],[build with debugging support]),,,)
-if test "x$enable_debug" = "xyes" ; then
-        CFLAGS="$CFLAGS -g -O0"
-        CXXFLAGS="$CXXFLAGS -g -O0"
-else
-        CFLAGS="$CFLAGS -g -O3 -funroll-loops -DNDEBUG "
-        CXXFLAGS="$CXXFLAGS -g -O3 -funroll-loops -DNDEBUG "
-fi
-
 
 dnl ----------------------------------------------------------------------------
@@ -336 +327 @@
         Source code location:       ${srcdir}
         Compiler:                   ${CXX}
-        Debugging support           ${enable_debug}
         Build Command-Line client:  ${build_cli}
         Build Daemon:               ${build_daemon}

branches/1.5x/libtransmission/net.c

@@ -58 +58 @@
     { { { { INADDR_ANY, 0x00, 0x00, 0x00 } } } } }; 
 
-
 #ifdef WIN32
 static const char *
@@ -463 +462 @@
 }
 
+static tr_bool
+isMulticastAddress( const tr_address * addr )
+{
+    if( addr->type == TR_AF_INET && IN_MULTICAST( htonl( addr->addr.addr4.s_addr ) ) )
+        return TRUE;
+
+    if( addr->type == TR_AF_INET6 && ( addr->addr.addr6.s6_addr[0] == 0xff ) )
+        return TRUE;
+
+    return FALSE;
+}
+
+tr_bool
+tr_isValidPeerAddress( const tr_address * addr, tr_port port )
+{
+    if( isMulticastAddress( addr ) )
+        return FALSE;
+
+    if( port == 0 )
+        return FALSE;
+
+    return TRUE;
+}
+
 int
 tr_netOpenTCP( tr_session        * session,
@@ -475 +498 @@
     assert( tr_isAddress( addr ) );
 
-    /* don't try to connect to multicast addresses */
-    if( addr->type == TR_AF_INET && IN_MULTICAST( htonl( addr->addr.addr4.s_addr ) ) )
-        return -EINVAL;
-    if( addr->type == TR_AF_INET6 && ( addr->addr.addr6.s6_addr[0] == 0xff ) )
+    if( isMulticastAddress( addr ) )
         return -EINVAL;
 

branches/1.5x/libtransmission/net.h

@@ -89 +89 @@
 void tr_normalizeV4Mapped( tr_address * const addr );
 
+tr_bool tr_isValidPeerAddress( const tr_address * addr, tr_port port );
+
 void tr_suspectAddress( const tr_address * a, const char * source );
 

branches/1.5x/libtransmission/peer-mgr.c

@@ -1316 +1316 @@
 
         if( !tr_sessionIsAddressBlocked( t->manager->session, &pex->addr ) )
-            ensureAtomExists( t, &pex->addr, pex->port, pex->flags, from );
+            if( tr_isValidPeerAddress( &pex->addr, pex->port ) )
+                ensureAtomExists( t, &pex->addr, pex->port, pex->flags, from );
 
         managerUnlock( t->manager );

branches/1.5x/libtransmission/web.c

@@ -126 +126 @@
         }
 
-        curl_easy_setopt( easy, CURLOPT_DNS_CACHE_TIMEOUT, 3600L );
-        curl_easy_setopt( easy, CURLOPT_CONNECTTIMEOUT, 120L );
+        curl_easy_setopt( easy, CURLOPT_DNS_CACHE_TIMEOUT, 360L );
+        curl_easy_setopt( easy, CURLOPT_CONNECTTIMEOUT, 60L );
         curl_easy_setopt( easy, CURLOPT_FOLLOWLOCATION, 1L );
         curl_easy_setopt( easy, CURLOPT_FORBID_REUSE, 1L );
+        curl_easy_setopt( easy, CURLOPT_MAXREDIRS, 16L );
         curl_easy_setopt( easy, CURLOPT_NOSIGNAL, 1L );
         curl_easy_setopt( easy, CURLOPT_PRIVATE, task );
@@ -200 +201 @@
 remove_finished_tasks( tr_web * g )
 {
-    for( ;; )
+    CURL * easy;
+
+    do
     {
-        int ignored;
-        CURLMsg * msg = curl_multi_info_read( g->multi, &ignored );
-
-        if( msg == NULL )
-        {
-            break;
-        }
-        else if( ( msg->msg == CURLMSG_DONE ) && ( msg->easy_handle != NULL ) )
-        {
-            CURL * easy = msg->easy_handle;
+        CURLMsg * msg;
+        int msgs_left;
+
+        easy = NULL;
+        while(( msg = curl_multi_info_read( g->multi, &msgs_left ))) {
+            if( msg->msg == CURLMSG_DONE ) {
+                easy = msg->easy_handle;
+                break;
+            }
+        }
+
+        if( easy ) {
             long code;
             struct tr_web_task * task;
             curl_easy_getinfo( easy, CURLINFO_PRIVATE, (void*)&task );
             curl_easy_getinfo( easy, CURLINFO_RESPONSE_CODE, &code );
-            task_finish( task, code );
             curl_multi_remove_handle( g->multi, easy );
             curl_easy_cleanup( easy );
-        }
-    }
+            task_finish( task, code );
+        }
+    }
+    while ( easy );
 
     g->prev_running = g->still_running;