phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

scripted-diff: Rename UPnP stuff

Browse source 
-BEGIN VERIFY SCRIPT-
sed -i 's/g_upnp_interrupt/g_mapport_interrupt/' src/mapport.cpp
sed -i 's/if(g_upnp_thread/if (g_mapport_thread/' src/mapport.cpp
sed -i 's/g_upnp_thread/g_mapport_thread/' src/mapport.cpp
sed -i 's/LOCAL_UPNP/LOCAL_MAPPED/' src/mapport.cpp
sed -i 's/\bupnp\b/mapport/' src/mapport.cpp
sed -i 's/LOCAL_UPNP,  /LOCAL_MAPPED,/' src/net.h
-END VERIFY SCRIPT-
This commit is contained in:
Hennadii Stepanov 2020-02-23 00:57:47 +02:00
parent 4e91b1e24d
commit cf151cc68c
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/mapport.cpp
View file

@ -33,8 +33,8 @@ static_assert(MINIUPNPC_API_VERSION >= 10, "miniUPnPc API version >= 10 assumed"
#include <thread> #include <thread>
#ifdef USE_UPNP #ifdef USE_UPNP
static CThreadInterrupt g_upnp_interrupt; static CThreadInterrupt g_mapport_interrupt;
static std::thread g_upnp_thread; static std::thread g_mapport_thread;
static std::atomic_uint g_mapport_target_proto{MapPortProtoFlag::NONE}; static std::atomic_uint g_mapport_target_proto{MapPortProtoFlag::NONE};
using namespace std::chrono_literals; using namespace std::chrono_literals;
@ -74,7 +74,7 @@ static bool ProcessUpnp()
CNetAddr resolved; CNetAddr resolved;
if (LookupHost(externalIPAddress, resolved, false)) { if (LookupHost(externalIPAddress, resolved, false)) {
LogPrintf("UPnP: ExternalIPAddress = %s\n", resolved.ToString()); LogPrintf("UPnP: ExternalIPAddress = %s\n", resolved.ToString());
AddLocal(resolved, LOCAL_UPNP); AddLocal(resolved, LOCAL_MAPPED);
} }
} else { } else {
LogPrintf("UPnP: GetExternalIPAddress failed.\n"); LogPrintf("UPnP: GetExternalIPAddress failed.\n");
@ -95,8 +95,8 @@ static bool ProcessUpnp()
ret = true; ret = true;
LogPrintf("UPnP Port Mapping successful.\n"); LogPrintf("UPnP Port Mapping successful.\n");
} }
} while (g_upnp_interrupt.sleep_for(PORT_MAPPING_REANNOUNCE_PERIOD)); } while (g_mapport_interrupt.sleep_for(PORT_MAPPING_REANNOUNCE_PERIOD));
g_upnp_interrupt.reset(); g_mapport_interrupt.reset();
r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port.c_str(), "TCP", 0); r = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port.c_str(), "TCP", 0);
LogPrintf("UPNP_DeletePortMapping() returned: %d\n", r); LogPrintf("UPNP_DeletePortMapping() returned: %d\n", r);
@ -116,14 +116,14 @@ static void ThreadMapPort()
{ {
do { do {
if (ProcessUpnp()) return; if (ProcessUpnp()) return;
} while (g_upnp_interrupt.sleep_for(PORT_MAPPING_RETRY_PERIOD)); } while (g_mapport_interrupt.sleep_for(PORT_MAPPING_RETRY_PERIOD));
} }
void StartThreadMapPort() void StartThreadMapPort()
{ {
if (!g_upnp_thread.joinable()) { if (!g_mapport_thread.joinable()) {
assert(!g_upnp_interrupt); assert(!g_mapport_interrupt);
g_upnp_thread = std::thread((std::bind(&TraceThread<void (*)()>, "upnp", &ThreadMapPort))); g_mapport_thread = std::thread((std::bind(&TraceThread<void (*)()>, "mapport", &ThreadMapPort)));
} }
} }
@ -154,16 +154,16 @@ void StartMapPort(bool use_upnp)
void InterruptMapPort() void InterruptMapPort()
{ {
if(g_upnp_thread.joinable()) { if (g_mapport_thread.joinable()) {
g_upnp_interrupt(); g_mapport_interrupt();
} }
} }
void StopMapPort() void StopMapPort()
{ {
if(g_upnp_thread.joinable()) { if (g_mapport_thread.joinable()) {
g_upnp_thread.join(); g_mapport_thread.join();
g_upnp_interrupt.reset(); g_mapport_interrupt.reset();
} }
} }

2
src/net.h
View file

@ -182,7 +182,7 @@ enum
LOCAL_NONE, // unknown LOCAL_NONE, // unknown
LOCAL_IF, // address a local interface listens on LOCAL_IF, // address a local interface listens on
LOCAL_BIND, // address explicit bound to LOCAL_BIND, // address explicit bound to
LOCAL_UPNP, // address reported by UPnP LOCAL_MAPPED, // address reported by UPnP
LOCAL_MANUAL, // address explicitly specified (-externalip=) LOCAL_MANUAL, // address explicitly specified (-externalip=)
LOCAL_MAX LOCAL_MAX