Changeset 13948

Timestamp:

Feb 3, 2013, 10:45:32 PM (8 years ago)

Author:

jordan

Message:

move tr_peer.encryptionPreference to tr_peermsgs.encryptionPreference

Location:

trunk/libtransmission

Files:

• peer-common.h (modified) (2 diffs)
• peer-mgr.h (modified) (1 diff)
• peer-msgs.c (modified) (3 diffs)

trunk/libtransmission/peer-common.h

@@ -113 +113 @@
   uint8_t strikes;
 
-  uint8_t encryption_preference;
-
   /* how many requests the peer has made that we haven't responded to yet */
   int pendingReqsToClient;
@@ -122 +120 @@
 
   struct tr_peerIo * io;
+
+  /* Hook to private peer-mgr information */
   struct peer_atom * atom;
 

trunk/libtransmission/peer-mgr.h

@@ -70 +70 @@
 struct tr_peermsgs;
 
-enum
-{
-  ENCRYPTION_PREFERENCE_UNKNOWN,
-  ENCRYPTION_PREFERENCE_YES,
-  ENCRYPTION_PREFERENCE_NO
-};
-
 /* opaque forward declaration */
 struct peer_atom;

trunk/libtransmission/peer-msgs.c

@@ -105 +105 @@
 };
 
+typedef enum
+{
+  ENCRYPTION_PREFERENCE_UNKNOWN,
+  ENCRYPTION_PREFERENCE_YES,
+  ENCRYPTION_PREFERENCE_NO
+}
+encryption_preference_t;
+
+
+
 /**
 ***
@@ -180 +190 @@
     tr_port         dht_port;
 
-    size_t          metadata_size_hint;
+    encryption_preference_t  encryption_preference;
+
+    size_t                   metadata_size_hint;
 #if 0
     size_t                 fastsetSize;
@@ -884 +896 @@
     /* does the peer prefer encrypted connections? */
     if (tr_variantDictFindInt (&val, TR_KEY_e, &i)) {
-        msgs->peer->encryption_preference = i ? ENCRYPTION_PREFERENCE_YES
-                                              : ENCRYPTION_PREFERENCE_NO;
+        msgs->encryption_preference = i ? ENCRYPTION_PREFERENCE_YES
+                                        : ENCRYPTION_PREFERENCE_NO;
         if (i)
             pex.flags |= ADDED_F_ENCRYPTION_FLAG;