Changeset 164 for trunk/sonorous

Timestamp:

29/04/10 23:20:16 (4 months ago)

Author:

mbooth

Message:

Search on all available network interfaces.

Files:

• trunk/sonorous/uk.co.matbooth.upnp/src/uk/co/matbooth/upnp/discovery/SearchThread.java (modified) (5 diffs)

trunk/sonorous/uk.co.matbooth.upnp/src/uk/co/matbooth/upnp/discovery/SearchThread.java

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.net.Inet6Address;
 import java.net.InetAddress;
+import java.net.NetworkInterface;
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.List;
 
@@ -13 +16 @@
 
 /**
- * A thread that sends an SSDP search request from a socket bound to every network
- * interface attached to the local host and listens for responses from UPnP devices
- * announcing their presence on the network.
+ * A thread that sends an SSDP search request and listens for responses from UPnP devices
+ * announcing their presence on the network. A request will be sent to every network the
+ * host machine is connected to.
  */
 public class SearchThread extends DiscoveryThread {
@@ -38 +41 @@
 
     /**
-     * TODO
+     * Creates the search thread.
      */
     public SearchThread() {
-        // TODO create a socket for each network interface attached to this machine!
         try {
-            Socket sock = new Socket(InetAddress.getLocalHost().getHostAddress(), 0);
-            socks.add(sock);
+            // Create a socket for every address of every interface on the machine
+            Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
+            while (nis.hasMoreElements()) {
+                NetworkInterface ni = (NetworkInterface) nis.nextElement();
+                Enumeration<InetAddress> addrs = ni.getInetAddresses();
+                while (addrs.hasMoreElements()) {
+                    InetAddress addr = addrs.nextElement();
+                    // TODO support IPv6
+                    if (addr.isLoopbackAddress() || addr instanceof Inet6Address)
+                        continue;
+                    Socket sock = new Socket(addr.getHostAddress(), 0);
+                    socks.add(sock);
+                }
+            }
         } catch (Exception e) {
             // If we can't create a socket for this network interface then just shrug it
             // off and don't bother
+            //TODO warn
+            e.printStackTrace();
         }
     }
@@ -69 +85 @@
             int timeout = (MAX_TIME + ADDITIONAL_TIME) * SEARCH_ATTEMPTS * 1000;
             for (Socket sock : socks) {
-                Thread t = new Thread(new SearchResponseThread(sock, timeout), "UPnP Discovery Search Response");
+                Thread t = new Thread(new SearchResponseThread(sock, timeout),
+                        "UPnP Discovery Search Response");
                 t.setDaemon(true);
                 t.start();
@@ -121 +138 @@
                 // TODO Auto-generated catch block
                 e.printStackTrace();
+            } finally {
+                sock.close();
             }
         }