From 0750ee006f2154c5a7ada5b00398ee135d2f085d Mon Sep 17 00:00:00 2001 From: Michael Croes Date: Wed, 2 Jun 2021 22:06:00 +0200 Subject: [PATCH 1/4] Change S7 200 remote TSAP to 10.01 --- S7.Net/Protocol/ConnectionRequest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/S7.Net/Protocol/ConnectionRequest.cs b/S7.Net/Protocol/ConnectionRequest.cs index 64e2b5d..2231ccb 100644 --- a/S7.Net/Protocol/ConnectionRequest.cs +++ b/S7.Net/Protocol/ConnectionRequest.cs @@ -9,7 +9,7 @@ namespace S7.Net.Protocol byte[] bSend1 = { 3, 0, 0, 22, //TPKT 17, //COTP Header Length - 224, //Connect Request + 224, //Connect Request 0, 0, //Destination Reference 0, 46, //Source Reference 0, //Flags @@ -27,12 +27,12 @@ namespace S7.Net.Protocol switch (cpu) { case CpuType.S7200: - //S7200: Chr(193) & Chr(2) & Chr(16) & Chr(0) 'Eigener Tsap + // local bSend1[13] = 0x10; bSend1[14] = 0x00; - //S7200: Chr(194) & Chr(2) & Chr(16) & Chr(0) 'Fremder Tsap + // remote bSend1[17] = 0x10; - bSend1[18] = 0x00; + bSend1[18] = 0x01; break; case CpuType.Logo0BA8: // These values are taken from NodeS7, it's not verified if these are From fd9aeb5b3bf29ca3267ce79bbfd2493ba2608ad9 Mon Sep 17 00:00:00 2001 From: Michael Croes Date: Wed, 2 Jun 2021 23:03:06 +0200 Subject: [PATCH 2/4] Fix unit test for S7 200 --- S7.Net.UnitTest/ConnectionRequestTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S7.Net.UnitTest/ConnectionRequestTest.cs b/S7.Net.UnitTest/ConnectionRequestTest.cs index 440a962..eff00e3 100644 --- a/S7.Net.UnitTest/ConnectionRequestTest.cs +++ b/S7.Net.UnitTest/ConnectionRequestTest.cs @@ -9,7 +9,7 @@ namespace S7.Net.UnitTest [TestMethod] public void Test_ConnectionRequest_S7_200() { - CollectionAssert.AreEqual(MakeConnectionRequest(16, 0, 16, 0), + CollectionAssert.AreEqual(MakeConnectionRequest(16, 0, 16, 1), ConnectionRequest.GetCOTPConnectionRequest(CpuType.S7200, 0, 0)); } From 70bc1499efc3688bfbae56b358cb6035202c1bcf Mon Sep 17 00:00:00 2001 From: Michael Croes Date: Wed, 2 Jun 2021 23:03:23 +0200 Subject: [PATCH 3/4] ConnectionRequestTest: Cleanup trailing whitespace --- S7.Net.UnitTest/ConnectionRequestTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S7.Net.UnitTest/ConnectionRequestTest.cs b/S7.Net.UnitTest/ConnectionRequestTest.cs index eff00e3..6429d14 100644 --- a/S7.Net.UnitTest/ConnectionRequestTest.cs +++ b/S7.Net.UnitTest/ConnectionRequestTest.cs @@ -63,7 +63,7 @@ namespace S7.Net.UnitTest { 3, 0, 0, 22, //TPKT 17, //COTP Header Length - 224, //Connect Request + 224, //Connect Request 0, 0, //Destination Reference 0, 46, //Source Reference 0, //Flags From 677d2941e1ac0b81af660a362f495440d8806f85 Mon Sep 17 00:00:00 2001 From: Michael Croes Date: Sun, 6 Jun 2021 22:33:12 +0200 Subject: [PATCH 4/4] Apply S7 200 TSAP change to relocated code --- S7.Net/Protocol/TsapPair.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S7.Net/Protocol/TsapPair.cs b/S7.Net/Protocol/TsapPair.cs index 4a329d3..e54fc32 100644 --- a/S7.Net/Protocol/TsapPair.cs +++ b/S7.Net/Protocol/TsapPair.cs @@ -68,7 +68,7 @@ namespace S7.Net.Protocol switch (cpuType) { case CpuType.S7200: - return new TsapPair(new Tsap(0x10, 0x00), new Tsap(0x10, 0x00)); + return new TsapPair(new Tsap(0x10, 0x00), new Tsap(0x10, 0x01)); case CpuType.Logo0BA8: // The actual values are probably on a per-project basis return new TsapPair(new Tsap(0x01, 0x00), new Tsap(0x01, 0x02));