Add Contructor overloads to CoapUdpEndPoint for simplicity

NZSmartie · Aug 24, 2017 · 98dad09 · 98dad09
1 parent 4480168
commit 98dad09
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 18 deletions.
diff --git a/CoAPNet.Udp/CoAPNet.Udp.csproj b/CoAPNet.Udp/CoAPNet.Udp.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.4</TargetFramework>
     <PackageId>NZSmartie.CoAPNet.Udp</PackageId>
-    <Version>0.2.4</Version>
+    <Version>0.2.5</Version>
     <Authors>Roman Vaughan</Authors>
     <Company>NZSmartie</Company>
     <Description>UDP Socket implementation for NZSmartie.CoAPNet</Description>
@@ -14,10 +14,12 @@
     <RepositoryUrl>https://github.com/NZSmartie/CoAP.Net</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>CoAP IoT sensors devices hardware network protocol udp socket</PackageTags>
-    <PackageReleaseNotes>v0.2.4
+    <PackageReleaseNotes>v0.2.5
+ - Add Contructor overloads to CoapUdpEndPoint for simplicity
+v0.2.4
  - Implemented a UDP example to use with NZSmartie.CoAPNet</PackageReleaseNotes>
-    <AssemblyVersion>0.2.4.0</AssemblyVersion>
-    <FileVersion>0.2.4.0</FileVersion>
+    <AssemblyVersion>0.2.5.0</AssemblyVersion>
+    <FileVersion>0.2.5.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/CoAPNet.Udp/CoapUdpEndPoint.cs b/CoAPNet.Udp/CoapUdpEndPoint.cs
@@ -35,18 +35,23 @@ public class CoapUdpEndPoint : ICoapEndpoint
         public bool IsSecure => false;
 
         public CoapUdpEndPoint(UdpClient udpClient)
+            :this((IPEndPoint)udpClient.Client.LocalEndPoint)
         {
-            Client = udpClient ?? throw new ArgumentNullException(nameof(udpClient));
-            _endpoint = (IPEndPoint)Client.Client.LocalEndPoint;
-
-            BaseUri = new UriBuilder()
-            {
-                Scheme = "coap://",
-                Host = _endpoint.Address.ToString(),
-                Port = _endpoint.Port != Coap.Port ? _endpoint.Port : -1
-            }.Uri;
+            Client = udpClient;
         }
 
+        public CoapUdpEndPoint(int port = 0)
+            : this(new IPEndPoint(IPAddress.Any, port))
+        { }
+
+        public CoapUdpEndPoint(IPAddress address, int port = 0)
+            : this(new IPEndPoint(address, port))
+        { }
+
+        public CoapUdpEndPoint(string ipAddress, int port = 0)
+            :this(new IPEndPoint(IPAddress.Parse(ipAddress), port))
+        { }
+
         public CoapUdpEndPoint(IPEndPoint endpoint)
         {
             _endpoint = endpoint ?? throw new ArgumentNullException(nameof(endpoint));
@@ -79,7 +84,7 @@ public void Dispose()
         public async Task<CoapPacket> ReceiveAsync(CancellationToken token = default (CancellationToken))
         {
             if (Client == null)
-                throw new InvalidOperationException();
+                await BindAsync();
 
             var result = await Client.ReceiveAsync();
             return new CoapPacket
@@ -92,11 +97,25 @@ public void Dispose()
         public async Task SendAsync(CoapPacket packet, CancellationToken token = default (CancellationToken))
         {
             if (Client == null)
-                throw new InvalidOperationException();
+                await BindAsync();
 
-            var udpDestEndpoint = packet.Endpoint as CoapUdpEndPoint;
-            if (udpDestEndpoint == null)
-                throw new ArgumentException();
+
+            CoapUdpEndPoint udpDestEndpoint;
+            switch (packet.Endpoint)
+            {
+                case CoapUdpEndPoint udpEndPoint:
+                    udpDestEndpoint = udpEndPoint;
+                    break;
+                case CoapEndpoint coapEndpoint:
+                    int port = coapEndpoint.BaseUri.Port;
+                    if (port == -1)
+                        port = coapEndpoint.IsSecure ? Coap.PortDTLS : Coap.Port;
+
+                    udpDestEndpoint = new CoapUdpEndPoint(coapEndpoint.BaseUri.Host, port);
+                    break;
+                default:
+                    throw new InvalidOperationException($"Unsupported {nameof(CoapPacket)}.{nameof(CoapPacket.Endpoint)} type ({packet.Endpoint.GetType().FullName})");
+            }
 
             try
             {