add connect by service name to TcpSocketClient

rdavisau · Jan 10, 2016 · 731e946 · 731e946
1 parent 7bec44f
commit 731e946
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 1 deletion.
diff --git a/Sockets/Sockets.Implementation.NET/TcpSocketClient.cs b/Sockets/Sockets.Implementation.NET/TcpSocketClient.cs
@@ -7,6 +7,7 @@
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
+using Sockets.Plugin.Abstractions.Resources;
 using PlatformSocketException = System.Net.Sockets.SocketException;
 using PclSocketException = Sockets.Plugin.Abstractions.SocketException;
 
@@ -93,6 +94,20 @@ internal TcpSocketClient(TcpClient backingClient, int bufferSize)
             }            
         }
 
+        /// <summary>
+        ///     Establishes a TCP connection with the endpoint at the specified address/port pair.
+        /// </summary>
+        /// <param name="address">The address of the endpoint to connect to.</param>
+        /// <param name="service">The service name of the endpoint to connect to.</param>
+        /// <param name="secure">True to enable TLS on the socket.</param>
+        /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
+        public Task ConnectAsync(string address, string service, bool secure = false,
+            CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var port = ServiceNames.PortForTcpServiceName(service);
+            return ConnectAsync(address, port, secure, cancellationToken);
+        }
+
         #region Secure Sockets Details
 
         private bool ServerValidationCallback (object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)

diff --git a/Sockets/Sockets.Implementation.WinRT/TcpSocketClient.cs b/Sockets/Sockets.Implementation.WinRT/TcpSocketClient.cs
@@ -57,9 +57,22 @@ internal TcpSocketClient(StreamSocket nativeSocket, int bufferSize)
         /// <param name="secure">True to enable TLS on the socket.</param>
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         public Task ConnectAsync(string address, int port, bool secure = false, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var service = port.ToString();
+            return ConnectAsync(address, service, secure, cancellationToken);
+        }
+
+        /// <summary>
+        ///     Establishes a TCP connection with the endpoint at the specified address/port pair.
+        /// </summary>
+        /// <param name="address">The address of the endpoint to connect to.</param>
+        /// <param name="service">The service of the endpoint to connect to.</param>
+        /// <param name="secure">True to enable TLS on the socket.</param>
+        /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
+        public Task ConnectAsync(string address, string service, bool secure = false, CancellationToken cancellationToken = default(CancellationToken))
         {
             var hn = new HostName(address);
-            var sn = port.ToString();
+            var sn = service;
             var spl = secure ? _secureSocketProtectionLevel : SocketProtectionLevel.PlainSocket;
 
             return _backingStreamSocket

diff --git a/Sockets/Sockets.Plugin.Abstractions/ITcpSocketClient.cs b/Sockets/Sockets.Plugin.Abstractions/ITcpSocketClient.cs
@@ -22,6 +22,15 @@ public interface ITcpSocketClient : IDisposable
         /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
         Task ConnectAsync(string address, int port, bool secure = false, CancellationToken cancellationToken = default(CancellationToken));
 
+        /// <summary>
+        ///     Establishes a TCP connection with the endpoint at the specified address/port pair.
+        /// </summary>
+        /// <param name="address">The address of the endpoint to connect to.</param>
+        /// <param name="service">The service of the endpoint to connect to.</param>
+        /// <param name="secure">True to enable TLS on the socket.</param>
+        /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
+        Task ConnectAsync(string address, string service, bool secure = false, CancellationToken cancellationToken = default(CancellationToken));
+
         /// <summary>
         ///     Disconnects from an endpoint previously connected to using <code>ConnectAsync</code>.
         ///     Should not be called on a <code>TcpSocketClient</code> that is not already connected.

diff --git a/Sockets/Sockets.Plugin/TcpSocketClient.cs b/Sockets/Sockets.Plugin/TcpSocketClient.cs
@@ -42,6 +42,18 @@ public TcpSocketClient(int bufferSize) : this()
             throw new NotImplementedException(PCL.BaitWithoutSwitchMessage);
         }
 
+        /// <summary>
+        ///     Establishes a TCP connection with the endpoint at the specified address/port pair.
+        /// </summary>
+        /// <param name="address">The address of the endpoint to connect to.</param>
+        /// <param name="service">The service of the endpoint to connect to.</param>
+        /// <param name="secure">True to enable TLS on the socket.</param>
+        /// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
+        public Task ConnectAsync(string address, string service, bool secure = false, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            throw new NotImplementedException(PCL.BaitWithoutSwitchMessage);
+        }
+
         /// <summary>
         ///     Disconnects from an endpoint previously connected to using <code>ConnectAsync</code>.
         ///     Should not be called on a <code>TcpSocketClient</code> that is not already connected.