Changeset 13932

Timestamp:

Feb 2, 2013, 5:31:43 AM (8 years ago)

Author:

jordan

Message:

(libT) remove pointless tr_session.peer_id variable

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (4 diffs)
• session.c (modified) (1 diff)
• session.h (modified) (2 diffs)

trunk/libtransmission/handshake.c

@@ -195 +195 @@
   const uint8_t * torrentHash = tr_cryptoGetTorrentHash (handshake->crypto);
   const tr_torrent * tor = tr_torrentFindFromHash (handshake->session, torrentHash);
-  const uint8_t * peer_id = tor && *tor->peer_id ? tor->peer_id : tr_getPeerId (handshake->session);
+  const uint8_t * peer_id = tor->peer_id;
 
   memcpy (walk, HANDSHAKE_NAME, HANDSHAKE_NAME_LEN);
@@ -273 +273 @@
 
   tor = tr_torrentFindFromHash (handshake->session, hash);
-  tor_peer_id = tor ? tor->peer_id : tr_getPeerId (handshake->session);
+  tor_peer_id = tor->peer_id;
   if (!memcmp (peer_id, tor_peer_id, PEER_ID_LEN))
     {
@@ -686 +686 @@
             struct evbuffer * inbuf)
 {
-  bool peerIsGood;
+  bool connected_to_self;
   char client[128];
+  uint8_t peer_id[PEER_ID_LEN];
   tr_torrent * tor;
-  const uint8_t * tor_peer_id;
-  uint8_t peer_id[PEER_ID_LEN];
 
   if (evbuffer_get_length (inbuf) < PEER_ID_LEN)
@@ -705 +704 @@
   /* if we've somehow connected to ourselves, don't keep the connection */
   tor = tr_torrentFindFromHash (handshake->session, tr_peerIoGetTorrentHash (handshake->io));
-  tor_peer_id = tor ? tor->peer_id : tr_getPeerId (handshake->session);
-  peerIsGood = memcmp (peer_id, tor_peer_id, PEER_ID_LEN) != 0;
-  dbgmsg (handshake, "isPeerGood == %d", (int)peerIsGood);
-  return tr_handshakeDone (handshake, peerIsGood);
+  connected_to_self = (tor != NULL) && !memcmp (peer_id, tor->peer_id, PEER_ID_LEN);
+
+  return tr_handshakeDone (handshake, !connected_to_self);
 }
 

trunk/libtransmission/session.c

@@ -593 +593 @@
     session->magicNumber = SESSION_MAGIC_NUMBER;
     tr_bandwidthConstruct (&session->bandwidth, session, NULL);
-    tr_peerIdInit (session->peer_id);
     tr_variantInitList (&session->removedTorrents, 0);
 

trunk/libtransmission/session.h

@@ -224 +224 @@
     struct tr_bindinfo         * public_ipv4;
     struct tr_bindinfo         * public_ipv6;
-
-    uint8_t peer_id[PEER_ID_LEN+1];
 };
 
@@ -232 +230 @@
 {
     return session->public_peer_port;
-}
-
-static inline const uint8_t*
-tr_getPeerId (tr_session * session)
-{
-    return session->peer_id;
 }