echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPnP: Set lease duration of 3 hours, always refresh the lease

Browse Source
This commit is contained in:
zzz
2019-06-09 11:48:03 +00:00
parent 2c97dc2bcd
commit 5ede0a139c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
router/java/src/net/i2p/router/transport/UPnP.java
View File

@ -910,7 +910,9 @@ public class UPnP extends ControlPoint implements DeviceChangeListener, EventLis
add.setArgumentValue("NewProtocol", protocol); add.setArgumentValue("NewProtocol", protocol);
add.setArgumentValue("NewPortMappingDescription", description); add.setArgumentValue("NewPortMappingDescription", description);
add.setArgumentValue("NewEnabled","1"); add.setArgumentValue("NewEnabled","1");
add.setArgumentValue("NewLeaseDuration", 0); // 3 hours
// MUST be longer than max RI republish which is 52 minutes
add.setArgumentValue("NewLeaseDuration", 3*60*60);
boolean rv = add.postControlAction(); boolean rv = add.postControlAction();
if(rv) { if(rv) {
@ -1085,17 +1087,19 @@ public class UPnP extends ControlPoint implements DeviceChangeListener, EventLis
// Ports in ports but not in portsToForwardNow we must forward // Ports in ports but not in portsToForwardNow we must forward
// Ports in portsToForwardNow but not in ports we must dump // Ports in portsToForwardNow but not in ports we must dump
for(ForwardPort port: ports) { for(ForwardPort port: ports) {
// Always add, since we now have a 3 hour lease duration,
// so we have to keep refreshing the lease.
//if(portsToForward.contains(port)) { //if(portsToForward.contains(port)) {
// If not in portsForwarded, it wasn't successful, try again // If not in portsForwarded, it wasn't successful, try again
if(portsForwarded.contains(port)) { //if(portsForwarded.contains(port)) {
// We have forwarded it, and it should be forwarded, cool. // We have forwarded it, and it should be forwarded, cool.
// Big problem here, if firewall resets, we don't know it. // Big problem here, if firewall resets, we don't know it.
// Do we need to re-forward anyway? or poll the router? // Do we need to re-forward anyway? or poll the router?
} else { //} else {
// Needs forwarding // Needs forwarding
if(portsToForwardNow == null) portsToForwardNow = new HashSet<ForwardPort>(); if(portsToForwardNow == null) portsToForwardNow = new HashSet<ForwardPort>();
portsToForwardNow.add(port); portsToForwardNow.add(port);
} //}
} }
for(ForwardPort port : portsToForward) { for(ForwardPort port : portsToForward) {
if(ports.contains(port)) { if(ports.contains(port)) {