From 968dbbc34a89dd7e5b749601280836cb7ab7d259 Mon Sep 17 00:00:00 2001 From: Julian Kiedaisch Date: Wed, 30 Sep 2026 08:51:03 +0000 Subject: [PATCH] fix(fls): read and write a network card's wireless flag A notebook that joins a switch's wireless network has its card marked wireless (NetzwerkInterface.setWireless, Betriebssystem.wireless()), next to the wireless cable. The reader did not read it, the writer did not write it, and the Java oracle did not report it, so the Java-against-Java writer test could not see the loss. Found while exporting the editor model: the corpus has 18 wireless cards, one at each wireless cable. The oracle now reports `wireless` per interface; FlsInterface has it; the writer sets it. The synthetic topology has a wireless card; a mutation probe that drops it is caught by Java. Co-Authored-By: Claude Opus 5.5 --- CHANGES.md | 2 +- corpus/corpus.java.json | 660 ++++++++++++++------- packages/fls/src/topology.ts | 6 + packages/fls/src/topologyWriter.ts | 1 + packages/fls/test/importProject.test.ts | 4 +- packages/fls/test/topology.test.ts | 4 +- packages/fls/test/topologyWriter.test.ts | 8 +- packages/fls/test/written.java.json | 694 +++++++++++++++-------- tools/java-oracle/README.md | 2 +- tools/java-oracle/src/FlsOracle.java | 1 + 10 files changed, 919 insertions(+), 463 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d93346b..40afbce 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -42,7 +42,7 @@ Swift-Pfade relativ zu `filius-ipad/ios/FiliusPad/TopologyEditor/` (Stand | `src/systemSoftware.ts` | Java `SwitchFirmware`, `Betriebssystem`, `VermittlungsrechnerBetriebssystem`, `GatewayFirmware`, `Weiterleitungstabelle`, `Firewall`, `FirewallRule`, `DHCPServer`, `ModemFirmware`, `Dateisystem`, `Datei` | neu nach Java: SSID, Lernzeit, RIP, manuelle Routen, Router-Firewall (an allen Stellen, an denen die Datei sie erreicht), DHCP (ein kaputter statischer Eintrag fällt allein weg, Java verliert alle folgenden), statische NAT, Modem, Dateisystem (bei Router und Heimrouter das, was die Datei zu den Vorlagen des Konstruktors hinzufügt, oder eine eigene Wurzel, die sie ersetzt), installierte Programme von Rechner und Notebook; `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/dnsHosts.ts` | Java `DNSServer.leseRecordListe`, `ResourceRecord`, `Dateisystem.holeDatei`; Swift `State/TopologyDNSResolver.swift` (`TopologyDNSHostsFileCodec`) als Vergleich | neu nach Java: Felder nur an einzelnen Leerzeichen, keine Kommentare, ungültige TTL → 3600, Doppelte bleiben; ins Modell kommt nur, was Java beantwortet (Typ A/MX/NS, Name nicht leer); Javas Fehler nicht übernommen: Label mit Ziffer vorn erlaubt, kein Backslash, letztes Label nicht rein numerisch (RFC 1123/3696), Typ in jeder Schreibung (RFC 4343), negative TTL ungültig (RFC 2181); an 76 Fällen mit Java und Swift 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, die Zeichen-Enden eines Kabels | +| `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, die Zeichen-Enden eines Kabels, die Funk-Eigenschaft einer Netzwerkkarte (`wireless`, bis 30.09.2026 übersehen) | | `test/javabeans.test.ts` | — | neu: je XMLDecoder-Regel ein Test; alle 23 Korpus-Dateien, Klasse und Position jedes Geräts wie Java | | `test/topology.test.ts` | — | neu: alle 23 Korpus-Dateien Feld für Feld wie Java (Geräte, Schnittstellen, Kabel, Doku-Elemente), dazu die Regeln, die der Korpus nicht berührt | | `test/javaIp.test.ts`, `test/ip-check.*` | — | neu: `IP.ipCheck`-Fälle, Ergebnis aus Java | diff --git a/corpus/corpus.java.json b/corpus/corpus.java.json index a79057a..3f6884e 100644 --- a/corpus/corpus.java.json +++ b/corpus/corpus.java.json @@ -20,7 +20,8 @@ "mask": "255.255.255.0", "mac": "FB:07:94:E4:05:06", "gateway": "192.168.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": true } ], "system": { @@ -68,14 +69,16 @@ "mask": "255.0.0.0", "mac": "18:C4:B3:33:AB:BD", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "28:62:32:5B:5C:90", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -141,21 +144,24 @@ "mask": "255.255.255.0", "mac": "A7:1D:A9:4C:C4:A7", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "160.10.20.1", "mask": "255.255.255.0", "mac": "D1:3E:5F:E6:BA:F9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "8.8.8.1", "mask": "255.255.255.0", "mac": "03:3C:DF:0A:44:1E", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -223,7 +229,8 @@ "mask": "255.255.255.0", "mac": "71:6A:B4:64:00:4E", "gateway": "160.10.20.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -292,7 +299,8 @@ "mask": "255.255.255.0", "mac": "48:76:39:9B:AC:29", "gateway": "8.8.8.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -354,7 +362,8 @@ "mask": "255.255.255.0", "mac": "45:06:FC:3E:2B:59", "gateway": "192.168.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": true } ], "system": { @@ -841,7 +850,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -903,7 +913,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -976,7 +987,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -1022,7 +1034,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -1125,7 +1138,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -1187,7 +1201,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -1458,7 +1473,8 @@ "mask": "255.255.255.0", "mac": "55:69:1F:18:4C:96", "gateway": "141.99.2.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -1562,7 +1578,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "141.99.1.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -1608,7 +1625,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -1691,14 +1709,16 @@ "mask": "255.255.255.0", "mac": "A4:F4:2A:89:9F:E8", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.2.1", "mask": "255.255.255.0", "mac": "6D:B4:5B:F1:70:FC", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -1871,7 +1891,8 @@ "mask": "255.0.0.0", "mac": "A8:BD:04:A6:63:AD", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": false } ], "system": { @@ -1990,7 +2011,8 @@ "mask": "255.0.0.0", "mac": "3D:67:2A:01:2D:91", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": false } ], "system": { @@ -2066,21 +2088,24 @@ "mask": "255.255.255.0", "mac": "2E:E7:53:65:17:0F", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "6.0.0.2", "mask": "255.255.255.0", "mac": "1E:27:AE:8E:77:14", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "2.0.0.1", "mask": "255.255.255.0", "mac": "4B:A0:59:16:7C:2C", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2150,28 +2175,32 @@ "mask": "255.255.255.0", "mac": "C5:AD:0D:4F:97:06", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "11.0.0.1", "mask": "255.255.255.0", "mac": "E0:3F:89:38:E3:2C", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "130.100.200.1", "mask": "255.255.255.0", "mac": "3C:84:27:63:5A:E3", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "12.0.0.1", "mask": "255.255.255.0", "mac": "F5:FB:71:A8:11:59", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2241,21 +2270,24 @@ "mask": "255.255.255.0", "mac": "3A:DC:16:7C:AA:78", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "11.0.0.2", "mask": "255.255.255.0", "mac": "91:D6:EC:3F:56:B0", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "3.0.0.1", "mask": "255.255.255.0", "mac": "16:F2:4D:40:AA:56", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2325,35 +2357,40 @@ "mask": "255.255.255.0", "mac": "A2:55:52:6B:6F:27", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "3.0.0.2", "mask": "255.255.255.0", "mac": "27:17:86:69:32:C9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "4.0.0.1", "mask": "255.255.255.0", "mac": "B3:22:50:EC:11:FB", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "8.0.0.1", "mask": "255.0.0.0", "mac": "63:D5:E4:BB:37:E6", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "15.0.0.1", "mask": "255.255.255.0", "mac": "15:DA:6A:2F:5F:3A", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2423,21 +2460,24 @@ "mask": "255.255.255.0", "mac": "80:6D:2A:57:59:B2", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "5.0.0.1", "mask": "255.255.255.0", "mac": "69:EB:EB:6E:F6:82", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "120.130.140.1", "mask": "255.255.255.0", "mac": "C9:5D:41:10:67:82", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2507,14 +2547,16 @@ "mask": "255.255.255.0", "mac": "A0:D8:AE:E8:2A:E1", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "140.100.200.1", "mask": "255.255.255.0", "mac": "A2:3C:B4:FB:9D:D1", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2586,7 +2628,8 @@ "mask": "255.0.0.0", "mac": "17:66:19:C9:9E:29", "gateway": "8.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2663,7 +2706,8 @@ "mask": "255.255.255.0", "mac": "4B:ED:F2:C7:AF:8C", "gateway": "120.130.140.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -2740,7 +2784,8 @@ "mask": "255.255.255.0", "mac": "47:AF:A1:5F:0E:C7", "gateway": "130.100.200.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -2853,7 +2898,8 @@ "mask": "255.255.255.0", "mac": "62:A4:B8:31:8D:33", "gateway": "140.100.200.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -2942,7 +2988,8 @@ "mask": "255.0.0.0", "mac": "C5:39:AE:55:77:F5", "gateway": "10.0.0.2", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -3039,14 +3086,16 @@ "mask": "255.255.255.0", "mac": "E4:0B:71:77:E8:25", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false }, { "ip": "192.168.1.1", "mask": "255.255.255.0", "mac": "F6:F2:70:B5:92:97", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -3114,7 +3163,8 @@ "mask": "255.255.255.0", "mac": "68:3B:FB:D6:E1:D8", "gateway": "192.168.1.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -3192,7 +3242,8 @@ "mask": "255.0.0.0", "mac": "EF:1A:35:6C:C2:DC", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -3270,7 +3321,8 @@ "mask": "255.0.0.0", "mac": "19:06:AC:C7:9D:0E", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -3311,7 +3363,8 @@ "mask": "255.0.0.0", "mac": "D3:51:75:D6:71:EA", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -3352,7 +3405,8 @@ "mask": "255.0.0.0", "mac": "E2:AC:66:8B:39:9F", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -3441,14 +3495,16 @@ "mask": "255.0.0.0", "mac": "95:C1:83:23:BB:4C", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "10.0.0.2", "mask": "255.0.0.0", "mac": "D6:AF:B6:8B:75:85", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -3576,14 +3632,16 @@ "mask": "255.255.255.0", "mac": "11:EE:8E:9F:31:18", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "15.0.0.2", "mask": "255.255.255.0", "mac": "B7:E7:AB:01:FE:F6", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -3651,7 +3709,8 @@ "mask": "255.255.255.0", "mac": "8B:54:A9:28:2D:18", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -4463,7 +4522,8 @@ "mask": "255.0.0.0", "mac": "A8:BD:04:A6:63:AD", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": false } ], "system": { @@ -4643,7 +4703,8 @@ "mask": "255.0.0.0", "mac": "3D:67:2A:01:2D:91", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": false } ], "system": { @@ -4780,21 +4841,24 @@ "mask": "255.255.255.0", "mac": "2E:E7:53:65:17:0F", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "6.0.0.2", "mask": "255.255.255.0", "mac": "1E:27:AE:8E:77:14", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "2.0.0.1", "mask": "255.255.255.0", "mac": "4B:A0:59:16:7C:2C", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -4864,28 +4928,32 @@ "mask": "255.255.255.0", "mac": "C5:AD:0D:4F:97:06", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "11.0.0.1", "mask": "255.255.255.0", "mac": "E0:3F:89:38:E3:2C", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "130.100.200.1", "mask": "255.255.255.0", "mac": "3C:84:27:63:5A:E3", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "12.0.0.1", "mask": "255.255.255.0", "mac": "F5:FB:71:A8:11:59", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -4955,21 +5023,24 @@ "mask": "255.255.255.0", "mac": "3A:DC:16:7C:AA:78", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "11.0.0.2", "mask": "255.255.255.0", "mac": "91:D6:EC:3F:56:B0", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "3.0.0.1", "mask": "255.255.255.0", "mac": "16:F2:4D:40:AA:56", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5039,35 +5110,40 @@ "mask": "255.255.255.0", "mac": "A2:55:52:6B:6F:27", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "3.0.0.2", "mask": "255.255.255.0", "mac": "27:17:86:69:32:C9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "4.0.0.1", "mask": "255.255.255.0", "mac": "B3:22:50:EC:11:FB", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "8.0.0.1", "mask": "255.0.0.0", "mac": "63:D5:E4:BB:37:E6", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "15.0.0.1", "mask": "255.255.255.0", "mac": "15:DA:6A:2F:5F:3A", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5137,21 +5213,24 @@ "mask": "255.255.255.0", "mac": "80:6D:2A:57:59:B2", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "5.0.0.1", "mask": "255.255.255.0", "mac": "69:EB:EB:6E:F6:82", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "120.130.140.1", "mask": "255.255.255.0", "mac": "C9:5D:41:10:67:82", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5221,14 +5300,16 @@ "mask": "255.255.255.0", "mac": "A0:D8:AE:E8:2A:E1", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "140.100.200.1", "mask": "255.255.255.0", "mac": "A2:3C:B4:FB:9D:D1", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5300,7 +5381,8 @@ "mask": "255.0.0.0", "mac": "17:66:19:C9:9E:29", "gateway": "8.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5370,7 +5452,8 @@ "mask": "255.255.255.0", "mac": "4B:ED:F2:C7:AF:8C", "gateway": "120.130.140.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5447,7 +5530,8 @@ "mask": "255.255.255.0", "mac": "47:AF:A1:5F:0E:C7", "gateway": "130.100.200.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5560,7 +5644,8 @@ "mask": "255.255.255.0", "mac": "62:A4:B8:31:8D:33", "gateway": "140.100.200.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5649,7 +5734,8 @@ "mask": "255.0.0.0", "mac": "C5:39:AE:55:77:F5", "gateway": "10.0.0.2", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5746,14 +5832,16 @@ "mask": "255.255.255.0", "mac": "E4:0B:71:77:E8:25", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false }, { "ip": "192.168.1.1", "mask": "255.255.255.0", "mac": "F6:F2:70:B5:92:97", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5821,7 +5909,8 @@ "mask": "255.255.255.0", "mac": "68:3B:FB:D6:E1:D8", "gateway": "192.168.1.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5899,7 +5988,8 @@ "mask": "255.0.0.0", "mac": "EF:1A:35:6C:C2:DC", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -5977,7 +6067,8 @@ "mask": "255.0.0.0", "mac": "19:06:AC:C7:9D:0E", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -6018,7 +6109,8 @@ "mask": "255.0.0.0", "mac": "D3:51:75:D6:71:EA", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -6059,7 +6151,8 @@ "mask": "255.0.0.0", "mac": "E2:AC:66:8B:39:9F", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -6148,14 +6241,16 @@ "mask": "255.0.0.0", "mac": "95:C1:83:23:BB:4C", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "10.0.0.2", "mask": "255.0.0.0", "mac": "D6:AF:B6:8B:75:85", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -6283,14 +6378,16 @@ "mask": "255.255.255.0", "mac": "11:EE:8E:9F:31:18", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "15.0.0.2", "mask": "255.255.255.0", "mac": "B7:E7:AB:01:FE:F6", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -6358,7 +6455,8 @@ "mask": "255.255.255.0", "mac": "55:E4:24:B2:2F:7B", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -7123,7 +7221,8 @@ "mask": "255.255.255.0", "mac": "FB:07:94:E4:05:06", "gateway": "192.168.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": true } ], "system": { @@ -7171,14 +7270,16 @@ "mask": "255.0.0.0", "mac": "18:C4:B3:33:AB:BD", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "28:62:32:5B:5C:90", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7244,21 +7345,24 @@ "mask": "255.255.255.0", "mac": "A7:1D:A9:4C:C4:A7", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "160.10.20.1", "mask": "255.255.255.0", "mac": "D1:3E:5F:E6:BA:F9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "8.8.8.1", "mask": "255.255.255.0", "mac": "03:3C:DF:0A:44:1E", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7326,7 +7430,8 @@ "mask": "255.255.255.0", "mac": "71:6A:B4:64:00:4E", "gateway": "160.10.20.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7395,7 +7500,8 @@ "mask": "255.255.255.0", "mac": "48:76:39:9B:AC:29", "gateway": "8.8.8.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7457,7 +7563,8 @@ "mask": "255.255.255.0", "mac": "45:06:FC:3E:2B:59", "gateway": "192.168.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": true } ], "system": { @@ -7903,7 +8010,8 @@ "mask": "255.255.255.0", "mac": "4B:82:31:A8:4D:54", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7944,7 +8052,8 @@ "mask": "255.255.255.0", "mac": "43:F8:45:DC:FC:53", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8033,7 +8142,8 @@ "mask": "255.255.255.0", "mac": "66:38:EB:F5:F4:3B", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8140,7 +8250,8 @@ "mask": "255.255.255.0", "mac": "91:E4:54:FA:C9:7D", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8181,7 +8292,8 @@ "mask": "255.255.255.0", "mac": "B6:F7:8C:F6:CC:0F", "gateway": "0.0.0.0", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false } ], "system": { @@ -8222,7 +8334,8 @@ "mask": "255.255.255.0", "mac": "54:71:65:D0:3A:4B", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8304,7 +8417,8 @@ "mask": "255.255.255.0", "mac": "30:B7:97:00:00:FD", "gateway": "192.168.0.10", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false } ], "system": { @@ -8343,14 +8457,16 @@ "mask": "255.0.0.0", "mac": "9F:CF:0A:89:4E:32", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.10", "mask": "255.255.255.0", "mac": "AB:53:E6:9C:D9:87", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8418,7 +8534,8 @@ "mask": "255.255.255.0", "mac": "24:C4:CA:44:77:A4", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8593,7 +8710,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -8655,7 +8773,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -8728,7 +8847,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -8774,7 +8894,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8877,7 +8998,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8939,7 +9061,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -9128,7 +9251,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9174,7 +9298,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9215,7 +9340,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9256,7 +9382,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9297,7 +9424,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9468,7 +9596,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9509,7 +9638,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9550,7 +9680,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9591,7 +9722,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9909,7 +10041,8 @@ "mask": "255.255.255.128", "mac": "1A:77:96:CF:32:33", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -9978,7 +10111,8 @@ "mask": "255.255.255.128", "mac": "5F:A4:08:F1:FC:88", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10052,7 +10186,8 @@ "mask": "255.255.255.128", "mac": "9D:8C:F6:C9:98:AE", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10126,7 +10261,8 @@ "mask": "255.255.255.128", "mac": "A8:13:4D:62:BF:61", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10200,7 +10336,8 @@ "mask": "255.255.255.128", "mac": "FD:92:36:FB:99:6D", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10315,7 +10452,8 @@ "mask": "255.255.255.128", "mac": "9D:26:F9:23:B2:F9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -10377,7 +10515,8 @@ "mask": "255.255.255.128", "mac": "37:DF:DC:1A:CF:E0", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10490,7 +10629,8 @@ "mask": "255.255.255.128", "mac": "7A:10:61:61:15:A3", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10827,14 +10967,16 @@ "mask": "255.255.255.0", "mac": "C1:60:0A:E1:76:C5", "gateway": "141.99.2.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.2.1", "mask": "255.255.255.0", "mac": "5A:54:FE:11:5D:6C", "gateway": "141.99.2.2", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -10900,21 +11042,24 @@ "mask": "255.255.255.0", "mac": "6E:1E:CD:78:BE:78", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.4.1", "mask": "255.255.255.0", "mac": "28:09:56:2D:27:6F", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.3.1", "mask": "255.255.255.0", "mac": "F6:A4:32:18:E5:05", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -10993,14 +11138,16 @@ "mask": "255.255.255.0", "mac": "63:D3:1F:5D:56:02", "gateway": "141.99.4.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.5.1", "mask": "255.255.255.0", "mac": "28:1D:80:BE:38:62", "gateway": "141.99.4.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -11109,7 +11256,8 @@ "mask": "255.255.255.0", "mac": "55:69:1F:18:4C:96", "gateway": "141.99.2.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11171,7 +11319,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "141.99.1.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11221,7 +11370,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11294,7 +11444,8 @@ "mask": "255.255.255.0", "mac": "E3:F7:EF:12:BC:94", "gateway": "141.99.3.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11335,7 +11486,8 @@ "mask": "255.255.255.0", "mac": "6D:C7:88:09:72:A8", "gateway": "141.99.5.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11408,7 +11560,8 @@ "mask": "255.255.255.0", "mac": "3F:34:B7:E1:52:67", "gateway": "141.99.4.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11490,7 +11643,8 @@ "mask": "255.255.255.0", "mac": "58:5D:D7:F0:C5:89", "gateway": "141.99.5.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11760,7 +11914,8 @@ "mask": "255.255.255.128", "mac": "EA:B6:32:93:26:33", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -12044,7 +12199,8 @@ "mask": "255.255.255.128", "mac": "FA:17:C7:84:81:6E", "gateway": "", - "dns": "127.0.0.1" + "dns": "127.0.0.1", + "wireless": false } ], "system": { @@ -12137,7 +12293,8 @@ "mask": "255.255.255.128", "mac": "13:84:F1:E6:16:2A", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -12350,7 +12507,8 @@ "mask": "255.255.255.128", "mac": "F2:BF:5A:E0:17:CB", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -12412,7 +12570,8 @@ "mask": "255.255.255.128", "mac": "16:F4:6C:5F:0C:9C", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -12583,7 +12742,8 @@ "mask": "255.255.255.128", "mac": "D4:7A:40:9D:1B:91", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -12842,7 +13002,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -12925,7 +13086,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13065,7 +13227,8 @@ "mask": "255.255.255.0", "mac": "25:9B:C0:C4:32:17", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13113,7 +13276,8 @@ "mask": "255.255.255.0", "mac": "54:84:0B:8A:58:0C", "gateway": "", - "dns": "" + "dns": "", + "wireless": true } ], "system": { @@ -13182,7 +13346,8 @@ "mask": "255.255.255.0", "mac": "03:42:BB:88:50:95", "gateway": "", - "dns": "" + "dns": "", + "wireless": true } ], "system": { @@ -13328,14 +13493,16 @@ "mask": "255.0.0.0", "mac": "49:71:D3:3F:F0:3E", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "F8:24:0B:58:BD:87", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13403,7 +13570,8 @@ "mask": "255.255.255.0", "mac": "1E:A0:9E:34:FA:24", "gateway": "192.168.0.1", - "dns": "192.168.0.1" + "dns": "192.168.0.1", + "wireless": false } ], "system": { @@ -13480,7 +13648,8 @@ "mask": "255.255.255.0", "mac": "23:2E:63:7C:81:B7", "gateway": "192.168.0.1", - "dns": "192.168.0.1" + "dns": "192.168.0.1", + "wireless": false } ], "system": { @@ -13710,14 +13879,16 @@ "mask": "255.255.255.0", "mac": "C1:60:0A:E1:76:C5", "gateway": "141.99.2.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.2.1", "mask": "255.255.255.0", "mac": "5A:54:FE:11:5D:6C", "gateway": "141.99.2.2", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13783,21 +13954,24 @@ "mask": "255.255.255.0", "mac": "6E:1E:CD:78:BE:78", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.4.1", "mask": "255.255.255.0", "mac": "28:09:56:2D:27:6F", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.3.1", "mask": "255.255.255.0", "mac": "F6:A4:32:18:E5:05", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13876,14 +14050,16 @@ "mask": "255.255.255.0", "mac": "63:D3:1F:5D:56:02", "gateway": "141.99.4.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.5.1", "mask": "255.255.255.0", "mac": "28:1D:80:BE:38:62", "gateway": "141.99.4.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13951,7 +14127,8 @@ "mask": "255.255.255.0", "mac": "55:69:1F:18:4C:96", "gateway": "141.99.2.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14017,7 +14194,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14073,7 +14251,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14146,7 +14325,8 @@ "mask": "255.255.255.0", "mac": "E3:F7:EF:12:BC:94", "gateway": "141.99.4.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14229,7 +14409,8 @@ "mask": "255.255.255.0", "mac": "6D:C7:88:09:72:A8", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14349,7 +14530,8 @@ "mask": "255.255.255.0", "mac": "58:5D:D7:F0:C5:89", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14399,14 +14581,16 @@ "mask": "255.255.255.0", "mac": "2F:1F:C3:B1:68:1A", "gateway": "141.99.5.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "FD:7A:10:01:33:82", "gateway": "141.99.5.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -14479,14 +14663,16 @@ "mask": "255.255.255.0", "mac": "25:13:13:0E:49:9D", "gateway": "141.99.1.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "B9:64:F2:59:30:D6", "gateway": "141.99.1.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -15060,7 +15246,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": true } ], "system": { @@ -15110,7 +15297,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": true } ], "system": { @@ -15181,14 +15369,16 @@ "mask": "255.255.255.0", "mac": "D6:32:D9:8F:3C:C3", "gateway": "", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "55:DA:E5:38:11:16", "gateway": "", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false } ], "system": { @@ -15297,7 +15487,8 @@ "mask": "255.255.255.0", "mac": "7B:2B:66:48:19:16", "gateway": "141.99.2.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -15659,7 +15850,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "192.168.0.1", - "dns": "42.0.0.2" + "dns": "42.0.0.2", + "wireless": true } ], "system": { @@ -15709,7 +15901,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "192.168.0.1", - "dns": "42.0.0.2" + "dns": "42.0.0.2", + "wireless": true } ], "system": { @@ -15777,14 +15970,16 @@ "mask": "255.255.255.0", "mac": "D6:32:D9:8F:3C:C3", "gateway": "42.0.0.1", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "55:DA:E5:38:11:16", "gateway": "42.0.0.1", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false } ], "system": { @@ -15893,7 +16088,8 @@ "mask": "255.255.255.0", "mac": "7B:2B:66:48:19:16", "gateway": "42.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -15983,21 +16179,24 @@ "mask": "255.255.255.0", "mac": "49:E7:F2:39:E5:58", "gateway": "1.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "1.0.0.2", "mask": "255.255.255.0", "mac": "C1:20:94:DC:20:AC", "gateway": "1.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.10", "mask": "255.255.255.0", "mac": "02:0F:87:E5:B6:52", "gateway": "1.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16065,7 +16264,8 @@ "mask": "255.255.255.0", "mac": "41:8E:FC:A1:C1:CD", "gateway": "120.130.140.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16138,7 +16338,8 @@ "mask": "255.255.255.0", "mac": "6E:31:51:DD:9E:45", "gateway": "8.8.8.1", - "dns": "127.0.0.1" + "dns": "127.0.0.1", + "wireless": false } ], "system": { @@ -16198,21 +16399,24 @@ "mask": "255.255.255.0", "mac": "B5:EB:CB:68:70:48", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "120.130.140.1", "mask": "255.255.255.0", "mac": "D6:6E:0A:7C:2A:E9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "1.0.0.1", "mask": "255.255.255.0", "mac": "7B:48:CA:D9:EC:DD", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16636,7 +16840,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16735,7 +16940,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16958,7 +17164,8 @@ "mask": "255.255.255.0", "mac": "55:69:1F:18:4C:96", "gateway": "141.99.2.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -17062,7 +17269,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "141.99.1.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -17108,7 +17316,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -17191,14 +17400,16 @@ "mask": "255.255.255.0", "mac": "A4:F4:2A:89:9F:E8", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.2.1", "mask": "255.255.255.0", "mac": "6D:B4:5B:F1:70:FC", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -17371,7 +17582,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17417,7 +17629,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17458,7 +17671,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17499,7 +17713,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17540,7 +17755,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17711,7 +17927,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17752,7 +17969,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17793,7 +18011,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17834,7 +18053,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { diff --git a/packages/fls/src/topology.ts b/packages/fls/src/topology.ts index 6f791c6..aa2a333 100644 --- a/packages/fls/src/topology.ts +++ b/packages/fls/src/topology.ts @@ -31,6 +31,8 @@ export interface FlsInterface { mac: string | undefined; gateway: string | null; dns: string | null; + /** A notebook's or PC's card joining a switch's wireless network (Betriebssystem.wireless). */ + wireless: boolean; } export interface FlsNode { @@ -270,6 +272,7 @@ class Reader { mac: undefined, gateway: '', dns: '', + wireless: false, }; if (!isJavaObject(nic)) return result; // Only the constructor's own interface gets the WAN address; one the file @@ -302,6 +305,9 @@ class Reader { if (typeof value === 'string' || value === null) result[field] = value; else this.unexpected(at, property, value); } + const wireless = nic.properties.get('wireless'); + if (typeof wireless === 'boolean') result.wireless = wireless; + else if (wireless !== undefined) this.unexpected(at, 'wireless', wireless); return result; } diff --git a/packages/fls/src/topologyWriter.ts b/packages/fls/src/topologyWriter.ts index 814cc40..978679c 100644 --- a/packages/fls/src/topologyWriter.ts +++ b/packages/fls/src/topologyWriter.ts @@ -469,6 +469,7 @@ function interfaceStatements(nic: FlsInterface): BeanStatement[] { if (nic.mask !== null) statements.push({ set: 'subnetzMaske', value: nic.mask }); if (nic.mac !== undefined) statements.push({ set: 'mac', value: nic.mac }); statements.push({ set: 'gateway', value: nic.gateway }, { set: 'dns', value: nic.dns }); + if (nic.wireless) statements.push({ set: 'wireless', value: true }); return statements; } diff --git a/packages/fls/test/importProject.test.ts b/packages/fls/test/importProject.test.ts index b6c9e36..6488a17 100644 --- a/packages/fls/test/importProject.test.ts +++ b/packages/fls/test/importProject.test.ts @@ -526,7 +526,7 @@ function topology(fields: Partial): FlsTopology { return { versionLine: null, nodes: [], links: [], documentation: [], warnings: [], ...fields }; } -const nic = (ip: string | null, mask: string | null = '255.255.255.0') => ({ ip, mask, mac: undefined, gateway: '', dns: '' }); +const nic = (ip: string | null, mask: string | null = '255.255.255.0') => ({ ip, mask, mac: undefined, gateway: '', dns: '', wireless: false }); describe('importProject rules', () => { it('labels a gateway wan0, lan0, gw2 and gives a rejected address the default', () => { @@ -857,7 +857,7 @@ describe('importProject rules', () => { }); const host = (dns: string, recursive: boolean) => flsNode('Rechner', { - interfaces: [{ ip: '10.0.0.1', mask: '255.255.255.0', mac: undefined, gateway: '', dns }], + interfaces: [{ ip: '10.0.0.1', mask: '255.255.255.0', mac: undefined, gateway: '', dns, wireless: false }], system: { applications: [application('filius.software.dns.DNSServer', { isActive: true, port: 53, recursiveResolutionEnabled: recursive })] }, }); const project = importProject( diff --git a/packages/fls/test/topology.test.ts b/packages/fls/test/topology.test.ts index 030e78a..bff5fd9 100644 --- a/packages/fls/test/topology.test.ts +++ b/packages/fls/test/topology.test.ts @@ -292,8 +292,8 @@ describe('readTopology rules', () => { `)}`); expect(nodes[0]!.interfaces).toEqual([ - { ip: '10.0.0.1', mask: null, mac: undefined, gateway: '', dns: '' }, - { ip: '192.168.0.10', mask: '255.255.255.0', mac: '0A:0B:0C:0D:0E:0F', gateway: '', dns: '' }, + { ip: '10.0.0.1', mask: null, mac: undefined, gateway: '', dns: '', wireless: false }, + { ip: '192.168.0.10', mask: '255.255.255.0', mac: '0A:0B:0C:0D:0E:0F', gateway: '', dns: '', wireless: false }, ]); }); diff --git a/packages/fls/test/topologyWriter.test.ts b/packages/fls/test/topologyWriter.test.ts index 8161f91..7777625 100644 --- a/packages/fls/test/topologyWriter.test.ts +++ b/packages/fls/test/topologyWriter.test.ts @@ -169,7 +169,7 @@ const SYNTHETIC: TopologyToWrite = { y: 20, useIpAsName: false, useMacAsName: true, - interfaces: [{ ip: '10.0.0.1', mask: '255.0.0.0', mac: 'AA:BB:CC:DD:EE:01', gateway: null, dns: '10.0.0.53' }], + interfaces: [{ ip: '10.0.0.1', mask: '255.0.0.0', mac: 'AA:BB:CC:DD:EE:01', gateway: null, dns: '10.0.0.53', wireless: true }], portCount: 1, system: { ssid: 'Lab', @@ -301,6 +301,7 @@ const SYNTHETIC: TopologyToWrite = { mac: `AA:BB:CC:DD:EE:1${octet}`, gateway: '', dns: '', + wireless: false, })), portCount: 3, system: { @@ -346,6 +347,7 @@ const SYNTHETIC: TopologyToWrite = { mac: `AA:BB:CC:DD:EE:1${octet}`, gateway: '', dns: '', + wireless: false, })), portCount: 2, system: { @@ -406,7 +408,7 @@ describe('a topology beyond the corpus, as Java loads it', () => { expect(java?.sha256, 'written.java.json is not about this output: UPDATE_WRITTEN=1, then npm run oracle:java').toBe( createHash('sha256').update(archive).digest('hex'), ); - const plainInterface = (octet: string) => ({ ip: `10.0.${octet}.1`, mask: '255.255.255.0', mac: `AA:BB:CC:DD:EE:1${octet}`, gateway: '', dns: '' }); + const plainInterface = (octet: string) => ({ ip: `10.0.${octet}.1`, mask: '255.255.255.0', mac: `AA:BB:CC:DD:EE:1${octet}`, gateway: '', dns: '', wireless: false }); expect(topologyOf(java!)).toEqual({ success: true, nodes: [ @@ -416,7 +418,7 @@ describe('a topology beyond the corpus, as Java loads it', () => { position: [10, 20], useIpAsName: false, useMacAsName: true, - ports: [{ ip: '10.0.0.1', mask: '255.0.0.0', mac: 'AA:BB:CC:DD:EE:01', gateway: null, dns: '10.0.0.53' }], + ports: [{ ip: '10.0.0.1', mask: '255.0.0.0', mac: 'AA:BB:CC:DD:EE:01', gateway: null, dns: '10.0.0.53', wireless: true }], system: { ssid: 'Lab', manualRoutes: [['10.1.0.0', '255.255.0.0', '10.0.0.254', '10.0.0.1']], diff --git a/packages/fls/test/written.java.json b/packages/fls/test/written.java.json index 84e49b3..a15b1e7 100644 --- a/packages/fls/test/written.java.json +++ b/packages/fls/test/written.java.json @@ -20,7 +20,8 @@ "mask": "255.255.255.0", "mac": "FB:07:94:E4:05:06", "gateway": "192.168.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": true } ], "system": { @@ -68,14 +69,16 @@ "mask": "255.0.0.0", "mac": "18:C4:B3:33:AB:BD", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "28:62:32:5B:5C:90", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -141,21 +144,24 @@ "mask": "255.255.255.0", "mac": "A7:1D:A9:4C:C4:A7", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "160.10.20.1", "mask": "255.255.255.0", "mac": "D1:3E:5F:E6:BA:F9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "8.8.8.1", "mask": "255.255.255.0", "mac": "03:3C:DF:0A:44:1E", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -223,7 +229,8 @@ "mask": "255.255.255.0", "mac": "71:6A:B4:64:00:4E", "gateway": "160.10.20.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -292,7 +299,8 @@ "mask": "255.255.255.0", "mac": "48:76:39:9B:AC:29", "gateway": "8.8.8.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -354,7 +362,8 @@ "mask": "255.255.255.0", "mac": "45:06:FC:3E:2B:59", "gateway": "192.168.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": true } ], "system": { @@ -778,7 +787,7 @@ ] } ], - "sha256": "f65ccc8cf005a6900f1e59113c55d58917512eb418ee99b5eb42743584d4ade5" + "sha256": "1c6b45107d44bf87f59566dfa625df2b3d507f729635bb4b4db5bec97ff7f94b" }, "ipad-fixtures/dns_server.fls": { "success": true, @@ -842,7 +851,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -904,7 +914,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -977,7 +988,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -1023,7 +1035,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -1126,7 +1139,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -1188,7 +1202,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -1460,7 +1475,8 @@ "mask": "255.255.255.0", "mac": "55:69:1F:18:4C:96", "gateway": "141.99.2.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -1564,7 +1580,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "141.99.1.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -1610,7 +1627,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -1693,14 +1711,16 @@ "mask": "255.255.255.0", "mac": "A4:F4:2A:89:9F:E8", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.2.1", "mask": "255.255.255.0", "mac": "6D:B4:5B:F1:70:FC", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -1874,7 +1894,8 @@ "mask": "255.0.0.0", "mac": "A8:BD:04:A6:63:AD", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": false } ], "system": { @@ -1993,7 +2014,8 @@ "mask": "255.0.0.0", "mac": "3D:67:2A:01:2D:91", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": false } ], "system": { @@ -2069,21 +2091,24 @@ "mask": "255.255.255.0", "mac": "2E:E7:53:65:17:0F", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "6.0.0.2", "mask": "255.255.255.0", "mac": "1E:27:AE:8E:77:14", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "2.0.0.1", "mask": "255.255.255.0", "mac": "4B:A0:59:16:7C:2C", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2153,28 +2178,32 @@ "mask": "255.255.255.0", "mac": "C5:AD:0D:4F:97:06", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "11.0.0.1", "mask": "255.255.255.0", "mac": "E0:3F:89:38:E3:2C", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "130.100.200.1", "mask": "255.255.255.0", "mac": "3C:84:27:63:5A:E3", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "12.0.0.1", "mask": "255.255.255.0", "mac": "F5:FB:71:A8:11:59", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2244,21 +2273,24 @@ "mask": "255.255.255.0", "mac": "3A:DC:16:7C:AA:78", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "11.0.0.2", "mask": "255.255.255.0", "mac": "91:D6:EC:3F:56:B0", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "3.0.0.1", "mask": "255.255.255.0", "mac": "16:F2:4D:40:AA:56", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2328,35 +2360,40 @@ "mask": "255.255.255.0", "mac": "A2:55:52:6B:6F:27", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "3.0.0.2", "mask": "255.255.255.0", "mac": "27:17:86:69:32:C9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "4.0.0.1", "mask": "255.255.255.0", "mac": "B3:22:50:EC:11:FB", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "8.0.0.1", "mask": "255.0.0.0", "mac": "63:D5:E4:BB:37:E6", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "15.0.0.1", "mask": "255.255.255.0", "mac": "15:DA:6A:2F:5F:3A", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2426,21 +2463,24 @@ "mask": "255.255.255.0", "mac": "80:6D:2A:57:59:B2", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "5.0.0.1", "mask": "255.255.255.0", "mac": "69:EB:EB:6E:F6:82", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "120.130.140.1", "mask": "255.255.255.0", "mac": "C9:5D:41:10:67:82", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2510,14 +2550,16 @@ "mask": "255.255.255.0", "mac": "A0:D8:AE:E8:2A:E1", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "140.100.200.1", "mask": "255.255.255.0", "mac": "A2:3C:B4:FB:9D:D1", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2589,7 +2631,8 @@ "mask": "255.0.0.0", "mac": "17:66:19:C9:9E:29", "gateway": "8.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -2666,7 +2709,8 @@ "mask": "255.255.255.0", "mac": "4B:ED:F2:C7:AF:8C", "gateway": "120.130.140.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -2743,7 +2787,8 @@ "mask": "255.255.255.0", "mac": "47:AF:A1:5F:0E:C7", "gateway": "130.100.200.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -2856,7 +2901,8 @@ "mask": "255.255.255.0", "mac": "62:A4:B8:31:8D:33", "gateway": "140.100.200.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -2945,7 +2991,8 @@ "mask": "255.0.0.0", "mac": "C5:39:AE:55:77:F5", "gateway": "10.0.0.2", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -3042,14 +3089,16 @@ "mask": "255.255.255.0", "mac": "E4:0B:71:77:E8:25", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false }, { "ip": "192.168.1.1", "mask": "255.255.255.0", "mac": "F6:F2:70:B5:92:97", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -3117,7 +3166,8 @@ "mask": "255.255.255.0", "mac": "68:3B:FB:D6:E1:D8", "gateway": "192.168.1.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -3195,7 +3245,8 @@ "mask": "255.0.0.0", "mac": "EF:1A:35:6C:C2:DC", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -3273,7 +3324,8 @@ "mask": "255.0.0.0", "mac": "19:06:AC:C7:9D:0E", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -3314,7 +3366,8 @@ "mask": "255.0.0.0", "mac": "D3:51:75:D6:71:EA", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -3355,7 +3408,8 @@ "mask": "255.0.0.0", "mac": "E2:AC:66:8B:39:9F", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -3444,14 +3498,16 @@ "mask": "255.0.0.0", "mac": "95:C1:83:23:BB:4C", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "10.0.0.2", "mask": "255.0.0.0", "mac": "D6:AF:B6:8B:75:85", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -3579,14 +3635,16 @@ "mask": "255.255.255.0", "mac": "11:EE:8E:9F:31:18", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "15.0.0.2", "mask": "255.255.255.0", "mac": "B7:E7:AB:01:FE:F6", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -3654,7 +3712,8 @@ "mask": "255.255.255.0", "mac": "8B:54:A9:28:2D:18", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -4444,7 +4503,7 @@ ] } ], - "sha256": "f46da844fb935e67ebfc332820994f771564939a98734f5d9ba63873c9789706" + "sha256": "40e368d967371b680f9c3a5673f998196e23e10a6018312fbe206740855e05d1" }, "java-examples/Internet_Komplett_mit_eMail_Webserver_Intranet_Portforwarding_Firewall_DHCP_DE.fls": { "success": true, @@ -4467,7 +4526,8 @@ "mask": "255.0.0.0", "mac": "A8:BD:04:A6:63:AD", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": false } ], "system": { @@ -4647,7 +4707,8 @@ "mask": "255.0.0.0", "mac": "3D:67:2A:01:2D:91", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": false } ], "system": { @@ -4784,21 +4845,24 @@ "mask": "255.255.255.0", "mac": "2E:E7:53:65:17:0F", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "6.0.0.2", "mask": "255.255.255.0", "mac": "1E:27:AE:8E:77:14", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "2.0.0.1", "mask": "255.255.255.0", "mac": "4B:A0:59:16:7C:2C", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -4868,28 +4932,32 @@ "mask": "255.255.255.0", "mac": "C5:AD:0D:4F:97:06", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "11.0.0.1", "mask": "255.255.255.0", "mac": "E0:3F:89:38:E3:2C", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "130.100.200.1", "mask": "255.255.255.0", "mac": "3C:84:27:63:5A:E3", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "12.0.0.1", "mask": "255.255.255.0", "mac": "F5:FB:71:A8:11:59", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -4959,21 +5027,24 @@ "mask": "255.255.255.0", "mac": "3A:DC:16:7C:AA:78", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "11.0.0.2", "mask": "255.255.255.0", "mac": "91:D6:EC:3F:56:B0", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "3.0.0.1", "mask": "255.255.255.0", "mac": "16:F2:4D:40:AA:56", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5043,35 +5114,40 @@ "mask": "255.255.255.0", "mac": "A2:55:52:6B:6F:27", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "3.0.0.2", "mask": "255.255.255.0", "mac": "27:17:86:69:32:C9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "4.0.0.1", "mask": "255.255.255.0", "mac": "B3:22:50:EC:11:FB", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "8.0.0.1", "mask": "255.0.0.0", "mac": "63:D5:E4:BB:37:E6", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "15.0.0.1", "mask": "255.255.255.0", "mac": "15:DA:6A:2F:5F:3A", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5141,21 +5217,24 @@ "mask": "255.255.255.0", "mac": "80:6D:2A:57:59:B2", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "5.0.0.1", "mask": "255.255.255.0", "mac": "69:EB:EB:6E:F6:82", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "120.130.140.1", "mask": "255.255.255.0", "mac": "C9:5D:41:10:67:82", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5225,14 +5304,16 @@ "mask": "255.255.255.0", "mac": "A0:D8:AE:E8:2A:E1", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "140.100.200.1", "mask": "255.255.255.0", "mac": "A2:3C:B4:FB:9D:D1", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5304,7 +5385,8 @@ "mask": "255.0.0.0", "mac": "17:66:19:C9:9E:29", "gateway": "8.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -5374,7 +5456,8 @@ "mask": "255.255.255.0", "mac": "4B:ED:F2:C7:AF:8C", "gateway": "120.130.140.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5451,7 +5534,8 @@ "mask": "255.255.255.0", "mac": "47:AF:A1:5F:0E:C7", "gateway": "130.100.200.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5564,7 +5648,8 @@ "mask": "255.255.255.0", "mac": "62:A4:B8:31:8D:33", "gateway": "140.100.200.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5653,7 +5738,8 @@ "mask": "255.0.0.0", "mac": "C5:39:AE:55:77:F5", "gateway": "10.0.0.2", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5750,14 +5836,16 @@ "mask": "255.255.255.0", "mac": "E4:0B:71:77:E8:25", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false }, { "ip": "192.168.1.1", "mask": "255.255.255.0", "mac": "F6:F2:70:B5:92:97", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5825,7 +5913,8 @@ "mask": "255.255.255.0", "mac": "68:3B:FB:D6:E1:D8", "gateway": "192.168.1.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -5903,7 +5992,8 @@ "mask": "255.0.0.0", "mac": "EF:1A:35:6C:C2:DC", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -5981,7 +6071,8 @@ "mask": "255.0.0.0", "mac": "19:06:AC:C7:9D:0E", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -6022,7 +6113,8 @@ "mask": "255.0.0.0", "mac": "D3:51:75:D6:71:EA", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -6063,7 +6155,8 @@ "mask": "255.0.0.0", "mac": "E2:AC:66:8B:39:9F", "gateway": "10.0.0.1", - "dns": "10.0.0.1" + "dns": "10.0.0.1", + "wireless": true } ], "system": { @@ -6152,14 +6245,16 @@ "mask": "255.0.0.0", "mac": "95:C1:83:23:BB:4C", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "10.0.0.2", "mask": "255.0.0.0", "mac": "D6:AF:B6:8B:75:85", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -6287,14 +6382,16 @@ "mask": "255.255.255.0", "mac": "11:EE:8E:9F:31:18", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "15.0.0.2", "mask": "255.255.255.0", "mac": "B7:E7:AB:01:FE:F6", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -6362,7 +6459,8 @@ "mask": "255.255.255.0", "mac": "55:E4:24:B2:2F:7B", "gateway": "43.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -7105,7 +7203,7 @@ ] } ], - "sha256": "fb90133ed91aebfe934b73c37e71b970d4cce7eb25c531dc8b11a82a0bd77b6f" + "sha256": "409dbdfe908e8b8fdc943689fccbe4c85ffcdd13c3ba2d8d685bb2e6f67820b3" }, "java-examples/Public_and_Private_Networks_2_EN.fls": { "success": true, @@ -7128,7 +7226,8 @@ "mask": "255.255.255.0", "mac": "FB:07:94:E4:05:06", "gateway": "192.168.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": true } ], "system": { @@ -7176,14 +7275,16 @@ "mask": "255.0.0.0", "mac": "18:C4:B3:33:AB:BD", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "28:62:32:5B:5C:90", "gateway": "42.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7249,21 +7350,24 @@ "mask": "255.255.255.0", "mac": "A7:1D:A9:4C:C4:A7", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "160.10.20.1", "mask": "255.255.255.0", "mac": "D1:3E:5F:E6:BA:F9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "8.8.8.1", "mask": "255.255.255.0", "mac": "03:3C:DF:0A:44:1E", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7331,7 +7435,8 @@ "mask": "255.255.255.0", "mac": "71:6A:B4:64:00:4E", "gateway": "160.10.20.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7400,7 +7505,8 @@ "mask": "255.255.255.0", "mac": "48:76:39:9B:AC:29", "gateway": "8.8.8.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7462,7 +7568,8 @@ "mask": "255.255.255.0", "mac": "45:06:FC:3E:2B:59", "gateway": "192.168.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": true } ], "system": { @@ -7886,7 +7993,7 @@ ] } ], - "sha256": "f65ccc8cf005a6900f1e59113c55d58917512eb418ee99b5eb42743584d4ade5" + "sha256": "1c6b45107d44bf87f59566dfa625df2b3d507f729635bb4b4db5bec97ff7f94b" }, "java-examples/anwendung_komplett.fls": { "success": true, @@ -7909,7 +8016,8 @@ "mask": "255.255.255.0", "mac": "4B:82:31:A8:4D:54", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -7950,7 +8058,8 @@ "mask": "255.255.255.0", "mac": "43:F8:45:DC:FC:53", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8039,7 +8148,8 @@ "mask": "255.255.255.0", "mac": "66:38:EB:F5:F4:3B", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8147,7 +8257,8 @@ "mask": "255.255.255.0", "mac": "91:E4:54:FA:C9:7D", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8188,7 +8299,8 @@ "mask": "255.255.255.0", "mac": "B6:F7:8C:F6:CC:0F", "gateway": "0.0.0.0", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false } ], "system": { @@ -8229,7 +8341,8 @@ "mask": "255.255.255.0", "mac": "54:71:65:D0:3A:4B", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8311,7 +8424,8 @@ "mask": "255.255.255.0", "mac": "30:B7:97:00:00:FD", "gateway": "192.168.0.10", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false } ], "system": { @@ -8350,14 +8464,16 @@ "mask": "255.0.0.0", "mac": "9F:CF:0A:89:4E:32", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.10", "mask": "255.255.255.0", "mac": "AB:53:E6:9C:D9:87", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8425,7 +8541,8 @@ "mask": "255.255.255.0", "mac": "24:C4:CA:44:77:A4", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8601,7 +8718,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -8663,7 +8781,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -8736,7 +8855,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "141.99.5.1", - "dns": "141.99.5.12" + "dns": "141.99.5.12", + "wireless": false } ], "system": { @@ -8782,7 +8902,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8885,7 +9006,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -8947,7 +9069,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -9137,7 +9260,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9183,7 +9307,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9224,7 +9349,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9265,7 +9391,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9306,7 +9433,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9477,7 +9605,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9518,7 +9647,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9559,7 +9689,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9600,7 +9731,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -9919,7 +10051,8 @@ "mask": "255.255.255.128", "mac": "1A:77:96:CF:32:33", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -9988,7 +10121,8 @@ "mask": "255.255.255.128", "mac": "5F:A4:08:F1:FC:88", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10062,7 +10196,8 @@ "mask": "255.255.255.128", "mac": "9D:8C:F6:C9:98:AE", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10136,7 +10271,8 @@ "mask": "255.255.255.128", "mac": "A8:13:4D:62:BF:61", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10210,7 +10346,8 @@ "mask": "255.255.255.128", "mac": "FD:92:36:FB:99:6D", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10325,7 +10462,8 @@ "mask": "255.255.255.128", "mac": "9D:26:F9:23:B2:F9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -10387,7 +10525,8 @@ "mask": "255.255.255.128", "mac": "37:DF:DC:1A:CF:E0", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10500,7 +10639,8 @@ "mask": "255.255.255.128", "mac": "7A:10:61:61:15:A3", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -10838,14 +10978,16 @@ "mask": "255.255.255.0", "mac": "C1:60:0A:E1:76:C5", "gateway": "141.99.2.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.2.1", "mask": "255.255.255.0", "mac": "5A:54:FE:11:5D:6C", "gateway": "141.99.2.2", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -10911,21 +11053,24 @@ "mask": "255.255.255.0", "mac": "6E:1E:CD:78:BE:78", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.4.1", "mask": "255.255.255.0", "mac": "28:09:56:2D:27:6F", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.3.1", "mask": "255.255.255.0", "mac": "F6:A4:32:18:E5:05", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -11004,14 +11149,16 @@ "mask": "255.255.255.0", "mac": "63:D3:1F:5D:56:02", "gateway": "141.99.4.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.5.1", "mask": "255.255.255.0", "mac": "28:1D:80:BE:38:62", "gateway": "141.99.4.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -11120,7 +11267,8 @@ "mask": "255.255.255.0", "mac": "55:69:1F:18:4C:96", "gateway": "141.99.2.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11182,7 +11330,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "141.99.1.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11232,7 +11381,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11305,7 +11455,8 @@ "mask": "255.255.255.0", "mac": "E3:F7:EF:12:BC:94", "gateway": "141.99.3.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11346,7 +11497,8 @@ "mask": "255.255.255.0", "mac": "6D:C7:88:09:72:A8", "gateway": "141.99.5.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11419,7 +11571,8 @@ "mask": "255.255.255.0", "mac": "3F:34:B7:E1:52:67", "gateway": "141.99.4.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11501,7 +11654,8 @@ "mask": "255.255.255.0", "mac": "58:5D:D7:F0:C5:89", "gateway": "141.99.5.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -11772,7 +11926,8 @@ "mask": "255.255.255.128", "mac": "EA:B6:32:93:26:33", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -12032,7 +12187,8 @@ "mask": "255.255.255.128", "mac": "FA:17:C7:84:81:6E", "gateway": "", - "dns": "127.0.0.1" + "dns": "127.0.0.1", + "wireless": false } ], "system": { @@ -12125,7 +12281,8 @@ "mask": "255.255.255.128", "mac": "13:84:F1:E6:16:2A", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -12326,7 +12483,8 @@ "mask": "255.255.255.128", "mac": "F2:BF:5A:E0:17:CB", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -12388,7 +12546,8 @@ "mask": "255.255.255.128", "mac": "16:F4:6C:5F:0C:9C", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -12559,7 +12718,8 @@ "mask": "255.255.255.128", "mac": "D4:7A:40:9D:1B:91", "gateway": "", - "dns": "141.99.50.230" + "dns": "141.99.50.230", + "wireless": false } ], "system": { @@ -12819,7 +12979,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -12902,7 +13063,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13043,7 +13205,8 @@ "mask": "255.255.255.0", "mac": "25:9B:C0:C4:32:17", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13091,7 +13254,8 @@ "mask": "255.255.255.0", "mac": "54:84:0B:8A:58:0C", "gateway": "", - "dns": "" + "dns": "", + "wireless": true } ], "system": { @@ -13160,7 +13324,8 @@ "mask": "255.255.255.0", "mac": "03:42:BB:88:50:95", "gateway": "", - "dns": "" + "dns": "", + "wireless": true } ], "system": { @@ -13286,7 +13451,7 @@ } ], "documentation": [], - "sha256": "28ab7864014fe7e056ed43755e8a8ea835a83ae2dc6822490e5c623df58b0e75" + "sha256": "35e84042bc6b04062cb943127a85900ebbc947d5148e9fbf4978bb128a013ff3" }, "java-examples/nat.fls": { "success": true, @@ -13307,14 +13472,16 @@ "mask": "255.0.0.0", "mac": "49:71:D3:3F:F0:3E", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "F8:24:0B:58:BD:87", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13382,7 +13549,8 @@ "mask": "255.255.255.0", "mac": "1E:A0:9E:34:FA:24", "gateway": "192.168.0.1", - "dns": "192.168.0.1" + "dns": "192.168.0.1", + "wireless": false } ], "system": { @@ -13459,7 +13627,8 @@ "mask": "255.255.255.0", "mac": "23:2E:63:7C:81:B7", "gateway": "192.168.0.1", - "dns": "192.168.0.1" + "dns": "192.168.0.1", + "wireless": false } ], "system": { @@ -13690,14 +13859,16 @@ "mask": "255.255.255.0", "mac": "C1:60:0A:E1:76:C5", "gateway": "141.99.2.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.2.1", "mask": "255.255.255.0", "mac": "5A:54:FE:11:5D:6C", "gateway": "141.99.2.2", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13763,21 +13934,24 @@ "mask": "255.255.255.0", "mac": "6E:1E:CD:78:BE:78", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.4.1", "mask": "255.255.255.0", "mac": "28:09:56:2D:27:6F", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.3.1", "mask": "255.255.255.0", "mac": "F6:A4:32:18:E5:05", "gateway": "141.99.4.2", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13856,14 +14030,16 @@ "mask": "255.255.255.0", "mac": "63:D3:1F:5D:56:02", "gateway": "141.99.4.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.5.1", "mask": "255.255.255.0", "mac": "28:1D:80:BE:38:62", "gateway": "141.99.4.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -13931,7 +14107,8 @@ "mask": "255.255.255.0", "mac": "55:69:1F:18:4C:96", "gateway": "141.99.2.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -13997,7 +14174,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14053,7 +14231,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14126,7 +14305,8 @@ "mask": "255.255.255.0", "mac": "E3:F7:EF:12:BC:94", "gateway": "141.99.4.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14209,7 +14389,8 @@ "mask": "255.255.255.0", "mac": "6D:C7:88:09:72:A8", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14329,7 +14510,8 @@ "mask": "255.255.255.0", "mac": "58:5D:D7:F0:C5:89", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -14379,14 +14561,16 @@ "mask": "255.255.255.0", "mac": "2F:1F:C3:B1:68:1A", "gateway": "141.99.5.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "FD:7A:10:01:33:82", "gateway": "141.99.5.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -14459,14 +14643,16 @@ "mask": "255.255.255.0", "mac": "25:13:13:0E:49:9D", "gateway": "141.99.1.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "B9:64:F2:59:30:D6", "gateway": "141.99.1.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -15041,7 +15227,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": true } ], "system": { @@ -15091,7 +15278,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "192.168.0.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": true } ], "system": { @@ -15162,14 +15350,16 @@ "mask": "255.255.255.0", "mac": "D6:32:D9:8F:3C:C3", "gateway": "", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "55:DA:E5:38:11:16", "gateway": "", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false } ], "system": { @@ -15278,7 +15468,8 @@ "mask": "255.255.255.0", "mac": "7B:2B:66:48:19:16", "gateway": "141.99.2.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -15577,7 +15768,7 @@ ] } ], - "sha256": "562765e044caf57606bd11c61f1c82a2faca1243a8ae22287f7055d0724162ae" + "sha256": "e88ee13445e88230b3d83c145ebc1f3f9bceafae29948dd87dc064ee2a34ee2e" }, "java-examples/private_und_public_networks_mit_provider_DE.fls": { "success": true, @@ -15641,7 +15832,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "192.168.0.1", - "dns": "42.0.0.2" + "dns": "42.0.0.2", + "wireless": true } ], "system": { @@ -15691,7 +15883,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "192.168.0.1", - "dns": "42.0.0.2" + "dns": "42.0.0.2", + "wireless": true } ], "system": { @@ -15759,14 +15952,16 @@ "mask": "255.255.255.0", "mac": "D6:32:D9:8F:3C:C3", "gateway": "42.0.0.1", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false }, { "ip": "192.168.0.1", "mask": "255.255.255.0", "mac": "55:DA:E5:38:11:16", "gateway": "42.0.0.1", - "dns": "0.0.0.0" + "dns": "0.0.0.0", + "wireless": false } ], "system": { @@ -15875,7 +16070,8 @@ "mask": "255.255.255.0", "mac": "7B:2B:66:48:19:16", "gateway": "42.0.0.1", - "dns": "8.8.8.8" + "dns": "8.8.8.8", + "wireless": false } ], "system": { @@ -15965,21 +16161,24 @@ "mask": "255.255.255.0", "mac": "49:E7:F2:39:E5:58", "gateway": "1.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "1.0.0.2", "mask": "255.255.255.0", "mac": "C1:20:94:DC:20:AC", "gateway": "1.0.0.1", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "192.168.0.10", "mask": "255.255.255.0", "mac": "02:0F:87:E5:B6:52", "gateway": "1.0.0.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16047,7 +16246,8 @@ "mask": "255.255.255.0", "mac": "41:8E:FC:A1:C1:CD", "gateway": "120.130.140.1", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16120,7 +16320,8 @@ "mask": "255.255.255.0", "mac": "6E:31:51:DD:9E:45", "gateway": "8.8.8.1", - "dns": "127.0.0.1" + "dns": "127.0.0.1", + "wireless": false } ], "system": { @@ -16180,21 +16381,24 @@ "mask": "255.255.255.0", "mac": "B5:EB:CB:68:70:48", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "120.130.140.1", "mask": "255.255.255.0", "mac": "D6:6E:0A:7C:2A:E9", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "1.0.0.1", "mask": "255.255.255.0", "mac": "7B:48:CA:D9:EC:DD", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16596,7 +16800,7 @@ ] } ], - "sha256": "b4e9fe16d8f5c1281e215bf10a696089e92bbd590ae8f40d5438c15dc910858e" + "sha256": "0999945106e22a4283c38040f5d12153e77a564aa7997be1bef560fb87a39111" }, "java-examples/webserver.fls": { "success": true, @@ -16619,7 +16823,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16718,7 +16923,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -16942,7 +17148,8 @@ "mask": "255.255.255.0", "mac": "55:69:1F:18:4C:96", "gateway": "141.99.2.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -17046,7 +17253,8 @@ "mask": "255.255.255.0", "mac": "95:11:22:49:65:CB", "gateway": "141.99.1.1", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -17092,7 +17300,8 @@ "mask": "255.255.255.0", "mac": "AE:F4:7A:63:81:B9", "gateway": "", - "dns": "141.99.2.10" + "dns": "141.99.2.10", + "wireless": false } ], "system": { @@ -17175,14 +17384,16 @@ "mask": "255.255.255.0", "mac": "A4:F4:2A:89:9F:E8", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "141.99.2.1", "mask": "255.255.255.0", "mac": "6D:B4:5B:F1:70:FC", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -17356,7 +17567,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17402,7 +17614,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17443,7 +17656,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17484,7 +17698,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17525,7 +17740,8 @@ "mask": "255.255.255.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17696,7 +17912,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17737,7 +17954,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17778,7 +17996,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -17819,7 +18038,8 @@ "mask": "0.0.0.0", "mac": null, "gateway": "", - "dns": "192.168.0.100" + "dns": "192.168.0.100", + "wireless": false } ], "system": { @@ -18145,7 +18365,8 @@ "mask": "255.0.0.0", "mac": "AA:BB:CC:DD:EE:01", "gateway": null, - "dns": "10.0.0.53" + "dns": "10.0.0.53", + "wireless": true } ], "system": { @@ -18513,21 +18734,24 @@ "mask": "255.255.255.0", "mac": "AA:BB:CC:DD:EE:11", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "10.0.2.1", "mask": "255.255.255.0", "mac": "AA:BB:CC:DD:EE:12", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "10.0.3.1", "mask": "255.255.255.0", "mac": "AA:BB:CC:DD:EE:13", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -18655,14 +18879,16 @@ "mask": "255.255.255.0", "mac": "AA:BB:CC:DD:EE:14", "gateway": "", - "dns": "" + "dns": "", + "wireless": false }, { "ip": "10.0.5.1", "mask": "255.255.255.0", "mac": "AA:BB:CC:DD:EE:15", "gateway": "", - "dns": "" + "dns": "", + "wireless": false } ], "system": { @@ -18751,6 +18977,6 @@ "font": null } ], - "sha256": "e959ee2a763b90112bd773b8a31f2a27e9ce7bf01c07d2429b3d1426da471475" + "sha256": "b9e38c4de23ae628e211910a5e3b1bd770753469839d531a03c01ba987e6ad4f" } } diff --git a/tools/java-oracle/README.md b/tools/java-oracle/README.md index a1a1e6a..dd0dbc4 100644 --- a/tools/java-oracle/README.md +++ b/tools/java-oracle/README.md @@ -31,7 +31,7 @@ virtuellen Bildschirm statt „headless". 29.09.2026 suchte es die MAC im Dateitext und hielt dabei acht kleingeschriebene für gewürfelt.) * Bisher ausgelesen: Geräte (Klasse, Name, Beschriftung, Position, - Schnittstellen, bei Rechner/Notebook `useIPAsName`/`useMACAsName`), unter + Schnittstellen samt Funk-Eigenschaft `wireless`, bei Rechner/Notebook `useIPAsName`/`useMACAsName`), unter `system` SSID, Lernzeit des Switches, RIP, manuelle Routen, die Firewall von Router und Heimrouter, DHCP-Client und -Server, die statische NAT-Tabelle des Heimrouters, die Verbindung eines Modems und das diff --git a/tools/java-oracle/src/FlsOracle.java b/tools/java-oracle/src/FlsOracle.java index 393552e..fbfd8af 100644 --- a/tools/java-oracle/src/FlsOracle.java +++ b/tools/java-oracle/src/FlsOracle.java @@ -195,6 +195,7 @@ public class FlsOracle { port.put("mac", nic.getMac()); port.put("gateway", nic.getGateway()); port.put("dns", nic.getDns()); + port.put("wireless", nic.isWireless()); ports.add(port); if (nic.getPort() != null) portOwners.put(nic.getPort(), new int[] { nodeIndex, index }); }