Append default port (2459) in [ips] and [ips_fixed] when no port is s…

…pecified FIXES: XRPLF#2861
gregtatcam · Apr 27, 2020 · 6d9f656 · 6d9f656
1 parent 023f570
commit 6d9f656
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/src/ripple/overlay/impl/OverlayImpl.cpp b/src/ripple/overlay/impl/OverlayImpl.cpp
@@ -577,14 +577,9 @@ OverlayImpl::onPrepare()
             for (auto const& addr : addresses)
             {
                 if (addr.port() == 0)
-                {
-                    Throw<std::runtime_error>(
-                        "Port not specified for "
-                        "address:" +
-                        addr.to_string());
-                }
-
-                ips.push_back(to_string(addr));
+                    ips.push_back(to_string(addr.at_port(DEFAULT_PEER_PORT)));
+                else
+                    ips.push_back(to_string(addr));
             }
 
             std::string const base("config: ");
@@ -600,8 +595,19 @@ OverlayImpl::onPrepare()
             [this](
                 std::string const& name,
                 std::vector<beast::IP::Endpoint> const& addresses) {
-                if (!addresses.empty())
-                    m_peerFinder->addFixedPeer(name, addresses);
+                std::vector<beast::IP::Endpoint> ips;
+                ips.reserve(addresses.size());
+
+                for (auto& addr : addresses)
+                {
+                    if (addr.port() == 0)
+                        ips.emplace_back(addr.address(), DEFAULT_PEER_PORT);
+                    else
+                        ips.emplace_back(addr);
+                }
+
+                if (!ips.empty())
+                    m_peerFinder->addFixedPeer(name, ips);
             });
     }
 }

diff --git a/src/ripple/protocol/SystemParameters.h b/src/ripple/protocol/SystemParameters.h
@@ -61,4 +61,7 @@ static std::uint32_t constexpr XRP_LEDGER_EARLIEST_SEQ{32570};
 
 }  // namespace ripple
 
+/** Default peer port (IANA registered) */
+inline std::uint16_t constexpr DEFAULT_PEER_PORT{2459};
+
 #endif
diff --git a/src/ripple/rpc/handlers/Connect.cpp b/src/ripple/rpc/handlers/Connect.cpp
@@ -22,6 +22,7 @@
 #include <ripple/net/RPCErr.h>
 #include <ripple/overlay/Overlay.h>
 #include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/SystemParameters.h>
 #include <ripple/protocol/jss.h>
 #include <ripple/rpc/Context.h>
 #include <ripple/rpc/impl/Handler.h>
@@ -53,7 +54,7 @@ doConnect(RPC::JsonContext& context)
     if (context.params.isMember(jss::port))
         iPort = context.params[jss::port].asInt();
     else
-        iPort = 6561;
+        iPort = DEFAULT_PEER_PORT;
 
     auto ip =
         beast::IP::Endpoint::from_string(context.params[jss::ip].asString());