From 2a6536ceda7a28c5605005032bba32ffd3df082d Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Tue, 29 Oct 2024 11:58:51 -0400 Subject: [PATCH] mapport: rename 'use_pcp' to 'enable' There is only a single protocol now, caller should just be concerned about whether to enable port mapping or not. --- src/interfaces/node.h | 2 +- src/mapport.cpp | 4 ++-- src/mapport.h | 2 +- src/node/interfaces.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/interfaces/node.h b/src/interfaces/node.h index aebb4386511..b7bcb431214 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -121,7 +121,7 @@ public: virtual void resetSettings() = 0; //! Map port. - virtual void mapPort(bool use_pcp) = 0; + virtual void mapPort(bool enable) = 0; //! Get proxy. virtual bool getProxy(Network net, Proxy& proxy_info) = 0; diff --git a/src/mapport.cpp b/src/mapport.cpp index 96aa1020dde..066370287d8 100644 --- a/src/mapport.cpp +++ b/src/mapport.cpp @@ -166,9 +166,9 @@ static void MapPortProtoSetEnabled(bool enabled) g_mapport_enabled = enabled; } -void StartMapPort(bool use_pcp) +void StartMapPort(bool enable) { - MapPortProtoSetEnabled(use_pcp); + MapPortProtoSetEnabled(enable); DispatchMapPort(); } diff --git a/src/mapport.h b/src/mapport.h index aaf15051e71..3f16b2ea619 100644 --- a/src/mapport.h +++ b/src/mapport.h @@ -7,7 +7,7 @@ static constexpr bool DEFAULT_NATPMP = false; -void StartMapPort(bool use_pcp); +void StartMapPort(bool enable); void InterruptMapPort(); void StopMapPort(); diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp index e4ae9400e37..20c644b3479 100644 --- a/src/node/interfaces.cpp +++ b/src/node/interfaces.cpp @@ -187,7 +187,7 @@ public: }); args().WriteSettingsFile(); } - void mapPort(bool use_pcp) override { StartMapPort(use_pcp); } + void mapPort(bool enable) override { StartMapPort(enable); } bool getProxy(Network net, Proxy& proxy_info) override { return GetProxy(net, proxy_info); } size_t getNodeCount(ConnectionDirection flags) override {