Support IGD v2 port mappings

Handle newer gateways and routers that describe ports differently. Added check for unset ports to avoid NPEs. Covered the IGD v2 hierarchy in tests. Fixes #366 Signed-off-by: Giovanni Menzano <giovanni.menzano@gmail.com>
wborn · Jul 29, 2026 · Jul 23, 2026 · Jul 27, 2026 · Jul 27, 2026 · f3ec271343d4ec5eb0df338bdb530b24fad822bc
commit f3ec271343d4ec5eb0df338bdb530b24fad822bc
diff --git a/bundles/org.jupnp.support/src/main/java/org/jupnp/support/igd/callback/PortMappingAdd.java b/bundles/org.jupnp.support/src/main/java/org/jupnp/support/igd/callback/PortMappingAdd.java
@@ -15,6 +15,8 @@
  */
 package org.jupnp.support.igd.callback;
 
+import java.util.Objects;
+
 import org.jupnp.controlpoint.ActionCallback;
 import org.jupnp.controlpoint.ControlPoint;
 import org.jupnp.model.action.ActionInvocation;
@@ -38,10 +40,10 @@ protected PortMappingAdd(Service<?, ?> service, ControlPoint controlPoint, PortM
 
         this.portMapping = portMapping;
 
-        getActionInvocation().setInput("NewExternalPort", portMapping.getExternalPort().toString());
+        getActionInvocation().setInput("NewExternalPort", Objects.toString(portMapping.getExternalPort(), null));
         getActionInvocation().setInput("NewProtocol", portMapping.getProtocol());
         getActionInvocation().setInput("NewInternalClient", portMapping.getInternalClient());
-        getActionInvocation().setInput("NewInternalPort", portMapping.getInternalPort().toString());
+        getActionInvocation().setInput("NewInternalPort", Objects.toString(portMapping.getInternalPort(), null));
         getActionInvocation().setInput("NewLeaseDuration", portMapping.getLeaseDurationSeconds());
         getActionInvocation().setInput("NewEnabled", portMapping.isEnabled());
         if (portMapping.hasRemoteHost()) {

diff --git a/...les/org.jupnp.support/src/main/java/org/jupnp/support/igd/callback/PortMappingDelete.java b/...les/org.jupnp.support/src/main/java/org/jupnp/support/igd/callback/PortMappingDelete.java
@@ -15,6 +15,8 @@
  */
 package org.jupnp.support.igd.callback;
 
+import java.util.Objects;
+
 import org.jupnp.controlpoint.ActionCallback;
 import org.jupnp.controlpoint.ControlPoint;
 import org.jupnp.model.action.ActionInvocation;
@@ -38,7 +40,7 @@ protected PortMappingDelete(Service<?, ?> service, ControlPoint controlPoint, Po
 
         this.portMapping = portMapping;
 
-        getActionInvocation().setInput("NewExternalPort", portMapping.getExternalPort().toString());
+        getActionInvocation().setInput("NewExternalPort", Objects.toString(portMapping.getExternalPort(), null));
         getActionInvocation().setInput("NewProtocol", portMapping.getProtocol());
         if (portMapping.hasRemoteHost()) {
             getActionInvocation().setInput("NewRemoteHost", portMapping.getRemoteHost());

diff --git a/bundles/org.jupnp.support/src/test/java/org/jupnp/support/igd/PortMappingListenerTest.java b/bundles/org.jupnp.support/src/test/java/org/jupnp/support/igd/PortMappingListenerTest.java
@@ -37,15 +37,17 @@ class PortMappingListenerTest {
 
     @Test
     void discoversVersionTwoInternetGatewayDevice() throws Exception {
-        final RemoteService connectionService = new RemoteService(new UDAServiceType("WANIPConnection", 1),
+        final RemoteService connectionService = new RemoteService(new UDAServiceType("WANIPConnection", 2),
                 new UDAServiceId("WANIPConnection"), URI.create("service.xml"), URI.create("control"),
                 URI.create("events"));
         final RemoteDevice connectionDevice = new RemoteDevice(identity("connection"),
-                new UDADeviceType("WANConnectionDevice", 1), new DeviceDetails("WAN connection"),
+                new UDADeviceType("WANConnectionDevice", 2), new DeviceDetails("WAN connection"),
                 new RemoteService[] { connectionService });
+        final RemoteDevice wanDevice = new RemoteDevice(identity("wan"), new UDADeviceType("WANDevice", 2),
+                new DeviceDetails("WAN device"), new RemoteService[0], new RemoteDevice[] { connectionDevice });
         final RemoteDevice gateway = new RemoteDevice(identity("gateway"),
                 new UDADeviceType("InternetGatewayDevice", 2), new DeviceDetails("Internet gateway"),
-                new RemoteService[0], new RemoteDevice[] { connectionDevice });
+                new RemoteService[0], new RemoteDevice[] { wanDevice });
 
         final Service<?, ?> discovered = new PortMappingListener(new PortMapping()).discoverConnectionService(gateway);
 

diff --git a/...g.jupnp.support/src/test/java/org/jupnp/support/igd/callback/PortMappingCallbackTest.java b/...g.jupnp.support/src/test/java/org/jupnp/support/igd/callback/PortMappingCallbackTest.java
@@ -16,6 +16,7 @@
 package org.jupnp.support.igd.callback;
 
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.net.URI;
 
@@ -72,6 +73,25 @@ public void failure(final ActionInvocation invocation, final UpnpResponse operat
         assertInstanceOf(UnsignedIntegerFourBytes.class, invocation.getInput("NewExternalPort").getValue());
     }
 
+    @Test
+    void addAllowsUnsetPorts() throws Exception {
+        final PortMappingAdd callback = new PortMappingAdd(portMappingService(Datatype.Builtin.UI4.getDatatype(), true),
+                new PortMapping()) {
+            @Override
+            public void success(final ActionInvocation invocation) {
+            }
+
+            @Override
+            public void failure(final ActionInvocation invocation, final UpnpResponse operation,
+                    final String defaultMsg) {
+            }
+        };
+        final ActionInvocation<?> invocation = callback.getActionInvocation();
+
+        assertNull(invocation.getInput("NewExternalPort").getValue());
+        assertNull(invocation.getInput("NewInternalPort").getValue());
+    }
+
     private PortMapping mapping() {
         return new PortMapping(36743, "192.168.1.99", PortMapping.Protocol.TCP, "jUPnP test");
     }