Fix broadcast code.

– Send broadcast from SameController.
– Correct usage of SO_REUSEADDR.
– BroadcasterInterface for Android code.

1 files changed, 4 insertions, 2 deletions

diff --git a/same/src/main/java/com/orbekk/net/BroadcastListener.java b/same/src/main/java/com/orbekk/net/BroadcastListener.java
index 59a1022..3fdfd23 100644
--- a/same/src/main/java/com/orbekk/net/BroadcastListener.java
+++ b/same/src/main/java/com/orbekk/net/BroadcastListener.java
@@ -3,6 +3,7 @@ package com.orbekk.net;
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
+import java.net.InetSocketAddress;
 import java.net.SocketException;
 
 import org.slf4j.Logger;
@@ -21,7 +22,9 @@ public class BroadcastListener {
         logger.debug("Waiting for broadcast on port " + port);
         try {
             if (socket == null) {
-                socket = new DatagramSocket(port);
+                socket = new DatagramSocket(null);
+                socket.setReuseAddress(true);
+                socket.bind(new InetSocketAddress(port));
             }
         } catch (SocketException e) {
             logger.warn("Failed to create socket.", e.fillInStackTrace());
@@ -29,7 +32,6 @@ public class BroadcastListener {
         }
         try {
             socket.setBroadcast(true);
-            socket.setReuseAddress(true);
         } catch (SocketException e) {
             logger.warn("Exception: {}", e);
         }