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

UPnP: cleanup variable names

This commit is contained in:
Michael M 2017-08-06 23:37:17 -07:00
parent 3386543a9c
commit 106ae9636e
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,11 +16,11 @@
#include <thread> #include <thread>
#include <upnpcommands.h> #include <upnpcommands.h>
static struct UPNPUrls m_upnp_urls; static UPNPUrls s_urls;
static struct IGDdatas m_upnp_data; static IGDdatas s_data;
static std::string m_upnp_ourip; static std::string s_our_ip;
static u16 m_upnp_mapped = 0; static u16 s_mapped = 0;
static std::thread m_upnp_thread; static std::thread s_thread;
// called from ---UPnP--- thread // called from ---UPnP--- thread
// discovers the IGD // discovers the IGD
@ -41,8 +41,8 @@ static bool initUPnP()
if (s_error) if (s_error)
return false; return false;
std::memset(&m_upnp_urls, 0, sizeof(UPNPUrls)); std::memset(&s_urls, 0, sizeof(UPNPUrls));
std::memset(&m_upnp_data, 0, sizeof(IGDdatas)); std::memset(&s_data, 0, sizeof(IGDdatas));
// Find all UPnP devices // Find all UPnP devices
std::unique_ptr<UPNPDev, decltype(&freeUPNPDevlist)> devlist(nullptr, freeUPNPDevlist); std::unique_ptr<UPNPDev, decltype(&freeUPNPDevlist)> devlist(nullptr, freeUPNPDevlist);
@ -80,10 +80,10 @@ static bool initUPnP()
#endif #endif
if (descXML && statusCode == 200) if (descXML && statusCode == 200)
{ {
parserootdesc(descXML.get(), descXMLsize, &m_upnp_data); parserootdesc(descXML.get(), descXMLsize, &s_data);
GetUPNPUrls(&m_upnp_urls, &m_upnp_data, dev->descURL, 0); GetUPNPUrls(&s_urls, &s_data, dev->descURL, 0);
m_upnp_ourip = cIP; s_our_ip = cIP;
NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL); NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL);
break; break;
@ -110,8 +110,8 @@ static bool initUPnP()
static bool UPnPUnmapPort(const u16 port) static bool UPnPUnmapPort(const u16 port)
{ {
std::string port_str = StringFromFormat("%d", port); std::string port_str = StringFromFormat("%d", port);
UPNP_DeletePortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype, port_str.c_str(), UPNP_DeletePortMapping(s_urls.controlURL, s_data.first.servicetype, port_str.c_str(), "UDP",
"UDP", nullptr); nullptr);
return true; return true;
} }
@ -120,18 +120,18 @@ static bool UPnPUnmapPort(const u16 port)
// Attempt to portforward! // Attempt to portforward!
static bool UPnPMapPort(const std::string& addr, const u16 port) static bool UPnPMapPort(const std::string& addr, const u16 port)
{ {
if (m_upnp_mapped > 0) if (s_mapped > 0)
UPnPUnmapPort(m_upnp_mapped); UPnPUnmapPort(s_mapped);
std::string port_str = StringFromFormat("%d", port); std::string port_str = StringFromFormat("%d", port);
int result = UPNP_AddPortMapping( int result = UPNP_AddPortMapping(
m_upnp_urls.controlURL, m_upnp_data.first.servicetype, port_str.c_str(), port_str.c_str(), s_urls.controlURL, s_data.first.servicetype, port_str.c_str(), port_str.c_str(), addr.c_str(),
addr.c_str(), (std::string("dolphin-emu UDP on ") + addr).c_str(), "UDP", nullptr, nullptr); (std::string("dolphin-emu UDP on ") + addr).c_str(), "UDP", nullptr, nullptr);
if (result != 0) if (result != 0)
return false; return false;
m_upnp_mapped = port; s_mapped = port;
return true; return true;
} }
@ -139,35 +139,35 @@ static bool UPnPMapPort(const std::string& 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(m_upnp_ourip, port)) if (initUPnP() && UPnPMapPort(s_our_ip, port))
{ {
NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, m_upnp_ourip.c_str()); NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, s_our_ip.c_str());
return; return;
} }
WARN_LOG(NETPLAY, "Failed to map port %d to %s.", port, m_upnp_ourip.c_str()); WARN_LOG(NETPLAY, "Failed to map port %d to %s.", port, s_our_ip.c_str());
} }
// UPnP thread: try to unmap a port // UPnP thread: try to unmap a port
static void unmapPortThread() static void unmapPortThread()
{ {
if (m_upnp_mapped > 0) if (s_mapped > 0)
UPnPUnmapPort(m_upnp_mapped); UPnPUnmapPort(s_mapped);
} }
void UPnP::TryPortmapping(u16 port) void UPnP::TryPortmapping(u16 port)
{ {
if (m_upnp_thread.joinable()) if (s_thread.joinable())
m_upnp_thread.join(); s_thread.join();
m_upnp_thread = std::thread(&mapPortThread, port); s_thread = std::thread(&mapPortThread, port);
} }
void UPnP::StopPortmapping() void UPnP::StopPortmapping()
{ {
if (m_upnp_thread.joinable()) if (s_thread.joinable())
m_upnp_thread.join(); s_thread.join();
m_upnp_thread = std::thread(&unmapPortThread); s_thread = std::thread(&unmapPortThread);
m_upnp_thread.join(); s_thread.join();
} }
#endif #endif