Ticket #1590: daemon_random_port_support.diff

libtransmission/session.h

@@ -69 +69 @@
 
     struct tr_event_handle *     events;
 
-    int                          proxyPort;
+    tr_port                      proxyPort;
     int                          peerSocketTOS;
 
     int                          torrentCount;

daemon/daemon.c

@@ -38 +38 @@
 #define KEY_LAZY_BITFIELD     "lazy-bitfield-enabled"
 #define KEY_PEER_LIMIT        "max-peers-global"
 #define KEY_PEER_PORT         "peer-port"
+#define KEY_PEER_PORT_RANDOM  "peer-port-random"
 #define KEY_PORT_FORWARDING   "port-forwarding-enabled"
 #define KEY_PEX_ENABLED       "pex-enabled"
 #define KEY_AUTH_REQUIRED     "rpc-authentication-required"
@@ -160 +161 @@
 {
     tr_benc       state, *dict = NULL;
     int           peerPort = -1, peers = -1;
+    int           peerPortIsRandom = -1;
     int           whitelistEnabled = -1;
     int           pexEnabled = -1;
     int           fwdEnabled = -1;
@@ -185 +187 @@
     getConfigInt( dict, KEY_PEX_ENABLED,       &pexEnabled,        TR_DEFAULT_PEX_ENABLED );
     getConfigInt( dict, KEY_PORT_FORWARDING,   &fwdEnabled,        TR_DEFAULT_PORT_FORWARDING_ENABLED );
     getConfigInt( dict, KEY_PEER_PORT,         &peerPort,          TR_DEFAULT_PORT );
+    getConfigInt( dict, KEY_PEER_PORT_RANDOM,  &peerPortIsRandom,  FALSE );
     getConfigInt( dict, KEY_DSPEED,            &downLimit,         100 );
     getConfigInt( dict, KEY_DSPEED_ENABLED,    &downLimited,       FALSE );
     getConfigInt( dict, KEY_USPEED,            &upLimit,           100 );
@@ -200 +203 @@
     getConfigInt( dict, KEY_ENCRYPTION,        &encryption,        TR_DEFAULT_ENCRYPTION );
 
     whitelistEnabled = whitelist && *whitelist;
-
+    if ( peerPortIsRandom )
+        peerPort = -1;
+    
     /***
     ****
     ***/