add netcore and refactoring
This commit is contained in:
+10
-17
@@ -14,23 +14,16 @@ Contributors:
|
||||
Paolo Patierno - initial API and implementation and/or initial documentation
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Threading;
|
||||
|
||||
namespace uPLibrary.Networking.M2Mqtt
|
||||
{
|
||||
/// <summary>
|
||||
/// Support methods fos specific framework
|
||||
/// </summary>
|
||||
public class Fx
|
||||
{
|
||||
public static void StartThread(ThreadStart threadStart)
|
||||
{
|
||||
new Thread(threadStart).Start();
|
||||
}
|
||||
|
||||
public static void SleepThread(int millisecondsTimeout)
|
||||
{
|
||||
Thread.Sleep(millisecondsTimeout);
|
||||
}
|
||||
}
|
||||
namespace uPLibrary.Networking.M2Mqtt {
|
||||
/// <summary>
|
||||
/// Support methods fos specific framework
|
||||
/// </summary>
|
||||
public class Fx {
|
||||
public static void StartThread(ThreadStart threadStart) => new Thread(threadStart).Start();
|
||||
|
||||
public static void SleepThread(Int32 millisecondsTimeout) => Thread.Sleep(millisecondsTimeout);
|
||||
}
|
||||
}
|
||||
|
||||
+286
-332
@@ -15,13 +15,17 @@ Contributors:
|
||||
*/
|
||||
|
||||
#if SSL
|
||||
#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
|
||||
#if MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3
|
||||
using Microsoft.SPOT.Net.Security;
|
||||
#else
|
||||
using System.Net.Security;
|
||||
using System.Security.Authentication;
|
||||
#if NETCOREAPP
|
||||
using System.Net.Security;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
using System.Net.Sockets;
|
||||
using System.Net;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
@@ -29,90 +33,73 @@ using System;
|
||||
//using System.Security.Authentication;
|
||||
//using System.Net.Security;
|
||||
|
||||
namespace uPLibrary.Networking.M2Mqtt
|
||||
{
|
||||
/// <summary>
|
||||
/// Channel to communicate over the network
|
||||
/// </summary>
|
||||
public class MqttNetworkChannel : IMqttNetworkChannel
|
||||
{
|
||||
namespace uPLibrary.Networking.M2Mqtt {
|
||||
/// <summary>
|
||||
/// Channel to communicate over the network
|
||||
/// </summary>
|
||||
public class MqttNetworkChannel : IMqttNetworkChannel {
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
|
||||
private readonly RemoteCertificateValidationCallback userCertificateValidationCallback;
|
||||
private readonly LocalCertificateSelectionCallback userCertificateSelectionCallback;
|
||||
private readonly RemoteCertificateValidationCallback userCertificateValidationCallback;
|
||||
private readonly LocalCertificateSelectionCallback userCertificateSelectionCallback;
|
||||
#endif
|
||||
// remote host information
|
||||
private string remoteHostName;
|
||||
private IPAddress remoteIpAddress;
|
||||
private int remotePort;
|
||||
// remote host information
|
||||
|
||||
// socket for communication
|
||||
private Socket socket;
|
||||
// using SSL
|
||||
private bool secure;
|
||||
// socket for communication
|
||||
private Socket socket;
|
||||
// using SSL
|
||||
private readonly Boolean secure;
|
||||
|
||||
// CA certificate (on client)
|
||||
private X509Certificate caCert;
|
||||
// Server certificate (on broker)
|
||||
private X509Certificate serverCert;
|
||||
// client certificate (on client)
|
||||
private X509Certificate clientCert;
|
||||
// CA certificate (on client)
|
||||
private readonly X509Certificate caCert;
|
||||
// Server certificate (on broker)
|
||||
private readonly X509Certificate serverCert;
|
||||
// client certificate (on client)
|
||||
private readonly X509Certificate clientCert;
|
||||
|
||||
// SSL/TLS protocol version
|
||||
private MqttSslProtocols sslProtocol;
|
||||
// SSL/TLS protocol version
|
||||
private readonly MqttSslProtocols sslProtocol;
|
||||
|
||||
/// <summary>
|
||||
/// Remote host name
|
||||
/// </summary>
|
||||
public string RemoteHostName { get { return this.remoteHostName; } }
|
||||
/// <summary>
|
||||
/// Remote host name
|
||||
/// </summary>
|
||||
public String RemoteHostName { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Remote IP address
|
||||
/// </summary>
|
||||
public IPAddress RemoteIpAddress { get { return this.remoteIpAddress; } }
|
||||
/// <summary>
|
||||
/// Remote IP address
|
||||
/// </summary>
|
||||
public IPAddress RemoteIpAddress { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Remote port
|
||||
/// </summary>
|
||||
public int RemotePort { get { return this.remotePort; } }
|
||||
/// <summary>
|
||||
/// Remote port
|
||||
/// </summary>
|
||||
public Int32 RemotePort { get; }
|
||||
|
||||
#if SSL
|
||||
// SSL stream
|
||||
private SslStream sslStream;
|
||||
#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
|
||||
private NetworkStream netStream;
|
||||
// SSL stream
|
||||
private SslStream sslStream;
|
||||
#if !MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3
|
||||
private NetworkStream netStream;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/// <summary>
|
||||
/// Data available on the channel
|
||||
/// </summary>
|
||||
public bool DataAvailable
|
||||
{
|
||||
get
|
||||
{
|
||||
/// <summary>
|
||||
/// Data available on the channel
|
||||
/// </summary>
|
||||
#if SSL
|
||||
#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
|
||||
if (secure)
|
||||
return this.sslStream.DataAvailable;
|
||||
else
|
||||
return (this.socket.Available > 0);
|
||||
#if MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3
|
||||
public Boolean DataAvailable => this.secure ? this.sslStream.DataAvailable : this.socket.Available > 0;
|
||||
#else
|
||||
if (secure)
|
||||
return this.netStream.DataAvailable;
|
||||
else
|
||||
return (this.socket.Available > 0);
|
||||
public Boolean DataAvailable => this.secure ? this.netStream.DataAvailable : this.socket.Available > 0;
|
||||
#endif
|
||||
#else
|
||||
return (this.socket.Available > 0);
|
||||
public Boolean DataAvailable => this.socket.Available > 0;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="socket">Socket opened with the client</param>
|
||||
public MqttNetworkChannel(Socket socket)
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="socket">Socket opened with the client</param>
|
||||
public MqttNetworkChannel(Socket socket)
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
|
||||
: this(socket, false, null, MqttSslProtocols.None, null, null)
|
||||
#else
|
||||
@@ -120,212 +107,203 @@ namespace uPLibrary.Networking.M2Mqtt
|
||||
#endif
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="socket">Socket opened with the client</param>
|
||||
/// <param name="secure">Secure connection (SSL/TLS)</param>
|
||||
/// <param name="serverCert">Server X509 certificate for secure connection</param>
|
||||
/// <param name="sslProtocol">SSL/TLS protocol version</param>
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="socket">Socket opened with the client</param>
|
||||
/// <param name="secure">Secure connection (SSL/TLS)</param>
|
||||
/// <param name="serverCert">Server X509 certificate for secure connection</param>
|
||||
/// <param name="sslProtocol">SSL/TLS protocol version</param>
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
|
||||
/// <param name="userCertificateSelectionCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
|
||||
/// <param name="userCertificateValidationCallback">A LocalCertificateSelectionCallback delegate responsible for selecting the certificate used for authentication</param>
|
||||
public MqttNetworkChannel(Socket socket, bool secure, X509Certificate serverCert, MqttSslProtocols sslProtocol,
|
||||
RemoteCertificateValidationCallback userCertificateValidationCallback,
|
||||
LocalCertificateSelectionCallback userCertificateSelectionCallback)
|
||||
/// <param name="userCertificateSelectionCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
|
||||
/// <param name="userCertificateValidationCallback">A LocalCertificateSelectionCallback delegate responsible for selecting the certificate used for authentication</param>
|
||||
public MqttNetworkChannel(Socket socket, Boolean secure, X509Certificate serverCert, MqttSslProtocols sslProtocol,
|
||||
RemoteCertificateValidationCallback userCertificateValidationCallback,
|
||||
LocalCertificateSelectionCallback userCertificateSelectionCallback)
|
||||
#else
|
||||
public MqttNetworkChannel(Socket socket, bool secure, X509Certificate serverCert, MqttSslProtocols sslProtocol)
|
||||
#endif
|
||||
{
|
||||
this.socket = socket;
|
||||
this.secure = secure;
|
||||
this.serverCert = serverCert;
|
||||
this.sslProtocol = sslProtocol;
|
||||
this.socket = socket;
|
||||
this.secure = secure;
|
||||
this.serverCert = serverCert;
|
||||
this.sslProtocol = sslProtocol;
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
|
||||
this.userCertificateValidationCallback = userCertificateValidationCallback;
|
||||
this.userCertificateSelectionCallback = userCertificateSelectionCallback;
|
||||
this.userCertificateValidationCallback = userCertificateValidationCallback;
|
||||
this.userCertificateSelectionCallback = userCertificateSelectionCallback;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="remoteHostName">Remote Host name</param>
|
||||
/// <param name="remotePort">Remote port</param>
|
||||
public MqttNetworkChannel(string remoteHostName, int remotePort)
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="remoteHostName">Remote Host name</param>
|
||||
/// <param name="remotePort">Remote port</param>
|
||||
public MqttNetworkChannel(String remoteHostName, Int32 remotePort)
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
|
||||
: this(remoteHostName, remotePort, false, null, null, MqttSslProtocols.None, null, null)
|
||||
#else
|
||||
: this(remoteHostName, remotePort, false, null, null, MqttSslProtocols.None)
|
||||
#endif
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="remoteHostName">Remote Host name</param>
|
||||
/// <param name="remotePort">Remote port</param>
|
||||
/// <param name="secure">Using SSL</param>
|
||||
/// <param name="caCert">CA certificate</param>
|
||||
/// <param name="clientCert">Client certificate</param>
|
||||
/// <param name="sslProtocol">SSL/TLS protocol version</param>
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="remoteHostName">Remote Host name</param>
|
||||
/// <param name="remotePort">Remote port</param>
|
||||
/// <param name="secure">Using SSL</param>
|
||||
/// <param name="caCert">CA certificate</param>
|
||||
/// <param name="clientCert">Client certificate</param>
|
||||
/// <param name="sslProtocol">SSL/TLS protocol version</param>
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
|
||||
/// <param name="userCertificateSelectionCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
|
||||
/// <param name="userCertificateValidationCallback">A LocalCertificateSelectionCallback delegate responsible for selecting the certificate used for authentication</param>
|
||||
public MqttNetworkChannel(string remoteHostName, int remotePort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol,
|
||||
RemoteCertificateValidationCallback userCertificateValidationCallback,
|
||||
LocalCertificateSelectionCallback userCertificateSelectionCallback)
|
||||
/// <param name="userCertificateSelectionCallback">A RemoteCertificateValidationCallback delegate responsible for validating the certificate supplied by the remote party</param>
|
||||
/// <param name="userCertificateValidationCallback">A LocalCertificateSelectionCallback delegate responsible for selecting the certificate used for authentication</param>
|
||||
public MqttNetworkChannel(String remoteHostName, Int32 remotePort, Boolean secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol,
|
||||
RemoteCertificateValidationCallback userCertificateValidationCallback,
|
||||
LocalCertificateSelectionCallback userCertificateSelectionCallback)
|
||||
#else
|
||||
public MqttNetworkChannel(string remoteHostName, int remotePort, bool secure, X509Certificate caCert, X509Certificate clientCert, MqttSslProtocols sslProtocol)
|
||||
#endif
|
||||
{
|
||||
IPAddress remoteIpAddress = null;
|
||||
try
|
||||
{
|
||||
// check if remoteHostName is a valid IP address and get it
|
||||
remoteIpAddress = IPAddress.Parse(remoteHostName);
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
IPAddress remoteIpAddress = null;
|
||||
try {
|
||||
// check if remoteHostName is a valid IP address and get it
|
||||
remoteIpAddress = IPAddress.Parse(remoteHostName);
|
||||
} catch {
|
||||
}
|
||||
|
||||
// in this case the parameter remoteHostName isn't a valid IP address
|
||||
if (remoteIpAddress == null)
|
||||
{
|
||||
IPHostEntry hostEntry = Dns.GetHostEntry(remoteHostName);
|
||||
if ((hostEntry != null) && (hostEntry.AddressList.Length > 0))
|
||||
{
|
||||
// check for the first address not null
|
||||
// it seems that with .Net Micro Framework, the IPV6 addresses aren't supported and return "null"
|
||||
int i = 0;
|
||||
while (hostEntry.AddressList[i] == null) i++;
|
||||
remoteIpAddress = hostEntry.AddressList[i];
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("No address found for the remote host name");
|
||||
}
|
||||
}
|
||||
// in this case the parameter remoteHostName isn't a valid IP address
|
||||
if (remoteIpAddress == null) {
|
||||
IPHostEntry hostEntry = Dns.GetHostEntry(remoteHostName);
|
||||
if (hostEntry != null && hostEntry.AddressList.Length > 0) {
|
||||
// check for the first address not null
|
||||
// it seems that with .Net Micro Framework, the IPV6 addresses aren't supported and return "null"
|
||||
Int32 i = 0;
|
||||
while (hostEntry.AddressList[i] == null) {
|
||||
i++;
|
||||
}
|
||||
|
||||
this.remoteHostName = remoteHostName;
|
||||
this.remoteIpAddress = remoteIpAddress;
|
||||
this.remotePort = remotePort;
|
||||
this.secure = secure;
|
||||
this.caCert = caCert;
|
||||
this.clientCert = clientCert;
|
||||
this.sslProtocol = sslProtocol;
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
|
||||
this.userCertificateValidationCallback = userCertificateValidationCallback;
|
||||
this.userCertificateSelectionCallback = userCertificateSelectionCallback;
|
||||
#endif
|
||||
remoteIpAddress = hostEntry.AddressList[i];
|
||||
} else {
|
||||
throw new Exception("No address found for the remote host name");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Connect to remote server
|
||||
/// </summary>
|
||||
public void Connect()
|
||||
{
|
||||
this.socket = new Socket(IPAddressUtility.GetAddressFamily(this.remoteIpAddress), SocketType.Stream, ProtocolType.Tcp);
|
||||
// try connection to the broker
|
||||
this.socket.Connect(new IPEndPoint(this.remoteIpAddress, this.remotePort));
|
||||
this.RemoteHostName = remoteHostName;
|
||||
this.RemoteIpAddress = remoteIpAddress;
|
||||
this.RemotePort = remotePort;
|
||||
this.secure = secure;
|
||||
this.caCert = caCert;
|
||||
this.clientCert = clientCert;
|
||||
this.sslProtocol = sslProtocol;
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3 || COMPACT_FRAMEWORK)
|
||||
this.userCertificateValidationCallback = userCertificateValidationCallback;
|
||||
this.userCertificateSelectionCallback = userCertificateSelectionCallback;
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Connect to remote server
|
||||
/// </summary>
|
||||
public void Connect() {
|
||||
this.socket = new Socket(IPAddressUtility.GetAddressFamily(this.RemoteIpAddress), SocketType.Stream, ProtocolType.Tcp);
|
||||
// try connection to the broker
|
||||
this.socket.Connect(new IPEndPoint(this.RemoteIpAddress, this.RemotePort));
|
||||
|
||||
#if SSL
|
||||
// secure channel requested
|
||||
if (secure)
|
||||
{
|
||||
// create SSL stream
|
||||
#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
|
||||
// secure channel requested
|
||||
if (this.secure) {
|
||||
// create SSL stream
|
||||
#if MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3
|
||||
this.sslStream = new SslStream(this.socket);
|
||||
#else
|
||||
this.netStream = new NetworkStream(this.socket);
|
||||
this.sslStream = new SslStream(this.netStream, false, this.userCertificateValidationCallback, this.userCertificateSelectionCallback);
|
||||
this.netStream = new NetworkStream(this.socket);
|
||||
this.sslStream = new SslStream(this.netStream, false, this.userCertificateValidationCallback, this.userCertificateSelectionCallback);
|
||||
#endif
|
||||
|
||||
// server authentication (SSL/TLS handshake)
|
||||
#if (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
|
||||
// server authentication (SSL/TLS handshake)
|
||||
#if MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3
|
||||
this.sslStream.AuthenticateAsClient(this.remoteHostName,
|
||||
this.clientCert,
|
||||
new X509Certificate[] { this.caCert },
|
||||
SslVerification.CertificateRequired,
|
||||
MqttSslUtility.ToSslPlatformEnum(this.sslProtocol));
|
||||
#else
|
||||
X509CertificateCollection clientCertificates = null;
|
||||
// check if there is a client certificate to add to the collection, otherwise it's null (as empty)
|
||||
if (this.clientCert != null)
|
||||
clientCertificates = new X509CertificateCollection(new X509Certificate[] { this.clientCert });
|
||||
|
||||
this.sslStream.AuthenticateAsClient(this.remoteHostName,
|
||||
clientCertificates,
|
||||
MqttSslUtility.ToSslPlatformEnum(this.sslProtocol),
|
||||
false);
|
||||
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
X509CertificateCollection clientCertificates = null;
|
||||
// check if there is a client certificate to add to the collection, otherwise it's null (as empty)
|
||||
if (this.clientCert != null) {
|
||||
clientCertificates = new X509CertificateCollection(new X509Certificate[] { this.clientCert });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Send data on the network channel
|
||||
/// </summary>
|
||||
/// <param name="buffer">Data buffer to send</param>
|
||||
/// <returns>Number of byte sent</returns>
|
||||
public int Send(byte[] buffer)
|
||||
{
|
||||
this.sslStream.AuthenticateAsClient(this.RemoteHostName,
|
||||
clientCertificates,
|
||||
MqttSslUtility.ToSslPlatformEnum(this.sslProtocol),
|
||||
false);
|
||||
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Send data on the network channel
|
||||
/// </summary>
|
||||
/// <param name="buffer">Data buffer to send</param>
|
||||
/// <returns>Number of byte sent</returns>
|
||||
public Int32 Send(Byte[] buffer) {
|
||||
#if SSL
|
||||
if (this.secure)
|
||||
{
|
||||
this.sslStream.Write(buffer, 0, buffer.Length);
|
||||
this.sslStream.Flush();
|
||||
return buffer.Length;
|
||||
}
|
||||
else
|
||||
return this.socket.Send(buffer, 0, buffer.Length, SocketFlags.None);
|
||||
if (this.secure) {
|
||||
this.sslStream.Write(buffer, 0, buffer.Length);
|
||||
this.sslStream.Flush();
|
||||
return buffer.Length;
|
||||
} else {
|
||||
return this.socket.Send(buffer, 0, buffer.Length, SocketFlags.None);
|
||||
}
|
||||
#else
|
||||
return this.socket.Send(buffer, 0, buffer.Length, SocketFlags.None);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Receive data from the network
|
||||
/// </summary>
|
||||
/// <param name="buffer">Data buffer for receiving data</param>
|
||||
/// <returns>Number of bytes received</returns>
|
||||
public int Receive(byte[] buffer)
|
||||
{
|
||||
/// <summary>
|
||||
/// Receive data from the network
|
||||
/// </summary>
|
||||
/// <param name="buffer">Data buffer for receiving data</param>
|
||||
/// <returns>Number of bytes received</returns>
|
||||
public Int32 Receive(Byte[] buffer) {
|
||||
#if SSL
|
||||
if (this.secure)
|
||||
{
|
||||
// read all data needed (until fill buffer)
|
||||
int idx = 0, read = 0;
|
||||
while (idx < buffer.Length)
|
||||
{
|
||||
// fixed scenario with socket closed gracefully by peer/broker and
|
||||
// Read return 0. Avoid infinite loop.
|
||||
read = this.sslStream.Read(buffer, idx, buffer.Length - idx);
|
||||
if (read == 0)
|
||||
return 0;
|
||||
idx += read;
|
||||
}
|
||||
return buffer.Length;
|
||||
}
|
||||
else
|
||||
{
|
||||
// read all data needed (until fill buffer)
|
||||
int idx = 0, read = 0;
|
||||
while (idx < buffer.Length)
|
||||
{
|
||||
// fixed scenario with socket closed gracefully by peer/broker and
|
||||
// Read return 0. Avoid infinite loop.
|
||||
read = this.socket.Receive(buffer, idx, buffer.Length - idx, SocketFlags.None);
|
||||
if (read == 0)
|
||||
return 0;
|
||||
idx += read;
|
||||
}
|
||||
return buffer.Length;
|
||||
}
|
||||
if (this.secure) {
|
||||
// read all data needed (until fill buffer)
|
||||
Int32 idx = 0, read = 0;
|
||||
while (idx < buffer.Length) {
|
||||
// fixed scenario with socket closed gracefully by peer/broker and
|
||||
// Read return 0. Avoid infinite loop.
|
||||
read = this.sslStream.Read(buffer, idx, buffer.Length - idx);
|
||||
if (read == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
idx += read;
|
||||
}
|
||||
return buffer.Length;
|
||||
} else {
|
||||
// read all data needed (until fill buffer)
|
||||
Int32 idx = 0, read = 0;
|
||||
while (idx < buffer.Length) {
|
||||
// fixed scenario with socket closed gracefully by peer/broker and
|
||||
// Read return 0. Avoid infinite loop.
|
||||
read = this.socket.Receive(buffer, idx, buffer.Length - idx, SocketFlags.None);
|
||||
if (read == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
idx += read;
|
||||
}
|
||||
return buffer.Length;
|
||||
}
|
||||
#else
|
||||
// read all data needed (until fill buffer)
|
||||
int idx = 0, read = 0;
|
||||
@@ -340,118 +318,94 @@ namespace uPLibrary.Networking.M2Mqtt
|
||||
}
|
||||
return buffer.Length;
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Receive data from the network channel with a specified timeout
|
||||
/// </summary>
|
||||
/// <param name="buffer">Data buffer for receiving data</param>
|
||||
/// <param name="timeout">Timeout on receiving (in milliseconds)</param>
|
||||
/// <returns>Number of bytes received</returns>
|
||||
public int Receive(byte[] buffer, int timeout)
|
||||
{
|
||||
// check data availability (timeout is in microseconds)
|
||||
if (this.socket.Poll(timeout * 1000, SelectMode.SelectRead))
|
||||
{
|
||||
return this.Receive(buffer);
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Close the network channel
|
||||
/// </summary>
|
||||
public void Close()
|
||||
{
|
||||
#if SSL
|
||||
if (this.secure)
|
||||
{
|
||||
#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
|
||||
this.netStream.Close();
|
||||
#endif
|
||||
this.sslStream.Close();
|
||||
}
|
||||
this.socket.Close();
|
||||
#else
|
||||
this.socket.Close();
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Accept connection from a remote client
|
||||
/// </summary>
|
||||
public void Accept()
|
||||
{
|
||||
#if SSL
|
||||
// secure channel requested
|
||||
if (secure)
|
||||
{
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
|
||||
|
||||
this.netStream = new NetworkStream(this.socket);
|
||||
this.sslStream = new SslStream(this.netStream, false, this.userCertificateValidationCallback, this.userCertificateSelectionCallback);
|
||||
|
||||
this.sslStream.AuthenticateAsServer(this.serverCert, false, MqttSslUtility.ToSslPlatformEnum(this.sslProtocol), false);
|
||||
#endif
|
||||
}
|
||||
|
||||
return;
|
||||
#else
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// IPAddress Utility class
|
||||
/// Receive data from the network channel with a specified timeout
|
||||
/// </summary>
|
||||
public static class IPAddressUtility
|
||||
{
|
||||
/// <summary>
|
||||
/// Return AddressFamily for the IP address
|
||||
/// </summary>
|
||||
/// <param name="ipAddress">IP address to check</param>
|
||||
/// <returns>Address family</returns>
|
||||
public static AddressFamily GetAddressFamily(IPAddress ipAddress)
|
||||
{
|
||||
#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3)
|
||||
return ipAddress.AddressFamily;
|
||||
/// <param name="buffer">Data buffer for receiving data</param>
|
||||
/// <param name="timeout">Timeout on receiving (in milliseconds)</param>
|
||||
/// <returns>Number of bytes received</returns>
|
||||
public Int32 Receive(Byte[] buffer, Int32 timeout) =>
|
||||
// check data availability (timeout is in microseconds)
|
||||
this.socket.Poll(timeout * 1000, SelectMode.SelectRead) ? this.Receive(buffer) : 0;
|
||||
|
||||
/// <summary>
|
||||
/// Close the network channel
|
||||
/// </summary>
|
||||
public void Close() {
|
||||
#if SSL
|
||||
if (this.secure) {
|
||||
#if !MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3
|
||||
this.netStream.Close();
|
||||
#endif
|
||||
this.sslStream.Close();
|
||||
}
|
||||
this.socket.Close();
|
||||
#else
|
||||
this.socket.Close();
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Accept connection from a remote client
|
||||
/// </summary>
|
||||
public void Accept() {
|
||||
#if SSL
|
||||
// secure channel requested
|
||||
if (this.secure) {
|
||||
#if !(MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
|
||||
|
||||
this.netStream = new NetworkStream(this.socket);
|
||||
this.sslStream = new SslStream(this.netStream, false, this.userCertificateValidationCallback, this.userCertificateSelectionCallback);
|
||||
|
||||
this.sslStream.AuthenticateAsServer(this.serverCert, false, MqttSslUtility.ToSslPlatformEnum(this.sslProtocol), false);
|
||||
#endif
|
||||
}
|
||||
|
||||
return;
|
||||
#else
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// IPAddress Utility class
|
||||
/// </summary>
|
||||
public static class IPAddressUtility {
|
||||
/// <summary>
|
||||
/// Return AddressFamily for the IP address
|
||||
/// </summary>
|
||||
/// <param name="ipAddress">IP address to check</param>
|
||||
/// <returns>Address family</returns>
|
||||
public static AddressFamily GetAddressFamily(IPAddress ipAddress) =>
|
||||
#if !MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3
|
||||
ipAddress.AddressFamily;
|
||||
#else
|
||||
return (ipAddress.ToString().IndexOf(':') != -1) ?
|
||||
AddressFamily.InterNetworkV6 : AddressFamily.InterNetwork;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// MQTT SSL utility class
|
||||
/// </summary>
|
||||
public static class MqttSslUtility
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// MQTT SSL utility class
|
||||
/// </summary>
|
||||
public static class MqttSslUtility {
|
||||
#if !MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3 && !COMPACT_FRAMEWORK
|
||||
|
||||
public static SslProtocols ToSslPlatformEnum(MqttSslProtocols mqttSslProtocol) => mqttSslProtocol switch
|
||||
{
|
||||
#if (!MF_FRAMEWORK_VERSION_V4_2 && !MF_FRAMEWORK_VERSION_V4_3 && !COMPACT_FRAMEWORK)
|
||||
public static SslProtocols ToSslPlatformEnum(MqttSslProtocols mqttSslProtocol)
|
||||
{
|
||||
switch (mqttSslProtocol)
|
||||
{
|
||||
case MqttSslProtocols.None:
|
||||
return SslProtocols.None;
|
||||
case MqttSslProtocols.SSLv3:
|
||||
return SslProtocols.Ssl3;
|
||||
case MqttSslProtocols.TLSv1_0:
|
||||
return SslProtocols.Tls;
|
||||
/*case MqttSslProtocols.TLSv1_1:
|
||||
return SslProtocols.Tls11;
|
||||
case MqttSslProtocols.TLSv1_2:
|
||||
return SslProtocols.Tls12;*/
|
||||
default:
|
||||
throw new ArgumentException("SSL/TLS protocol version not supported");
|
||||
}
|
||||
}
|
||||
#elif (MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3)
|
||||
public static SslProtocols ToSslPlatformEnum(MqttSslProtocols mqttSslProtocol)
|
||||
MqttSslProtocols.None => SslProtocols.None,
|
||||
//MqttSslProtocols.SSLv3 => SslProtocols.Ssl3,
|
||||
MqttSslProtocols.TLSv1_0 => SslProtocols.Tls,
|
||||
MqttSslProtocols.TLSv1_1 => SslProtocols.Tls11,
|
||||
MqttSslProtocols.TLSv1_2 => SslProtocols.Tls12,
|
||||
_ => throw new ArgumentException("SSL/TLS protocol version not supported"),
|
||||
};
|
||||
#elif MF_FRAMEWORK_VERSION_V4_2 || MF_FRAMEWORK_VERSION_V4_3
|
||||
public static SslProtocols ToSslPlatformEnum(MqttSslProtocols mqttSslProtocol)
|
||||
{
|
||||
switch (mqttSslProtocol)
|
||||
{
|
||||
@@ -468,5 +422,5 @@ namespace uPLibrary.Networking.M2Mqtt
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user