From 6f5ecd2ab8be0187bf69a4531e0d0a080cd2ec6d Mon Sep 17 00:00:00 2001
From: Juliusz Chroboczek <jch@pps.univ-paris-diderot.fr>
Date: Sat, 15 Jan 2011 17:10:54 +0000
Subject: [PATCH] Make the peer-socket-tos preference more user-friendly.
Possible values are now the strings default, lowcost, throughput etc.
Numeric values are used for non-standard values.
---
libtransmission/session.c | 49 +++++++++++++++++++++++++++++++---
libtransmission/transmission.h | 2 +-
2 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/libtransmission/session.c b/libtransmission/session.c
index 9f2d70c14..171432f1f 100644
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -257,6 +257,47 @@ tr_sessionGetPublicAddress( const tr_session * session, int tr_af_type, tr_bool
#define TR_DEFAULT_ENCRYPTION TR_ENCRYPTION_PREFERRED
#endif
+static int
+parse_tos(const char *string)
+{
+ char *p;
+ int value;
+
+ if(strcasecmp(string, "") == 0 || strcasecmp(string, "default") == 0)
+ return 0;
+ else if(strcasecmp(string, "lowcost") == 0 ||
+ strcasecmp(string, "mincost") == 0)
+ return 0x10;
+ else if(strcasecmp(string, "throughput") == 0)
+ return 0x08;
+ else if(strcasecmp(string, "reliability") == 0)
+ return 0x04;
+ else if(strcasecmp(string, "lowdelay") == 0)
+ return 0x02;
+
+ value = strtol(string, &p, 0);
+ if(p == NULL || p == string)
+ return 0;
+
+ return value;
+}
+
+static const char *
+format_tos(int value)
+{
+ static char buf[8];
+ switch(value) {
+ case 0: return "default";
+ case 0x10: return "lowcost";
+ case 0x08: return "throughput";
+ case 0x04: return "reliability";
+ case 0x02: return "lowdelay";
+ default:
+ snprintf(buf, 8, "%d", value);
+ return buf;
+ }
+}
+
void
tr_sessionGetDefaultSettings( const char * configDir UNUSED, tr_benc * d )
{
@@ -285,7 +326,7 @@ tr_sessionGetDefaultSettings( const char * configDir UNUSED, tr_benc * d )
tr_bencDictAddBool( d, TR_PREFS_KEY_PEER_PORT_RANDOM_ON_START, FALSE );
tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT_RANDOM_LOW, 49152 );
tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT_RANDOM_HIGH, 65535 );
- tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_SOCKET_TOS, atoi( TR_DEFAULT_PEER_SOCKET_TOS_STR ) );
+ tr_bencDictAddStr ( d, TR_PREFS_KEY_PEER_SOCKET_TOS, TR_DEFAULT_PEER_SOCKET_TOS_STR );
tr_bencDictAddBool( d, TR_PREFS_KEY_PEX_ENABLED, TRUE );
tr_bencDictAddBool( d, TR_PREFS_KEY_PORT_FORWARDING, TRUE );
tr_bencDictAddInt ( d, TR_PREFS_KEY_PREALLOCATION, TR_PREALLOCATE_SPARSE );
@@ -348,7 +389,7 @@ tr_sessionGetSettings( tr_session * s, struct tr_benc * d )
tr_bencDictAddBool( d, TR_PREFS_KEY_PEER_PORT_RANDOM_ON_START, s->isPortRandom );
tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT_RANDOM_LOW, s->randomPortLow );
tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_PORT_RANDOM_HIGH, s->randomPortHigh );
- tr_bencDictAddInt ( d, TR_PREFS_KEY_PEER_SOCKET_TOS, s->peerSocketTOS );
+ tr_bencDictAddStr ( d, TR_PREFS_KEY_PEER_SOCKET_TOS, format_tos(s->peerSocketTOS) );
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 ) );
@@ -718,8 +759,8 @@ sessionSetImpl( void * vdata )
tr_sessionSetLPDEnabled( session, boolVal );
if( tr_bencDictFindInt( settings, TR_PREFS_KEY_ENCRYPTION, &i ) )
tr_sessionSetEncryption( session, i );
- if( tr_bencDictFindInt( settings, TR_PREFS_KEY_PEER_SOCKET_TOS, &i ) )
- session->peerSocketTOS = i;
+ if( tr_bencDictFindStr( settings, TR_PREFS_KEY_PEER_SOCKET_TOS, &str ) )
+ session->peerSocketTOS = parse_tos( str );
if( tr_bencDictFindStr( settings, TR_PREFS_KEY_PEER_CONGESTION_ALGORITHM, &str ) )
session->peer_congestion_algorithm = tr_strdup(str);
else
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 01b57fe7d..5b24a3914 100644
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -144,7 +144,7 @@ const char* tr_getDefaultDownloadDir( void );
#define TR_DEFAULT_RPC_PORT_STR "9091"
#define TR_DEFAULT_RPC_URL_STR "/transmission/"
#define TR_DEFAULT_PEER_PORT_STR "51413"
-#define TR_DEFAULT_PEER_SOCKET_TOS_STR "0"
+#define TR_DEFAULT_PEER_SOCKET_TOS_STR "default"
#define TR_DEFAULT_PEER_LIMIT_GLOBAL_STR "240"
#define TR_DEFAULT_PEER_LIMIT_TORRENT_STR "60"
--
2.40.0