Rename /BadCondition/ in Peer to /Drop/

4 files changed, 9 insertions, 10 deletions

diff --git a/src/DefaultPeerStorage.cc b/src/DefaultPeerStorage.cc
index b8a0ce5a..a6bb908d 100644
--- a/src/DefaultPeerStorage.cc
+++ b/src/DefaultPeerStorage.cc
@@ -238,7 +238,7 @@ void DefaultPeerStorage::onReturningPeer(const SharedHandle<Peer>& peer)
 {
   if(peer->isActive()) {
     if(peer->isDisconnectedGracefully() && !peer->isIncomingPeer()) {
-      peer->startBadCondition();
+      peer->startDrop();
       addDroppedPeer(peer);
     }
     // Execute choking algorithm if unchoked and interested peer is
diff --git a/src/Peer.cc b/src/Peer.cc
index 1ca02d91..4edcebb9 100644
--- a/src/Peer.cc
+++ b/src/Peer.cc
@@ -51,7 +51,7 @@ Peer::Peer(std::string ipaddr, uint16_t port, bool incoming):
   origPort_(port),
   cuid_(0),
   firstContactTime_(global::wallclock()),
-  badConditionStartTime_(0),
+  dropStartTime_(0),
   seeder_(false),
   res_(0),
   incoming_(incoming),
@@ -317,9 +317,9 @@ void Peer::setAllBitfield() {
   updateSeeder();
 }
 
-void Peer::startBadCondition()
+void Peer::startDrop()
 {
-  badConditionStartTime_ = global::wallclock();
+  dropStartTime_ = global::wallclock();
 }
 
 uint8_t Peer::getExtensionMessageID(int key) const
diff --git a/src/Peer.h b/src/Peer.h
index 072764ea..ec6a22ec 100644
--- a/src/Peer.h
+++ b/src/Peer.h
@@ -71,7 +71,7 @@ private:
 
   Timer firstContactTime_;
 
-  Timer badConditionStartTime_;
+  Timer dropStartTime_;
 
   bool seeder_;
 
@@ -145,7 +145,7 @@ public:
     return seeder_;
   }
 
-  void startBadCondition();
+  void startDrop();
 
   void allocateSessionResource(int32_t pieceLength, int64_t totalLength);
 
@@ -160,9 +160,9 @@ public:
 
   void setFirstContactTime(const Timer& time);
 
-  const Timer& getBadConditionStartTime() const
+  const Timer& getDropStartTime() const
   {
-    return badConditionStartTime_;
+    return dropStartTime_;
   }
 
   // Before calling following member functions,  make sure that
diff --git a/src/UTPexExtensionMessage.cc b/src/UTPexExtensionMessage.cc
index 3de9e8fc..a5245772 100644
--- a/src/UTPexExtensionMessage.cc
+++ b/src/UTPexExtensionMessage.cc
@@ -151,8 +151,7 @@ bool UTPexExtensionMessage::freshPeersAreFull() const
 bool UTPexExtensionMessage::addDroppedPeer(const SharedHandle<Peer>& peer)
 {
   if(!peer->isIncomingPeer() &&
-     peer->getBadConditionStartTime().
-     difference(global::wallclock()) < interval_) {
+     peer->getDropStartTime().difference(global::wallclock()) < interval_) {
     droppedPeers_.push_back(peer);
     return true;
   } else {