mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-11 09:40:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UPnP: Improve error messages on initialization failure.

Browse Source
This commit is contained in:
Admiral H. Curtiss 2021-05-14 16:42:08 +02:00
parent fd4efd3787
commit c3560f033e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@
#include <string> #include <string>
#include <thread> #include <thread>
#include <upnpcommands.h> #include <upnpcommands.h>
#include <upnperrors.h>
#include <vector> #include <vector>
static UPNPUrls s_urls; static UPNPUrls s_urls;
@ -52,7 +53,15 @@ static bool InitUPnP()
#endif #endif
if (!devlist) if (!devlist)
{ {
WARN_LOG_FMT(NETPLAY, "An error occurred trying to discover UPnP devices."); if (upnperror == UPNPDISCOVER_SUCCESS)
{
WARN_LOG_FMT(NETPLAY, "No UPnP devices could be found.");
}
else
{
WARN_LOG_FMT(NETPLAY, "An error occurred trying to discover UPnP devices: {}",
strupnperror(upnperror));
}
s_error = true; s_error = true;
@ -60,6 +69,7 @@ static bool InitUPnP()
} }
// Look for the IGD // Look for the IGD
bool found_valid_igd = false;
for (UPNPDev* dev = devlist.get(); dev; dev = dev->pNext) for (UPNPDev* dev = devlist.get(); dev; dev = dev->pNext)
{ {
if (!std::strstr(dev->st, "InternetGatewayDevice")) if (!std::strstr(dev->st, "InternetGatewayDevice"))
@ -81,6 +91,7 @@ static bool InitUPnP()
parserootdesc(desc_xml.get(), desc_xml_size, &s_data); parserootdesc(desc_xml.get(), desc_xml_size, &s_data);
GetUPNPUrls(&s_urls, &s_data, dev->descURL, 0); GetUPNPUrls(&s_urls, &s_data, dev->descURL, 0);
found_valid_igd = true;
NOTICE_LOG_FMT(NETPLAY, "Got info from IGD at {}.", dev->descURL); NOTICE_LOG_FMT(NETPLAY, "Got info from IGD at {}.", dev->descURL);
break; break;
} }
@ -90,6 +101,9 @@ static bool InitUPnP()
} }
} }
if (!found_valid_igd)
WARN_LOG_FMT(NETPLAY, "Could not find a valid IGD in the discovered UPnP devices.");
s_inited = true; s_inited = true;
return true; return true;