ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UPnP: cleanup function names

This commit is contained in:
Michael M 2017-08-06 23:43:24 -07:00
parent 281f90efc3
commit 862e0bec79
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Common/UPnP.cpp
View File

@ -25,7 +25,7 @@ static std::thread s_thread;
// called from ---UPnP--- thread // called from ---UPnP--- thread
// discovers the IGD // discovers the IGD
static bool initUPnP() static bool InitUPnP()
{ {
static bool s_inited = false; static bool s_inited = false;
static bool s_error = false; static bool s_error = false;
@ -106,7 +106,7 @@ static bool initUPnP()
// hanging, the NVRAM will fill with portmappings, and eventually all UPnP // hanging, the NVRAM will fill with portmappings, and eventually all UPnP
// requests will fail silently, with the only recourse being a factory reset. // requests will fail silently, with the only recourse being a factory reset.
// -- // --
static bool UPnPUnmapPort(const u16 port) static bool UnmapPort(const u16 port)
{ {
std::string port_str = StringFromFormat("%d", port); std::string port_str = StringFromFormat("%d", port);
UPNP_DeletePortMapping(s_urls.controlURL, s_data.first.servicetype, port_str.c_str(), "UDP", UPNP_DeletePortMapping(s_urls.controlURL, s_data.first.servicetype, port_str.c_str(), "UDP",
@ -117,10 +117,10 @@ static bool UPnPUnmapPort(const u16 port)
// called from ---UPnP--- thread // called from ---UPnP--- thread
// Attempt to portforward! // Attempt to portforward!
static bool UPnPMapPort(const char* addr, const u16 port) static bool MapPort(const char* addr, const u16 port)
{ {
if (s_mapped > 0) if (s_mapped > 0)
UPnPUnmapPort(s_mapped); UnmapPort(s_mapped);
std::string port_str = StringFromFormat("%d", port); std::string port_str = StringFromFormat("%d", port);
int result = UPNP_AddPortMapping( int result = UPNP_AddPortMapping(
@ -136,9 +136,9 @@ static bool UPnPMapPort(const char* addr, const u16 port)
} }
// UPnP thread: try to map a port // UPnP thread: try to map a port
static void mapPortThread(const u16 port) static void MapPortThread(const u16 port)
{ {
if (initUPnP() && UPnPMapPort(s_our_ip.data(), port)) if (InitUPnP() && MapPort(s_our_ip.data(), port))
{ {
NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, s_our_ip.data()); NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, s_our_ip.data());
return; return;
@ -148,24 +148,24 @@ static void mapPortThread(const u16 port)
} }
// UPnP thread: try to unmap a port // UPnP thread: try to unmap a port
static void unmapPortThread() static void UnmapPortThread()
{ {
if (s_mapped > 0) if (s_mapped > 0)
UPnPUnmapPort(s_mapped); UnmapPort(s_mapped);
} }
void UPnP::TryPortmapping(u16 port) void UPnP::TryPortmapping(u16 port)
{ {
if (s_thread.joinable()) if (s_thread.joinable())
s_thread.join(); s_thread.join();
s_thread = std::thread(&mapPortThread, port); s_thread = std::thread(&MapPortThread, port);
} }
void UPnP::StopPortmapping() void UPnP::StopPortmapping()
{ {
if (s_thread.joinable()) if (s_thread.joinable())
s_thread.join(); s_thread.join();
s_thread = std::thread(&unmapPortThread); s_thread = std::thread(&UnmapPortThread);
s_thread.join(); s_thread.join();
} }