CreateObjectRequest: Optional integrity-id

Author: thomas-v2

src/S7CommPlusDriver/Core/CreateObjectRequest.cs

@@ -32,11 +32,11 @@ public class CreateObjectRequest : IS7pRequest
         public uint IntegrityId { get; set; }
         public bool WithIntegrityId { get; set; }
 
-        public CreateObjectRequest(byte protocolVersion, UInt16 seqNum)
+        public CreateObjectRequest(byte protocolVersion, UInt16 seqNum, bool withIntegrityId)
         {
             ProtocolVersion = protocolVersion;
             SequenceNumber = seqNum;
-            WithIntegrityId = false;
+            WithIntegrityId = withIntegrityId;
         }
 
         public void SetRequestIdValue(UInt32 requestId, PValue requestValue)
@@ -80,13 +80,15 @@ public int Serialize(Stream buffer)
             ret += S7p.EncodeByte(buffer, TransportFlags);
 
             // Request set
-            ret += S7p.EncodeUInt32(buffer, Ids.ObjectServerSessionContainer);
-            ret += S7p.EncodeByte(buffer, 0x00);
-            ret += S7p.EncodeByte(buffer, Datatype.UDInt);
-            ret += S7p.EncodeUInt32Vlq(buffer, 0);
-
+            ret += S7p.EncodeUInt32(buffer, RequestId);
+            ret += RequestValue.Serialize(buffer);
             ret += S7p.EncodeUInt32(buffer, 0); // Unknown value 1
 
+            if (WithIntegrityId)
+            {
+                ret += S7p.EncodeUInt32Vlq(buffer, IntegrityId);
+            }
+
             // Object 
             ret += RequestObject.Serialize(buffer);
 

src/S7CommPlusDriver/S7CommPlusConnection.cs

@@ -81,6 +81,7 @@ private UInt32 GetNextIntegrityId(ushort functioncode)
                 case Functioncode.SetVariable:
                 case Functioncode.SetVarSubStreamed:
                 case Functioncode.DeleteObject:
+                case Functioncode.CreateObject:
                     if (m_IntegrityId_Set == UInt32.MaxValue)
                     {
                         m_IntegrityId_Set = 0;
@@ -435,7 +436,7 @@ public int Connect(string address)
 
             #region Step 3: CreateObjectRequest / Response (with TLS)
 
-            var createObjReq = new CreateObjectRequest(ProtocolVersion.V1, 0);
+            var createObjReq = new CreateObjectRequest(ProtocolVersion.V1, 0, false);
             createObjReq.SetNullServerSessionData();
             res = SendS7plusFunctionObject(createObjReq);
             if (res != 0)