Changeset 8339 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java

Timestamp:

2015-05-07T17:30:43+02:00 (9 years ago)

Author:

stoecker

Message:

fix #11409 - Remotecontrol on IPv6 and IPv4

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java

@@ -20 +20 @@
 public class RemoteControlHttpServer extends Thread {
 
-    /** The server socket for IPv4 */
-    private ServerSocket server4 = null;
-    /** The server socket for IPv6 */
-    private ServerSocket server6 = null;
+    /** The server socket */
+    private ServerSocket server = null;
 
-    private static volatile RemoteControlHttpServer instance;
+    /** The server instance for IPv4 */
+    private static volatile RemoteControlHttpServer instance4 = null;
+    /** The server instance for IPv6 */
+    private static volatile RemoteControlHttpServer instance6 = null;
 
     /**
@@ -31 +32 @@
      */
     public static void restartRemoteControlHttpServer() {
+        stopRemoteControlHttpServer();
         int port = Main.pref.getInteger("remote.control.port", 8111);
         try {
-            stopRemoteControlHttpServer();
-
-            instance = new RemoteControlHttpServer(port);
-            instance.start();
-        } catch (BindException ex) {
-            Main.warn(marktr("Cannot start remotecontrol server on port {0}: {1}"),
+            instance4 = new RemoteControlHttpServer(port, false);
+            instance4.start();
+        } catch (Exception ex) {
+            Main.warn(marktr("Cannot start IPv4 remotecontrol server on port {0}: {1}"),
                     Integer.toString(port), ex.getLocalizedMessage());
-        } catch (IOException ioe) {
-            Main.error(ioe);
+        }
+        try {
+            instance6 = new RemoteControlHttpServer(port, true);
+            instance6.start();
+        } catch (Exception ex) {
+            /* only show error when we also have no IPv4 */
+            if(instance4 == null) {
+                Main.warn(marktr("Cannot start IPv6 remotecontrol server on port {0}: {1}"),
+                    Integer.toString(port), ex.getLocalizedMessage());
+            }
         }
     }
@@ -50 +58 @@
      */
     public static void stopRemoteControlHttpServer() {
-        if (instance != null) {
+        if (instance4 != null) {
             try {
-                instance.stopServer();
-                instance = null;
+                instance4.stopServer();
+                instance4 = null;
+            } catch (IOException ioe) {
+                Main.error(ioe);
+            }
+        }
+        if (instance6 != null) {
+            try {
+                instance6.stopServer();
+                instance6 = null;
             } catch (IOException ioe) {
                 Main.error(ioe);
@@ -63 +79 @@
      * Constructor
      * @param port The port this server will listen on
+     * @param ipv6 Whether IPv6 or IPv4 server should be started
      * @throws IOException when connection errors
+     * @since 8339
      */
-    public RemoteControlHttpServer(int port) throws IOException {
+    public RemoteControlHttpServer(int port, boolean ipv6) throws IOException {
         super("RemoteControl HTTP Server");
         this.setDaemon(true);
-        try {
-            this.server4 = new ServerSocket(port, 1, RemoteControl.getInet4Address());
-        } catch (IOException e) {
-        }
-        try {
-            this.server6 = new ServerSocket(port, 1, RemoteControl.getInet6Address());
-        } catch (IOException e) {
-            if(this.server4 == null) /* both failed */
-                throw e;
-        }
+        this.server = new ServerSocket(port, 1, ipv6 ?
+            RemoteControl.getInet6Address() : RemoteControl.getInet4Address());
     }
 
@@ -85 +95 @@
     @Override
     public void run() {
-        if(server4 != null) {
-            Main.info(marktr("RemoteControl::Accepting IPv4 connections on {0}:{1}"),
-                server4.getInetAddress(), Integer.toString(server4.getLocalPort()));
-        }
-        if(server6 != null) {
-            Main.info(marktr("RemoteControl::Accepting IPv6 connections on {0}:{1}"),
-                server6.getInetAddress(), Integer.toString(server6.getLocalPort()));
-        }
+        Main.info(marktr("RemoteControl::Accepting remote connections on {0}:{1}"),
+                server.getInetAddress(), Integer.toString(server.getLocalPort()));
         while (true) {
-            if(server4 != null) {
-                try {
-                    @SuppressWarnings("resource")
-                    Socket request = server4.accept();
-                    RequestProcessor.processRequest(request);
-                } catch (SocketException se) {
-                    if (!server4.isClosed())
-                        Main.error(se);
-                } catch (IOException ioe) {
-                    Main.error(ioe);
-                }
-            }
-            if(server6 != null) {
-                try {
-                    @SuppressWarnings("resource")
-                    Socket request = server6.accept();
-                    RequestProcessor.processRequest(request);
-                } catch (SocketException se) {
-                    if (!server6.isClosed())
-                        Main.error(se);
-                } catch (IOException ioe) {
-                    Main.error(ioe);
-                }
+            try {
+                @SuppressWarnings("resource")
+                Socket request = server.accept();
+                RequestProcessor.processRequest(request);
+            } catch (SocketException se) {
+                if (!server.isClosed())
+                    Main.error(se);
+            } catch (IOException ioe) {
+                Main.error(ioe);
             }
         }
@@ -127 +117 @@
      */
     public void stopServer() throws IOException {
-        if(server4 != null)
-            server4.close();
-        if(server6 != null)
-            server6.close();
-        Main.info(marktr("RemoteControl::Server stopped."));
+        Main.info(marktr("RemoteControl::Server {0}:{1} stopped."),
+        server.getInetAddress(), Integer.toString(server.getLocalPort()));
+        server.close();
     }
 }