Merge pull request #1944 from vogel/config-peers-are-outbound

set peers from config as OUTBOUND by default Reviewed-by: MonsieurNicolas
stellar · Feb 4, 2019 · d6661f7 · d6661f7
2 parents 4185e57 + edc8f16
commit d6661f7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/src/overlay/OverlayManagerImpl.cpp b/src/overlay/OverlayManagerImpl.cpp
@@ -304,8 +304,9 @@ void
 OverlayManagerImpl::storePeerList(std::vector<std::string> const& list,
                                   bool setPreferred)
 {
-    auto typeUpgrade = setPreferred ? PeerManager::TypeUpdate::SET_PREFERRED
-                                    : PeerManager::TypeUpdate::KEEP;
+    auto typeUpgrade = setPreferred
+                           ? PeerManager::TypeUpdate::SET_PREFERRED
+                           : PeerManager::TypeUpdate::UPDATE_TO_OUTBOUND;
 
     for (auto const& peerStr : list)
     {

diff --git a/src/overlay/PeerManager.cpp b/src/overlay/PeerManager.cpp
@@ -278,15 +278,6 @@ PeerManager::update(PeerRecord& peer, TypeUpdate type)
 {
     switch (type)
     {
-    case TypeUpdate::KEEP:
-    {
-        break;
-    }
-    case TypeUpdate::SET_INBOUND:
-    {
-        peer.mType = static_cast<int>(PeerType::INBOUND);
-        break;
-    }
     case TypeUpdate::SET_OUTBOUND:
     {
         peer.mType = static_cast<int>(PeerType::OUTBOUND);
@@ -305,6 +296,14 @@ PeerManager::update(PeerRecord& peer, TypeUpdate type)
         }
         break;
     }
+    case TypeUpdate::UPDATE_TO_OUTBOUND:
+    {
+        if (peer.mType == static_cast<int>(PeerType::INBOUND))
+        {
+            peer.mType = static_cast<int>(PeerType::OUTBOUND);
+        }
+        break;
+    }
     default:
     {
         abort();
@@ -333,10 +332,6 @@ PeerManager::update(PeerRecord& peer, BackOffUpdate backOff, Application& app)
 {
     switch (backOff)
     {
-    case BackOffUpdate::KEEP:
-    {
-        break;
-    }
     case BackOffUpdate::HARD_RESET:
     {
         peer.mNumFailures = 0;

diff --git a/src/overlay/PeerManager.h b/src/overlay/PeerManager.h
@@ -64,16 +64,14 @@ class PeerManager
   public:
     enum class TypeUpdate
     {
-        KEEP,
-        SET_INBOUND,
         SET_OUTBOUND,
         SET_PREFERRED,
-        REMOVE_PREFERRED
+        REMOVE_PREFERRED,
+        UPDATE_TO_OUTBOUND
     };
 
     enum class BackOffUpdate
     {
-        KEEP,
         HARD_RESET,
         RESET,
         INCREASE