Green-Sky/solanaceae_tox_upnp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

even if igd is not valid, try anyway

Browse Source
This commit is contained in:
Green Sky 2024-03-10 23:45:46 +01:00
parent 3fb3b449c9
commit 951710864b
No known key found for this signature in database
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/solanaceae/tox_upnp.cpp
View File

@ -48,12 +48,16 @@ ToxUPnP::ToxUPnP(ToxI& tox) {
char lanaddr[64] = "unset"; char lanaddr[64] = "unset";
auto res = UPNP_GetValidIGD(devices, &urls, &data, lanaddr, sizeof(lanaddr)); auto res = UPNP_GetValidIGD(devices, &urls, &data, lanaddr, sizeof(lanaddr));
if (res != 1) { if (res < 1) {
std::cerr << "TUPNP error: no valid connected IGD has been found\n"; std::cerr << "TUPNP error: no valid connected IGD has been found\n";
if (res != 0) {
FreeUPNPUrls(&urls);
freeUPNPDevlist(devices);
}
continue; continue;
} }
std::cerr << "TUPNP: valid IGD found, local ip: " << lanaddr << "\n"; std::cerr << "TUPNP: valid IGD found (" << res << "), local ip: " << lanaddr << "\n";
const auto port_string = std::to_string(_local_port); const auto port_string = std::to_string(_local_port);
auto map_ret = UPNP_AddPortMapping( auto map_ret = UPNP_AddPortMapping(
@ -70,6 +74,8 @@ ToxUPnP::ToxUPnP(ToxI& tox) {
if (map_ret != UPNPCOMMAND_SUCCESS) { if (map_ret != UPNPCOMMAND_SUCCESS) {
std::cerr << "TUPNP error: adding port mapping failed " << strupnperror(map_ret) << "\n"; std::cerr << "TUPNP error: adding port mapping failed " << strupnperror(map_ret) << "\n";
FreeUPNPUrls(&urls);
freeUPNPDevlist(devices);
continue; continue;
} }
@ -94,6 +100,9 @@ ToxUPnP::ToxUPnP(ToxI& tox) {
// potentially succ ??? // potentially succ ???
last_mapping_succ = true; last_mapping_succ = true;
FreeUPNPUrls(&urls);
freeUPNPDevlist(devices);
continue; continue;
} }