(trunk libT) #2508 "atom->port never updated" -- (1) fix r9434 bug that used the...

diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index 1cf07677d358979f1df43d4d5fa5b271e3ede433..4add0664fd83c360c6bd3f2d310c96b0e0e86f55 100644 (file)
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -51,7 +51,7 @@ enum
 typedef struct tr_pex
 {
     tr_address addr;
-    tr_port    port;
+    tr_port    port; /* this field is in network byte order */
     uint8_t    flags;
 }
 tr_pex;

diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 814e1ed09864c0e3966c2630a688cdddf10a1651..ac19dec4197c625943d272fec0eee3f6bb59286a 100644 (file)
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -975,8 +975,8 @@ parseLtepHandshake( tr_peermsgs *     msgs,
 
     /* get peer's listening port */
     if( tr_bencDictFindInt( &val, "p", &i ) ) {
-        fireClientGotPort( msgs, (tr_port)i );
         pex.port = htons( (uint16_t)i );
+        fireClientGotPort( msgs, pex.port );
         dbgmsg( msgs, "peer's port is now %d", (int)i );
     }
 

diff --git a/libtransmission/resume.c b/libtransmission/resume.c
index 4ff6f0be6974e298f00e87aa97dec9e359ae8b48..cef4a3d38c58e9b218b3d7f7d3470e97b09b328c 100644 (file)
--- a/libtransmission/resume.c
+++ b/libtransmission/resume.c
@@ -34,8 +34,8 @@
 #define KEY_INCOMPLETE_DIR      "incomplete-dir"
 #define KEY_MAX_PEERS           "max-peers"
 #define KEY_PAUSED              "paused"
-#define KEY_PEERS               "peers"
-#define KEY_PEERS6              "peers6"
+#define KEY_PEERS               "peers2"
+#define KEY_PEERS6              "peers2-6"
 #define KEY_FILE_PRIORITIES     "priority"
 #define KEY_BANDWIDTH_PRIORITY  "bandwidth-priority"
 #define KEY_PROGRESS            "progress"