moonlight-stream/Internet-Hosting-Tool
1
0
Fork 0
mirror of https://github.com/moonlight-stream/Internet-Hosting-Tool.git synced 2025-07-03 00:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wait for the NAT-PMP response when deleting a conflicting entry

Browse Source
This commit is contained in:
Cameron Gutman 2018-11-06 20:24:45 -08:00
parent d379a4ee74
commit 1b8f15e259
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
miss/miss.cpp
View File

@ -417,9 +417,42 @@ bool NATPMPMapPort(natpmp_t* natpmp, int proto, int port, bool enable)
// It couldn't assign us the external port we requested and gave us an alternate external port. // It couldn't assign us the external port we requested and gave us an alternate external port.
// We can't use this alternate mapping, so immediately release it. // We can't use this alternate mapping, so immediately release it.
sendnewportmappingrequest(natpmp, natPmpProto, response.pnu.newportmapping.privateport, 0, 0); printf("Deleting unwanted NAT-PMP mapping %s %d...", proto == IPPROTO_TCP ? "TCP" : "UDP", response.pnu.newportmapping.mappedpublicport);
err = sendnewportmappingrequest(natpmp, natPmpProto, response.pnu.newportmapping.privateport, 0, 0);
if (err < 0) {
printf("ERROR %d" NL, err);
return false; return false;
} }
else {
do {
fd_set fds;
struct timeval timeout;
FD_ZERO(&fds);
FD_SET(natpmp->s, &fds);
err = getnatpmprequesttimeout(natpmp, &timeout);
if (err != 0) {
assert(err == 0);
printf("WAIT FAILED: %d" NL, err);
return false;
}
select(0, &fds, nullptr, nullptr, &timeout);
err = readnatpmpresponseorretry(natpmp, &response);
} while (err == NATPMP_TRYAGAIN);
if (err == 0) {
printf("DONE" NL);
return false;
}
else {
printf("FAILED %d" NL, err);
return false;
}
}
}
else { else {
printf("OK (%d seconds remaining)" NL, response.pnu.newportmapping.lifetime); printf("OK (%d seconds remaining)" NL, response.pnu.newportmapping.lifetime);
return true; return true;