DeleteObject: Parameter for integrity yes/no

Author: thomas-v2

src/S7CommPlusDriver/Core/DeleteObjectResponse.cs

@@ -30,10 +30,10 @@ public class DeleteObjectResponse : IS7pResponse
         public uint IntegrityId { get; set; }
         public bool WithIntegrityId { get; set; }
 
-        public DeleteObjectResponse(byte protocolVersion)
+        public DeleteObjectResponse(byte protocolVersion, bool withIntegrityId)
         {
             ProtocolVersion = protocolVersion;
-            WithIntegrityId = false;
+            WithIntegrityId = withIntegrityId; // When deleting the Sesssion Object-Id, there's no Integrity-Id!
         }
 
         public int Deserialize(Stream buffer)
@@ -52,7 +52,11 @@ public int Deserialize(Stream buffer)
                 PObject errorObject = new PObject();
                 ret += S7p.DecodeObject(buffer, ref errorObject);
             }
-
+            if (WithIntegrityId)
+            {
+                ret += S7p.DecodeUInt32Vlq(buffer, out uint iid);
+                IntegrityId = iid;
+            }
             return ret;
         }
 
@@ -71,7 +75,7 @@ public override string ToString()
             return s;
         }
 
-        public static DeleteObjectResponse DeserializeFromPdu(Stream pdu)
+        public static DeleteObjectResponse DeserializeFromPdu(Stream pdu, bool withIntegrityId)
         {
             byte protocolVersion;
             byte opcode;
@@ -91,7 +95,7 @@ public static DeleteObjectResponse DeserializeFromPdu(Stream pdu)
             {
                 return null;
             }
-            DeleteObjectResponse resp = new DeleteObjectResponse(protocolVersion);
+            DeleteObjectResponse resp = new DeleteObjectResponse(protocolVersion, withIntegrityId);
             resp.Deserialize(pdu);
 
             return resp;

src/S7CommPlusDriver/S7CommPlusConnection.cs

@@ -19,6 +19,7 @@
 using System.Threading;
 using System.IO;
 using System.Linq;
+using System.Diagnostics;
 
 namespace S7CommPlusDriver
 {
@@ -540,15 +541,16 @@ private int DeleteObject(uint deleteObjectId)
             // And the error code gives an error, but not a fatal one.
             // If we delete another object, there should be an IntegrityId in the response, and
             // the response gives no error.
-            var delRes = DeleteObjectResponse.DeserializeFromPdu(m_ReceivedStream);
             if (deleteObjectId == m_SessionId)
             {
-                Console.WriteLine("S7CommPlusConnection - DeleteSession: Deleted our own Session Id object, not checking the response.");
+                var delRes = DeleteObjectResponse.DeserializeFromPdu(m_ReceivedStream, false);
+                Trace.WriteLine("S7CommPlusConnection - DeleteSession: Deleted our own Session Id object, not checking the response.");
                 m_SessionId = 0; // not valid anymore
                 m_SessionId2 = 0;
             }
             else
             {
+                var delRes = DeleteObjectResponse.DeserializeFromPdu(m_ReceivedStream, true);
                 res = checkResponseWithIntegrity(delReq, delRes);
                 if (res != 0)
                 {