From 10b90f45f0930a79e8e1afaf2395bd26da26c272 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Wed, 3 Mar 2021 19:53:24 -0500
Subject: [PATCH] UPnP: IPv6 part 12
Fix retention of deprecated messages
log tweaks, finals
---
router/java/src/net/i2p/router/transport/UPnP.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java
index 6105ac62ea..9baa61fc2b 100644
--- a/router/java/src/net/i2p/router/transport/UPnP.java
+++ b/router/java/src/net/i2p/router/transport/UPnP.java
@@ -1712,7 +1712,13 @@ public class UPnP extends ControlPoint implements DeviceChangeListener, EventLis
long now = _context.clock().now();
long exp = v6port.getExpiration();
if (exp > 0) {
- keep = exp < now;
+ keep = exp > now;
+ if (_log.shouldWarn()) {
+ if (keep)
+ _log.warn("Deprecated address not expired, continue forwarding: " + v6port);
+ else
+ _log.warn("Deprecated address expired, stop forwarding: " + v6port);
+ }
} else {
try {
Inet6Address v6addr = (Inet6Address) InetAddress.getByName(v6port.getIP());
@@ -1803,7 +1809,7 @@ public class UPnP extends ControlPoint implements DeviceChangeListener, EventLis
* This also renews all subscriptions.
*/
private class RegisterPortsThread implements Runnable {
- private Set<ForwardPort> portsToForwardNow;
+ private final Set<ForwardPort> portsToForwardNow;
/**
* @param ports if null, renew subscriptions only, then exit.
@@ -1859,7 +1865,7 @@ public class UPnP extends ControlPoint implements DeviceChangeListener, EventLis
}
private class UnregisterPortsThread implements Runnable {
- private Set<ForwardPort> portsToForwardNow;
+ private final Set<ForwardPort> portsToForwardNow;
public UnregisterPortsThread(Set<ForwardPort> ports) {
portsToForwardNow = ports;
--
GitLab