Get XML of Folders

Author: jogibear9988

src/S7CommPlusDriver/Core/BlobDecompressor.cs

@@ -160,6 +160,8 @@ public string decompress(byte[] compressed_blob, int startoffset)
             }
             else
             {
+                retstring = System.Text.Encoding.UTF8.GetString(uncompressed_blob, 0, uncomp_length);
+                //TODO: error!!!
                 Console.WriteLine(String.Format("BlobDecompressor: Blob decompression failed! Zlib retcode={0} msg={1} ", retcode, z.msg));
             }
             z.inflateEnd();

src/S7CommPlusDriver/Core/Ids.cs

@@ -133,7 +133,8 @@ public static class Ids
         public const int ControllerArea_ValueInitial = 3735;
         public const int ControllerArea_ValueActual = 3736;
         public const int ControllerArea_RuntimeModified = 3737;
-        public const int DAI_MessageType = 4079;
+        public const int DAI_MessageType = 4079;
+        public const int ConstantsGlobal_Symbolics = 4275;
         public const int ASObjectES_Comment = 4288;
         public const int AlarmSubscriptionRef_AlarmDomain2 = 7731;
         public const int DAI_HmiInfo = 7813;
@@ -144,6 +145,8 @@ public static class Ids
         public const int AlarmSubscriptionRef_SendAlarmTexts_Rid = 8173;
         public const int ReturnValue = 40305;
 
+        public const uint Constants = 0x8a110000;
+
         public const int TI_BOOL = 0x02000000 + 1;
         public const int TI_BYTE = 0x02000000 + 2;
         public const int TI_CHAR = 0x02000000 + 3;

src/S7CommPlusDriver/S7CommPlusConnectionHighLevel.cs

@@ -161,7 +161,6 @@ public int BrowseAllBlocks(out List<BlockInfo> exploreData)
             #region Evaluate all data blocks that then need to be browsed
 
             var obj = exploreRes.Objects.First(o => o.ClassId == Ids.PLCProgram_Class_Rid);
-
             foreach (var ob in obj.GetObjects())
             {
                 switch (ob.ClassId)
@@ -196,10 +195,61 @@ public int BrowseAllBlocks(out List<BlockInfo> exploreData)
 
             #endregion
 
+            return 0;
+        }
+
+        public int GetPlcStructureXML(out string plcStrutureXml)
+        {
+            int res;
+            Browser vars = new Browser();
+            ExploreRequest exploreReq;
+            ExploreResponse exploreRes;
+            plcStrutureXml = null;
+
+            #region Read all objects
+
+            exploreReq = new ExploreRequest(ProtocolVersion.V2);
+            exploreReq.ExploreId = Ids.Constants | 0x0000ffff;
+            exploreReq.ExploreRequestId = Ids.None;
+            exploreReq.ExploreChildsRecursive = 1;
+            exploreReq.ExploreParents = 1;
+
+            exploreReq.AddressList.Add(Ids.ConstantsGlobal_Symbolics);
+
+            res = SendS7plusFunctionObject(exploreReq);
+            if (res != 0)
+            {
+                return res;
+            }
+            m_LastError = 0;
+            WaitForNewS7plusReceived(m_ReadTimeout);
+            if (m_LastError != 0)
+            {
+                return m_LastError;
+            }
+
+            exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true);
+            res = checkResponseWithIntegrity(exploreReq, exploreRes);
+            if (res != 0)
+            {
+                return res;
+            }
+
+            #endregion
+
+            var attr = exploreRes?.Objects?[0]?.Objects?.First().Value?.Objects?.First().Value?.Attributes?[Ids.ConstantsGlobal_Symbolics] as ValueBlob;
+            if (attr != null)
+            {
+                BlobDecompressor bd3 = new BlobDecompressor();
+                var v = attr.GetValue();
+                var xml = bd3.decompress(v, 0);
+                plcStrutureXml = xml;
+            }
+
             return 0;
         }
 
-        public int GetBlockXml(uint relid, out string blockName, out ProgrammingLanguage lang, out uint blockNumber, out string xml_linecomment, out Dictionary<uint, string> xml_comment, out string interfaceDescription, out string[] blockBody, out string fuctionalObjectCode, out string[] intRef, out string[] extRef)
+        public int GetBlockXml(uint relid, out string blockName, out ProgrammingLanguage lang, out uint blockNumber, out BlockType blockType, out string xml_linecomment, out Dictionary<uint, string> xml_comment, out string interfaceDescription, out string[] blockBody, out string fuctionalObjectCode, out string[] intRef, out string[] extRef)
         {
             int res;
             // With requesting DataInterface_InterfaceDescription, whe would be able to get all informations like the access ids and
@@ -215,6 +265,7 @@ public int GetBlockXml(uint relid, out string blockName, out ProgrammingLanguage
             blockName = null;
             lang = ProgrammingLanguage.Undef;
             blockNumber = relid & 0xffff;
+            blockType = BlockType.unkown;
 
             var exploreReq = new ExploreRequest(ProtocolVersion.V2);
             exploreReq.ExploreId = relid;
@@ -254,7 +305,16 @@ public int GetBlockXml(uint relid, out string blockName, out ProgrammingLanguage
             }
 
             foreach (var obj in exploreRes.Objects)
-            {
+            {
+                blockType = obj.ClassId switch
+                {
+                    Ids.DB_Class_Rid => BlockType.DB,
+                    Ids.FB_Class_Rid => BlockType.FB,
+                    Ids.FC_Class_Rid => BlockType.FC,
+                    Ids.OB_Class_Rid => BlockType.OB,
+                };
+
+
                 foreach (var att in obj.Attributes)
                 {
                     switch (att.Key)