Changeset 2995

Timestamp:

Sep 9, 2007, 1:52:14 AM (15 years ago)

Author:

charles

Message:

add an `isEncrypted' field to tr_peer_stat, so the GUI can show which connections are encrypted with a lock icon or something

Location:

branches/encryption/libtransmission

Files:

• peer-io.c (modified) (1 diff)
• peer-io.h (modified) (1 diff)
• peer-mgr.c (modified) (1 diff)
• transmission.h (modified) (1 diff)

branches/encryption/libtransmission/peer-io.c

@@ -374 +374 @@
 }
 
+int
+tr_peerIoIsEncrypted( const tr_peerIo * io )
+{
+    return io!=NULL && io->encryptionMode==PEER_ENCRYPTION_RC4;
+}
+
 void
 tr_peerIoWriteBytes( tr_peerIo        * io,

branches/encryption/libtransmission/peer-io.h

@@ -138 +138 @@
                               int              encryptionMode );
 
+int  tr_peerIoIsEncrypted( const tr_peerIo * io );
+
 void tr_peerIoWriteBytes  ( tr_peerIo        * io,
                             struct evbuffer  * outbuf,

branches/encryption/libtransmission/peer-mgr.c

@@ -776 +776 @@
         stat->client           = peer->client;
         stat->progress         = peer->progress;
-        stat->isConnected      = live;
+        stat->isConnected      = live ? 1 : 0;
+        stat->isEncrypted      = tr_peerIoIsEncrypted( peer->io ) ? 1 : 0;
         stat->uploadToRate     = tr_peerIoGetRateToPeer( peer->io );
         stat->downloadFromRate = tr_peerIoGetRateToClient( peer->io );

branches/encryption/libtransmission/transmission.h

@@ -659 +659 @@
     const char * client;
     
-    int     isConnected;
-    int     from;
-    float   progress;
-    int     port;
+    unsigned int isConnected   : 1;
+    unsigned int isEncrypted   : 1;
+    unsigned int isDownloading : 1;
+    unsigned int isUploading   : 1;
+
+    uint8_t  from;
+    uint16_t port;
     
-    int     isDownloading;
-    int     isUploading;
-    float   downloadFromRate;
-    float   uploadToRate;
+    float progress;
+    float downloadFromRate;
+    float uploadToRate;
 };