Page MenuHomePhabricator
Files F13115434

D12092.diff
No OneTemporary
Actions

D12092.diff
View Options

diff --git a/src/mapport.cpp b/src/mapport.cpp
--- a/src/mapport.cpp
+++ b/src/mapport.cpp
@@ -42,7 +42,9 @@
#if defined(USE_NATPMP) || defined(USE_UPNP)
static CThreadInterrupt g_mapport_interrupt;
static std::thread g_mapport_thread;
-static std::atomic_uint g_mapport_target_proto{MapPortProtoFlag::NONE};
+static std::atomic_uint g_mapport_enabled_protos{MapPortProtoFlag::NONE};
+static std::atomic<MapPortProtoFlag> g_mapport_current_proto{
+ MapPortProtoFlag::NONE};
using namespace std::chrono_literals;
static constexpr auto PORT_MAPPING_REANNOUNCE_PERIOD{20min};
@@ -249,11 +251,38 @@
#endif // USE_UPNP
static void ThreadMapPort() {
+ bool ok;
do {
- if (ProcessUpnp()) {
+ ok = false;
+
+#ifdef USE_UPNP
+ // High priority protocol.
+ if (g_mapport_enabled_protos & MapPortProtoFlag::UPNP) {
+ g_mapport_current_proto = MapPortProtoFlag::UPNP;
+ ok = ProcessUpnp();
+ if (ok) {
+ continue;
+ }
+ }
+#endif // USE_UPNP
+
+#ifdef USE_NATPMP
+ // Low priority protocol.
+ if (g_mapport_enabled_protos & MapPortProtoFlag::NAT_PMP) {
+ g_mapport_current_proto = MapPortProtoFlag::NAT_PMP;
+ ok = ProcessNatpmp();
+ if (ok) {
+ continue;
+ }
+ }
+#endif // USE_NATPMP
+
+ g_mapport_current_proto = MapPortProtoFlag::NONE;
+ if (g_mapport_enabled_protos == MapPortProtoFlag::NONE) {
return;
}
- } while (g_mapport_interrupt.sleep_for(PORT_MAPPING_RETRY_PERIOD));
+
+ } while (ok || g_mapport_interrupt.sleep_for(PORT_MAPPING_RETRY_PERIOD));
}
void StartThreadMapPort() {
@@ -265,19 +294,43 @@
}
static void DispatchMapPort() {
- if (g_mapport_target_proto == MapPortProtoFlag::UPNP) {
+ if (g_mapport_current_proto == MapPortProtoFlag::NONE &&
+ g_mapport_enabled_protos == MapPortProtoFlag::NONE) {
+ return;
+ }
+
+ if (g_mapport_current_proto == MapPortProtoFlag::NONE &&
+ g_mapport_enabled_protos != MapPortProtoFlag::NONE) {
StartThreadMapPort();
- } else {
+ return;
+ }
+
+ if (g_mapport_current_proto != MapPortProtoFlag::NONE &&
+ g_mapport_enabled_protos == MapPortProtoFlag::NONE) {
InterruptMapPort();
StopMapPort();
+ return;
}
+
+ if (g_mapport_enabled_protos & g_mapport_current_proto) {
+ // Enabling another protocol does not cause switching from the currently
+ // used one.
+ return;
+ }
+
+ assert(g_mapport_thread.joinable());
+ assert(!g_mapport_interrupt);
+ // Interrupt a protocol-specific loop in the ThreadUpnp() or in the
+ // ThreadNatpmp() to force trying the next protocol in the ThreadMapPort()
+ // loop.
+ g_mapport_interrupt();
}
static void MapPortProtoSetEnabled(MapPortProtoFlag proto, bool enabled) {
if (enabled) {
- g_mapport_target_proto |= proto;
+ g_mapport_enabled_protos |= proto;
} else {
- g_mapport_target_proto &= ~proto;
+ g_mapport_enabled_protos &= ~proto;
}
}
@@ -287,6 +340,7 @@
}
void InterruptMapPort() {
+ g_mapport_enabled_protos = MapPortProtoFlag::NONE;
if (g_mapport_thread.joinable()) {
g_mapport_interrupt();
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:05 (19 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187492
Default Alt Text
D12092.diff (3 KB)

Event Timeline