Added support for receiving responses from the broadcasted messages

Author: alex89200

kcp2k/Assets/kcp2k/highlevel/KcpClient.cs

@@ -110,11 +110,22 @@ void OnDisconnectedWrap()
             // even a 1ms block per connection would stop us from scaling.
             socket.Blocking = false;
 
+            // set flag to be able to send/recv broadcast messages if needed
+            socket.EnableBroadcast = config.EnableBroadcast;
+
             // configure buffer sizes
             Common.ConfigureSocketBuffers(socket, config.RecvBufferSize, config.SendBufferSize);
 
             // bind to endpoint so we can use send/recv instead of sendto/recvfrom.
-            socket.Connect(remoteEndPoint);
+            // But we don't do that if we want to be able to receive answers to
+            // broadcast requests, we must use socket.SendTo instead of socket.Connect.
+            // Otherwise broadcast address will be bound to the socket and it will be
+            // trying to receive data from it instead of the real address of
+            // the client and nothing will be received.
+            if (!config.EnableBroadcast)
+            {
+                socket.Connect(remoteEndPoint);
+            }
 
             // client should send handshake to server as very first message
             peer.SendHandshake();
@@ -154,7 +165,18 @@ protected virtual void RawSend(ArraySegment<byte> data)
         {
             try
             {
-                socket.SendNonBlocking(data);
+                // if broadcast enabled, we use connectionless mode and must send
+                // data using the SendTo method. Note that using this method causes
+                // allocations (remoteEndPoint is re-serialized each time). Thus it
+                // is recommended to use broadcast-enabled client ONLY for discovery.
+                if (config.EnableBroadcast)
+                {
+                    socket.SendToNonBlocking(data, remoteEndPoint);
+                }
+                else
+                {
+                    socket.SendNonBlocking(data);
+                }
             }
             catch (SocketException e)
             {

kcp2k/Assets/kcp2k/highlevel/KcpConfig.cs

@@ -63,6 +63,11 @@ public class KcpConfig
         // maximum retransmission attempts until dead_link
         public uint MaxRetransmits;
 
+        // Whether to enable broadcasting. If true, the client will be able
+        // to broadcast messages and the server will be able to receive them
+        // and reply.
+        public bool EnableBroadcast;
+
         // constructor /////////////////////////////////////////////////////////
         // constructor with defaults for convenience.
         // makes it easy to define "new KcpConfig(DualMode=false)" etc.
@@ -78,7 +83,8 @@ public KcpConfig(
             uint SendWindowSize    = Kcp.WND_SND,
             uint ReceiveWindowSize = Kcp.WND_RCV,
             int Timeout            = KcpPeer.DEFAULT_TIMEOUT,
-            uint MaxRetransmits    = Kcp.DEADLINK)
+            uint MaxRetransmits    = Kcp.DEADLINK,
+            bool EnableBroadcast   = false)
         {
             this.DualMode = DualMode;
             this.RecvBufferSize = RecvBufferSize;
@@ -92,6 +98,7 @@ public KcpConfig(
             this.ReceiveWindowSize = ReceiveWindowSize;
             this.Timeout = Timeout;
             this.MaxRetransmits = MaxRetransmits;
+            this.EnableBroadcast = EnableBroadcast;
         }
     }
 }

kcp2k/Assets/kcp2k/highlevel/KcpServer.cs

@@ -64,7 +64,7 @@ public KcpServer(Action<int> OnConnected,
 
         public virtual bool IsActive() => socket != null;
 
-        static Socket CreateServerSocket(bool DualMode, ushort port)
+        static Socket CreateServerSocket(bool DualMode, ushort port, bool enableBroadcast)
         {
             if (DualMode)
             {
@@ -82,13 +82,15 @@ static Socket CreateServerSocket(bool DualMode, ushort port)
                 {
                     Log.Warning($"Failed to set Dual Mode, continuing with IPv6 without Dual Mode. Error: {e}");
                 }
+                socket.EnableBroadcast = enableBroadcast;
                 socket.Bind(new IPEndPoint(IPAddress.IPv6Any, port));
                 return socket;
             }
             else
             {
                 // IPv4 socket @ "0.0.0.0" : port
                 Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+                socket.EnableBroadcast = enableBroadcast;
                 socket.Bind(new IPEndPoint(IPAddress.Any, port));
                 return socket;
             }
@@ -104,7 +106,7 @@ public virtual void Start(ushort port)
             }
 
             // listen
-            socket = CreateServerSocket(config.DualMode, port);
+            socket = CreateServerSocket(config.DualMode, port, config.EnableBroadcast);
 
             // recv & send are called from main thread.
             // need to ensure this never blocks.