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

Allow deletion of upstream mappings if we can guarantee they are ours

Browse Source
This commit is contained in:
Cameron Gutman 2018-11-07 17:44:49 -08:00
parent 2ba42e6dd5
commit 176a1762d6
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
miss/miss.cpp
View File

@ -141,7 +141,10 @@ bool UPnPMapPort(struct UPNPUrls* urls, struct IGDdatas* data, int proto, const
printf("CONFLICT: %s %s" NL, intClient, desc); printf("CONFLICT: %s %s" NL, intClient, desc);
// Some UPnP IGDs won't let unauthenticated clients delete other conflicting port mappings // Some UPnP IGDs won't let unauthenticated clients delete other conflicting port mappings
// for security reasons, but we will give it a try anyway. // for security reasons, but we will give it a try anyway. If GameStream is not enabled,
// we will leave the conflicting entry alone to avoid disturbing another PC's port forwarding
// (especially if we're double NATed).
if (enable) {
printf("Trying to delete conflicting UPnP mapping for %s %s -> %s...", protoStr, portStr, intClient); printf("Trying to delete conflicting UPnP mapping for %s %s -> %s...", protoStr, portStr, intClient);
err = UPNP_DeletePortMapping(urls->controlURL, data->first.servicetype, portStr, protoStr, nullptr); err = UPNP_DeletePortMapping(urls->controlURL, data->first.servicetype, portStr, protoStr, nullptr);
if (err == UPNPCOMMAND_SUCCESS) { if (err == UPNPCOMMAND_SUCCESS) {
@ -157,6 +160,7 @@ bool UPnPMapPort(struct UPNPUrls* urls, struct IGDdatas* data, int proto, const
} }
} }
} }
}
else { else {
printf("ERROR %d (%s)" NL, err, strupnperror(err)); printf("ERROR %d (%s)" NL, err, strupnperror(err));
} }
@ -593,6 +597,14 @@ void UpdatePortMappingsForTarget(bool enable, char* targetAddressIP4, char* inte
fflush(stdout); fflush(stdout);
if (natPmpErr == 0) { if (natPmpErr == 0) {
// NAT-PMP has no description field or other token that we can use to determine
// if we created the rules we'd be deleting. Since we don't have that, we can't
// safely remove mappings that could be shared by another machine behind a double NAT.
if (!enable && targetAddressIP4 != nullptr) {
printf("Not removing upstream NAT-PMP mappings on non-default gateway device" NL);
tryNatPmp = false;
}
if (tryNatPmp) { if (tryNatPmp) {
bool success = true; bool success = true;
for (int i = 0; i < ARRAYSIZE(k_Ports); i++) { for (int i = 0; i < ARRAYSIZE(k_Ports); i++) {
@ -677,11 +689,6 @@ void UpdatePortMappings(bool enable)
break; break;
} }
if (!enable) {
printf("Skipping hop traversal with GameStream disabled" NL);
break;
}
char targetAddress[128]; char targetAddress[128];
inet_ntop(AF_INET, &hops[nextHopIndex], targetAddress, sizeof(targetAddress)); inet_ntop(AF_INET, &hops[nextHopIndex], targetAddress, sizeof(targetAddress));