am-wd/AMWD.Protocols.Modbus
1
0
Fork 0
Code Issues Actions Activity

Fix of #7 tried to set DualMode on IPv4 network

Browse Source
This commit is contained in:
Andreas Müller
2025-02-06 17:02:52 +01:00
parent 5b8a2a8af1
commit 885231466b
3 changed files with 34 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AMWD.Protocols.Modbus.Tcp/ModbusTcpProxy.cs
View File

@@ -108,7 +108,10 @@ namespace AMWD.Protocols.Modbus.Tcp
_stopCts?.Dispose(); _stopCts?.Dispose();
_stopCts = new CancellationTokenSource(); _stopCts = new CancellationTokenSource();
_tcpListener.Socket.DualMode = ListenAddress.AddressFamily == AddressFamily.InterNetworkV6; // Only allowed to set, if the socket is in the InterNetworkV6 address family.
// See: https://learn.microsoft.com/en-us/dotnet/api/system.net.sockets.socket.dualmode?view=netstandard-2.0#exceptions
if (ListenAddress.AddressFamily == AddressFamily.InterNetworkV6)
_tcpListener.Socket.DualMode = true;
_tcpListener.Start(); _tcpListener.Start();
_clientConnectTask = WaitForClientAsync(_stopCts.Token); _clientConnectTask = WaitForClientAsync(_stopCts.Token);

118
AMWD.Protocols.Modbus.Tests/Tcp/ModbusTcpProxyTest.cs
View File

@@ -143,7 +143,6 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await proxy.StopAsync(); await proxy.StopAsync();
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
@@ -151,7 +150,29 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
_tcpListenerMock.Verify(m => m.Stop(), Times.Exactly(2)); _tcpListenerMock.Verify(m => m.Stop(), Times.Exactly(2));
_tcpListenerMock.Verify(m => m.AcceptTcpClientAsync(It.IsAny<CancellationToken>()), Times.Once); _tcpListenerMock.Verify(m => m.AcceptTcpClientAsync(It.IsAny<CancellationToken>()), Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once); VerifyNoOtherCalls();
}
[TestMethod]
public async Task ShouldSetSocketToDualModeOnIpV6()
{
// Arrange
_connectClient = false;
using var proxy = GetProxy(IPAddress.IPv6Loopback);
// Act
await proxy.StartAsync();
await proxy.StopAsync();
// Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = true, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Exactly(2));
_tcpListenerMock.Verify(m => m.AcceptTcpClientAsync(It.IsAny<CancellationToken>()), Times.Once);
VerifyNoOtherCalls(); VerifyNoOtherCalls();
} }
@@ -238,7 +259,6 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
@@ -246,7 +266,6 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
_tcpListenerMock.Verify(m => m.AcceptTcpClientAsync(It.IsAny<CancellationToken>()), Times.AtLeast(1)); _tcpListenerMock.Verify(m => m.AcceptTcpClientAsync(It.IsAny<CancellationToken>()), Times.AtLeast(1));
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
VerifyNoOtherCalls(); VerifyNoOtherCalls();
} }
@@ -263,10 +282,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -294,10 +311,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -341,10 +356,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -382,10 +395,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -419,10 +430,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -471,10 +480,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -512,10 +519,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -549,10 +554,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -599,10 +602,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -640,10 +641,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -677,10 +676,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -727,10 +724,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -768,10 +763,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -805,10 +798,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -856,10 +847,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -898,10 +887,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -930,10 +917,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -965,10 +950,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1000,10 +983,9 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1041,10 +1023,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1089,10 +1069,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1146,10 +1124,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1192,10 +1168,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1238,10 +1212,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1288,10 +1260,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1329,10 +1299,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1361,10 +1329,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1397,10 +1363,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1444,10 +1408,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1490,10 +1452,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1531,10 +1491,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1564,10 +1522,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1611,10 +1567,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1657,10 +1611,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1702,10 +1654,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1734,10 +1684,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1770,10 +1718,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1821,10 +1767,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1871,10 +1815,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1916,10 +1858,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1948,10 +1888,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -1984,10 +1922,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -2035,10 +1971,8 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
await Task.Delay(100); await Task.Delay(100);
// Assert // Assert
_tcpListenerMock.VerifyGet(m => m.Socket, Times.Once);
_tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once); _tcpListenerMock.VerifyGet(m => m.LocalIPEndPoint, Times.Once);
_ipEndPointMock.VerifyGet(m => m.Address, Times.Once); _ipEndPointMock.VerifyGet(m => m.Address, Times.Once);
_socketMock.VerifySet(m => m.DualMode = false, Times.Once);
_tcpListenerMock.Verify(m => m.Start(), Times.Once); _tcpListenerMock.Verify(m => m.Start(), Times.Once);
_tcpListenerMock.Verify(m => m.Stop(), Times.Once); _tcpListenerMock.Verify(m => m.Stop(), Times.Once);
@@ -2094,9 +2028,9 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp
return [.. CreateHeader(request), .. request]; return [.. CreateHeader(request), .. request];
} }
private ModbusTcpProxy GetProxy() private ModbusTcpProxy GetProxy(IPAddress localAddress = null)
{ {
var localAddress = IPAddress.Loopback; localAddress ??= IPAddress.Loopback;
int localPort = 502; int localPort = 502;
var connection = new Mock<IModbusConnection>(); var connection = new Mock<IModbusConnection>();

4
CHANGELOG.md
View File

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Async methods do not return on captured context anymore (`Task.ConfigureAwait(false)`). - Async methods do not return on captured context anymore (`Task.ConfigureAwait(false)`).
### Fixed
- Set `Socket.DualMode` on IPv4 network address is not allowed (`ModbusTcpProxy`).
## [v0.4.0] (2025-01-29) ## [v0.4.0] (2025-01-29)