TEST: jmdns hacking

Author: facchinm

arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java

@@ -46,7 +46,8 @@ public class NetworkDiscovery implements Discovery, ServiceListener {
 
   private final List<BoardPort> reachableBoardPorts = new LinkedList<>();
   private final List<BoardPort> boardPortsDiscoveredWithJmDNS = new LinkedList<>();
-  private final Timer reachabilityTimer = new Timer();
+  private Timer reachabilityTimer;
+  private JmDNS jmdns = null;
 
   private void removeDuplicateBoards(BoardPort newBoard) {
     synchronized (boardPortsDiscoveredWithJmDNS) {
@@ -137,23 +138,31 @@ public void serviceResolved(ServiceEvent serviceEvent) {
   }
 
   public NetworkDiscovery() {
-    final JmDNS jmdns;
+
+  }
+
+  @Override
+  public void start() {
     try {
       jmdns = JmDNS.create();
       jmdns.addServiceListener("_arduino._tcp.local.", this);
     } catch (IOException e) {
       e.printStackTrace();
     }
-  }
-
-  @Override
-  public void start() {
+    reachabilityTimer =  new Timer();
     new BoardReachabilityFilter(this).start(reachabilityTimer);
   }
 
   @Override
   public void stop() {
+    jmdns.unregisterAllServices();
+    try {
+      jmdns.close();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
     reachabilityTimer.cancel();
+    start();
   }
 
   @Override

arduino-core/src/cc/arduino/packages/discoverers/network/BoardReachabilityFilter.java

@@ -34,23 +34,51 @@
 import processing.app.helpers.NetUtils;
 
 import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Enumeration;
 import java.net.UnknownHostException;
 import java.util.*;
 
 public class BoardReachabilityFilter extends TimerTask {
 
   private final NetworkDiscovery networkDiscovery;
+  private Enumeration<NetworkInterface> staticNetworkInterfaces;
+  private final List<String> staticNetworkInterfacesList = new LinkedList<>();
 
   public BoardReachabilityFilter(NetworkDiscovery networkDiscovery) {
     this.networkDiscovery = networkDiscovery;
   }
 
   public void start(Timer timer) {
+    try {
+      staticNetworkInterfaces = NetworkInterface.getNetworkInterfaces();
+      while (staticNetworkInterfaces.hasMoreElements()) {
+        staticNetworkInterfacesList.add(staticNetworkInterfaces.nextElement().getInterfaceAddresses().toString());
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+
     timer.schedule(this, 0, 5000);
   }
 
   @Override
   public void run() {
+
+    try {
+      Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
+      while (networkInterfaces.hasMoreElements()) {
+        if (!staticNetworkInterfacesList.contains(networkInterfaces.nextElement().getInterfaceAddresses().toString())) {
+          networkDiscovery.stop();
+          staticNetworkInterfacesList.clear();
+          System.out.println("IP changed, restarting jmdns");
+          return;
+        }
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+
     List<BoardPort> boardPorts = networkDiscovery.getBoardPortsDiscoveredWithJmDNS();
 
     Iterator<BoardPort> boardPortIterator = boardPorts.iterator();