mapport: rename 'use_pcp' to 'enable'

darosior · darosior · commit 2a6536ceda7a · 2024-10-29T11:58:51.000-04:00
There is only a single protocol now, caller should just be concerned about whether to enable port mapping or not.
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
@@ -121,7 +121,7 @@ class Node
     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
@@ -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
@@ -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
@@ -187,7 +187,7 @@ class NodeImpl : public Node
         });
         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
     {

Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,9 @@ static void MapPortProtoSetEnabled(bool enabled)`
`166`	`166`	`g_mapport_enabled = enabled;`
`167`	`167`	`}`
`168`	`168`
`169`		`-void StartMapPort(bool use_pcp)`
	`169`	`+void StartMapPort(bool enable)`
`170`	`170`	`{`
`171`		`- MapPortProtoSetEnabled(use_pcp);`
	`171`	`+ MapPortProtoSetEnabled(enable);`
`172`	`172`	`DispatchMapPort();`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ class NodeImpl : public Node`
`187`	`187`	`});`
`188`	`188`	`args().WriteSettingsFile();`
`189`	`189`	`}`
`190`		`- void mapPort(bool use_pcp) override { StartMapPort(use_pcp); }`
	`190`	`+ void mapPort(bool enable) override { StartMapPort(enable); }`
`191`	`191`	`bool getProxy(Network net, Proxy& proxy_info) override { return GetProxy(net, proxy_info); }`
`192`	`192`	`size_t getNodeCount(ConnectionDirection flags) override`
`193`	`193`	`{`