Changeset 10508

Timestamp:

Apr 22, 2010, 1:49:16 AM (11 years ago)

Author:

charles

Message:

(trunk libT) #3162 "allow optional end-user configuration of TCP_CONGESTION" -- add jch's implementation of this to trunk for 2.00

Location:

trunk/libtransmission

Files:

• net.c (modified) (2 diffs)
• net.h (modified) (1 diff)
• peer-io.c (modified) (2 diffs)
• session.c (modified) (3 diffs)
• session.h (modified) (1 diff)
• transmission.h (modified) (1 diff)

trunk/libtransmission/net.c

@@ -36 +36 @@
  #include <WS2tcpip.h>
 #else
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
  #include <arpa/inet.h> /* inet_addr */
  #include <netdb.h>
@@ -208 +211 @@
 #else
     return 0;
+#endif
+}
+
+int
+tr_netSetCongestionControl( int s, const char *algorithm )
+{
+#ifdef TCP_CONGESTION
+    return setsockopt( s, IPPROTO_TCP, TCP_CONGESTION,
+                       algorithm, strlen(algorithm) + 1 );
+#else
+    errno = ENOSYS;
+    return -1;
 #endif
 }

trunk/libtransmission/net.h

@@ -116 +116 @@
                    int tos );
 
+int tr_netSetCongestionControl( int s, const char *algorithm );
+
 void tr_netClose( tr_session * session, int s );
 

trunk/libtransmission/peer-io.c

@@ -375 +375 @@
     assert( tr_amInEventThread( session ) );
 
-    if( socket >= 0 )
+    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));
+            }
+        }
+    }
+    
     io = tr_new0( tr_peerIo, 1 );
     io->magicNumber = MAGIC_NUMBER;
@@ -647 +659 @@
     {
         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));
+            }
+        }
+
         return 0;
     }

trunk/libtransmission/session.c

@@ -323 +323 @@
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT_RANDOM_HIGH,    s->randomPortHigh );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_SOCKET_TOS,          s->peerSocketTOS );
+    if(s->peer_congestion_algorithm && s->peer_congestion_algorithm[0])
+        tr_bencDictAddStr ( d, TR_PREFS_KEY_PEER_CONGESTION_ALGORITHM, s->peer_congestion_algorithm );
     tr_bencDictAddBool( d, TR_PREFS_KEY_PEX_ENABLED,              s->isPexEnabled );
     tr_bencDictAddBool( d, TR_PREFS_KEY_PORT_FORWARDING,          tr_sessionIsPortForwardingEnabled( s ) );
@@ -669 +671 @@
     if( tr_bencDictFindInt( settings, TR_PREFS_KEY_PEER_SOCKET_TOS, &i ) )
         session->peerSocketTOS = i;
+    if( tr_bencDictFindStr( settings, TR_PREFS_KEY_PEER_CONGESTION_ALGORITHM, &str ) )
+        session->peer_congestion_algorithm = tr_strdup(str);
     if( tr_bencDictFindBool( settings, TR_PREFS_KEY_BLOCKLIST_ENABLED, &boolVal ) )
         tr_blocklistSetEnabled( session, boolVal );
@@ -1657 +1661 @@
     tr_free( session->proxyUsername );
     tr_free( session->proxyPassword );
+    tr_free( session->peer_congestion_algorithm );
     tr_free( session );
 }

trunk/libtransmission/session.h

@@ -125 +125 @@
     int                          proxyPort;
     int                          peerSocketTOS;
+    char *                       peer_congestion_algorithm;
 
     int                          torrentCount;

trunk/libtransmission/transmission.h

@@ -179 +179 @@
 #define TR_PREFS_KEY_PEER_PORT_RANDOM_HIGH      "peer-port-random-high"
 #define TR_PREFS_KEY_PEER_SOCKET_TOS            "peer-socket-tos"
+#define TR_PREFS_KEY_PEER_CONGESTION_ALGORITHM  "peer-congestion-algorithm"
 #define TR_PREFS_KEY_PEX_ENABLED                "pex-enabled"
 #define TR_PREFS_KEY_PORT_FORWARDING            "port-forwarding-enabled"