The remote server is disabled by default; closes #934

Author: hneemann

distribution/ReleaseNotes.txt

@@ -1,5 +1,9 @@
 Release Notes
 
+HEAD, planned as v0.30
+- The remote server is now disabled by default.
+  It must be enabled in the settings.
+
 v0.29, released on 11. February 2022
 - Allows loading byte base files in big-endian format.
 - Added some more DIL chips

src/main/java/de/neemann/digital/core/element/Keys.java

@@ -528,7 +528,24 @@ private Keys() {
      * enables tunnel rename dialog
      */
     public static final Key<Boolean> SETTINGS_SHOW_TUNNEL_RENAME_DIALOG
-            = new Key<>("tunnelRenameDialog", true).setSecondary();
+            = new Key<>("tunnelRenameDialog", true);
+
+    /**
+     * enables remote port
+     */
+    public static final Key<Boolean> SETTINGS_OPEN_REMOTE_PORT
+            = new Key<>("openRemotePort", false).setSecondary().setRequiresRestart();
+    /**
+     * remote port
+     */
+    public static final Key<Integer> SETTINGS_REMOTE_PORT
+            = new Key.KeyInteger("remotePort", 41114)
+            .setMin(0)
+            .setMax(0xffff)
+            .setComboBoxValues(41114)
+            .setSecondary()
+            .setRequiresRestart()
+            .setDependsOn(SETTINGS_OPEN_REMOTE_PORT);
 
     /**
      * Counter used to detect oscillations

src/main/java/de/neemann/digital/gui/Main.java

@@ -2135,10 +2135,14 @@ else if (s.trim().length() > 0) {
                 }
 
                 Main main = builder.build();
-                try {
-                    new RemoteSever(new DigitalHandler(main)).start(41114);
-                } catch (IOException e) {
-                    SwingUtilities.invokeLater(() -> main.statusLabel.setText(Lang.get("err_portIsInUse")));
+                if (Settings.getInstance().get(Keys.SETTINGS_OPEN_REMOTE_PORT)) {
+                    final int port = Settings.getInstance().get(Keys.SETTINGS_REMOTE_PORT);
+                    LOGGER.info("open remote port " + port);
+                    try {
+                        new RemoteSever(new DigitalHandler(main)).start(port);
+                    } catch (IOException e) {
+                        SwingUtilities.invokeLater(() -> main.statusLabel.setText(Lang.get("err_portIsInUse")));
+                    }
                 }
                 main.setVisible(true);
 

src/main/java/de/neemann/digital/gui/Settings.java

@@ -61,6 +61,8 @@ private static List<Key> createKeyList() {
         intList.add(Keys.SETTINGS_MAC_MOUSE);
         intList.add(Keys.SETTINGS_USE_EQUALS_KEY);
         intList.add(Keys.SETTINGS_SHOW_TUNNEL_RENAME_DIALOG);
+        intList.add(Keys.SETTINGS_OPEN_REMOTE_PORT);
+        intList.add(Keys.SETTINGS_REMOTE_PORT);
 
         return Collections.unmodifiableList(intList);
     }

src/main/resources/lang/lang_de.xml

@@ -1693,6 +1693,12 @@ Sind evtl. die Namen der Variablen nicht eindeutig?</string>
     <string name="key_port">Port</string>
     <string name="key_port_tt">Der vom Server zu öffnende Port.</string>
 
+    <string name="key_openRemotePort">Remote-Verbindung zulassen</string>
+    <string name="key_openRemotePort_tt">Wenn gesetzt, wird ein TCP/IP Port geöffnet, über welchen die Steuerung
+        des Simulators möglich ist.</string>
+    <string name="key_remotePort">Port-Nummer</string>
+    <string name="key_remotePort_tt">Der Port, auf welchem der Remote-Server geöffnet wird.</string>
+
     <string name="key_skipHDL">In Verilog/VHDL-Export auslassen</string>
     <string name="key_skipHDL_tt">Wenn gesetzt wird diese Schaltung bei der Generierung von
         Verilog/VHDL ausgelassen. Die Verweise auf die Schaltung werden beibehalten, sodass eine eigene

src/main/resources/lang/lang_en.xml

@@ -1675,6 +1675,12 @@
     <string name="key_port">Port</string>
     <string name="key_port_tt">The port to be opened by the server.</string>
 
+    <string name="key_openRemotePort">Allow remote connection</string>
+    <string name="key_openRemotePort_tt">If set, a TCP/IP port is opened, through which the control of the
+        simulator is possible.</string>
+    <string name="key_remotePort">Port number</string>
+    <string name="key_remotePort_tt">The port on which the remote server is opened.</string>
+
     <string name="key_skipHDL">Skip in Verilog/VHDL export</string>
     <string name="key_skipHDL_tt">Skips generating the internals of the circuit in Verilog/VHDL
         export. The references to the circuit are kept, making it possible to override the