fix(web): Fixed firewall service pid in GwtNetworkService (#5328)

Fixed firewall service pid in GwtNetworkService Signed-off-by: pierantoniomerlino <[email protected]>
eclipse-kura · Jul 30, 2024 · 1ba7687 · 1ba7687
1 parent 83b5252
commit 1ba7687
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtNetworkServiceImpl.java b/...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtNetworkServiceImpl.java
@@ -59,7 +59,8 @@
 public class GwtNetworkServiceImpl extends OsgiRemoteServiceServlet implements GwtNetworkService {
 
     private static final long serialVersionUID = -4188750359099902616L;
-    private static final String FIREWALL_CONFIGURATION_SERVICE_PID = "org.eclipse.kura.net.admin.ipv6.FirewallConfigurationServiceIPv6";
+    private static final String FIREWALL_IPV4_CONFIGURATION_SERVICE_PID = "org.eclipse.kura.net.admin.FirewallConfigurationService";
+    private static final String FIREWALL_IPV6_CONFIGURATION_SERVICE_PID = "org.eclipse.kura.net.admin.ipv6.FirewallConfigurationServiceIPv6";
     private static final String UNKNOWN_NETWORK_IP6_SHORT = "::/0";
     private static final String UNKNOWN_NETWORK_IP6_LONG = "0:0:0:0:0:0:0:0/0";
     private static final String UNKNOWN_NETWORK_IP4 = "0.0.0.0/0";
@@ -411,7 +412,7 @@ public void updateDeviceFirewallOpenPorts(GwtXSRFToken xsrfToken, List<GwtFirewa
             }
 
             properties.put(openPortsPropName, openPorts.toString());
-            configurationService.updateConfiguration(FIREWALL_CONFIGURATION_SERVICE_PID, properties, true);
+            configurationService.updateConfiguration(FIREWALL_IPV4_CONFIGURATION_SERVICE_PID, properties, true);
         } catch (KuraException | UnknownHostException e) {
             throw new GwtKuraException(GwtKuraErrorCode.INTERNAL_ERROR, e);
         }
@@ -457,7 +458,7 @@ public void updateDeviceFirewallOpenPortsIPv6(GwtXSRFToken xsrfToken, List<GwtFi
             }
 
             properties.put(openPortsPropName, openPorts.toString());
-            configurationService.updateConfiguration(FIREWALL_CONFIGURATION_SERVICE_PID, properties, true);
+            configurationService.updateConfiguration(FIREWALL_IPV6_CONFIGURATION_SERVICE_PID, properties, true);
         } catch (KuraException | UnknownHostException e) {
             throw new GwtKuraException(GwtKuraErrorCode.INTERNAL_ERROR, e);
         }
@@ -505,7 +506,7 @@ public void updateDeviceFirewallPortForwards(GwtXSRFToken xsrfToken, List<GwtFir
             }
 
             properties.put(portForwardingPropName, portForwarding.toString());
-            configurationService.updateConfiguration(FIREWALL_CONFIGURATION_SERVICE_PID, properties, true);
+            configurationService.updateConfiguration(FIREWALL_IPV4_CONFIGURATION_SERVICE_PID, properties, true);
         } catch (KuraException | UnknownHostException e) {
             throw new GwtKuraException(GwtKuraErrorCode.INTERNAL_ERROR, e);
         }
@@ -554,7 +555,7 @@ public void updateDeviceFirewallPortForwardsIPv6(GwtXSRFToken xsrfToken, List<Gw
             }
 
             properties.put(portForwardingPropName, portForwarding.toString());
-            configurationService.updateConfiguration(FIREWALL_CONFIGURATION_SERVICE_PID, properties, true);
+            configurationService.updateConfiguration(FIREWALL_IPV6_CONFIGURATION_SERVICE_PID, properties, true);
         } catch (KuraException | UnknownHostException e) {
             throw new GwtKuraException(GwtKuraErrorCode.INTERNAL_ERROR, e);
         }
@@ -596,7 +597,7 @@ public void updateDeviceFirewallNATs(GwtXSRFToken xsrfToken, List<GwtFirewallNat
             }
 
             properties.put(natPropName, nat.toString());
-            configurationService.updateConfiguration(FIREWALL_CONFIGURATION_SERVICE_PID, properties, true);
+            configurationService.updateConfiguration(FIREWALL_IPV4_CONFIGURATION_SERVICE_PID, properties, true);
         } catch (KuraException | UnknownHostException e) {
             throw new GwtKuraException(GwtKuraErrorCode.INTERNAL_ERROR, e);
         }
@@ -638,7 +639,7 @@ public void updateDeviceFirewallNATsIPv6(GwtXSRFToken xsrfToken, List<GwtFirewal
             }
 
             properties.put(natPropName, nat.toString());
-            configurationService.updateConfiguration(FIREWALL_CONFIGURATION_SERVICE_PID, properties, true);
+            configurationService.updateConfiguration(FIREWALL_IPV6_CONFIGURATION_SERVICE_PID, properties, true);
         } catch (KuraException | UnknownHostException e) {
             throw new GwtKuraException(GwtKuraErrorCode.INTERNAL_ERROR, e);
         }