Changeset f869b8a

Timestamp:

Feb 27, 2018 3:09:49 PM (3 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

ab182d08

Parents:

7035db2

Message:

UPnP: Fix event listening, prep for using events

File:

• router/java/src/net/i2p/router/transport/UPnP.java (modified) (5 diffs)

router/java/src/net/i2p/router/transport/UPnP.java

@@ -85 +85 @@
         private Service _service;
         // UDN -> friendly name
-        private final Map<String, String> _otherUDNs;
+        private final Map<String, String> _otherUDNs;
+        private final Map<String, String> _eventVars;
         private boolean isDisabled = false; // We disable the plugin if more than one IGD is found
         private volatile boolean _serviceLacksAPM;
@@ -108 +109 @@
                 portsToForward = new HashSet<ForwardPort>();
                 portsForwarded = new HashSet<ForwardPort>();
-                _otherUDNs = new HashMap<String, String>(4);
+                _otherUDNs = new HashMap<String, String>(4);
+                _eventVars = new HashMap<String, String>(4);
+        }
+        
+        public synchronized boolean runPlugin() {
                 addDeviceChangeListener(this);
-        }
-        
-        public synchronized boolean runPlugin() {
+                addEventListener(this);
                 synchronized(lock) {
                         portsToForward.clear();
                         portsForwarded.clear();
+                        _eventVars.clear();
                 }
                 return super.start();
@@ -124 +128 @@
          */
         public synchronized void terminate() {
+                removeDeviceChangeListener(this);
+                removeEventListener(this);
                 synchronized(lock) {
                         portsToForward.clear();
+                        _eventVars.clear();
                 }
                 // this gets spun off in a thread...
@@ -367 +374 @@
                                 _router = null;
                                 _service = null;
+                                _eventVars.clear();
                                 _serviceLacksAPM = false;
                                 if (!portsForwarded.isEmpty()) {
@@ -387 +395 @@
         /**
          *  EventListener callback -
-         *  unused for now - how many devices support events?
+         *  unused for now - supported in miniupnpd as of 1.1
          */
         public void eventNotifyReceived(String uuid, long seq, String varName, String value) {
-                if (_log.shouldLog(Log.WARN))
-                        _log.warn("Event: " + uuid + ' ' + seq + ' ' + varName + '=' + value);
+                if (uuid == null || varName == null || value == null)
+                        return;
+                if (varName.length() > 128 || value.length() > 128)
+                        return;
+                String old = null;
+                synchronized(lock) {
+                        if (_service == null || !uuid.equals(_service.getSID()))
+                                return;
+                        if (_eventVars.size() >= 20 && !_eventVars.containsKey(varName))
+                                return;
+                        old = _eventVars.put(varName, value);
+                }
+                // The following four variables are "evented":
+                // PossibleConnectionTypes: {Unconfigured IP_Routed IP_Bridged}
+                // ConnectionStatus: {Unconfigured Connecting Connected PendingDisconnect Disconnecting Disconnected}
+                // ExternalIPAddress: string
+                // PortMappingNumberOfEntries: int
+                if (!value.equals(old)) {
+                        if (_log.shouldDebug())
+                                _log.debug("Event: " + varName + " changed from " + old + " to " + value);
+                }
+                // call callback...
         }