From 4dcc7e09fc366b23049136e87e51af92c1cc8ee7 Mon Sep 17 00:00:00 2001 From: Julian Kiedaisch Date: Tue, 29 Sep 2026 21:06:08 +0000 Subject: [PATCH] feat(fls): DHCP, static NAT and modem settings as Java loads them readSystemSoftware adds the DHCP client switch and server settings of every IP stack, a home router's static NAT table (port forwarding) and a modem's mode, port and address. All 23 corpus files match Java. Static DHCP assignments follow setStaticAssignedAddresses: each entry is split at Java whitespace (the same 25 characters as Character.isWhitespace, measured over the BMP), and an entry without MAC and IP ends the list, as Java throws there. Co-Authored-By: Claude Opus 5.5 --- CHANGES.md | 2 +- corpus/corpus.java.json | 1899 ++++++++++++++++++++++++-- packages/fls/src/index.ts | 1 + packages/fls/src/systemSoftware.ts | 106 +- packages/fls/test/topology.test.ts | 76 +- scripts/code_language_allow.txt | 10 + tools/java-oracle/README.md | 5 +- tools/java-oracle/src/FlsOracle.java | 29 + 8 files changed, 1995 insertions(+), 133 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5555536..c6ce871 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -35,7 +35,7 @@ Swift-Pfade relativ zu `filius-ipad/ios/FiliusPad/TopologyEditor/` (Stand | `src/javabeans.ts`, `src/javaDefaults.json` | — | neu: XMLEncoder-Leser nach den Regeln von `java.beans.XMLDecoder` (Swift liest elementweise und verliert geteilte Werte); Getter-Standardwerte und statische Konstanten mit `tools/java-oracle` gemessen | | `src/importProject.ts` | `Persistence/TopologyProjectStore.swift` (Knoten, Ports, Kabel, IP-Konfiguration, Switch/WLAN, Routen, RIP, Firewall, Doku-Elemente des Imports) | übertragen, Eingabe ist Javas Sicht: Name und Port-Anzahl wie Java, abgelehnte Adresse → Swift-Standard, Router-Standardgateway wie Java (Swift verliert es), jede Router-Firewall eingetragen; gegen Swifts importiertes Modell auf 13 Dateien geprüft | | `test/importProject.test.ts` | — | neu: Swifts importiertes Modell (13 Dateien, zwei begründete Abweichungen), Vollständigkeit aller 23, Pings im Kern (über einen Router; über drei Router mit manuellen Routen und Router-Gateways) | -| `src/systemSoftware.ts` | Java `SwitchFirmware`, `Betriebssystem`, `VermittlungsrechnerBetriebssystem`, `GatewayFirmware`, `Weiterleitungstabelle`, `Firewall`, `FirewallRule` | neu nach Java: SSID, Lernzeit, RIP, manuelle Routen, Router-Firewall (an allen Stellen, an denen die Datei sie erreicht); gegen Java geprüft | +| `src/systemSoftware.ts` | Java `SwitchFirmware`, `Betriebssystem`, `VermittlungsrechnerBetriebssystem`, `GatewayFirmware`, `Weiterleitungstabelle`, `Firewall`, `FirewallRule`, `DHCPServer`, `ModemFirmware` | neu nach Java: SSID, Lernzeit, RIP, manuelle Routen, Router-Firewall (an allen Stellen, an denen die Datei sie erreicht), DHCP, statische NAT, Modem; `Character.isWhitespace` am JDK gemessen; gegen Java geprüft | | `src/javaIp.ts` | Java `IP.inetAton`/`ipCheck` | neu nach Java; an 46 Fällen mit Java gemessen | | `src/topology.ts` | Java `SzenarioVerwaltung.netzwerkLaden`, Konstruktoren und Setter der Geräte; Swift `Persistence/TopologyProjectStore.swift` (Parser) als Vergleich | neu nach Java statt Übertragung: Geräteart aus der Klasse statt aus der Beschriftung, Geräte ohne Koordinaten bei 0,0 statt verworfen, Werte durch Javas Setter | | `test/javabeans.test.ts` | — | neu: je XMLDecoder-Regel ein Test; alle 23 Korpus-Dateien, Klasse und Position jedes Geräts wie Java | diff --git a/corpus/corpus.java.json b/corpus/corpus.java.json index a65bf41..8c7f2d1 100644 --- a/corpus/corpus.java.json +++ b/corpus/corpus.java.json @@ -25,7 +25,17 @@ ], "system": { "ssid": "MyWiFi", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -56,6 +66,17 @@ ], "system": { "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.0.11", + "obergrenze": "192.168.0.254", + "gatewayip": "0.0.0.0", + "dnsserverip": "8.8.8.8", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [], "firewall": { "activated": false, "defaultPolicy": 0, @@ -102,6 +123,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -135,7 +166,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -161,7 +202,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -187,7 +238,17 @@ ], "system": { "ssid": "MyWiFi", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -626,7 +687,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -652,7 +723,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -678,7 +759,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -704,7 +795,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -771,7 +872,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -797,7 +908,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } } ], @@ -1004,7 +1125,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1030,7 +1161,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1056,7 +1197,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1088,6 +1239,16 @@ "system": { "ripEnabled": false, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -1194,7 +1355,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1261,7 +1432,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1300,6 +1481,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -1353,6 +1544,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -1399,6 +1600,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -1459,6 +1670,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -1505,6 +1726,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -1544,6 +1775,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -1577,7 +1818,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1603,7 +1854,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1629,7 +1890,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1655,7 +1926,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1681,7 +1962,20 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "10.50.50.11", + "obergrenze": "10.50.50.254", + "gatewayip": "10.0.0.1", + "dnsserverip": "10.0.0.1", + "ownSettings": true, + "staticAssignedAddresses": [ + "A8:BD:04:A6:63:AD 10.10.20.11", + "3D:67:2A:01:2D:91 10.10.20.12" + ] + } } }, { @@ -1712,6 +2006,17 @@ ], "system": { "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.1.11", + "obergrenze": "192.168.1.254", + "gatewayip": "0.0.0.0", + "dnsserverip": "8.8.8.8", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [], "firewall": { "activated": false, "defaultPolicy": 0, @@ -1745,7 +2050,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1771,7 +2086,17 @@ ], "system": { "ssid": "MyWiFiNetwork", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1797,7 +2122,17 @@ ], "system": { "ssid": "MyWiFiNetwork", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1823,7 +2158,17 @@ ], "system": { "ssid": "MyWiFiNetwork", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1849,7 +2194,17 @@ ], "system": { "ssid": "MyWiFiNetwork", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -1921,6 +2276,24 @@ ], "system": { "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [ + [ + "TCP", + "80", + "10.0.0.1", + "80" + ] + ], "firewall": { "activated": true, "defaultPolicy": 0, @@ -2015,6 +2388,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -2048,7 +2431,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "43.0.0.11", + "obergrenze": "43.0.0.254", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -2736,7 +3129,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -2803,7 +3206,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -2842,6 +3255,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -2895,6 +3318,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -2941,6 +3374,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -3001,6 +3444,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -3047,6 +3500,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -3086,6 +3549,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -3119,7 +3592,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -3145,7 +3628,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -3171,7 +3664,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -3197,7 +3700,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -3223,7 +3736,20 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "10.50.50.11", + "obergrenze": "10.50.50.254", + "gatewayip": "10.0.0.1", + "dnsserverip": "10.0.0.1", + "ownSettings": true, + "staticAssignedAddresses": [ + "A8:BD:04:A6:63:AD 10.10.20.11", + "3D:67:2A:01:2D:91 10.10.20.12" + ] + } } }, { @@ -3254,6 +3780,17 @@ ], "system": { "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.1.11", + "obergrenze": "192.168.1.254", + "gatewayip": "0.0.0.0", + "dnsserverip": "8.8.8.8", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [], "firewall": { "activated": false, "defaultPolicy": 0, @@ -3287,7 +3824,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -3313,7 +3860,17 @@ ], "system": { "ssid": "MyWiFiNetwork", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -3339,7 +3896,17 @@ ], "system": { "ssid": "MyWiFiNetwork", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -3365,7 +3932,17 @@ ], "system": { "ssid": "MyWiFiNetwork", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -3391,7 +3968,17 @@ ], "system": { "ssid": "MyWiFiNetwork", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -3463,6 +4050,24 @@ ], "system": { "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [ + [ + "TCP", + "80", + "10.0.0.1", + "80" + ] + ], "firewall": { "activated": true, "defaultPolicy": 0, @@ -3557,6 +4162,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -3590,7 +4205,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "43.0.0.11", + "obergrenze": "43.0.0.254", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -4236,7 +4861,17 @@ ], "system": { "ssid": "MyWiFi", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -4267,6 +4902,17 @@ ], "system": { "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.0.11", + "obergrenze": "192.168.0.254", + "gatewayip": "0.0.0.0", + "dnsserverip": "8.8.8.8", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [], "firewall": { "activated": false, "defaultPolicy": 0, @@ -4313,6 +4959,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -4346,7 +5002,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -4372,7 +5038,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -4398,7 +5074,17 @@ ], "system": { "ssid": "MyWiFi", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -4796,7 +5482,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -4822,7 +5518,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -4889,7 +5595,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } } ], @@ -4962,7 +5678,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.0.100", + "obergrenze": "192.168.0.150", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -4988,7 +5714,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5014,7 +5750,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5081,7 +5827,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5112,6 +5868,17 @@ ], "system": { "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.0.100", + "obergrenze": "192.168.0.200", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [], "firewall": { "activated": false, "defaultPolicy": 0, @@ -5145,7 +5912,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } } ], @@ -5285,7 +6062,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5311,7 +6098,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5337,7 +6134,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5363,7 +6170,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5430,7 +6247,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5456,7 +6283,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } } ], @@ -5581,7 +6418,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5607,7 +6454,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5633,7 +6490,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5659,7 +6526,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5685,7 +6562,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.0.21", + "obergrenze": "192.168.0.29", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5752,7 +6639,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5778,7 +6675,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5804,7 +6711,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -5830,7 +6747,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6089,7 +7016,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6115,7 +7052,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6141,7 +7088,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6167,7 +7124,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6193,7 +7160,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6260,7 +7237,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6286,7 +7273,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6312,7 +7309,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } } ], @@ -6538,6 +7545,16 @@ "system": { "ripEnabled": false, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -6597,6 +7614,16 @@ "141.99.4.1" ] ], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -6636,6 +7663,16 @@ "system": { "ripEnabled": false, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -6710,7 +7747,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6736,7 +7783,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6762,7 +7819,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6788,7 +7855,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6814,7 +7891,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6840,7 +7927,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -6907,7 +8004,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } } ], @@ -7110,7 +8217,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7136,7 +8253,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7162,7 +8289,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7229,7 +8366,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7255,7 +8402,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7281,7 +8438,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } } ], @@ -7453,7 +8620,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7479,7 +8656,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7495,7 +8682,13 @@ "ports": [ {} ], - "system": {} + "system": { + "modem": { + "mode": 2, + "port": 12345, + "ipAdresse": "localhost" + } + } }, { "class": "Modem", @@ -7510,7 +8703,13 @@ "ports": [ {} ], - "system": {} + "system": { + "modem": { + "mode": 1, + "port": 12345, + "ipAdresse": "localhost" + } + } } ], "cables": [ @@ -7569,7 +8768,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7595,7 +8804,17 @@ ], "system": { "ssid": "Filius Wi Fi", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7621,7 +8840,17 @@ ], "system": { "ssid": "Filius Wi Fi", - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7740,6 +8969,17 @@ ], "system": { "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [], "firewall": { "activated": false, "defaultPolicy": 0, @@ -7773,7 +9013,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -7799,7 +9049,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -8001,6 +9261,16 @@ "system": { "ripEnabled": false, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -8060,6 +9330,16 @@ "141.99.4.1" ] ], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -8099,6 +9379,16 @@ "system": { "ripEnabled": false, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -8132,7 +9422,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -8158,7 +9458,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -8184,7 +9494,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -8210,7 +9530,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -8236,7 +9566,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -8303,7 +9643,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -8334,6 +9684,24 @@ ], "system": { "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [ + [ + "TCP", + "80", + "192.168.0.10", + "80" + ] + ], "firewall": { "activated": false, "defaultPolicy": 0, @@ -8372,6 +9740,17 @@ ], "system": { "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [], "firewall": { "activated": false, "defaultPolicy": 0, @@ -8855,7 +10234,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -8881,7 +10270,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -8912,6 +10311,17 @@ ], "system": { "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.0.10", + "obergrenze": "192.168.0.100", + "gatewayip": "0.0.0.0", + "dnsserverip": "141.99.2.10", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [], "firewall": { "activated": false, "defaultPolicy": 0, @@ -8986,7 +10396,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "141.99.2.100", + "obergrenze": "141.99.2.250", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } } ], @@ -9266,7 +10686,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -9292,7 +10722,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -9323,6 +10763,17 @@ ], "system": { "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.0.11", + "obergrenze": "192.168.0.100", + "gatewayip": "0.0.0.0", + "dnsserverip": "42.0.0.2", + "ownSettings": false, + "staticAssignedAddresses": [] + }, + "staticNAT": [], "firewall": { "activated": false, "defaultPolicy": 0, @@ -9397,7 +10848,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "42.0.0.11", + "obergrenze": "42.0.0.254", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -9436,6 +10897,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -9469,7 +10940,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -9495,7 +10976,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -9534,6 +11025,16 @@ "system": { "ripEnabled": true, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -9887,7 +11388,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -9913,7 +11424,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10096,7 +11617,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10122,7 +11653,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10148,7 +11689,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10180,6 +11731,16 @@ "system": { "ripEnabled": false, "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + }, "firewall": { "activated": false, "defaultPolicy": 0, @@ -10286,7 +11847,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10312,7 +11883,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10338,7 +11919,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10364,7 +11955,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10390,7 +11991,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": false, + "dhcpServer": { + "aktiv": true, + "untergrenze": "192.168.0.21", + "obergrenze": "192.168.0.29", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10457,7 +12068,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10483,7 +12104,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10509,7 +12140,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { @@ -10535,7 +12176,17 @@ ], "system": { "ssid": null, - "manualRoutes": [] + "manualRoutes": [], + "dhcpClient": true, + "dhcpServer": { + "aktiv": false, + "untergrenze": "0.0.0.0", + "obergrenze": "0.0.0.0", + "gatewayip": "0.0.0.0", + "dnsserverip": "0.0.0.0", + "ownSettings": false, + "staticAssignedAddresses": [] + } } }, { diff --git a/packages/fls/src/index.ts b/packages/fls/src/index.ts index 21e1f68..add02f6 100644 --- a/packages/fls/src/index.ts +++ b/packages/fls/src/index.ts @@ -3,5 +3,6 @@ export * from './archive.js'; export * from './importProject.js'; export * from './javaIp.js'; export * from './javabeans.js'; +export * from './systemSoftware.js'; export * from './topology.js'; export * from './zip.js'; diff --git a/packages/fls/src/systemSoftware.ts b/packages/fls/src/systemSoftware.ts index d127dec..014a803 100644 --- a/packages/fls/src/systemSoftware.ts +++ b/packages/fls/src/systemSoftware.ts @@ -7,8 +7,12 @@ // filius.software.vermittlungsschicht.Weiterleitungstabelle, // filius.software.firewall.Firewall and FirewallRule. // -// Checked against Java (corpus.java.json, `system`). DHCP, NAT, the modem, -// file systems and applications are later layers. +// Also DHCP (client switch and server settings), a home router's static NAT +// table (port forwarding) and a modem's connection settings. +// Java counterparts as well: filius.software.dhcp.DHCPServer, ModemFirmware. +// +// Checked against Java (corpus.java.json, `system`). File systems and +// applications are later layers. // // A router's firewall is one object its constructor makes and hangs in two // places: the installed applications and the configuration plug-ins of its @@ -43,6 +47,26 @@ export interface FlsFirewall { rules: FlsFirewallRule[]; } +/** The settings of Java's DHCPServer under English names (Java's own: javaDhcpServer in the topology test). */ +export interface FlsDhcpServer { + isActive: boolean; + lowerBound: string | null; + upperBound: string | null; + gateway: string | null; + dnsServer: string | null; + useOwnSettings: boolean; + /** As Java keeps them after setStaticAssignedAddresses: MAC and IP of each entry. */ + staticAssignedAddresses: { mac: string; ip: string }[]; +} + +export interface FlsModem { + /** 1 server, 2 client. */ + mode: number; + port: number; + /** Java's ipAdresse: the host a client modem connects to. */ + ipAddress: string | null; +} + export interface FlsSystemSoftware { /** * Switch: its SSID, undefined when the file has none (Java rolls one). @@ -57,6 +81,14 @@ export interface FlsSystemSoftware { manualRoutes?: (string | null)[][]; /** Vermittlungsrechner, Gateway. */ firewall?: FlsFirewall; + /** Every node with an IP stack: whether it asks a DHCP server for its address. */ + dhcpClient?: boolean; + /** Every node with an IP stack. */ + dhcpServer?: FlsDhcpServer; + /** Gateway: rows of protocol, public port, LAN address, LAN port — as the file has them. */ + staticNAT?: (string | null)[][]; + /** Modem. */ + modem?: FlsModem; } type Warn = (message: string) => void; @@ -88,6 +120,16 @@ export function readSystemSoftware(device: JavaObject, javaClass: FlsNodeClass, } if (javaClass !== 'Switch' && javaClass !== 'Modem') { result.manualRoutes = manualRoutes(value('weiterleitungstabelle'), warn); + result.dhcpClient = boolean(value('DHCPKonfiguration'), false, 'DHCPKonfiguration', warn); + result.dhcpServer = dhcpServer(value('DHCPServer'), warn); + } + if (javaClass === 'Gateway') result.staticNAT = rowsOfStrings(value('staticNAT')); + if (javaClass === 'Modem') { + result.modem = { + mode: integer(value('mode'), 2, 'modem mode', warn), + port: integer(value('port'), 12_345, 'modem port', warn), + ipAddress: modemAddress(optionalString(value('ipAdresse'), 'modem ipAdresse', warn)), + }; } if (javaClass === 'Vermittlungsrechner' || javaClass === 'Gateway') { result.firewall = firewall(software, warn); @@ -101,9 +143,63 @@ function manualRoutes(table: JavaValue | undefined, warn: Warn): (string | null) warn(`weiterleitungstabelle is ${describe(table)}, ignored`); return []; } - return listItems(table.properties.get('manuelleTabelle')).map((row) => - listItems(row).map((cell) => (typeof cell === 'string' || cell === null ? cell : null)), - ); + return rowsOfStrings(table.properties.get('manuelleTabelle')); +} + +function modemAddress(value: string | null | undefined): string | null { + return value === undefined ? 'localhost' : value; +} + +/** A list of String arrays (routes, static NAT); anything but a string is null. */ +function rowsOfStrings(list: JavaValue | undefined): (string | null)[][] { + return listItems(list).map((row) => listItems(row).map((cell) => (typeof cell === 'string' ? cell : null))); +} + +/** The DHCP server every IP stack's constructor makes: off, all addresses 0.0.0.0. */ +function dhcpServer(server: JavaValue | undefined, warn: Warn): FlsDhcpServer { + const at = (property: string) => (isJavaObject(server) ? server.properties.get(property) : undefined); + const address = (property: string) => { + const value = optionalString(at(property), `DHCPServer ${property}`, warn); + return value === undefined ? '0.0.0.0' : value; + }; + return { + isActive: boolean(at('aktiv'), false, 'DHCPServer aktiv', warn), + lowerBound: address('untergrenze'), + upperBound: address('obergrenze'), + gateway: address('gatewayip'), + dnsServer: address('dnsserverip'), + useOwnSettings: boolean(at('ownSettings'), false, 'DHCPServer ownSettings', warn), + staticAssignedAddresses: staticAssignments(at('staticAssignedAddresses'), warn), + }; +} + +/** + * setStaticAssignedAddresses: each entry split at whitespace (StringUtils.split), + * MAC and IP from the first two parts. An entry with fewer throws inside the + * loop — XMLDecoder swallows it, and the entries after it are lost. + */ +function staticAssignments(list: JavaValue | undefined, warn: Warn): { mac: string; ip: string }[] { + const result: { mac: string; ip: string }[] = []; + for (const entry of listItems(list)) { + const parts = typeof entry === 'string' ? javaWhitespaceSplit(entry) : []; + if (parts.length < 2) { + warn(`DHCPServer: static assignment ${describe(entry)} has no MAC and IP; Java stops reading here`); + break; + } + result.push({ mac: parts[0]!, ip: parts[1]! }); + } + return result; +} + +/** + * Character.isWhitespace: space, line and paragraph separators except the + * no-break ones (U+00A0, U+2007, U+202F), and the controls TAB, LF, VT, FF, + * CR, FS, GS, RS, US. + */ +const JAVA_WHITESPACE = /(?:(?![\u00A0\u2007\u202F])[\p{Zs}\p{Zl}\p{Zp}]|[\t\n\u000B\f\r\u001C-\u001F])+/u; + +function javaWhitespaceSplit(text: string): string[] { + return text.split(JAVA_WHITESPACE).filter((part) => part !== ''); } /** Every object the file reaches the router's one firewall by. */ diff --git a/packages/fls/test/topology.test.ts b/packages/fls/test/topology.test.ts index 157aab9..9d5fe1f 100644 --- a/packages/fls/test/topology.test.ts +++ b/packages/fls/test/topology.test.ts @@ -7,7 +7,15 @@ import { readdirSync, readFileSync, statSync } from 'node:fs'; import { dirname, join, relative } from 'node:path'; import { fileURLToPath } from 'node:url'; import { describe, expect, it } from 'vitest'; -import { decodeJavaBeans, readFlsArchive, readTopology, type FlsNodeClass, type FlsTopology } from '../src/index.js'; +import { + decodeJavaBeans, + readFlsArchive, + readTopology, + type FlsDhcpServer, + type FlsModem, + type FlsNodeClass, + type FlsTopology, +} from '../src/index.js'; const corpusRoot = join(dirname(fileURLToPath(import.meta.url)), '../../../corpus'); const javaView = JSON.parse(readFileSync(join(corpusRoot, 'corpus.java.json'), 'utf8')) as Record; @@ -34,6 +42,23 @@ const TYPE_LABELS: Record = { Modem: 'Modem', }; +/** Java's property names, as FlsOracle.java writes them. */ +function javaDhcpServer(server: FlsDhcpServer) { + return { + aktiv: server.isActive, + untergrenze: server.lowerBound, + obergrenze: server.upperBound, + gatewayip: server.gateway, + dnsserverip: server.dnsServer, + ownSettings: server.useOwnSettings, + staticAssignedAddresses: server.staticAssignedAddresses.map((entry) => `${entry.mac} ${entry.ip}`), + }; +} + +function javaModem(modem: FlsModem) { + return { mode: modem.mode, port: modem.port, ipAdresse: modem.ipAddress }; +} + /** The topology in the shape FlsOracle.java writes, less what Swing computes (label width and height). */ function asJavaView(topology: FlsTopology, javaBounds: (number[] | null)[]) { return { @@ -53,6 +78,12 @@ function asJavaView(topology: FlsTopology, javaBounds: (number[] | null)[]) { system: { ...node.system, ...('ssid' in node.system ? { ssid: node.system.ssid ?? null } : {}), + ...(node.system.dhcpServer === undefined + ? {} + : { + dhcpServer: javaDhcpServer(node.system.dhcpServer), + }), + ...(node.system.modem === undefined ? {} : { modem: javaModem(node.system.modem) }), ...(node.system.firewall === undefined ? {} : { @@ -235,6 +266,49 @@ describe('readTopology rules', () => { }); }); + it('splits static DHCP assignments at Java whitespace and stops where Java throws', () => { + // U+3000 separates, U+00A0 does not; the third entry has no IP, so Java + // throws there and the fourth is never read. + const { nodes, warnings } = topologyOf(`${nodeItem(` + + + 0A:00:00:00:00:0110.0.0.1extra + 0A:00:00:00:00:02 10.0.0.2x + 0A:00:00:00:00:03 + 0A:00:00:00:00:04 10.0.0.4 + + `)}`); + + expect(nodes[0]!.system.dhcpServer).toEqual({ + isActive: false, + lowerBound: '0.0.0.0', + upperBound: '0.0.0.0', + gateway: '0.0.0.0', + dnsServer: '0.0.0.0', + useOwnSettings: false, + staticAssignedAddresses: [ + { mac: '0A:00:00:00:00:01', ip: '10.0.0.1' }, + { mac: '0A:00:00:00:00:02', ip: '10.0.0.2\u00A0x' }, + ], + }); + expect(warnings).toEqual([ + 'node 1: DHCPServer: static assignment "0A:00:00:00:00:03" has no MAC and IP; Java stops reading here', + ]); + }); + + it("gives a modem Java's defaults and keeps an address the file sets to null", () => { + const { nodes } = topologyOf(` + ${nodeItem('')} + ${nodeItem(` + 1 + `)}`); + + expect(nodes.map((node) => node.system.modem)).toEqual([ + { mode: 2, port: 12_345, ipAddress: 'localhost' }, + { mode: 1, port: 12_345, ipAddress: null }, + ]); + }); + it("reads colors as Java's constructors do and keeps an invalid one unset", () => { const colors = ['16711935', '123', '123004']; const { documentation, warnings } = topologyOf(` diff --git a/scripts/code_language_allow.txt b/scripts/code_language_allow.txt index 7dd3257..7b13e61 100644 --- a/scripts/code_language_allow.txt +++ b/scripts/code_language_allow.txt @@ -16,3 +16,13 @@ vermittlungsschicht # The class name filius.hardware.knoten.Rechner, as the device classes of # the .fls format are keyed in packages/fls (topology.ts and its test). packages/fls/::rechner +# Property names of Java FILIUS's DHCPServer (aktiv, untergrenze, obergrenze, +# gatewayip, dnsserverip) and ModemFirmware (ipAdresse): read from the .fls +# file and written so by the Java oracle; our own types call them isActive, +# lowerBound, upperBound, gateway, dnsServer and ipAddress. +packages/fls/::aktiv +packages/fls/::untergrenze +packages/fls/::obergrenze +packages/fls/::gatewayip +packages/fls/::dnsserverip +packages/fls/::adresse diff --git a/tools/java-oracle/README.md b/tools/java-oracle/README.md index ca23d8a..3bb0131 100644 --- a/tools/java-oracle/README.md +++ b/tools/java-oracle/README.md @@ -25,8 +25,9 @@ virtuellen Bildschirm statt „headless". kleingeschriebene für gewürfelt.) * Bisher ausgelesen: Geräte (Klasse, Name, Beschriftung, Position, Schnittstellen, bei Rechner/Notebook `useIPAsName`/`useMACAsName`), unter - `system` SSID, Lernzeit des Switches, RIP, manuelle Routen und die Firewall - von Router und Heimrouter; Kabel (Enden als Gerät/Schnittstelle), + `system` SSID, Lernzeit des Switches, RIP, manuelle Routen, die Firewall + von Router und Heimrouter, DHCP-Client und -Server, die statische + NAT-Tabelle des Heimrouters und die Verbindung eines Modems; Kabel (Enden als Gerät/Schnittstelle), Doku-Elemente. Systemsoftware, Dateisysteme und Anwendungen folgen schrittweise. diff --git a/tools/java-oracle/src/FlsOracle.java b/tools/java-oracle/src/FlsOracle.java index f0afcd6..39aa4b7 100644 --- a/tools/java-oracle/src/FlsOracle.java +++ b/tools/java-oracle/src/FlsOracle.java @@ -15,11 +15,13 @@ import filius.hardware.knoten.InternetKnoten; import filius.hardware.knoten.Knoten; import filius.hardware.knoten.LokalerKnoten; import filius.rahmenprogramm.SzenarioVerwaltung; +import filius.software.dhcp.DHCPServer; import filius.software.firewall.Firewall; import filius.software.firewall.FirewallRule; import filius.software.system.Betriebssystem; import filius.software.system.GatewayFirmware; import filius.software.system.InternetKnotenBetriebssystem; +import filius.software.system.ModemFirmware; import filius.software.system.SwitchFirmware; import filius.software.system.SystemSoftware; import filius.software.system.VermittlungsrechnerBetriebssystem; @@ -235,6 +237,33 @@ public class FlsOracle { } } json.put("manualRoutes", routes); + json.put("dhcpClient", system.isDHCPKonfiguration()); + DHCPServer server = system.getDHCPServer(); + if (server != null) { + Map dhcp = new LinkedHashMap<>(); + dhcp.put("aktiv", server.isAktiv()); + dhcp.put("untergrenze", server.getUntergrenze()); + dhcp.put("obergrenze", server.getObergrenze()); + dhcp.put("gatewayip", server.getGatewayip()); + dhcp.put("dnsserverip", server.getDnsserverip()); + dhcp.put("ownSettings", server.isOwnSettings()); + dhcp.put("staticAssignedAddresses", server.getStaticAssignedAddresses()); + json.put("dhcpServer", dhcp); + } + } + if (software instanceof GatewayFirmware firmware) { + List rows = new ArrayList<>(); + if (firmware.getStaticNAT() != null) { + for (String[] row : firmware.getStaticNAT()) rows.add(row == null ? null : Arrays.asList(row)); + } + json.put("staticNAT", rows); + } + if (software instanceof ModemFirmware firmware) { + Map modem = new LinkedHashMap<>(); + modem.put("mode", firmware.getMode()); + modem.put("port", firmware.getPort()); + modem.put("ipAdresse", firmware.getIpAdresse()); + json.put("modem", modem); } Firewall firewall = software instanceof VermittlungsrechnerBetriebssystem system ? system.holeFirewall() : software instanceof GatewayFirmware firmware ? firmware.holeFirewall() : null;