Fixed UDP broadcast

markiodev · Mar 18, 2019 · 8d9c4ff · 8d9c4ff
1 parent 682ef61
commit 8d9c4ff
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 46 deletions.
diff --git a/Networker/Client/Client.cs b/Networker/Client/Client.cs
@@ -77,9 +77,13 @@ public void Connect()
 
             if(this.options.UdpPort > 0 && this.udpClient == null)
             {
-                this.udpClient = new UdpClient(this.options.UdpPortLocal);
+                this.udpClient = new UdpClient();
+                this.udpClient.ExclusiveAddressUse = false;
+                this.udpClient.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+
                 var address = IPAddress.Parse(this.options.Ip);
                 this.udpEndpoint = new IPEndPoint(address, this.options.UdpPort);
+				this.udpClient.Client.Bind(this.udpEndpoint);
 
                 Task.Factory.StartNew(() =>
                                       {

diff --git a/Networker/Server/DefaultUdpSocketListenerFactory.cs b/Networker/Server/DefaultUdpSocketListenerFactory.cs
@@ -1,39 +1,38 @@
-using System;
-using Microsoft.Extensions.Logging;
-using Networker.Common.Abstractions;
+using Microsoft.Extensions.Logging;
 using Networker.Server.Abstractions;
 
 namespace Networker.Server
 {
-    public class DefaultUdpSocketListenerFactory : IUdpSocketListenerFactory
-    {
-        private readonly ILogger<UdpClientListener> logger;
-        private readonly ServerBuilderOptions options;
-        private readonly IServerPacketProcessor serverPacketProcessor;
-        private IServerInformation serverInformation;
+	public class DefaultUdpSocketListenerFactory : IUdpSocketListenerFactory
+	{
+		private readonly ILogger<UdpClientListener> logger;
+		private readonly ServerBuilderOptions options;
+		private readonly IServerPacketProcessor serverPacketProcessor;
+		private IUdpSocketListener _clientListener;
+		private readonly IServerInformation serverInformation;
 
-        public DefaultUdpSocketListenerFactory(ServerBuilderOptions options,
-            ILogger<UdpClientListener> logger,
-            IServerPacketProcessor serverPacketProcessor,
-            IServerInformation serverInformation)
-        {
-            this.options = options;
-            this.logger = logger;
-            this.serverPacketProcessor = serverPacketProcessor;
-            this.serverInformation = serverInformation;
-        }
+		public DefaultUdpSocketListenerFactory(ServerBuilderOptions options,
+			ILogger<UdpClientListener> logger,
+			IServerPacketProcessor serverPacketProcessor,
+			IServerInformation serverInformation)
+		{
+			this.options = options;
+			this.logger = logger;
+			this.serverPacketProcessor = serverPacketProcessor;
+			this.serverInformation = serverInformation;
+		}
 
-        public IUdpSocketListener Create()
-        {
-            /*return new UdpSocketListener(this.options,
-                this.logger,
-                this.serverPacketProcessor,
-                this.bufferManager);*/
+		public IUdpSocketListener Create()
+		{
+			/*return new UdpSocketListener(this.options,
+			    this.logger,
+			    this.serverPacketProcessor,
+			    this.bufferManager);*/
 
-            return new UdpClientListener(this.options,
-                this.logger,
-                this.serverPacketProcessor,
-                this.serverInformation);
-        }
-    }
+			return _clientListener ?? (_clientListener = new UdpClientListener(options,
+				       logger,
+				       serverPacketProcessor,
+				       serverInformation));
+		}
+	}
 }
diff --git a/Networker/Server/ServerBuilder.cs b/Networker/Server/ServerBuilder.cs
@@ -18,6 +18,16 @@ public ServerBuilder() : base()
         public override IServer Build()
         {
             this.SetupSharedDependencies();
+
+            if(this.tcpSocketListenerFactory == null)
+	            this.serviceCollection
+		            .AddSingleton<ITcpSocketListenerFactory, DefaultTcpSocketListenerFactory>();
+
+            if (this.udpSocketListenerFactory == null)
+            {
+	            this.serviceCollection
+		            .AddSingleton<IUdpSocketListenerFactory, DefaultUdpSocketListenerFactory>();
+            }
 
             this.serviceCollection.AddSingleton<ITcpConnections, TcpConnections>();
             this.serviceCollection.AddSingleton<IServer, Server>();
@@ -27,21 +37,14 @@ public override IServer Build()
                 this.options.PacketSizeBuffer * this.options.TcpMaxConnections * 5,
                 this.options.PacketSizeBuffer));
             this.serviceCollection.AddSingleton<IUdpSocketSender, UdpSocketSender>();
+
 
-            if(this.tcpSocketListenerFactory == null)
-                this.serviceCollection
-                    .AddSingleton<ITcpSocketListenerFactory, DefaultTcpSocketListenerFactory>();
-
-            if (this.udpSocketListenerFactory == null)
-            {
-                this.serviceCollection
-                    .AddSingleton<IUdpSocketListenerFactory, DefaultUdpSocketListenerFactory>();
-            }
-
-            this.serviceCollection.AddSingleton<IUdpSocketListener>(collection => collection.GetService<IUdpSocketListenerFactory>().Create());
+            var serviceProvider = this.GetServiceProvider();
 
+            var udpSocketListener = serviceProvider.GetService<IUdpSocketListenerFactory>().Create();
+            this.serviceCollection.AddSingleton<IUdpSocketListener>(udpSocketListener);
 
-            var serviceProvider = this.GetServiceProvider();
+            serviceProvider = this.GetServiceProvider();
 
             return serviceProvider.GetService<IServer>();
         }

diff --git a/Networker/Server/ServerPacketProcessor.cs b/Networker/Server/ServerPacketProcessor.cs
@@ -81,7 +81,15 @@ public void ProcessFromBuffer(ISender sender,
                     if (packetSerialiser.CanReadName)
                         packetTypeName = Encoding.ASCII.GetString(buffer, currentPosition, packetNameSize);
 
-                    var packetHandler = packetHandlers.GetPacketHandlers()[packetTypeName];
+                    var packetHandlerDictionary = packetHandlers.GetPacketHandlers();
+
+                    if (!packetHandlerDictionary.ContainsKey(packetTypeName))
+                    {
+						logger.LogWarning($"Could not handle packet {packetTypeName}. Make sure you have registered a handler");
+						return;
+                    }
+
+                    var packetHandler = packetHandlerDictionary[packetTypeName];
 
                     if (string.IsNullOrEmpty(packetTypeName))
                     {

diff --git a/Networker/Server/UdpClientListener.cs b/Networker/Server/UdpClientListener.cs
@@ -45,8 +45,11 @@ public Socket GetSocket()
 
         public void Listen()
         {
-            client = new UdpClient(options.UdpPort);
+            client = new UdpClient();
+            client.ExclusiveAddressUse = false;
+            client.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
             endPoint = new IPEndPoint(IPAddress.Loopback, options.UdpPort);
+			client.Client.Bind(endPoint);
 
             logger.LogInformation($"Starting UDP listener on port {options.UdpPort}.");