Changeset 10509

Timestamp:

Apr 22, 2010, 2:04:43 AM (9 years ago)

Author:

charles

Message:

(trunk libT) #3162 "allow optional end-user configuration of TCP_CONGESTION" -- minor tweak removing a little bit of code duplication in r10508

File:

• trunk/libtransmission/peer-io.c (modified) (3 diffs)

trunk/libtransmission/peer-io.c

@@ -357 +357 @@
 **/
 
+static void
+maybeSetCongestionAlgorithm( int socket, const char * algorithm )
+{
+    if( algorithm && *algorithm )
+    {
+        const int rc = tr_netSetCongestionControl( socket, algorithm );
+
+        if( rc < 0 )
+            tr_ninf( "Net", "Can't set congestion control algorithm '%s': %s",
+                     algorithm, tr_strerror( errno ));
+    }
+}
+
 static tr_peerIo*
 tr_peerIoNew( tr_session       * session,
@@ -377 +390 @@
     if( socket >= 0 ) {
         tr_netSetTOS( socket, session->peerSocketTOS );
-        if( session->peer_congestion_algorithm &&
-            session->peer_congestion_algorithm[0] ) {
-            int rc;
-            rc = tr_netSetCongestionControl( socket,
-                                             session->peer_congestion_algorithm );
-            if(rc < 0) {
-                tr_ninf( "Net",
-                         "Couldn't set congestion control algorithm: %s\n",
-                         strerror(errno));
-            }
-        }
+        maybeSetCongestionAlgorithm( socket, session->peer_congestion_algorithm );
     }
     
@@ -659 +662 @@
     {
         tr_netSetTOS( io->socket, session->peerSocketTOS );
-        if( session->peer_congestion_algorithm &&
-            session->peer_congestion_algorithm[0] ) {
-            int rc;
-            rc = tr_netSetCongestionControl( io->socket,
-                                             session->peer_congestion_algorithm );
-            if(rc < 0) {
-                tr_ninf( "Net",
-                         "Couldn't set congestion control algorithm: %s\n",
-                         strerror(errno));
-            }
-        }
-
+        maybeSetCongestionAlgorithm( io->socket, session->peer_congestion_algorithm );
         return 0;
     }