diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 0000000..431496f --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,36 @@ +name: .NET + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Fetch history + run: git fetch --prune --unshallow + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 9.0.x + - name: Restore dependencies + run: | + dotnet restore src/S7CommPlusDriver + dotnet restore src/DriverTest + dotnet restore src/S7CommPlusGUIBrowser + + - name: Build + run: | + dotnet build src/S7CommPlusDriver + dotnet build src/DriverTest + dotnet build src/S7CommPlusGUIBrowser + - uses: actions/upload-artifact@v4 + with: + path: src/S7CommPlusDriver/bin/Debug/*.nupkg \ No newline at end of file diff --git a/.github/workflows/dotnetpull.yml b/.github/workflows/dotnetpull.yml new file mode 100644 index 0000000..e8de32f --- /dev/null +++ b/.github/workflows/dotnetpull.yml @@ -0,0 +1,30 @@ +name: .NET Pull Request + +on: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 6.0.x + 8.0.x + 9.0.x + - name: Restore dependencies + run: | + dotnet restore src/S7CommPlusDriver + dotnet restore src/DriverTest + dotnet restore src/S7CommPlusGUIBrowser + - name: Build + run: | + dotnet build src/S7CommPlusDriver + dotnet build src/DriverTest + dotnet build src/S7CommPlusGUIBrowser diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..94954b3 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,45 @@ +name: .NET + +on: + release: + types: [published] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Fetch history + run: git fetch --prune --unshallow + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 6.0.x + 8.0.x + 9.0.x + - name: Restore dependencies + run: | + dotnet restore src/S7CommPlusDriver + dotnet restore src/DriverTest + dotnet restore src/S7CommPlusGUIBrowser + + - name: Update project version + uses: roryprimrose/set-vs-sdk-project-version@v1 + with: + version: ${{ github.event.release.tag_name }} + assemblyVersion: ${{ github.event.release.tag_name }} + fileVersion: ${{ github.event.release.tag_name }} + informationalVersion: ${{ github.event.release.tag_name }}-${{ github.sha }} + + - name: Build + run: | + dotnet build --configuration Release src/S7CommPlusDriver + dotnet build --configuration Release src/DriverTest + dotnet build --configuration Release src/S7CommPlusGUIBrowser + - name: Publish + run: | + dotnet nuget push --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json src/S7CommPlusDriver/bin/Release/*.nupkg + \ No newline at end of file diff --git a/src/.gitignore b/src/.gitignore index ee97264..28cce75 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -11,5 +11,4 @@ [Rr]elease/ [Bb]in/ [Oo]bj/ -x64/ build/ diff --git a/src/DriverTest/DriverTest.csproj b/src/DriverTest/DriverTest.csproj index 3dad8a5..a337fa3 100644 --- a/src/DriverTest/DriverTest.csproj +++ b/src/DriverTest/DriverTest.csproj @@ -1,92 +1,26 @@ - - - - - Debug - AnyCPU - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B} - Exe - Properties - DriverTest - DriverTest - v4.7.2 - 512 - true - - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - 7.3 - prompt - true - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - 7.3 - prompt - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - 7.3 - prompt - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - 7.3 - prompt - true - - - - - - - - - - - - - - - - - - - - - - {781951d8-80de-4e2f-92ca-a5fef0059415} - S7CommPlusDriver - - - - - xcopy /y /d "$(SolutionDir)S7CommPlusDriver\OpenSSL-dll-$(PlatformName)\*.dll" "$(ProjectDir)$(OutDir)" - - + + + net8.0 + Exe + false + + + + + + + + + + + + + DriverTest + S7CommPlusDriver Test + DriverTest + Copyright © 2023, Thomas Wiens + 0.1.0.0 + 0.1.0.0 + x86 + \ No newline at end of file diff --git a/src/DriverTest/Program.cs b/src/DriverTest/Program.cs index 7be3757..aea7ba1 100644 --- a/src/DriverTest/Program.cs +++ b/src/DriverTest/Program.cs @@ -14,7 +14,7 @@ class Program { static void Main(string[] args) { - string HostIp = "192.168.1.30"; + string HostIp = "10.0.98.100"; string Password = ""; string Username = ""; int res; diff --git a/src/DriverTest/Properties/AssemblyInfo.cs b/src/DriverTest/Properties/AssemblyInfo.cs deleted file mode 100644 index 0c4d45b..0000000 --- a/src/DriverTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DriverTest")] -[assembly: AssemblyDescription("S7CommPlusDriver Test")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DriverTest")] -[assembly: AssemblyCopyright("Copyright © 2023, Thomas Wiens")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("94755b6a-7e0d-40f9-a2ed-48ff0c0fea2b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyFileVersion("0.1.0.0")] diff --git a/src/S7CommPlusDriver.sln b/src/S7CommPlusDriver.sln deleted file mode 100644 index 574c9b6..0000000 --- a/src/S7CommPlusDriver.sln +++ /dev/null @@ -1,71 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.33328.57 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "S7CommPlusDriver", "S7CommPlusDriver\S7CommPlusDriver.csproj", "{781951D8-80DE-4E2F-92CA-A5FEF0059415}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DriverTest", "DriverTest\DriverTest.csproj", "{94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "S7CommPlusGUIBrowser", "S7CommPlusGUIBrowser\S7CommPlusGUIBrowser.csproj", "{BEB37276-B3B3-4DEE-A1EA-D95EB774223B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zlib.net", "Zlib.net\Zlib.net.csproj", "{0C89B7A2-A218-49E4-B545-5B044A45F977}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Debug|Any CPU.ActiveCfg = Debug|x86 - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Debug|x64.ActiveCfg = Debug|x64 - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Debug|x64.Build.0 = Debug|x64 - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Debug|x86.ActiveCfg = Debug|x86 - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Debug|x86.Build.0 = Debug|x86 - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Release|Any CPU.ActiveCfg = Release|x86 - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Release|x64.ActiveCfg = Release|x64 - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Release|x64.Build.0 = Release|x64 - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Release|x86.ActiveCfg = Release|x86 - {781951D8-80DE-4E2F-92CA-A5FEF0059415}.Release|x86.Build.0 = Release|x86 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Debug|Any CPU.ActiveCfg = Debug|x86 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Debug|x64.ActiveCfg = Debug|x64 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Debug|x64.Build.0 = Debug|x64 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Debug|x86.ActiveCfg = Debug|x86 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Debug|x86.Build.0 = Debug|x86 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Release|Any CPU.ActiveCfg = Release|x86 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Release|x64.ActiveCfg = Release|x64 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Release|x64.Build.0 = Release|x64 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Release|x86.ActiveCfg = Release|x86 - {94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}.Release|x86.Build.0 = Release|x86 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Debug|Any CPU.ActiveCfg = Debug|x86 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Debug|x64.ActiveCfg = Debug|x64 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Debug|x64.Build.0 = Debug|x64 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Debug|x86.ActiveCfg = Debug|x86 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Debug|x86.Build.0 = Debug|x86 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Release|Any CPU.ActiveCfg = Release|x86 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Release|x64.ActiveCfg = Release|x64 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Release|x64.Build.0 = Release|x64 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Release|x86.ActiveCfg = Release|x86 - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B}.Release|x86.Build.0 = Release|x86 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Debug|Any CPU.ActiveCfg = Debug|x86 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Debug|x64.ActiveCfg = Debug|x64 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Debug|x64.Build.0 = Debug|x64 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Debug|x86.ActiveCfg = Debug|x86 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Debug|x86.Build.0 = Debug|x86 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Release|Any CPU.ActiveCfg = Release|x86 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Release|x64.ActiveCfg = Release|x64 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Release|x64.Build.0 = Release|x64 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Release|x86.ActiveCfg = Release|x86 - {0C89B7A2-A218-49E4-B545-5B044A45F977}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {641BA78D-D608-4377-9F99-E4C1029EFA0B} - EndGlobalSection -EndGlobal diff --git a/src/S7CommPlusDriver.slnx b/src/S7CommPlusDriver.slnx new file mode 100644 index 0000000..afa1056 --- /dev/null +++ b/src/S7CommPlusDriver.slnx @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/S7CommPlusDriver/Alarming/AlarmsHandler.cs b/src/S7CommPlusDriver/Alarming/AlarmsHandler.cs index abbb692..61f4b92 100644 --- a/src/S7CommPlusDriver/Alarming/AlarmsHandler.cs +++ b/src/S7CommPlusDriver/Alarming/AlarmsHandler.cs @@ -13,8 +13,9 @@ /****************************************************************************/ #endregion -using System; using S7CommPlusDriver.Alarming; +using System; +using System.Collections.Generic; namespace S7CommPlusDriver { @@ -38,7 +39,7 @@ public partial class S7CommPlusConnection short m_AlarmNextCreditLimit; uint m_AlarmSubscriptionObjectId; - public int AlarmSubscriptionCreate() + public int AlarmSubscriptionCreate(uint[] languageIds) { int res; PObject subsobj = new PObject(); @@ -72,7 +73,7 @@ public int AlarmSubscriptionCreate() asrefsobj.AddAttribute(Ids.AlarmSubscriptionRef_AlarmDomain2, new ValueUIntArray(new ushort[1] { 65535 }, 0x20)); // 0x20 = Adressarray // OPTION: // Send text informations with the message, we don't need to browse them in advance. - asrefsobj.AddAttribute(Ids.AlarmSubscriptionRef_AlarmTextLanguages_Rid, new ValueUDIntArray(new uint[0], 0x20)); // Empty for all languanges? Otherwise e.g. 1031 for de-de or what you need. + asrefsobj.AddAttribute(Ids.AlarmSubscriptionRef_AlarmTextLanguages_Rid, new ValueUDIntArray(languageIds, 0x20)); // Empty for all languanges? Otherwise e.g. 1031 for de-de or what you need. asrefsobj.AddAttribute(Ids.AlarmSubscriptionRef_SendAlarmTexts_Rid, new ValueBool(true)); asrefsobj.AddRelation(Ids.AlarmSubscriptionRef_itsAlarmSubsystem, 0x00000008); @@ -122,44 +123,76 @@ public int AlarmSubscriptionCreate() return res; } - public int TestWaitForAlarmNotifications(int waitTimeout, int untilNumberOfAlarms, int alarmTextsLanguageId) - { - int res = 0; - short creditLimitStep = 5; + //public int TestWaitForAlarmNotifications(int waitTimeout, int untilNumberOfAlarms, int alarmTextsLanguageId, out List notifications) + //{ + // int res = 0; + // short creditLimitStep = 5; - for (int i = 1; i <= untilNumberOfAlarms; i++) - { - Console.WriteLine(Environment.NewLine + "WaitForAlarmNotifications(): *** Loop #" + i.ToString() + " ***"); - m_LastError = 0; - WaitForNewS7plusReceived(waitTimeout); - if (m_LastError != 0) - { - return m_LastError; - } + // for (int i = 1; i <= untilNumberOfAlarms; i++) + // { + // Console.WriteLine(Environment.NewLine + "WaitForAlarmNotifications(): *** Loop #" + i.ToString() + " ***"); + // m_LastError = 0; + // WaitForNewS7plusReceived(waitTimeout); + // if (m_LastError != 0) + // { + // return m_LastError; + // } - var noti = Notification.DeserializeFromPdu(m_ReceivedPDU); - if (noti == null) - { - Console.WriteLine("Notification == null!"); - return S7Consts.errIsoInvalidPDU; - } - else - { - Console.Write("Notification: CreditTick=" + noti.NotificationCreditTick + " SequenceNumber=" + noti.NotificationSequenceNumber); - Console.WriteLine(String.Format(" PLC-Timestamp={0}.{1:D03}", noti.Add1Timestamp.ToString(), noti.Add1Timestamp.Millisecond)); + // var noti = Notification.DeserializeFromPdu(m_ReceivedPDU); + // if (noti == null) + // { + // Console.WriteLine("Notification == null!"); + // return S7Consts.errIsoInvalidPDU; + // } + // else + // { + // Console.Write("Notification: CreditTick=" + noti.NotificationCreditTick + " SequenceNumber=" + noti.NotificationSequenceNumber); + // Console.WriteLine(String.Format(" PLC-Timestamp={0}.{1:D03}", noti.Add1Timestamp.ToString(), noti.Add1Timestamp.Millisecond)); - var dai = AlarmsDai.FromNotificationObject(noti.P2Objects[0], alarmTextsLanguageId); - Console.WriteLine(dai.ToString()); - if (noti.NotificationCreditTick >= m_AlarmNextCreditLimit - 1) // Set new limit one tick before it expires, to get a constant flow of data - { - // CreditTick in Notification is only one byte - m_AlarmNextCreditLimit = (short)((m_AlarmNextCreditLimit + creditLimitStep) % 255); - Console.WriteLine("--> Credit limit of " + noti.NotificationCreditTick + " reached. SetCreditLimit to " + m_AlarmNextCreditLimit.ToString()); - SubscriptionSetCreditLimit(m_AlarmNextCreditLimit); - } - } - } - return res; + // var dai = AlarmsDai.FromNotificationObject(noti.P2Objects[0], alarmTextsLanguageId); + // Console.WriteLine(dai.ToString()); + // if (noti.NotificationCreditTick >= m_AlarmNextCreditLimit - 1) // Set new limit one tick before it expires, to get a constant flow of data + // { + // // CreditTick in Notification is only one byte + // m_AlarmNextCreditLimit = (short)((m_AlarmNextCreditLimit + creditLimitStep) % 255); + // Console.WriteLine("--> Credit limit of " + noti.NotificationCreditTick + " reached. SetCreditLimit to " + m_AlarmNextCreditLimit.ToString()); + // SubscriptionSetCreditLimit(m_AlarmNextCreditLimit); + // } + // } + // } + // return res; + //} + + public int WaitForAlarmNotifications(int waitTimeout, out List notifications) + { + int res = 0; + short creditLimitStep = 5; + notifications = new List(); + + m_LastError = 0; + WaitForNewS7plusReceived(waitTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + + var noti = Notification.DeserializeFromPdu(m_ReceivedPDU); + if (noti == null) + { + return S7Consts.errIsoInvalidPDU; + } + else + { + notifications.Add(noti); + + if (noti.NotificationCreditTick >= m_AlarmNextCreditLimit - 1) // Set new limit one tick before it expires, to get a constant flow of data + { + // CreditTick in Notification is only one byte + m_AlarmNextCreditLimit = (short)((m_AlarmNextCreditLimit + creditLimitStep) % 255); + SubscriptionSetCreditLimit(m_AlarmNextCreditLimit); + } + } + return res; } public int AlarmSubscriptionDelete() diff --git a/src/S7CommPlusDriver/App.config b/src/S7CommPlusDriver/App.config deleted file mode 100644 index 56efbc7..0000000 --- a/src/S7CommPlusDriver/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/S7CommPlusDriver/ClientApi/PlcTags.cs b/src/S7CommPlusDriver/ClientApi/PlcTags.cs index 368b9d9..cfaa5ea 100644 --- a/src/S7CommPlusDriver/ClientApi/PlcTags.cs +++ b/src/S7CommPlusDriver/ClientApi/PlcTags.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace S7CommPlusDriver.ClientApi { diff --git a/src/S7CommPlusDriver/Core/BlobDecompressor.cs b/src/S7CommPlusDriver/Core/BlobDecompressor.cs index 9c89e52..8cf8aca 100644 --- a/src/S7CommPlusDriver/Core/BlobDecompressor.cs +++ b/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(); diff --git a/src/S7CommPlusDriver/Core/Ids.cs b/src/S7CommPlusDriver/Core/Ids.cs index f543bf7..610ca0d 100644 --- a/src/S7CommPlusDriver/Core/Ids.cs +++ b/src/S7CommPlusDriver/Core/Ids.cs @@ -17,8 +17,11 @@ namespace S7CommPlusDriver { public static class Ids { - public const int None = 0; - public const int NativeObjects_thePLCProgram_Rid = 3; + public const int None = 0; + public const int NativeObjects_theASRoot_Rid = 1; + public const int NativeObjects_thePLCProgram_Rid = 3; + public const int NativeObjects_theCPUProxy_Rid = 49; + public const int NativeObjects_theCPUCommon_Rid = 50; public const int NativeObjects_theCPUexecUnit_Rid = 52; public const int NativeObjects_theIArea_Rid = 80; public const int NativeObjects_theQArea_Rid = 81; @@ -75,14 +78,50 @@ public static class Ids public const int EffectiveProtectionLevel = 1842; public const int ActiveProtectionLevel = 1843; public const int CPUexecUnit_operatingStateReq = 2167; + public const int ASRoot_ItsFolders = 2468; public const int PLCProgram_Class_Rid = 2520; - public const int Block_BlockNumber = 2521; + public const int Block_BlockNumber = 2521; + public const int Block_AutoNumbering = 2522; + public const int Block_BlockLanguage = 2523; + public const int Block_KnowhowProtected = 2524; + public const int Block_Unlinked = 2527; + public const int Block_LowLatency = 2528; + public const int Block_RuntimeModified = 2529; + public const int Block_Dirty = 2531; + public const int Block_CRC = 2532; + public const int Block_Binding = 3151; + public const int Block_OptimizeInfo = 2537; + public const int Block_TOblockSetNumber = 3619; + public const int Block_TypeInfo = 4578; + public const int Block_FunctionalSignature = 7589; + public const int Block_AdditionalMAC = 7831; + public const int Block_FailsafeBlockInfo = 7843; + public const int Block_FailsafeIFRHash = 7955; + public const int ASObjectES_IdentES = 2449; + public const int Block_BodyDescription = 2533; public const int DataInterface_InterfaceDescription = 2544; public const int DataInterface_LineComments = 2546; public const int DB_ValueInitial = 2548; public const int DB_ValueActual = 2550; - public const int DB_InitialChanged = 2551; - public const int DB_Class_Rid = 2574; + public const int DB_InitialChanged = 2551; + public const int DB_Class_Rid = 2574; + public const int FB_Class_Rid = 2578; + public const int FC_Class_Rid = 2579; + public const int FunctionalObject_Code = 2580; + public const int FunctionalObject_ParameterModified = 2581; + public const int FunctionalObject_extRefData = 2582; + public const int FunctionalObject_intRefData = 2583; + public const int FunctionalObject_NetworkComments = 2584; + public const int FunctionalObject_NetworkTitles = 2585; + public const int FunctionalObject_CalleeList = 2586; + public const int FunctionalObject_InterfaceSignature = 2587; + public const int FunctionalObject_DisplayInfo = 2588; + public const int FunctionalObject_DebugInfo = 2589; + public const int FunctionalObject_LocalErrorhandling = 2590; + public const int FunctionalObject_LongConstants = 2591; + public const int FunctionalObject_Class_Rid = 2592; + public const int OB_StartInfoType = 2607; + public const int OB_Class_Rid = 2610; public const int AlarmSubscriptionRef_AlarmDomain = 2659; public const int AlarmSubscriptionRef_itsAlarmSubsystem = 2660; public const int AlarmSubscriptionRef_Class_Rid = 2662; @@ -99,8 +138,10 @@ public static class Ids public const int AS_CGS_AckTimestamp = 3646; 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 ControllerArea_RuntimeModified = 3737; + public const int UDT_Class_Rid = 3932; + 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; @@ -115,6 +156,10 @@ public static class Ids public const int LID_LegitimationPayloadUsername = 40402; public const int LID_LegitimationPayloadPassword = 40403; + public const uint ReleaseMngmtRoot_Rid = 2303328256; + + 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; diff --git a/src/S7CommPlusDriver/Net/Error.cs b/src/S7CommPlusDriver/Net/Error.cs new file mode 100644 index 0000000..35dc393 --- /dev/null +++ b/src/S7CommPlusDriver/Net/Error.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using System.Linq; + +namespace S7CommPlusDriver.Net +{ + public class Error + { + private static readonly Dictionary errorsDictionary; + + static Error() + { + var fields = typeof(S7Consts).GetFields(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static); + errorsDictionary = fields.Where(x => x.Name.StartsWith("err")).ToDictionary(x => (int)x.GetValue(null), x => x.Name); + } + + public static string GetErrorText(int error) + { + if (errorsDictionary.TryGetValue(error, out var text)) + return text; + return null; + } + } +} diff --git a/src/S7CommPlusDriver/Net/S7Client.cs b/src/S7CommPlusDriver/Net/S7Client.cs index e62afd5..28fa468 100644 --- a/src/S7CommPlusDriver/Net/S7Client.cs +++ b/src/S7CommPlusDriver/Net/S7Client.cs @@ -21,9 +21,13 @@ namespace S7CommPlusDriver // | (at your option) any later version. | public class S7Client : OpenSSLConnector.IConnectorCallback { - #region [Constants and TypeDefs] - - public int _LastError = 0; + //TODO: better API, maybe a Callback + public static bool WriteSslKeyToFile; + public static string WriteSslKeyPath; + + #region [Constants and TypeDefs] + + public int _LastError = 0; #endregion @@ -107,6 +111,8 @@ public void OnDataAvailable() public void SSL_CTX_keylog_cb(IntPtr ssl, string line) { string filename = "key_" + m_DateTimeStarted.ToString("yyyyMMdd_HHmmss") + ".log"; + if (WriteSslKeyPath != null) + filename = Path.Combine(WriteSslKeyPath, filename); StreamWriter file = new StreamWriter(filename, append: true); file.WriteLine(line); file.Close(); @@ -120,7 +126,7 @@ public int SslActivate() { ret = Native.OPENSSL_init_ssl(0, IntPtr.Zero); // returns 1 on success or 0 on error if (ret != 1) - { + { return S7Consts.errOpenSSL; } m_ptr_ssl_method = Native.ExpectNonNull(Native.TLS_client_method()); @@ -132,20 +138,23 @@ public int SslActivate() Native.SSL_CTX_ctrl(m_ptr_ctx, Native.SSL_CTRL_SET_MIN_PROTO_VERSION, Native.TLS1_3_VERSION, IntPtr.Zero); ret = Native.SSL_CTX_set_ciphersuites(m_ptr_ctx, "TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256"); if (ret != 1) - { + { return S7Consts.errOpenSSL; } m_sslconn = new OpenSSLConnector(m_ptr_ctx, this); - m_sslconn.ExpectConnect(); - - // Keylog callback setzen - m_keylog_cb = new Native.SSL_CTX_keylog_cb_func(SSL_CTX_keylog_cb); - Native.SSL_CTX_set_keylog_callback(m_ptr_ctx, m_keylog_cb); + m_sslconn.ExpectConnect(); + + // Keylog callback setzen + if (WriteSslKeyToFile) + { + m_keylog_cb = new Native.SSL_CTX_keylog_cb_func(SSL_CTX_keylog_cb); + Native.SSL_CTX_set_keylog_callback(m_ptr_ctx, m_keylog_cb); + } m_SslActive = true; } catch - { + { return S7Consts.errOpenSSL; } return 0; @@ -284,7 +293,7 @@ public void Send(byte[] Buffer) } private int SendIsoPacket(byte[] Buffer) - { + { // Packt die zu sendenden Daten in den Iso-Header ein. int Size = Buffer.Length; _LastError = 0; diff --git a/src/S7CommPlusDriver/Net/S7Consts.cs b/src/S7CommPlusDriver/Net/S7Consts.cs index 50488bb..b8618d1 100644 --- a/src/S7CommPlusDriver/Net/S7Consts.cs +++ b/src/S7CommPlusDriver/Net/S7Consts.cs @@ -34,7 +34,19 @@ public static class S7Consts public const int errTCPUnreachableHost = 0x00002751; public const int errIsoConnect = 0x00010000; // Connection error - public const int errIsoInvalidPDU = 0x00030000; // Bad format + public const int errIsoInvalidPDU = 0x00030000; // Bad format + public const int errIsoInvalidPDU1 = 0x00030001; // Bad format + public const int errIsoInvalidPDU2 = 0x00030002; // Bad format + public const int errIsoInvalidPDU3 = 0x00030003; // Bad format + public const int errIsoInvalidPDU4 = 0x00030004; // Bad format + public const int errIsoInvalidPDU5 = 0x00030005; // Bad format + public const int errIsoInvalidPDU6 = 0x00030006; // Bad format + public const int errIsoInvalidPDU7 = 0x00030007; // Bad format + public const int errIsoInvalidPDU8 = 0x00030008; // Bad format + public const int errIsoInvalidPDU9 = 0x00030009; // Bad format + public const int errIsoInvalidPDU10 = 0x00030010; // Bad format + public const int errIsoInvalidPDU11 = 0x00030011; // Bad format + public const int errIsoInvalidPDU12 = 0x00030012; // Bad format public const int errIsoInvalidDataSize = 0x00040000; // Bad Datasize passed to send/recv : buffer is invalid public const int errCliNegotiatingPDU = 0x00100000; @@ -77,10 +89,11 @@ public static class S7Consts public const int errCliFirmwareNotSupported = 0x02800000; public const int errCliDeviceNotSupported = 0x02900000; - public const int errOpenSSL = 0x03100000; - //------------------------------------------------------------------------------ - // PARAMS LIST FOR COMPATIBILITY WITH Snap7.net.cs - //------------------------------------------------------------------------------ + public const int errOpenSSL = 0x03100000; + public const int errInitSslResponse = 0x03100001; + //------------------------------------------------------------------------------ + // PARAMS LIST FOR COMPATIBILITY WITH Snap7.net.cs + //------------------------------------------------------------------------------ public const Int32 p_u16_LocalPort = 1; // Not applicable here public const Int32 p_u16_RemotePort = 2; public const Int32 p_i32_PingTimeout = 3; diff --git a/src/S7CommPlusDriver/OpenSSL-dll-x64/libcrypto-3-x64.dll b/src/S7CommPlusDriver/OpenSSL-dll-x64/libcrypto-3-x64.dll deleted file mode 100644 index 87c2e0a..0000000 Binary files a/src/S7CommPlusDriver/OpenSSL-dll-x64/libcrypto-3-x64.dll and /dev/null differ diff --git a/src/S7CommPlusDriver/OpenSSL-dll-x64/libssl-3-x64.dll b/src/S7CommPlusDriver/OpenSSL-dll-x64/libssl-3-x64.dll deleted file mode 100644 index 64f9712..0000000 Binary files a/src/S7CommPlusDriver/OpenSSL-dll-x64/libssl-3-x64.dll and /dev/null differ diff --git a/src/S7CommPlusDriver/OpenSSL-dll-x86/libcrypto-3.dll b/src/S7CommPlusDriver/OpenSSL-dll-x86/libcrypto-3.dll deleted file mode 100644 index 40192cf..0000000 Binary files a/src/S7CommPlusDriver/OpenSSL-dll-x86/libcrypto-3.dll and /dev/null differ diff --git a/src/S7CommPlusDriver/OpenSSL-dll-x86/libssl-3.dll b/src/S7CommPlusDriver/OpenSSL-dll-x86/libssl-3.dll deleted file mode 100644 index 5757185..0000000 Binary files a/src/S7CommPlusDriver/OpenSSL-dll-x86/libssl-3.dll and /dev/null differ diff --git a/src/S7CommPlusDriver/OpenSSL/Native.cs b/src/S7CommPlusDriver/OpenSSL/Native.cs index 1647842..3d85084 100644 --- a/src/S7CommPlusDriver/OpenSSL/Native.cs +++ b/src/S7CommPlusDriver/OpenSSL/Native.cs @@ -14,26 +14,55 @@ #endregion using System; +using System.IO; +using System.Reflection; using System.Runtime.InteropServices; using System.Text; namespace OpenSsl { -#if _WIN64 - using size_t = UInt64; -#else - using size_t = UInt32; -#endif + public class Native - { -#if _WIN64 - const string DLLNAME = "libcrypto-3-x64.dll"; - const string SSLDLLNAME = "libssl-3-x64.dll"; -#else - const string DLLNAME = "libcrypto-3.dll"; - const string SSLDLLNAME = "libssl-3.dll"; -#endif + { + const string DLLNAME = "libcrypto-3"; + const string SSLDLLNAME = "libssl-3"; + static Native() + { + NativeLibrary.SetDllImportResolver(Assembly.GetExecutingAssembly(), DllImportResolver); + } + + private static IntPtr DllImportResolver(string libraryName, Assembly assembly, DllImportSearchPath? searchPath) + { + if (libraryName == DLLNAME) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture == Architecture.X86) + return NativeLibrary.Load(Path.Combine("runtimes", "win-x86", "native", "libcrypto-3.dll"), assembly, searchPath); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture == Architecture.X64) + return NativeLibrary.Load(Path.Combine("runtimes", "win-x64", "native", "libcrypto-3-x64.dll"), assembly, searchPath); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture == Architecture.Arm64) + return NativeLibrary.Load(Path.Combine("runtimes", "win-arm64", "native", "libcrypto-3-arm64.dll"), assembly, searchPath); + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && RuntimeInformation.ProcessArchitecture == Architecture.Arm64) + return NativeLibrary.Load("libcrypto.3.dylib", assembly, searchPath); + return IntPtr.Zero; + } + + if(libraryName == SSLDLLNAME) + { + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture == Architecture.X86) + return NativeLibrary.Load(Path.Combine("runtimes", "win-x86", "native", "libssl-3.dll"), assembly, searchPath); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture == Architecture.X64) + return NativeLibrary.Load(Path.Combine("runtimes", "win-x64", "native", "libssl-3-x64.dll"), assembly, searchPath); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture == Architecture.Arm64) + return NativeLibrary.Load(Path.Combine("runtimes", "win-arm64", "native", "libssl-3-arm64.dll"), assembly, searchPath); + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && RuntimeInformation.ProcessArchitecture == Architecture.Arm64) + return NativeLibrary.Load("libssl.3.dylib", assembly, searchPath); + return IntPtr.Zero; + } + + // Otherwise, fallback to default import resolver. + return IntPtr.Zero; + } #region Delegates @@ -227,7 +256,7 @@ public class Native public static extern IntPtr TLS_client_method(); [DllImport(SSLDLLNAME, CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr SSL_export_keying_material(IntPtr ssl, byte[] outKeyMaterial, size_t outKeyMaterialLength, char[] label, size_t labelLength, IntPtr context, size_t contextLength, int useContext); + public static extern IntPtr SSL_export_keying_material(IntPtr ssl, byte[] outKeyMaterial, nint outKeyMaterialLength, char[] label, nint labelLength, IntPtr context, nint contextLength, int useContext); #endregion @@ -264,7 +293,7 @@ public class Native // size_t BIO_ctrl_pending(BIO *b); [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public static extern size_t BIO_ctrl_pending(IntPtr bio); + public static extern nint BIO_ctrl_pending(IntPtr bio); // void BIO_free_all(BIO *a); [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] @@ -323,7 +352,7 @@ public static long BIO_set_mem_eof_return(IntPtr b, int v) // void ERR_error_string_n(unsigned long e, char *buf, size_t len); [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] //public static extern void ERR_error_string_n(ulong e, IntPtr buf, size_t len); - public static extern void ERR_error_string_n(ulong e, byte[] buf, size_t len); + public static extern void ERR_error_string_n(ulong e, byte[] buf, nint len); // unsigned long ERR_get_error(void); [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] diff --git a/src/S7CommPlusDriver/OpenSSL/OpenSSLConnector.cs b/src/S7CommPlusDriver/OpenSSL/OpenSSLConnector.cs index c621157..bf61865 100644 --- a/src/S7CommPlusDriver/OpenSSL/OpenSSLConnector.cs +++ b/src/S7CommPlusDriver/OpenSSL/OpenSSLConnector.cs @@ -353,7 +353,7 @@ void PutbackBuffer(DataBufferList list, DataBuffer pBuffer) public byte[] getOMSExporterSecret() { byte[] secretOut = new byte[32]; - int ret = (int)Native.SSL_export_keying_material(m_pSslConnection, secretOut, (uint)secretOut.Length, "EXPERIMENTAL_OMS".ToCharArray(), 16, IntPtr.Zero, 0, 0); + int ret = (int)Native.SSL_export_keying_material(m_pSslConnection, secretOut, (nint)secretOut.Length, "EXPERIMENTAL_OMS".ToCharArray(), 16, IntPtr.Zero, 0, 0); return secretOut; } } diff --git a/src/S7CommPlusDriver/Properties/AssemblyInfo.cs b/src/S7CommPlusDriver/Properties/AssemblyInfo.cs deleted file mode 100644 index ef803d9..0000000 --- a/src/S7CommPlusDriver/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("S7CommPlusDriver")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("S7CommPlusDriver")] -[assembly: AssemblyCopyright("Copyright © 2023, Thomas Wiens")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly -// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von -// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("781951d8-80de-4e2f-92ca-a5fef0059415")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -// indem Sie "*" wie unten gezeigt eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyFileVersion("0.1.0.0")] diff --git a/src/S7CommPlusDriver/S7CommPlusConnection.cs b/src/S7CommPlusDriver/S7CommPlusConnection.cs index 2bcb801..25737f8 100644 --- a/src/S7CommPlusDriver/S7CommPlusConnection.cs +++ b/src/S7CommPlusDriver/S7CommPlusConnection.cs @@ -1,1422 +1,1422 @@ -#region License -/****************************************************************************** - * S7CommPlusDriver - * - * Copyright (C) 2023 Thomas Wiens, th.wiens@gmx.de - * - * This file is part of S7CommPlusDriver. - * - * S7CommPlusDriver is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - /****************************************************************************/ -#endregion - -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.IO; -using System.Linq; -using System.Diagnostics; -using S7CommPlusDriver.ClientApi; -using System.Text.RegularExpressions; -using System.Security.Cryptography; - -namespace S7CommPlusDriver -{ - public partial class S7CommPlusConnection - { - #region Private Members - private S7Client m_client; - private MemoryStream m_ReceivedPDU; - private MemoryStream m_ReceivedTempPDU; - private Queue m_ReceivedPDUs = new Queue(); - private Mutex m_Mutex = new Mutex(); - - private bool m_ReceivedNeedMoreDataForCompletePDU; - private bool m_NewS7CommPlusReceived; - private UInt32 m_SessionId; - private UInt32 m_SessionId2; - public UInt32 SessionId2 - { - get { return m_SessionId2; } - private set { m_SessionId2 = value; } - } - - private int m_ReadTimeout = 5000; - private UInt16 m_SequenceNumber = 0; - private UInt32 m_IntegrityId = 0; - private UInt32 m_IntegrityId_Set = 0; - private CommRessources m_CommRessources = new CommRessources(); - - private List dbInfoList; - private List typeInfoList = new List(); - #endregion - - #region Public Members - public int m_LastError = 0; - - #endregion - - #region Private Methods - - private UInt16 GetNextSequenceNumber() - { - if (m_SequenceNumber == UInt16.MaxValue) - { - m_SequenceNumber = 1; - } - else - { - m_SequenceNumber++; - } - return m_SequenceNumber; - } - - // We must count the IntegrityId for different functions of the protocol. - // As a first guess functions for setting variables need separate counters. - // Use the functioncode to differ between the which sequence/integrity counter values. - private UInt32 GetNextIntegrityId(ushort functioncode) - { - UInt32 ret; - switch (functioncode) - { - case Functioncode.SetMultiVariables: - case Functioncode.SetVariable: - case Functioncode.SetVarSubStreamed: - case Functioncode.DeleteObject: - case Functioncode.CreateObject: - if (m_IntegrityId_Set == UInt32.MaxValue) - { - m_IntegrityId_Set = 0; - } - else - { - m_IntegrityId_Set++; - } - ret = m_IntegrityId_Set; - break; - default: - if (m_IntegrityId == UInt32.MaxValue) - { - m_IntegrityId = 0; - } - else - { - m_IntegrityId++; - } - ret = m_IntegrityId; - break; - } - return ret; - } - - private void WaitForNewS7plusReceived(int Timeout) - { - bool Expired = false; - int Elapsed = Environment.TickCount; - bool done = false; - - m_Mutex.WaitOne(); - if (m_ReceivedPDUs.Count > 0) - { - m_ReceivedPDU = m_ReceivedPDUs.Dequeue(); - done = true; - } - m_Mutex.ReleaseMutex(); - - while (!done && !Expired) - { - Thread.Sleep(2); - Expired = Environment.TickCount - Elapsed > Timeout; - m_Mutex.WaitOne(); - if (m_ReceivedPDUs.Count > 0) - { - m_ReceivedPDU = m_ReceivedPDUs.Dequeue(); - done = true; - } - m_Mutex.ReleaseMutex(); - } - - if (Expired) - { - Console.WriteLine("S7CommPlusConnection - WaitForNewS7plusReceived: ERROR: Timeout!"); - m_LastError = S7Consts.errTCPDataReceive; - } - } - - private int SendS7plusFunctionObject(IS7pRequest funcObj) - { - // If we don't have a SessionId, this must be the first CreateObjectRequest, where we use the Id for NullServerSession - if (m_SessionId == 0) - { - funcObj.SessionId = Ids.ObjectNullServerSession; - } - else - { - funcObj.SessionId = m_SessionId; - } - - // Insert SequenceNumber and IntegrityId, if neccessary for object type and state of communication - funcObj.SequenceNumber = GetNextSequenceNumber(); - if (funcObj.WithIntegrityId) - { - funcObj.IntegrityId = GetNextIntegrityId(funcObj.FunctionCode); - } - - MemoryStream stream = new MemoryStream(); - funcObj.Serialize(stream); - return SendS7plusPDUdata(stream.ToArray(), (int)stream.Length, funcObj.ProtocolVersion); - } - - private int SendS7plusPDUdata(byte[] sendPduData, int bytesToSend, byte protoVersion) - { - m_LastError = 0; - - int curSize; - int sourcePos = 0; - int sendLen; - int NegotiatedIsoPduSize = 1024;// TODO: Respect the negotiated TPDU size - - // 4 Byte TPKT Header - // 3 Byte ISO-Header - // 5 Byte TLS Header + 17 Bytes addition from TLS - // 4 Byte S7CommPlus Header - // 4 Byte S7CommPlus Trailer (must fit into last PDU) - int MaxSize = NegotiatedIsoPduSize - 4 - 3 - 5 - 17 - 4 - 4; - byte[] packet = new byte[MaxSize + 4]; //max packet size is always MaxSize + PDU Header - - while (bytesToSend > 0) - { - if (bytesToSend > MaxSize) - { - curSize = MaxSize; - bytesToSend -= MaxSize; - } - else - { - curSize = bytesToSend; - bytesToSend -= curSize; - } - // Header - packet[0] = 0x72; - packet[1] = protoVersion; - packet[2] = (byte)(curSize >> 8); - packet[3] = (byte)(curSize & 0x00FF); - // Data part - Array.Copy(sendPduData, sourcePos, packet, 4, curSize); - sourcePos += curSize; - sendLen = 4 + curSize; - - // Trailer only in last packet - if (bytesToSend == 0) - { - Array.Resize(ref packet, sendLen + 4); //resize only the last package to sendLen + TrailerLen - packet[sendLen] = 0x72; - sendLen++; - packet[sendLen] = protoVersion; - sendLen++; - packet[sendLen] = 0; - sendLen++; - packet[sendLen] = 0; - sendLen++; - } - m_client.Send(packet); - } - return m_LastError; - } - - private void OnDataReceived(byte[] PDU, int len) - { - // In this method, we've got always a complete TPDU (from protocol layer above) without fragmentation - // At this point, we can detect if we receive a fragmented S7CommPlus PDU. - // If not fragmented, then TPKT.Length - 15 is equal of the length in S7CommPlus.Header. - // 15 bytes because: 4 Bytes TPKT.Header.len + 3 Bytes ISO.Header.Len + 4 Bytes S7CommPlus.Header.len + 4 Bytes S7CommPlus.trailer.Len. - // Since the pure userdata of the TPDU comes in here, that is only minus 4 bytes header + 4 bytes trailer. - // - // Special handling for SystemEvents with ProtocolVersion = 0xfe: - // Here's only a header. - // Because of this, the first byte for the ProtocolVersion must be written in then stream at first. - // The datalength must not be written into the stream, because it's not valid on fragmented PDUs - // for the complete length, only for the single fragment. - - // This method is called from a different thread. - // If we use subscriptions or alarming, we may get new data before the last PDU was processed completely. - // First step we push the complete PDU to a queue. - // TODO: m_LastError handling would also not work as expected. This needs some more redesign. - - if (!m_ReceivedNeedMoreDataForCompletePDU) - { - m_ReceivedTempPDU = new MemoryStream(); - } - // S7comm-plus - byte protoVersion; - int pos = 0; - int s7HeaderDataLen = 0; - // Check header - if (PDU[pos] != 0x72) - { - m_ReceivedNeedMoreDataForCompletePDU = false; - m_LastError = S7Consts.errIsoInvalidPDU; - return; - } - pos++; - protoVersion = PDU[pos]; - if (protoVersion != ProtocolVersion.V1 && protoVersion != ProtocolVersion.V2 && protoVersion != ProtocolVersion.V3 && protoVersion != ProtocolVersion.SystemEvent) - { - m_ReceivedNeedMoreDataForCompletePDU = false; - m_LastError = S7Consts.errIsoInvalidPDU; - return; - } - // For the first fragment, write the ProtocolVersion into the stream in advance - if (!m_ReceivedNeedMoreDataForCompletePDU) - { - m_ReceivedTempPDU.Write(PDU, pos, 1); - } - pos++; - - // Read the length of the data-part from header - s7HeaderDataLen = GetWordAt(PDU, pos); - pos += 2; - if (s7HeaderDataLen > 0) - { - // Special handling for SystemEvent 0xfe PDUs: - // This only confirms a few data, but also reports major protocol errors (e.g. incorrect sequence numbers). - // The confirms can be discarded (for now), but the errors are relevant, because a connection termination is neccessary. - // As we don't have a trailer on this types, it's not possible that they are transmitted as fragments. - if (protoVersion == ProtocolVersion.SystemEvent) - { - Console.WriteLine("S7CommPlusConnection - OnDataReceived: ProtocolVersion 0xfe SystemEvent received"); - m_ReceivedTempPDU.Write(PDU, pos, s7HeaderDataLen); - pos += s7HeaderDataLen; - // Create SystemEventObject - m_ReceivedNeedMoreDataForCompletePDU = false; - m_ReceivedTempPDU.Position = 0; - m_NewS7CommPlusReceived = false; - - var sysevt = SystemEvent.DeserializeFromPdu(m_ReceivedTempPDU); - if (sysevt.IsFatalError()) - { - Console.WriteLine("S7CommPlusConnection - OnDataReceived: SystemEvent has fatal error"); - // Termination neccessary - m_LastError = S7Consts.errIsoInvalidPDU; - } - else - { - Console.WriteLine("S7CommPlusConnection - OnDataReceived: SystemEvent with non fatal error, do nothing"); - } - } - else - { - // Copy data part to destination stream - m_ReceivedTempPDU.Write(PDU, pos, s7HeaderDataLen); - pos += s7HeaderDataLen; - // If this is a fragmented PDU, then at this point no trailer - if ((len - 4 - 4) == s7HeaderDataLen) - { - m_ReceivedNeedMoreDataForCompletePDU = false; - m_ReceivedTempPDU.Position = 0; // Set position back to zero, ready for readout - m_NewS7CommPlusReceived = true; - } - else - { - m_ReceivedNeedMoreDataForCompletePDU = true; - } - } - } - - // If a complete (usable) PDU is received, add to the queue (threadsafe) for readout - if (m_NewS7CommPlusReceived) - { - // Push complete PDU to the queue - m_Mutex.WaitOne(); - m_ReceivedPDUs.Enqueue(m_ReceivedTempPDU); - m_Mutex.ReleaseMutex(); - m_NewS7CommPlusReceived = false; - } - } - - private UInt16 GetWordAt(byte[] Buffer, int Pos) - { - return (UInt16)((Buffer[Pos] << 8) | Buffer[Pos + 1]); - } - - private void SetWordAt(byte[] Buffer, int Pos, UInt16 Value) - { - Buffer[Pos] = (byte)(Value >> 8); - Buffer[Pos + 1] = (byte)(Value & 0x00FF); - } - - private void printBuf(byte[] b) - { - for (int i = 0; i < b.Length; i++) - { - Console.Write("0x" + String.Format("{0:X02} ", b[i])); - } - Console.Write(Environment.NewLine); - } - - private int checkResponseWithIntegrity(IS7pRequest request, IS7pResponse response) - { - if (response == null) - { - Console.WriteLine("checkResponseWithIntegrity: ERROR! response == null"); - return S7Consts.errIsoInvalidPDU; - } - if (request.SequenceNumber != response.SequenceNumber) - { - Console.WriteLine(String.Format("checkResponseWithIntegrity: ERROR! SeqenceNumber of Response ({0}) doesn't match Request ({1})", response.SequenceNumber, request.SequenceNumber)); - return S7Consts.errIsoInvalidPDU; - } - // Overflow is possible and allowed - UInt32 reqIntegCheck = (UInt32)request.SequenceNumber + request.IntegrityId; - if (response.IntegrityId != reqIntegCheck) - { - Console.WriteLine(String.Format("checkResponseWithIntegrity: ERROR! IntegrityId of the Response ({0}) doesn't match Request ({1})", response.IntegrityId, reqIntegCheck)); - // Don't return this as error so far - } - return 0; - } - #endregion - - #region Public Methods - /// - /// Establishes a connection to the PLC. - /// - /// PLC IP address - /// PLC password (if set) - /// read timeout in milliseconds (default: 5000 ms) - /// - public int Connect(string address, string password = "", string username = "", int timeoutMs = 5000) - { - if (timeoutMs > 0) { - m_ReadTimeout = timeoutMs; - } - - m_LastError = 0; - int res; - int Elapsed = Environment.TickCount; - m_client = new S7Client(); - m_client.OnDataReceived = this.OnDataReceived; - - m_client.SetConnectionParams(address, 0x0600, Encoding.ASCII.GetBytes("SIMATIC-ROOT-HMI")); - res = m_client.Connect(); - if (res != 0) - return res; - - #region Step 1: Unencrypted InitSSL Request / Response - - InitSslRequest sslReq = new InitSslRequest(ProtocolVersion.V1, 0 , 0); - res = SendS7plusFunctionObject(sslReq); - if (res != 0) - { - m_client.Disconnect(); - return res; - } - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - m_client.Disconnect(); - return m_LastError; - } - InitSslResponse sslRes; - sslRes = InitSslResponse.DeserializeFromPdu(m_ReceivedPDU); - if (sslRes == null) - { - Console.WriteLine("S7CommPlusConnection - Connect: InitSslResponse with Error!"); - m_client.Disconnect(); - return m_LastError; - } - - #endregion - - #region Step 2: Activate TLS. Everything from here onwards is TLS encrypted. - - res = m_client.SslActivate(); - if (res != 0) - { - m_client.Disconnect(); - return res; - } - - #endregion - - #region Step 3: CreateObjectRequest / Response (with TLS) - - var createObjReq = new CreateObjectRequest(ProtocolVersion.V1, 0, false); - createObjReq.SetNullServerSessionData(); - res = SendS7plusFunctionObject(createObjReq); - if (res != 0) - { - m_client.Disconnect(); - return res; - } - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - m_client.Disconnect(); - return m_LastError; - } - - var createObjRes = CreateObjectResponse.DeserializeFromPdu(m_ReceivedPDU); - if (createObjRes == null) - { - Console.WriteLine("S7CommPlusConnection - Connect: CreateObjectResponse with Error!"); - m_client.Disconnect(); - return S7Consts.errIsoInvalidPDU; - } - // There are (always?) at least two IDs in the response. - // Usually the first is used for polling data, and the 2nd for jobs which use notifications, e.g. alarming, subscriptions. - m_SessionId = createObjRes.ObjectIds[0]; - m_SessionId2 = createObjRes.ObjectIds[1]; - Console.WriteLine("S7CommPlusConnection - Connect: Using SessionId=0x" + String.Format("{0:X04}", m_SessionId)); - - // Evaluate Struct 314 - PValue sval = createObjRes.ResponseObject.GetAttribute(Ids.ServerSessionVersion); - ValueStruct serverSession = (ValueStruct)sval; - - #endregion - - #region Step 4: SetMultiVariablesRequest / Response - - var setMultiVarReq = new SetMultiVariablesRequest(ProtocolVersion.V2); - setMultiVarReq.SetSessionSetupData(m_SessionId, serverSession); - res = SendS7plusFunctionObject(setMultiVarReq); - if (res != 0) - { - m_client.Disconnect(); - return res; - } - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - m_client.Disconnect(); - return m_LastError; - } - - var setMultiVarRes = SetMultiVariablesResponse.DeserializeFromPdu(m_ReceivedPDU); - if (setMultiVarRes == null) - { - Console.WriteLine("S7CommPlusConnection - Connect: SetMultiVariablesResponse with Error!"); - m_client.Disconnect(); - return S7Consts.errIsoInvalidPDU; - } - - #endregion - - #region Step 5: Read SystemLimits - res = m_CommRessources.ReadMax(this); - if (res != 0) - { - m_client.Disconnect(); - return res; - } - #endregion - - #region Step 6: Password - res = legitimate(serverSession, password, username); - if (res != 0) { - m_client.Disconnect(); - return res; - } - #endregion - - // If everything has been error-free up to this point, then the connection has been established successfully. - Console.WriteLine("S7CommPlusConnection - Connect: Time for connection establishment: " + (Environment.TickCount - Elapsed) + " ms."); - return 0; - } - - public void Disconnect() - { - DeleteObject(m_SessionId); - m_client.Disconnect(); - } - - /// - /// Deletes the object with the given Id. - /// - /// The object Id to delete - /// 0 on success - private int DeleteObject(uint deleteObjectId) - { - int res; - var delObjReq = new DeleteObjectRequest(ProtocolVersion.V2); - delObjReq.DeleteObjectId = deleteObjectId; - res = SendS7plusFunctionObject(delObjReq); - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - return m_LastError; - } - // If we delete our own session id, then there's no IntegrityId in the response. - // 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. - if (deleteObjectId == m_SessionId) - { - var delObjRes = DeleteObjectResponse.DeserializeFromPdu(m_ReceivedPDU, 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 delObjRes = DeleteObjectResponse.DeserializeFromPdu(m_ReceivedPDU, true); - res = checkResponseWithIntegrity(delObjReq, delObjRes); - if (res != 0) - { - return res; - } - if (delObjRes.ReturnValue != 0) - { - Console.WriteLine("S7CommPlusConnection - DeleteSession: Executed with Error! ReturnValue=" + delObjRes.ReturnValue); - res = -1; - } - } - return res; - } - - public int ReadValues(List addresslist, out List values, out List errors) - { - // The requester must pass the internal type with the request, otherwise not all return values can be converted automatically. - // For example, strings are transmitted as UInt-Array. - values = new List(); - errors = new List(); - // Initialize error fields to error value - for (int i = 0; i < addresslist.Count; i++) - { - values.Add(null); - errors.Add(0xffffffffffffffff); - } - - // Split request into chunks, taking the MaxTags per request into account - int chunk_startIndex = 0; - int count_perChunk = 0; - do - { - int res; - var getMultiVarReq = new GetMultiVariablesRequest(ProtocolVersion.V2); - - getMultiVarReq.AddressList.Clear(); - count_perChunk = 0; - while (count_perChunk < m_CommRessources.TagsPerReadRequestMax && (chunk_startIndex + count_perChunk) < addresslist.Count) - { - getMultiVarReq.AddressList.Add(addresslist[chunk_startIndex + count_perChunk]); - count_perChunk++; - } - - res = SendS7plusFunctionObject(getMultiVarReq); - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - return m_LastError; - } - - var getMultiVarRes = GetMultiVariablesResponse.DeserializeFromPdu(m_ReceivedPDU); - res = checkResponseWithIntegrity(getMultiVarReq, getMultiVarRes); - if (res != 0) - { - return res; - } - // ReturnValue shows also an error, if only one single variable could not be read - if (getMultiVarRes.ReturnValue != 0) - { - Console.WriteLine("S7CommPlusConnection - ReadValues: Executed with Error! ReturnValue=" + getMultiVarRes.ReturnValue); - } - - // TODO: If a variable could not be read, there is no value, but there is an ErrorValue. - // The user must therefore check whether Value != null. Maybe there's a more elegant solution. - foreach (var v in getMultiVarRes.Values) - { - values[chunk_startIndex + (int)v.Key - 1] = v.Value; - // Initialize error to 0, will be overwritten below if there was an error on an item. - errors[chunk_startIndex + (int)v.Key - 1] = 0; - } - - foreach (var ev in getMultiVarRes.ErrorValues) - { - errors[chunk_startIndex + (int)ev.Key - 1] = ev.Value; - } - chunk_startIndex += count_perChunk; - - } while (chunk_startIndex < addresslist.Count); - - return m_LastError; - } - - public int WriteValues(List addresslist, List values, out List errors) - { - int res; - errors = new List(); - for (int i = 0; i < addresslist.Count; i++) - { - // Initialize to no error value, as there's no explicit value for write success. - errors.Add(0); - } - - // Split request into chunks, taking the MaxTags per request into account - int chunk_startIndex = 0; - int count_perChunk = 0; - do - { - var setMultiVarReq = new SetMultiVariablesRequest(ProtocolVersion.V2); - setMultiVarReq.AddressListVar.Clear(); - setMultiVarReq.ValueList.Clear(); - count_perChunk = 0; - while (count_perChunk < m_CommRessources.TagsPerWriteRequestMax && (chunk_startIndex + count_perChunk) < addresslist.Count) - { - setMultiVarReq.AddressListVar.Add(addresslist[chunk_startIndex + count_perChunk]); - setMultiVarReq.ValueList.Add(values[chunk_startIndex + count_perChunk]); - count_perChunk++; - } - - res = SendS7plusFunctionObject(setMultiVarReq); - if (res != 0) - { - return res; - } - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - return m_LastError; - } - - var setMultiVarRes = SetMultiVariablesResponse.DeserializeFromPdu(m_ReceivedPDU); - res = checkResponseWithIntegrity(setMultiVarReq, setMultiVarRes); - if (res != 0) - { - return res; - } - // ReturnValue shows also an error, if only one single variable could not be written - if (setMultiVarRes.ReturnValue != 0) - { - Console.WriteLine("S7CommPlusConnection - WriteValues: Write with errors. ReturnValue=" + setMultiVarRes.ReturnValue); - } - - foreach (var ev in setMultiVarRes.ErrorValues) - { - errors[chunk_startIndex + (int)ev.Key - 1] = ev.Value; - } - chunk_startIndex += count_perChunk; - - } while (chunk_startIndex < addresslist.Count); - - return m_LastError; - } - - public int SetPlcOperatingState(Int32 state) - { - int res; - var setVarReq = new SetVariableRequest(ProtocolVersion.V2); - setVarReq.InObjectId = Ids.NativeObjects_theCPUexecUnit_Rid; - setVarReq.Address = Ids.CPUexecUnit_operatingStateReq; - setVarReq.Value = new ValueDInt(state); - - res = SendS7plusFunctionObject(setVarReq); - if (res != 0) - { - m_client.Disconnect(); - return res; - } - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - m_client.Disconnect(); - return m_LastError; - } - - var setVarRes = SetVariableResponse.DeserializeFromPdu(m_ReceivedPDU); - if (setVarRes == null) - { - Console.WriteLine("S7CommPlusConnection - Connect: SetVariableResponse with Error!"); - m_client.Disconnect(); - return S7Consts.errIsoInvalidPDU; - } - - return 0; - } - - public int Browse(out List varInfoList) - { - int res; - varInfoList = new List(); - Browser vars = new Browser(); - ExploreRequest exploreReq; - ExploreResponse exploreRes; - - #region Read all objects - - var exploreData = new List(); - - exploreReq = new ExploreRequest(ProtocolVersion.V2); - exploreReq.ExploreId = Ids.NativeObjects_thePLCProgram_Rid; - exploreReq.ExploreRequestId = Ids.None; - exploreReq.ExploreChildsRecursive = 1; - exploreReq.ExploreParents = 0; - - // We want to know the following attributes - exploreReq.AddressList.Add(Ids.ObjectVariableTypeName); - exploreReq.AddressList.Add(Ids.Block_BlockNumber); - exploreReq.AddressList.Add(Ids.ASObjectES_Comment); - - 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 - - #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) - { - case Ids.DB_Class_Rid: - UInt32 relid = ob.RelationId; - UInt32 area = (relid >> 16); - UInt32 num = relid & 0xffff; - if (area == 0x8a0e) - { - var name = (ValueWString)(ob.GetAttribute(Ids.ObjectVariableTypeName)); - BrowseData data = new BrowseData(); - data.db_block_relid = relid; - data.db_name = name.GetValue(); - data.db_number = num; - exploreData.Add(data); - } - break; - } - } - - #endregion - - #region Determine the TypeInfo RID to the RelId from the first response - // By querying LID = 1 from all DBs you get the RID back with which the type information can be queried. - // This is neccessary because, for example, with instance DBs (e.g. TON), the type information must - // not be accessed via the RID of the DB, but of the RID of the TON. - var readlist = new List(); - var values = new List(); - var errors = new List(); - - foreach (var data in exploreData) - { - if (data.db_number > 0) // only process datablocks here, no marker, timer etc. - { - // Insert the variable address - var adr1 = new ItemAddress(); - adr1.AccessArea = data.db_block_relid; - adr1.AccessSubArea = Ids.DB_ValueActual; - adr1.LID.Add(1); - readlist.Add(adr1); - } - } - res = ReadValues(readlist, out values, out errors); - if (res != 0) - { - return res; - } - #endregion - - #region Pass the preliminary information for recombination to ExploreSymbols - - // Add the response information to the list - for (int i = 0; i < values.Count; i++) - { - if (errors[i] == 0) - { - ValueRID rid = (ValueRID)values[i]; - var data = exploreData[i]; - data.db_block_ti_relid = rid.GetValue(); - exploreData[i] = data; - } - else - { - // On error, set the relid to zero, will be removed from the list in the next step. - // TODO: Report this as an error? - var data = exploreData[i]; - data.db_block_ti_relid = 0; - exploreData[i] = data; - } - } - // Remove elements with db_block_ti_relid == 0. This occurs e.g. on datablocks only present in load memory. - // The informations can't be used any further (at least not for variable access). - exploreData.RemoveAll(item => item.db_block_ti_relid == 0); - - foreach (var ed in exploreData) - { - vars.AddBlockNode(eNodeType.Root, ed.db_name, ed.db_block_relid, ed.db_block_ti_relid); - } - - // Add IQMCT areas manually - vars.AddBlockNode(eNodeType.Root, "IArea", Ids.NativeObjects_theIArea_Rid, 0x90010000); - vars.AddBlockNode(eNodeType.Root, "QArea", Ids.NativeObjects_theQArea_Rid, 0x90020000); - vars.AddBlockNode(eNodeType.Root, "MArea", Ids.NativeObjects_theMArea_Rid, 0x90030000); - vars.AddBlockNode(eNodeType.Root, "S7Timers", Ids.NativeObjects_theS7Timers_Rid, 0x90050000); - vars.AddBlockNode(eNodeType.Root, "S7Counters", Ids.NativeObjects_theS7Counters_Rid, 0x90060000); - - #endregion - - #region Read the Type Info Container (as a single big PDU, must be proven to be the way to go in big programs) - exploreReq = new ExploreRequest(ProtocolVersion.V2); - // With ObjectOMSTypeInfoContainer we get all in a big PDU (with maybe hundreds of fragments) - exploreReq.ExploreId = Ids.ObjectOMSTypeInfoContainer; - exploreReq.ExploreRequestId = Ids.None; - exploreReq.ExploreChildsRecursive = 1; - exploreReq.ExploreParents = 0; - - res = SendS7plusFunctionObject(exploreReq); - if (res != 0) - { - return res; - } - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - return m_LastError; - } - #endregion - - #region Process the response, and build the complete variables list - exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); - res = checkResponseWithIntegrity(exploreReq, exploreRes); - if (res != 0) - { - return res; - } - var objs = exploreRes.Objects.First(o => o.ClassId == Ids.ClassOMSTypeInfoContainer); - - vars.SetTypeInfoContainerObjects(objs.GetObjects()); - vars.BuildTree(); - vars.BuildFlatList(); - varInfoList = vars.GetVarInfoList(); - #endregion - - return 0; - } - - /// - /// Gets the first level of a tag symbol string. Removes the " used to escape special chars. - /// - /// plc tag symbol - /// The first level of the symbol string - /// Symbol syntax error - private string parseSymbolLevel(ref string symbol) - { - if (symbol.StartsWith("\"")) - { - int idx = symbol.IndexOf('"', 1); - if (idx < 0) throw new Exception("Symbol syntax error"); - string lvl = symbol.Substring(1, idx - 1); - symbol = symbol.Remove(0, idx + 1); - if (symbol.StartsWith(".")) symbol = symbol.Remove(0, 1); - return lvl; - } - else - { - int idx = symbol.IndexOf('.'); - int idx2 = symbol.IndexOf('[', 1); - if (idx2 >= 0 && (idx2 < idx || idx < 0)) idx = idx2; - if (idx >= 0) - { - string lvl = symbol.Substring(0, idx); - symbol = symbol.Remove(0, idx); - if (symbol.StartsWith(".")) symbol = symbol.Remove(0, 1); - return lvl; - } - else - { - string lvl = symbol; - symbol = ""; - return lvl; - } - } - } - - /// - /// Gets the typeinfo by given ti relid from the internal buffer. If it's not found in the buffer - /// it's fetched from the PLC and stored in the buffer. - /// - /// type info relid - /// type info - /// Could not get type info - public PObject getTypeInfoByRelId(uint ti_relid) - { - PObject pObj = typeInfoList.Find(ti => ti.RelationId == ti_relid); - if (pObj == null) - { - // Type info not found in list, request it from plc - List newPObj = new List(); - if (GetTypeInformation(ti_relid, out newPObj) != 0) throw new Exception("Could not get type info"); - typeInfoList.AddRange(newPObj); - // Try again - pObj = typeInfoList.Find(ti => ti.RelationId == ti_relid); - } - return pObj; - } - - /// - /// Calculates the access sequence for 1 dimensional arrays. - /// - /// plc tag symbol - /// Var type that holds the dim info - /// used to build access sequence - /// Symbol syntax error - private void calcAccessSeqFor1DimArray(ref string symbol, PVartypeListElement varType, VarInfo varInfo) - { - Regex re = new Regex(@"^\[(-?\d+)\]"); - Match m = re.Match(symbol); - if (!m.Success) throw new Exception("Symbol syntax error"); - parseSymbolLevel(ref symbol); // remove index from symbol string - int arrayIndex = int.Parse(m.Groups[1].Value); - - var ioit = (IOffsetInfoType_1Dim)varType.OffsetInfoType; - uint arrayElementCount = ioit.GetArrayElementCount(); - int arrayLowerBounds = ioit.GetArrayLowerBounds(); - - if (arrayIndex - arrayLowerBounds > arrayElementCount) throw new Exception("Out of bounds"); - if (arrayIndex < arrayLowerBounds) throw new Exception("Out of bounds"); - varInfo.AccessSequence += "." + String.Format("{0:X}", arrayIndex - arrayLowerBounds); - if (varType.OffsetInfoType.HasRelation()) varInfo.AccessSequence += ".1"; // additional ".1" for array of struct - } - - /// - /// Calculates the access sequence for multi-dimensional arrays. - /// - /// plc tag symbol - /// Var type that holds the dim info - /// used to build access sequence - /// Symbol syntax error - private void calcAccessSeqForMDimArray(ref string symbol, PVartypeListElement varType, VarInfo varInfo) - { - Regex re = new Regex(@"^\[( ?-?\d+ ?(, ?-?\d+ ?)+)\]"); - Match m = re.Match(symbol); - if (!m.Success) throw new Exception("Symbol syntax error"); - parseSymbolLevel(ref symbol); // remove index from symbol string - string idxs = m.Groups[1].Value.Replace(" ", ""); - - int[] indexes = Array.ConvertAll(idxs.Split(','), e => int.Parse(e)); - var ioit = (IOffsetInfoType_MDim)varType.OffsetInfoType; - uint[] MdimArrayElementCount = (uint[])ioit.GetMdimArrayElementCount().Clone(); - int[] MdimArrayLowerBounds = ioit.GetMdimArrayLowerBounds(); - - // check dim count - int dimCount = MdimArrayElementCount.Aggregate(0, (acc, act) => acc += (act > 0) ? 1 : 0); - if (dimCount != indexes.Count()) throw new Exception("Out of bounds"); - // check bounds - for (int i = 0; i < dimCount; ++i) - { - indexes[i] = (indexes[i] - MdimArrayLowerBounds[dimCount - i - 1]); - if (indexes[i] > MdimArrayElementCount[dimCount - i - 1]) throw new Exception("Out of bounds"); - if (indexes[i] < 0) throw new Exception("Out of bounds"); - } - - // calc dim size - if (varType.Softdatatype == Softdatatype.S7COMMP_SOFTDATATYPE_BBOOL) - { - MdimArrayElementCount[0] += 8 - MdimArrayElementCount[0] % 8; // for bool must be a mutiple of 8! - } - uint[] dimSize = new uint[dimCount]; - uint g = 1; - for (int i = 0; i < dimCount - 1; ++i) - { - dimSize[i] = g; - g *= MdimArrayElementCount[i]; - } - dimSize[dimCount - 1] = g; - - // calc id - int arrayIndex = 0; - for (int i = 0; i < dimCount; ++i) - { - arrayIndex += indexes[i] * (int)dimSize[dimCount - i - 1]; - } - - varInfo.AccessSequence += "." + String.Format("{0:X}", arrayIndex); - if (varType.OffsetInfoType.HasRelation()) varInfo.AccessSequence += ".1"; // additional ".1" for array of struct - } - - /// - /// Browses the symbol level by level recursively. Fetches missing type info automatically from the plc. - /// - /// type info relid - /// plc tag symbol - /// used to build access sequence - /// plc tag or null if not found - /// Symbol syntax error, Out of bounds - private PlcTag browsePlcTagBySymbol(uint ti_relid, ref string symbol, VarInfo varInfo) - { - PObject pObj = getTypeInfoByRelId(ti_relid); - if (pObj == null) throw new Exception("Could not get type info"); - string levelName = parseSymbolLevel(ref symbol); - // find level name of symbol in var list - int idx = pObj.VarnameList?.Names?.IndexOf(levelName) ?? -1; - if (idx < 0) return null; - PVartypeListElement varType = pObj.VartypeList.Elements[idx]; - varInfo.AccessSequence += "." + String.Format("{0:X}", varType.LID); - if (varType.OffsetInfoType.Is1Dim()) - { - calcAccessSeqFor1DimArray(ref symbol, varType, varInfo); - } - if (varType.OffsetInfoType.IsMDim()) - { - calcAccessSeqForMDimArray(ref symbol, varType, varInfo); - } - if (varType.OffsetInfoType.HasRelation()) - { - if (symbol.Length <= 0) - { - return null; - } - else - { - var ioit = (IOffsetInfoType_Relation)varType.OffsetInfoType; - return browsePlcTagBySymbol(ioit.GetRelationId(), ref symbol, varInfo); - } - } - else - { - return PlcTags.TagFactory(varInfo.Name, new ItemAddress(varInfo.AccessSequence), varType.Softdatatype); - } - } - - /// - /// Get the plc tag for the given plc tag symbol. - /// - /// plc tag symbol - /// plc tag, returns null if plc tag could not be found - public PlcTag getPlcTagBySymbol(string symbol) - { - VarInfo varInfo = new VarInfo(); - varInfo.Name = symbol; - // make sure we have the db list - if (dbInfoList == null) - { - if (GetListOfDatablocks(out dbInfoList) != 0) { return null; } - } - string levelName = parseSymbolLevel(ref symbol); - // find db by first level name of symbol - DatablockInfo dbInfo = dbInfoList.Find(dbi => dbi.db_name == levelName); - if (dbInfo != null) - { - varInfo.AccessSequence = String.Format("{0:X}", dbInfo.db_block_relid); - return browsePlcTagBySymbol(dbInfo.db_block_ti_relid, ref symbol, varInfo); - } - else - { - symbol = varInfo.Name; - // Merker - varInfo.AccessSequence = String.Format("{0:X}", Ids.NativeObjects_theMArea_Rid); - PlcTag tag = browsePlcTagBySymbol(0x90030000, ref symbol, varInfo); - if (tag != null) return tag; - symbol = varInfo.Name; - // Outputs - varInfo.AccessSequence = String.Format("{0:X}", Ids.NativeObjects_theQArea_Rid); - tag = browsePlcTagBySymbol(0x90020000, ref symbol, varInfo); - if (tag != null) return tag; - symbol = varInfo.Name; - // Inputs - varInfo.AccessSequence = String.Format("{0:X}", Ids.NativeObjects_theIArea_Rid); - tag = browsePlcTagBySymbol(0x90010000, ref symbol, varInfo); - if (tag != null) return tag; - // TODO: implement s5timers and counters... no one uses them anymore anyway - } - return null; - } - - public class BrowseEntry - { - public string Name; - public uint Softdatatype; - public UInt32 LID; - public UInt32 SymbolCrc; - public string AccessSequence; - }; - - public class BrowseData - { - public string db_name; // Name of the datablock - public UInt32 db_number; // Number of the datablock - public UInt32 db_block_relid; // RID of the datablock - public UInt32 db_block_ti_relid; // Type-Info RID of the datablock - public List variables = new List(); // Variables inside the datablock - }; - - public class DatablockInfo - { - public string db_name; // Name of the datablock - public UInt32 db_number; // Number of the datablock - public UInt32 db_block_relid; // RID of the datablock - public UInt32 db_block_ti_relid; // Type-Info RID of the datablock - }; - - public int GetListOfDatablocks(out List dbInfoList) - { - int res; - - dbInfoList = new List(); - - var exploreReq = new ExploreRequest(ProtocolVersion.V2); - exploreReq.ExploreId = Ids.NativeObjects_thePLCProgram_Rid; - exploreReq.ExploreRequestId = Ids.None; - exploreReq.ExploreChildsRecursive = 1; - exploreReq.ExploreParents = 0; - - // Add the attributes we need in the response - exploreReq.AddressList.Add(Ids.ObjectVariableTypeName); - - // Set filter on Id for Datablock Class RID. With this filter, we only - // get informations from datablocks, and not other blocks we don't need here. - var filter = new ValueStruct(Ids.Filter); - filter.AddStructElement(Ids.FilterOperation, new ValueDInt(8)); // 8 = InstanceIOf - filter.AddStructElement(Ids.AddressCount, new ValueUDInt(0)); - uint[] faddress = new uint[32]; // Unknown, possible dependant on FilterOperation - filter.AddStructElement(Ids.Address, new ValueUDIntArray(faddress)); - filter.AddStructElement(Ids.FilterValue, new ValueRID(Ids.DB_Class_Rid)); - - exploreReq.FilterData = filter; - - res = SendS7plusFunctionObject(exploreReq); - if (res != 0) - { - return res; - } - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - return m_LastError; - } - - var exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); - res = checkResponseWithIntegrity(exploreReq, exploreRes); - if (res != 0) - { - return res; - } - - // Get the datablock information we want further informations from. - var objList = exploreRes.Objects; - - foreach (var ob in objList) - { - // May be this check can be removed, if setting the filter to the DB_Class_Rid is working 100%. - switch (ob.ClassId) - { - case Ids.DB_Class_Rid: - UInt32 relid = ob.RelationId; - UInt32 area = (relid >> 16); - UInt32 num = relid & 0xffff; - if (area == 0x8a0e) - { - var name = (ValueWString)(ob.GetAttribute(Ids.ObjectVariableTypeName)); - DatablockInfo data = new DatablockInfo(); - data.db_block_relid = relid; - data.db_name = name.GetValue(); - data.db_number = num; - dbInfoList.Add(data); - } - break; - } - } - - // Get the TypeInfo RID to RelId from the first response - - // With LID=1 we get the RID back. With this number we can explore further - // informations of this datablock. - // This is neccessary, because informations about instance DBs (e.g. TON) you - // don't get by the RID of the DB, instead of exploring the TON Type RID. - var readlist = new List(); - var values = new List(); - var errors = new List(); - - foreach (var data in dbInfoList) - { - if (data.db_number > 0) - { - // Insert the address - var adr1 = new ItemAddress(); - adr1.AccessArea = data.db_block_relid; - adr1.AccessSubArea = Ids.DB_ValueActual; - adr1.LID.Add(1); - readlist.Add(adr1); - } - } - res = ReadValues(readlist, out values, out errors); - if (res != 0) - { - return res; - } - - // Insert response data into the list - for (int i = 0; i < values.Count; i++) - { - if (errors[i] == 0) - { - var rid = (ValueRID)values[i]; - var data = dbInfoList[i]; - data.db_block_ti_relid = rid.GetValue(); - dbInfoList[i] = data; - } - else - { - // On error, set relid=0, which is then removed in the next step. - // Should we report this for the user? - var data = dbInfoList[i]; - data.db_block_ti_relid = 0; - dbInfoList[i] = data; - } - } - - // Remove elements with db_block_ti_relid == 0. - // This can occur on datablocks which are only in load memory and can't be explored. - dbInfoList.RemoveAll(item => item.db_block_ti_relid == 0); - - return 0; - } - - public int GetTypeInformation(uint exploreId, out List objList) - { - int res; - objList = new List(); - - var exploreReq = new ExploreRequest(ProtocolVersion.V2); - exploreReq.ExploreId = exploreId; - exploreReq.ExploreRequestId = Ids.None; - exploreReq.ExploreChildsRecursive = 1; - exploreReq.ExploreParents = 0; - - res = SendS7plusFunctionObject(exploreReq); - if (res != 0) - { - return res; - } - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - return m_LastError; - } - - var exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); - res = checkResponseWithIntegrity(exploreReq, exploreRes); - if (res != 0) - { - return res; - } - objList = exploreRes.Objects; - - return 0; - } - - /// - /// Requests the tag and block comments from the Plc, returned as XML strings. - /// xml_linecomment: - /// The returned XML format differs between between request of I/Q/M/C/T areas and datablocks: - /// I/Q/M/C/T: .... - /// Datablock: .... - /// As "ID" the number for the variable identification is used. - /// - /// xml_dbcomment: - /// The xml-value description generated from our own value xml-serialization for WStringSparseArray. The value key is the language id. - /// Example: - /// DB Kommentar in german de-DEDB comment in english en-US - /// - /// The relation ID for the area you want the comments for, e.g. 0x8a0e0000+db_number, or 0x52 for M-area - /// - /// - /// 0 if no error - public int GetCommentsXml(uint relid, out string xml_linecomment, out string xml_dbcomment) - { - int res; - // With requesting DataInterface_InterfaceDescription, whe would be able to get all informations like the access ids and - // datatype informations, that we get from the other browsing method. Needs to be tested which one is more efficient on network traffic or plc load. - // If we keep use browsing for the comments, at least we would be able to read all information in one request. - xml_linecomment = String.Empty; - xml_dbcomment = String.Empty; - - var exploreReq = new ExploreRequest(ProtocolVersion.V2); - exploreReq.ExploreId = relid; - exploreReq.ExploreRequestId = Ids.None; - exploreReq.ExploreChildsRecursive = 1; - exploreReq.ExploreParents = 0; - - // We want to know the following attributes - exploreReq.AddressList.Add(Ids.ASObjectES_Comment); - exploreReq.AddressList.Add(Ids.DataInterface_LineComments); - - res = SendS7plusFunctionObject(exploreReq); - if (res != 0) - { - return res; - } - m_LastError = 0; - WaitForNewS7plusReceived(m_ReadTimeout); - if (m_LastError != 0) - { - return m_LastError; - } - - var exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); - res = checkResponseWithIntegrity(exploreReq, exploreRes); - if (res != 0) - { - return res; - } - - foreach(var obj in exploreRes.Objects) - { - foreach(var att in obj.Attributes) - { - switch (att.Key) - { - case Ids.ASObjectES_Comment: - var att_comment = (ValueWStringSparseArray)att.Value; - xml_dbcomment = att_comment.ToString(); - break; - case Ids.DataInterface_LineComments: - var att_linecomment = (ValueBlobSparseArray)att.Value; - BlobDecompressor bd = new BlobDecompressor(); - var blob_sp = att_linecomment.GetValue(); - // In DBs we get the data with Sparsearray key = 1, in M-Area with key = 2. - // For now, just take the first, don't know where the key ids are for. - foreach (var key in blob_sp.Keys) - { - xml_linecomment = bd.decompress(blob_sp[key].value, 4); // Offset of 4, as we have a header for the zlib dictionary version - break; - } - break; - } - } - } - return 0; - } - } - #endregion -} +#region License +/****************************************************************************** + * S7CommPlusDriver + * + * Copyright (C) 2023 Thomas Wiens, th.wiens@gmx.de + * + * This file is part of S7CommPlusDriver. + * + * S7CommPlusDriver is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + /****************************************************************************/ +#endregion + +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.IO; +using System.Linq; +using System.Diagnostics; +using S7CommPlusDriver.ClientApi; +using System.Text.RegularExpressions; +using System.Security.Cryptography; + +namespace S7CommPlusDriver +{ + public partial class S7CommPlusConnection + { + #region Private Members + private S7Client m_client; + private MemoryStream m_ReceivedPDU; + private MemoryStream m_ReceivedTempPDU; + private Queue m_ReceivedPDUs = new Queue(); + private Mutex m_Mutex = new Mutex(); + + private bool m_ReceivedNeedMoreDataForCompletePDU; + private bool m_NewS7CommPlusReceived; + private UInt32 m_SessionId; + private UInt32 m_SessionId2; + public UInt32 SessionId2 + { + get { return m_SessionId2; } + private set { m_SessionId2 = value; } + } + + private int m_ReadTimeout = 5000; + private UInt16 m_SequenceNumber = 0; + private UInt32 m_IntegrityId = 0; + private UInt32 m_IntegrityId_Set = 0; + private CommRessources m_CommRessources = new CommRessources(); + + private List dbInfoList; + private List typeInfoList = new List(); + #endregion + + #region Public Members + public int m_LastError = 0; + + #endregion + + #region Private Methods + + private UInt16 GetNextSequenceNumber() + { + if (m_SequenceNumber == UInt16.MaxValue) + { + m_SequenceNumber = 1; + } + else + { + m_SequenceNumber++; + } + return m_SequenceNumber; + } + + // We must count the IntegrityId for different functions of the protocol. + // As a first guess functions for setting variables need separate counters. + // Use the functioncode to differ between the which sequence/integrity counter values. + private UInt32 GetNextIntegrityId(ushort functioncode) + { + UInt32 ret; + switch (functioncode) + { + case Functioncode.SetMultiVariables: + case Functioncode.SetVariable: + case Functioncode.SetVarSubStreamed: + case Functioncode.DeleteObject: + case Functioncode.CreateObject: + if (m_IntegrityId_Set == UInt32.MaxValue) + { + m_IntegrityId_Set = 0; + } + else + { + m_IntegrityId_Set++; + } + ret = m_IntegrityId_Set; + break; + default: + if (m_IntegrityId == UInt32.MaxValue) + { + m_IntegrityId = 0; + } + else + { + m_IntegrityId++; + } + ret = m_IntegrityId; + break; + } + return ret; + } + + private void WaitForNewS7plusReceived(int Timeout) + { + //TODO: Tickcount overflows!!!! + bool Expired = false; + int Elapsed = Environment.TickCount; + bool done = false; + + m_Mutex.WaitOne(); + if (m_ReceivedPDUs.Count > 0) + { + m_ReceivedPDU = m_ReceivedPDUs.Dequeue(); + done = true; + } + m_Mutex.ReleaseMutex(); + + while (!done && !Expired) + { + Thread.Sleep(2); + Expired = Environment.TickCount - Elapsed > Timeout; + m_Mutex.WaitOne(); + if (m_ReceivedPDUs.Count > 0) + { + m_ReceivedPDU = m_ReceivedPDUs.Dequeue(); + done = true; + } + m_Mutex.ReleaseMutex(); + } + + if (Expired) + { + Console.WriteLine("S7CommPlusConnection - WaitForNewS7plusReceived: ERROR: Timeout!"); + m_LastError = S7Consts.errTCPDataReceive; + } + } + + private int SendS7plusFunctionObject(IS7pRequest funcObj) + { + // If we don't have a SessionId, this must be the first CreateObjectRequest, where we use the Id for NullServerSession + if (m_SessionId == 0) + { + funcObj.SessionId = Ids.ObjectNullServerSession; + } + else + { + funcObj.SessionId = m_SessionId; + } + + // Insert SequenceNumber and IntegrityId, if neccessary for object type and state of communication + funcObj.SequenceNumber = GetNextSequenceNumber(); + if (funcObj.WithIntegrityId) + { + funcObj.IntegrityId = GetNextIntegrityId(funcObj.FunctionCode); + } + + MemoryStream stream = new MemoryStream(); + funcObj.Serialize(stream); + return SendS7plusPDUdata(stream.ToArray(), (int)stream.Length, funcObj.ProtocolVersion); + } + + private int SendS7plusPDUdata(byte[] sendPduData, int bytesToSend, byte protoVersion) + { + m_LastError = 0; + + int curSize; + int sourcePos = 0; + int sendLen; + int NegotiatedIsoPduSize = 1024;// TODO: Respect the negotiated TPDU size + + // 4 Byte TPKT Header + // 3 Byte ISO-Header + // 5 Byte TLS Header + 17 Bytes addition from TLS + // 4 Byte S7CommPlus Header + // 4 Byte S7CommPlus Trailer (must fit into last PDU) + int MaxSize = NegotiatedIsoPduSize - 4 - 3 - 5 - 17 - 4 - 4; + byte[] packet = new byte[MaxSize + 4]; //max packet size is always MaxSize + PDU Header + + while (bytesToSend > 0) + { + if (bytesToSend > MaxSize) + { + curSize = MaxSize; + bytesToSend -= MaxSize; + } + else + { + curSize = bytesToSend; + bytesToSend -= curSize; + } + // Header + packet[0] = 0x72; + packet[1] = protoVersion; + packet[2] = (byte)(curSize >> 8); + packet[3] = (byte)(curSize & 0x00FF); + // Data part + Array.Copy(sendPduData, sourcePos, packet, 4, curSize); + sourcePos += curSize; + sendLen = 4 + curSize; + + // Trailer only in last packet + if (bytesToSend == 0) + { + Array.Resize(ref packet, sendLen + 4); //resize only the last package to sendLen + TrailerLen + packet[sendLen] = 0x72; + sendLen++; + packet[sendLen] = protoVersion; + sendLen++; + packet[sendLen] = 0; + sendLen++; + packet[sendLen] = 0; + sendLen++; + } + m_client.Send(packet); + } + return m_LastError; + } + + private void OnDataReceived(byte[] PDU, int len) + { + // In this method, we've got always a complete TPDU (from protocol layer above) without fragmentation + // At this point, we can detect if we receive a fragmented S7CommPlus PDU. + // If not fragmented, then TPKT.Length - 15 is equal of the length in S7CommPlus.Header. + // 15 bytes because: 4 Bytes TPKT.Header.len + 3 Bytes ISO.Header.Len + 4 Bytes S7CommPlus.Header.len + 4 Bytes S7CommPlus.trailer.Len. + // Since the pure userdata of the TPDU comes in here, that is only minus 4 bytes header + 4 bytes trailer. + // + // Special handling for SystemEvents with ProtocolVersion = 0xfe: + // Here's only a header. + // Because of this, the first byte for the ProtocolVersion must be written in then stream at first. + // The datalength must not be written into the stream, because it's not valid on fragmented PDUs + // for the complete length, only for the single fragment. + + // This method is called from a different thread. + // If we use subscriptions or alarming, we may get new data before the last PDU was processed completely. + // First step we push the complete PDU to a queue. + // TODO: m_LastError handling would also not work as expected. This needs some more redesign. + + if (!m_ReceivedNeedMoreDataForCompletePDU) + { + m_ReceivedTempPDU = new MemoryStream(); + } + // S7comm-plus + byte protoVersion; + int pos = 0; + int s7HeaderDataLen = 0; + // Check header + if (PDU[pos] != 0x72) + { + m_ReceivedNeedMoreDataForCompletePDU = false; + m_LastError = S7Consts.errIsoInvalidPDU1; + return; + } + pos++; + protoVersion = PDU[pos]; + if (protoVersion != ProtocolVersion.V1 && protoVersion != ProtocolVersion.V2 && protoVersion != ProtocolVersion.V3 && protoVersion != ProtocolVersion.SystemEvent) + { + m_ReceivedNeedMoreDataForCompletePDU = false; + m_LastError = S7Consts.errIsoInvalidPDU2; + return; + } + // For the first fragment, write the ProtocolVersion into the stream in advance + if (!m_ReceivedNeedMoreDataForCompletePDU) + { + m_ReceivedTempPDU.Write(PDU, pos, 1); + } + pos++; + + // Read the length of the data-part from header + s7HeaderDataLen = GetWordAt(PDU, pos); + pos += 2; + if (s7HeaderDataLen > 0) + { + // Special handling for SystemEvent 0xfe PDUs: + // This only confirms a few data, but also reports major protocol errors (e.g. incorrect sequence numbers). + // The confirms can be discarded (for now), but the errors are relevant, because a connection termination is neccessary. + // As we don't have a trailer on this types, it's not possible that they are transmitted as fragments. + if (protoVersion == ProtocolVersion.SystemEvent) + { + Console.WriteLine("S7CommPlusConnection - OnDataReceived: ProtocolVersion 0xfe SystemEvent received"); + m_ReceivedTempPDU.Write(PDU, pos, s7HeaderDataLen); + pos += s7HeaderDataLen; + // Create SystemEventObject + m_ReceivedNeedMoreDataForCompletePDU = false; + m_ReceivedTempPDU.Position = 0; + m_NewS7CommPlusReceived = false; + + var sysevt = SystemEvent.DeserializeFromPdu(m_ReceivedTempPDU); + if (sysevt.IsFatalError()) + { + Console.WriteLine("S7CommPlusConnection - OnDataReceived: SystemEvent has fatal error"); + // Termination neccessary + m_LastError = S7Consts.errIsoInvalidPDU3; + } + else + { + Console.WriteLine("S7CommPlusConnection - OnDataReceived: SystemEvent with non fatal error, do nothing"); + } + } + else + { + // Copy data part to destination stream + m_ReceivedTempPDU.Write(PDU, pos, s7HeaderDataLen); + pos += s7HeaderDataLen; + // If this is a fragmented PDU, then at this point no trailer + if ((len - 4 - 4) == s7HeaderDataLen) + { + m_ReceivedNeedMoreDataForCompletePDU = false; + m_ReceivedTempPDU.Position = 0; // Set position back to zero, ready for readout + m_NewS7CommPlusReceived = true; + } + else + { + m_ReceivedNeedMoreDataForCompletePDU = true; + } + } + } + + // If a complete (usable) PDU is received, add to the queue (threadsafe) for readout + if (m_NewS7CommPlusReceived) + { + // Push complete PDU to the queue + m_Mutex.WaitOne(); + m_ReceivedPDUs.Enqueue(m_ReceivedTempPDU); + m_Mutex.ReleaseMutex(); + m_NewS7CommPlusReceived = false; + } + } + + private UInt16 GetWordAt(byte[] Buffer, int Pos) + { + return (UInt16)((Buffer[Pos] << 8) | Buffer[Pos + 1]); + } + + private void SetWordAt(byte[] Buffer, int Pos, UInt16 Value) + { + Buffer[Pos] = (byte)(Value >> 8); + Buffer[Pos + 1] = (byte)(Value & 0x00FF); + } + + private void printBuf(byte[] b) + { + for (int i = 0; i < b.Length; i++) + { + Console.Write("0x" + String.Format("{0:X02} ", b[i])); + } + Console.Write(Environment.NewLine); + } + + private int checkResponseWithIntegrity(IS7pRequest request, IS7pResponse response) + { + if (response == null) + { + //Console.WriteLine("checkResponseWithIntegrity: ERROR! response == null"); + return S7Consts.errIsoInvalidPDU4; + } + if (request.SequenceNumber != response.SequenceNumber) + { + //Console.WriteLine(String.Format("checkResponseWithIntegrity: ERROR! SeqenceNumber of Response ({0}) doesn't match Request ({1})", response.SequenceNumber, request.SequenceNumber)); + return S7Consts.errIsoInvalidPDU5; + } + // Overflow is possible and allowed + UInt32 reqIntegCheck = (UInt32)request.SequenceNumber + request.IntegrityId; + if (response.IntegrityId != reqIntegCheck) + { + Console.WriteLine(String.Format("checkResponseWithIntegrity: ERROR! IntegrityId of the Response ({0}) doesn't match Request ({1})", response.IntegrityId, reqIntegCheck)); + // Don't return this as error so far + } + return 0; + } + #endregion + + #region Public Methods + /// + /// Establishes a connection to the PLC. + /// + /// PLC IP address + /// PLC password (if set) + /// read timeout in milliseconds (default: 5000 ms) + /// + public int Connect(string address, string password = "", string username = "", int timeoutMs = 5000) + { + if (timeoutMs > 0) { + m_ReadTimeout = timeoutMs; + } + + m_LastError = 0; + int res; + int Elapsed = Environment.TickCount; + m_client = new S7Client(); + m_client.OnDataReceived = this.OnDataReceived; + + m_client.SetConnectionParams(address, 0x0600, Encoding.ASCII.GetBytes("SIMATIC-ROOT-HMI")); + res = m_client.Connect(); + if (res != 0) + return res; + + #region Step 1: Unencrypted InitSSL Request / Response + + InitSslRequest sslReq = new InitSslRequest(ProtocolVersion.V1, 0 , 0); + res = SendS7plusFunctionObject(sslReq); + if (res != 0) + { + m_client.Disconnect(); + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + m_client.Disconnect(); + return m_LastError; + } + InitSslResponse sslRes; + sslRes = InitSslResponse.DeserializeFromPdu(m_ReceivedPDU); + if (sslRes == null) + { + m_client.Disconnect(); + return S7Consts.errInitSslResponse; + } + + #endregion + + #region Step 2: Activate TLS. Everything from here onwards is TLS encrypted. + + res = m_client.SslActivate(); + if (res != 0) + { + m_client.Disconnect(); + return res; + } + + #endregion + + #region Step 3: CreateObjectRequest / Response (with TLS) + + var createObjReq = new CreateObjectRequest(ProtocolVersion.V1, 0, false); + createObjReq.SetNullServerSessionData(); + res = SendS7plusFunctionObject(createObjReq); + if (res != 0) + { + m_client.Disconnect(); + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + m_client.Disconnect(); + return m_LastError; + } + + var createObjRes = CreateObjectResponse.DeserializeFromPdu(m_ReceivedPDU); + if (createObjRes == null) + { + //Console.WriteLine("S7CommPlusConnection - Connect: CreateObjectResponse with Error!"); + m_client.Disconnect(); + return S7Consts.errIsoInvalidPDU6; + } + // There are (always?) at least two IDs in the response. + // Usually the first is used for polling data, and the 2nd for jobs which use notifications, e.g. alarming, subscriptions. + m_SessionId = createObjRes.ObjectIds[0]; + m_SessionId2 = createObjRes.ObjectIds[1]; + //Console.WriteLine("S7CommPlusConnection - Connect: Using SessionId=0x" + String.Format("{0:X04}", m_SessionId)); + + // Evaluate Struct 314 + PValue sval = createObjRes.ResponseObject.GetAttribute(Ids.ServerSessionVersion); + ValueStruct serverSession = (ValueStruct)sval; + + #endregion + + #region Step 4: SetMultiVariablesRequest / Response + + var setMultiVarReq = new SetMultiVariablesRequest(ProtocolVersion.V2); + setMultiVarReq.SetSessionSetupData(m_SessionId, serverSession); + res = SendS7plusFunctionObject(setMultiVarReq); + if (res != 0) + { + m_client.Disconnect(); + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + m_client.Disconnect(); + return m_LastError; + } + + var setMultiVarRes = SetMultiVariablesResponse.DeserializeFromPdu(m_ReceivedPDU); + if (setMultiVarRes == null) + { + //Console.WriteLine("S7CommPlusConnection - Connect: SetMultiVariablesResponse with Error!"); + m_client.Disconnect(); + return S7Consts.errIsoInvalidPDU7; + } + + #endregion + + #region Step 5: Read SystemLimits + res = m_CommRessources.ReadMax(this); + if (res != 0) + { + m_client.Disconnect(); + return res; + } + #endregion + + #region Step 6: Password + res = legitimate(serverSession, password, username); + if (res != 0) { + m_client.Disconnect(); + return res; + } + #endregion + + // If everything has been error-free up to this point, then the connection has been established successfully. + Console.WriteLine("S7CommPlusConnection - Connect: Time for connection establishment: " + (Environment.TickCount - Elapsed) + " ms."); + return 0; + } + + public void Disconnect() + { + DeleteObject(m_SessionId); + m_client.Disconnect(); + } + + /// + /// Deletes the object with the given Id. + /// + /// The object Id to delete + /// 0 on success + private int DeleteObject(uint deleteObjectId) + { + int res; + var delObjReq = new DeleteObjectRequest(ProtocolVersion.V2); + delObjReq.DeleteObjectId = deleteObjectId; + res = SendS7plusFunctionObject(delObjReq); + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + // If we delete our own session id, then there's no IntegrityId in the response. + // 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. + if (deleteObjectId == m_SessionId) + { + var delObjRes = DeleteObjectResponse.DeserializeFromPdu(m_ReceivedPDU, 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 delObjRes = DeleteObjectResponse.DeserializeFromPdu(m_ReceivedPDU, true); + res = checkResponseWithIntegrity(delObjReq, delObjRes); + if (res != 0) + { + return res; + } + if (delObjRes.ReturnValue != 0) + { + Console.WriteLine("S7CommPlusConnection - DeleteSession: Executed with Error! ReturnValue=" + delObjRes.ReturnValue); + res = -1; + } + } + return res; + } + + public int ReadValues(List addresslist, out List values, out List errors) + { + // The requester must pass the internal type with the request, otherwise not all return values can be converted automatically. + // For example, strings are transmitted as UInt-Array. + values = new List(); + errors = new List(); + // Initialize error fields to error value + for (int i = 0; i < addresslist.Count; i++) + { + values.Add(null); + errors.Add(0xffffffffffffffff); + } + + // Split request into chunks, taking the MaxTags per request into account + int chunk_startIndex = 0; + int count_perChunk = 0; + do + { + int res; + var getMultiVarReq = new GetMultiVariablesRequest(ProtocolVersion.V2); + + getMultiVarReq.AddressList.Clear(); + count_perChunk = 0; + while (count_perChunk < m_CommRessources.TagsPerReadRequestMax && (chunk_startIndex + count_perChunk) < addresslist.Count) + { + getMultiVarReq.AddressList.Add(addresslist[chunk_startIndex + count_perChunk]); + count_perChunk++; + } + + res = SendS7plusFunctionObject(getMultiVarReq); + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + + var getMultiVarRes = GetMultiVariablesResponse.DeserializeFromPdu(m_ReceivedPDU); + res = checkResponseWithIntegrity(getMultiVarReq, getMultiVarRes); + if (res != 0) + { + return res; + } + // ReturnValue shows also an error, if only one single variable could not be read + if (getMultiVarRes.ReturnValue != 0) + { + Console.WriteLine("S7CommPlusConnection - ReadValues: Executed with Error! ReturnValue=" + getMultiVarRes.ReturnValue); + } + + // TODO: If a variable could not be read, there is no value, but there is an ErrorValue. + // The user must therefore check whether Value != null. Maybe there's a more elegant solution. + foreach (var v in getMultiVarRes.Values) + { + values[chunk_startIndex + (int)v.Key - 1] = v.Value; + // Initialize error to 0, will be overwritten below if there was an error on an item. + errors[chunk_startIndex + (int)v.Key - 1] = 0; + } + + foreach (var ev in getMultiVarRes.ErrorValues) + { + errors[chunk_startIndex + (int)ev.Key - 1] = ev.Value; + } + chunk_startIndex += count_perChunk; + + } while (chunk_startIndex < addresslist.Count); + + return m_LastError; + } + + public int WriteValues(List addresslist, List values, out List errors) + { + int res; + errors = new List(); + for (int i = 0; i < addresslist.Count; i++) + { + // Initialize to no error value, as there's no explicit value for write success. + errors.Add(0); + } + + // Split request into chunks, taking the MaxTags per request into account + int chunk_startIndex = 0; + int count_perChunk = 0; + do + { + var setMultiVarReq = new SetMultiVariablesRequest(ProtocolVersion.V2); + setMultiVarReq.AddressListVar.Clear(); + setMultiVarReq.ValueList.Clear(); + count_perChunk = 0; + while (count_perChunk < m_CommRessources.TagsPerWriteRequestMax && (chunk_startIndex + count_perChunk) < addresslist.Count) + { + setMultiVarReq.AddressListVar.Add(addresslist[chunk_startIndex + count_perChunk]); + setMultiVarReq.ValueList.Add(values[chunk_startIndex + count_perChunk]); + count_perChunk++; + } + + res = SendS7plusFunctionObject(setMultiVarReq); + if (res != 0) + { + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + + var setMultiVarRes = SetMultiVariablesResponse.DeserializeFromPdu(m_ReceivedPDU); + res = checkResponseWithIntegrity(setMultiVarReq, setMultiVarRes); + if (res != 0) + { + return res; + } + // ReturnValue shows also an error, if only one single variable could not be written + if (setMultiVarRes.ReturnValue != 0) + { + Console.WriteLine("S7CommPlusConnection - WriteValues: Write with errors. ReturnValue=" + setMultiVarRes.ReturnValue); + } + + foreach (var ev in setMultiVarRes.ErrorValues) + { + errors[chunk_startIndex + (int)ev.Key - 1] = ev.Value; + } + chunk_startIndex += count_perChunk; + + } while (chunk_startIndex < addresslist.Count); + + return m_LastError; + } + + public int SetPlcOperatingState(Int32 state) + { + int res; + var setVarReq = new SetVariableRequest(ProtocolVersion.V2); + setVarReq.InObjectId = Ids.NativeObjects_theCPUexecUnit_Rid; + setVarReq.Address = Ids.CPUexecUnit_operatingStateReq; + setVarReq.Value = new ValueDInt(state); + + res = SendS7plusFunctionObject(setVarReq); + if (res != 0) + { + m_client.Disconnect(); + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + m_client.Disconnect(); + return m_LastError; + } + + var setVarRes = SetVariableResponse.DeserializeFromPdu(m_ReceivedPDU); + if (setVarRes == null) + { + //Console.WriteLine("S7CommPlusConnection - Connect: SetVariableResponse with Error!"); + m_client.Disconnect(); + return S7Consts.errIsoInvalidPDU12; + } + + return 0; + } + + public int Browse(out List varInfoList) + { + int res; + varInfoList = new List(); + Browser vars = new Browser(); + ExploreRequest exploreReq; + ExploreResponse exploreRes; + + #region Read all objects + + var exploreData = new List(); + + exploreReq = new ExploreRequest(ProtocolVersion.V2); + exploreReq.ExploreId = Ids.NativeObjects_thePLCProgram_Rid; + exploreReq.ExploreRequestId = Ids.None; + exploreReq.ExploreChildsRecursive = 1; + exploreReq.ExploreParents = 0; + + // We want to know the following attributes + exploreReq.AddressList.Add(Ids.ObjectVariableTypeName); + exploreReq.AddressList.Add(Ids.Block_BlockNumber); + exploreReq.AddressList.Add(Ids.ASObjectES_Comment); + + 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 + + #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) + { + case Ids.DB_Class_Rid: + UInt32 relid = ob.RelationId; + UInt32 area = (relid >> 16); + UInt32 num = relid & 0xffff; + if (area == 0x8a0e) + { + var name = (ValueWString)(ob.GetAttribute(Ids.ObjectVariableTypeName)); + BrowseData data = new BrowseData(); + data.db_block_relid = relid; + data.db_name = name.GetValue(); + data.db_number = num; + exploreData.Add(data); + } + break; + } + } + + #endregion + + #region Determine the TypeInfo RID to the RelId from the first response + // By querying LID = 1 from all DBs you get the RID back with which the type information can be queried. + // This is neccessary because, for example, with instance DBs (e.g. TON), the type information must + // not be accessed via the RID of the DB, but of the RID of the TON. + var readlist = new List(); + var values = new List(); + var errors = new List(); + + foreach (var data in exploreData) + { + if (data.db_number > 0) // only process datablocks here, no marker, timer etc. + { + // Insert the variable address + var adr1 = new ItemAddress(); + adr1.AccessArea = data.db_block_relid; + adr1.AccessSubArea = Ids.DB_ValueActual; + adr1.LID.Add(1); + readlist.Add(adr1); + } + } + res = ReadValues(readlist, out values, out errors); + if (res != 0) + { + return res; + } + #endregion + + #region Pass the preliminary information for recombination to ExploreSymbols + + // Add the response information to the list + for (int i = 0; i < values.Count; i++) + { + if (errors[i] == 0) + { + ValueRID rid = (ValueRID)values[i]; + var data = exploreData[i]; + data.db_block_ti_relid = rid.GetValue(); + exploreData[i] = data; + } + else + { + // On error, set the relid to zero, will be removed from the list in the next step. + // TODO: Report this as an error? + var data = exploreData[i]; + data.db_block_ti_relid = 0; + exploreData[i] = data; + } + } + // Remove elements with db_block_ti_relid == 0. This occurs e.g. on datablocks only present in load memory. + // The informations can't be used any further (at least not for variable access). + exploreData.RemoveAll(item => item.db_block_ti_relid == 0); + + foreach (var ed in exploreData) + { + vars.AddBlockNode(eNodeType.Root, ed.db_name, ed.db_block_relid, ed.db_block_ti_relid); + } + + // Add IQMCT areas manually + vars.AddBlockNode(eNodeType.Root, "IArea", Ids.NativeObjects_theIArea_Rid, 0x90010000); + vars.AddBlockNode(eNodeType.Root, "QArea", Ids.NativeObjects_theQArea_Rid, 0x90020000); + vars.AddBlockNode(eNodeType.Root, "MArea", Ids.NativeObjects_theMArea_Rid, 0x90030000); + vars.AddBlockNode(eNodeType.Root, "S7Timers", Ids.NativeObjects_theS7Timers_Rid, 0x90050000); + vars.AddBlockNode(eNodeType.Root, "S7Counters", Ids.NativeObjects_theS7Counters_Rid, 0x90060000); + + #endregion + + #region Read the Type Info Container (as a single big PDU, must be proven to be the way to go in big programs) + exploreReq = new ExploreRequest(ProtocolVersion.V2); + // With ObjectOMSTypeInfoContainer we get all in a big PDU (with maybe hundreds of fragments) + exploreReq.ExploreId = Ids.ObjectOMSTypeInfoContainer; + exploreReq.ExploreRequestId = Ids.None; + exploreReq.ExploreChildsRecursive = 1; + exploreReq.ExploreParents = 0; + + res = SendS7plusFunctionObject(exploreReq); + if (res != 0) + { + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + #endregion + + #region Process the response, and build the complete variables list + exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); + res = checkResponseWithIntegrity(exploreReq, exploreRes); + if (res != 0) + { + return res; + } + var objs = exploreRes.Objects.First(o => o.ClassId == Ids.ClassOMSTypeInfoContainer); + + vars.SetTypeInfoContainerObjects(objs.GetObjects()); + vars.BuildTree(); + vars.BuildFlatList(); + varInfoList = vars.GetVarInfoList(); + #endregion + + return 0; + } + + /// + /// Gets the first level of a tag symbol string. Removes the " used to escape special chars. + /// + /// plc tag symbol + /// The first level of the symbol string + /// Symbol syntax error + private string parseSymbolLevel(ref string symbol) + { + if (symbol.StartsWith("\"")) + { + int idx = symbol.IndexOf('"', 1); + if (idx < 0) throw new Exception("Symbol syntax error"); + string lvl = symbol.Substring(1, idx - 1); + symbol = symbol.Remove(0, idx + 1); + if (symbol.StartsWith(".")) symbol = symbol.Remove(0, 1); + return lvl; + } + else + { + int idx = symbol.IndexOf('.'); + int idx2 = symbol.IndexOf('[', 1); + if (idx2 >= 0 && (idx2 < idx || idx < 0)) idx = idx2; + if (idx >= 0) + { + string lvl = symbol.Substring(0, idx); + symbol = symbol.Remove(0, idx); + if (symbol.StartsWith(".")) symbol = symbol.Remove(0, 1); + return lvl; + } + else + { + string lvl = symbol; + symbol = ""; + return lvl; + } + } + } + + /// + /// Gets the typeinfo by given ti relid from the internal buffer. If it's not found in the buffer + /// it's fetched from the PLC and stored in the buffer. + /// + /// type info relid + /// type info + /// Could not get type info + public PObject getTypeInfoByRelId(uint ti_relid) + { + PObject pObj = typeInfoList.Find(ti => ti.RelationId == ti_relid); + if (pObj == null) + { + // Type info not found in list, request it from plc + List newPObj = new List(); + if (GetTypeInformation(ti_relid, out newPObj) != 0) throw new Exception("Could not get type info"); + typeInfoList.AddRange(newPObj); + // Try again + pObj = typeInfoList.Find(ti => ti.RelationId == ti_relid); + } + return pObj; + } + + /// + /// Calculates the access sequence for 1 dimensional arrays. + /// + /// plc tag symbol + /// Var type that holds the dim info + /// used to build access sequence + /// Symbol syntax error + private void calcAccessSeqFor1DimArray(ref string symbol, PVartypeListElement varType, VarInfo varInfo) + { + Regex re = new Regex(@"^\[(-?\d+)\]"); + Match m = re.Match(symbol); + if (!m.Success) throw new Exception("Symbol syntax error"); + parseSymbolLevel(ref symbol); // remove index from symbol string + int arrayIndex = int.Parse(m.Groups[1].Value); + + var ioit = (IOffsetInfoType_1Dim)varType.OffsetInfoType; + uint arrayElementCount = ioit.GetArrayElementCount(); + int arrayLowerBounds = ioit.GetArrayLowerBounds(); + + if (arrayIndex - arrayLowerBounds > arrayElementCount) throw new Exception("Out of bounds"); + if (arrayIndex < arrayLowerBounds) throw new Exception("Out of bounds"); + varInfo.AccessSequence += "." + String.Format("{0:X}", arrayIndex - arrayLowerBounds); + if (varType.OffsetInfoType.HasRelation()) varInfo.AccessSequence += ".1"; // additional ".1" for array of struct + } + + /// + /// Calculates the access sequence for multi-dimensional arrays. + /// + /// plc tag symbol + /// Var type that holds the dim info + /// used to build access sequence + /// Symbol syntax error + private void calcAccessSeqForMDimArray(ref string symbol, PVartypeListElement varType, VarInfo varInfo) + { + Regex re = new Regex(@"^\[( ?-?\d+ ?(, ?-?\d+ ?)+)\]"); + Match m = re.Match(symbol); + if (!m.Success) throw new Exception("Symbol syntax error"); + parseSymbolLevel(ref symbol); // remove index from symbol string + string idxs = m.Groups[1].Value.Replace(" ", ""); + + int[] indexes = Array.ConvertAll(idxs.Split(','), e => int.Parse(e)); + var ioit = (IOffsetInfoType_MDim)varType.OffsetInfoType; + uint[] MdimArrayElementCount = (uint[])ioit.GetMdimArrayElementCount().Clone(); + int[] MdimArrayLowerBounds = ioit.GetMdimArrayLowerBounds(); + + // check dim count + int dimCount = MdimArrayElementCount.Aggregate(0, (acc, act) => acc += (act > 0) ? 1 : 0); + if (dimCount != indexes.Count()) throw new Exception("Out of bounds"); + // check bounds + for (int i = 0; i < dimCount; ++i) + { + indexes[i] = (indexes[i] - MdimArrayLowerBounds[dimCount - i - 1]); + if (indexes[i] > MdimArrayElementCount[dimCount - i - 1]) throw new Exception("Out of bounds"); + if (indexes[i] < 0) throw new Exception("Out of bounds"); + } + + // calc dim size + if (varType.Softdatatype == Softdatatype.S7COMMP_SOFTDATATYPE_BBOOL) + { + MdimArrayElementCount[0] += 8 - MdimArrayElementCount[0] % 8; // for bool must be a mutiple of 8! + } + uint[] dimSize = new uint[dimCount]; + uint g = 1; + for (int i = 0; i < dimCount - 1; ++i) + { + dimSize[i] = g; + g *= MdimArrayElementCount[i]; + } + dimSize[dimCount - 1] = g; + + // calc id + int arrayIndex = 0; + for (int i = 0; i < dimCount; ++i) + { + arrayIndex += indexes[i] * (int)dimSize[dimCount - i - 1]; + } + + varInfo.AccessSequence += "." + String.Format("{0:X}", arrayIndex); + if (varType.OffsetInfoType.HasRelation()) varInfo.AccessSequence += ".1"; // additional ".1" for array of struct + } + + /// + /// Browses the symbol level by level recursively. Fetches missing type info automatically from the plc. + /// + /// type info relid + /// plc tag symbol + /// used to build access sequence + /// plc tag or null if not found + /// Symbol syntax error, Out of bounds + private PlcTag browsePlcTagBySymbol(uint ti_relid, ref string symbol, VarInfo varInfo) + { + PObject pObj = getTypeInfoByRelId(ti_relid); + if (pObj == null) throw new Exception("Could not get type info"); + string levelName = parseSymbolLevel(ref symbol); + // find level name of symbol in var list + int idx = pObj.VarnameList?.Names?.IndexOf(levelName) ?? -1; + if (idx < 0) return null; + PVartypeListElement varType = pObj.VartypeList.Elements[idx]; + varInfo.AccessSequence += "." + String.Format("{0:X}", varType.LID); + if (varType.OffsetInfoType.Is1Dim()) + { + calcAccessSeqFor1DimArray(ref symbol, varType, varInfo); + } + if (varType.OffsetInfoType.IsMDim()) + { + calcAccessSeqForMDimArray(ref symbol, varType, varInfo); + } + if (varType.OffsetInfoType.HasRelation()) + { + if (symbol.Length <= 0) + { + return null; + } + else + { + var ioit = (IOffsetInfoType_Relation)varType.OffsetInfoType; + return browsePlcTagBySymbol(ioit.GetRelationId(), ref symbol, varInfo); + } + } + else + { + return PlcTags.TagFactory(varInfo.Name, new ItemAddress(varInfo.AccessSequence), varType.Softdatatype); + } + } + + /// + /// Get the plc tag for the given plc tag symbol. + /// + /// plc tag symbol + /// plc tag, returns null if plc tag could not be found + public PlcTag getPlcTagBySymbol(string symbol) + { + VarInfo varInfo = new VarInfo(); + varInfo.Name = symbol; + // make sure we have the db list + if (dbInfoList == null) + { + if (GetListOfDatablocks(out dbInfoList) != 0) { return null; } + } + string levelName = parseSymbolLevel(ref symbol); + // find db by first level name of symbol + DatablockInfo dbInfo = dbInfoList.Find(dbi => dbi.db_name == levelName); + if (dbInfo != null) + { + varInfo.AccessSequence = String.Format("{0:X}", dbInfo.db_block_relid); + return browsePlcTagBySymbol(dbInfo.db_block_ti_relid, ref symbol, varInfo); + } + else + { + symbol = varInfo.Name; + // Merker + varInfo.AccessSequence = String.Format("{0:X}", Ids.NativeObjects_theMArea_Rid); + PlcTag tag = browsePlcTagBySymbol(0x90030000, ref symbol, varInfo); + if (tag != null) return tag; + symbol = varInfo.Name; + // Outputs + varInfo.AccessSequence = String.Format("{0:X}", Ids.NativeObjects_theQArea_Rid); + tag = browsePlcTagBySymbol(0x90020000, ref symbol, varInfo); + if (tag != null) return tag; + symbol = varInfo.Name; + // Inputs + varInfo.AccessSequence = String.Format("{0:X}", Ids.NativeObjects_theIArea_Rid); + tag = browsePlcTagBySymbol(0x90010000, ref symbol, varInfo); + if (tag != null) return tag; + // TODO: implement s5timers and counters... no one uses them anymore anyway + } + return null; + } + + public class BrowseEntry + { + public string Name; + public uint Softdatatype; + public UInt32 LID; + public UInt32 SymbolCrc; + public string AccessSequence; + }; + + public class BrowseData + { + public string db_name; // Name of the datablock + public UInt32 db_number; // Number of the datablock + public UInt32 db_block_relid; // RID of the datablock + public UInt32 db_block_ti_relid; // Type-Info RID of the datablock + public List variables = new List(); // Variables inside the datablock + }; + + public class DatablockInfo + { + public string db_name; // Name of the datablock + public UInt32 db_number; // Number of the datablock + public UInt32 db_block_relid; // RID of the datablock + public UInt32 db_block_ti_relid; // Type-Info RID of the datablock + }; + + public int GetListOfDatablocks(out List dbInfoList) + { + int res; + + dbInfoList = new List(); + + var exploreReq = new ExploreRequest(ProtocolVersion.V2); + exploreReq.ExploreId = Ids.NativeObjects_thePLCProgram_Rid; + exploreReq.ExploreRequestId = Ids.None; + exploreReq.ExploreChildsRecursive = 1; + exploreReq.ExploreParents = 0; + + // Add the attributes we need in the response + exploreReq.AddressList.Add(Ids.ObjectVariableTypeName); + + // Set filter on Id for Datablock Class RID. With this filter, we only + // get informations from datablocks, and not other blocks we don't need here. + var filter = new ValueStruct(Ids.Filter); + filter.AddStructElement(Ids.FilterOperation, new ValueDInt(8)); // 8 = InstanceIOf + filter.AddStructElement(Ids.AddressCount, new ValueUDInt(0)); + uint[] faddress = new uint[32]; // Unknown, possible dependant on FilterOperation + filter.AddStructElement(Ids.Address, new ValueUDIntArray(faddress)); + filter.AddStructElement(Ids.FilterValue, new ValueRID(Ids.DB_Class_Rid)); + + exploreReq.FilterData = filter; + + res = SendS7plusFunctionObject(exploreReq); + if (res != 0) + { + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + + var exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); + res = checkResponseWithIntegrity(exploreReq, exploreRes); + if (res != 0) + { + return res; + } + + // Get the datablock information we want further informations from. + var objList = exploreRes.Objects; + + foreach (var ob in objList) + { + // May be this check can be removed, if setting the filter to the DB_Class_Rid is working 100%. + switch (ob.ClassId) + { + case Ids.DB_Class_Rid: + UInt32 relid = ob.RelationId; + UInt32 area = (relid >> 16); + UInt32 num = relid & 0xffff; + if (area == 0x8a0e) + { + var name = (ValueWString)(ob.GetAttribute(Ids.ObjectVariableTypeName)); + DatablockInfo data = new DatablockInfo(); + data.db_block_relid = relid; + data.db_name = name.GetValue(); + data.db_number = num; + dbInfoList.Add(data); + } + break; + } + } + + // Get the TypeInfo RID to RelId from the first response + + // With LID=1 we get the RID back. With this number we can explore further + // informations of this datablock. + // This is neccessary, because informations about instance DBs (e.g. TON) you + // don't get by the RID of the DB, instead of exploring the TON Type RID. + var readlist = new List(); + var values = new List(); + var errors = new List(); + + foreach (var data in dbInfoList) + { + if (data.db_number > 0) + { + // Insert the address + var adr1 = new ItemAddress(); + adr1.AccessArea = data.db_block_relid; + adr1.AccessSubArea = Ids.DB_ValueActual; + adr1.LID.Add(1); + readlist.Add(adr1); + } + } + res = ReadValues(readlist, out values, out errors); + if (res != 0) + { + return res; + } + + // Insert response data into the list + for (int i = 0; i < values.Count; i++) + { + if (errors[i] == 0) + { + var rid = (ValueRID)values[i]; + var data = dbInfoList[i]; + data.db_block_ti_relid = rid.GetValue(); + dbInfoList[i] = data; + } + else + { + // On error, set relid=0, which is then removed in the next step. + // Should we report this for the user? + var data = dbInfoList[i]; + data.db_block_ti_relid = 0; + dbInfoList[i] = data; + } + } + + // Remove elements with db_block_ti_relid == 0. + // This can occur on datablocks which are only in load memory and can't be explored. + dbInfoList.RemoveAll(item => item.db_block_ti_relid == 0); + + return 0; + } + + public int GetTypeInformation(uint exploreId, out List objList) + { + int res; + objList = new List(); + + var exploreReq = new ExploreRequest(ProtocolVersion.V2); + exploreReq.ExploreId = exploreId; + exploreReq.ExploreRequestId = Ids.None; + exploreReq.ExploreChildsRecursive = 1; + exploreReq.ExploreParents = 0; + + res = SendS7plusFunctionObject(exploreReq); + if (res != 0) + { + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + + var exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); + res = checkResponseWithIntegrity(exploreReq, exploreRes); + if (res != 0) + { + return res; + } + objList = exploreRes.Objects; + + return 0; + } + + /// + /// Requests the tag and block comments from the Plc, returned as XML strings. + /// xml_linecomment: + /// The returned XML format differs between between request of I/Q/M/C/T areas and datablocks: + /// I/Q/M/C/T: .... + /// Datablock: .... + /// As "ID" the number for the variable identification is used. + /// + /// xml_dbcomment: + /// The xml-value description generated from our own value xml-serialization for WStringSparseArray. The value key is the language id. + /// Example: + /// DB Kommentar in german de-DEDB comment in english en-US + /// + /// The relation ID for the area you want the comments for, e.g. 0x8a0e0000+db_number, or 0x52 for M-area + /// + /// + /// 0 if no error + public int GetCommentsXml(uint relid, out string xml_linecomment, out string xml_dbcomment) + { + int res; + // With requesting DataInterface_InterfaceDescription, whe would be able to get all informations like the access ids and + // datatype informations, that we get from the other browsing method. Needs to be tested which one is more efficient on network traffic or plc load. + // If we keep use browsing for the comments, at least we would be able to read all information in one request. + xml_linecomment = String.Empty; + xml_dbcomment = String.Empty; + + var exploreReq = new ExploreRequest(ProtocolVersion.V2); + exploreReq.ExploreId = relid; + exploreReq.ExploreRequestId = Ids.None; + exploreReq.ExploreChildsRecursive = 1; + exploreReq.ExploreParents = 0; + + // We want to know the following attributes + exploreReq.AddressList.Add(Ids.ASObjectES_Comment); + exploreReq.AddressList.Add(Ids.DataInterface_LineComments); + + res = SendS7plusFunctionObject(exploreReq); + if (res != 0) + { + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + + var exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); + res = checkResponseWithIntegrity(exploreReq, exploreRes); + if (res != 0) + { + return res; + } + + foreach(var obj in exploreRes.Objects) + { + foreach(var att in obj.Attributes) + { + switch (att.Key) + { + case Ids.ASObjectES_Comment: + var att_comment = (ValueWStringSparseArray)att.Value; + xml_dbcomment = att_comment.ToString(); + break; + case Ids.DataInterface_LineComments: + var att_linecomment = (ValueBlobSparseArray)att.Value; + BlobDecompressor bd = new BlobDecompressor(); + var blob_sp = att_linecomment.GetValue(); + // In DBs we get the data with Sparsearray key = 1, in M-Area with key = 2. + // For now, just take the first, don't know where the key ids are for. + foreach (var key in blob_sp.Keys) + { + xml_linecomment = bd.decompress(blob_sp[key].value, 4); // Offset of 4, as we have a header for the zlib dictionary version + break; + } + break; + } + } + } + return 0; + } + } + #endregion +} diff --git a/src/S7CommPlusDriver/S7CommPlusConnectionHighLevel.cs b/src/S7CommPlusDriver/S7CommPlusConnectionHighLevel.cs new file mode 100644 index 0000000..3cf52c8 --- /dev/null +++ b/src/S7CommPlusDriver/S7CommPlusConnectionHighLevel.cs @@ -0,0 +1,583 @@ +#region License +/****************************************************************************** + * S7CommPlusDriver + * + * Copyright (C) 2023 Thomas Wiens, th.wiens@gmx.de + * + * This file is part of S7CommPlusDriver. + * + * S7CommPlusDriver is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + /****************************************************************************/ +#endregion + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace S7CommPlusDriver +{ + public partial class S7CommPlusConnection + { + public enum BlockType + { + unkown, + DB, + FB, + FC, + OB, + UDT, + } + + public enum ProgrammingLanguage : int + { + Undef = 0, + STL = 1, + LAD_CLASSIC = 2, + FBD_CLASSIC = 3, + SCL = 4, + DB = 5, + GRAPH = 6, + SDB = 7, + CPU_DB = 8, + CPU_SDB = 17, + CforS7 = 21, + HIGRAPH = 22, + CFC = 23, + SFC = 24, + S7_PDIAG = 26, + RSE = 29, + F_STL = 31, + F_LAD = 32, + F_FBD = 33, + F_DB = 34, + F_CALL = 35, + TechnoDB = 37, + F_LAD_LIB = 38, + F_FBD_LIB = 39, + ClassicEncryption = 41, + FCP = 50, + LAD_IEC = 100, + FBD_IEC = 101, + FLD = 102, + UDT = 150, + SDT = 151, + FBT = 152, + CB = 160, + ST = 161, + AX_CODE = 190, + AX_DATA = 191, + BMC_200 = 200, + Motion_DB = 201, + BMC_202 = 202, + BMC_203 = 203, + BMC_204 = 204, + BMC_205 = 205, + BMC_206 = 206, + BMC_207 = 207, + BMC_208 = 208, + BMC_209 = 209, + GRAPH_ACTIONS = 300, + GRAPH_SEQUENCE = 301, + GRAPH_ADDINFOS = 303, + GRAPH_PLUS = 310, + MC7plus = 400, + ProDiag = 500, + ProDiag_OB = 501, + CEM = 600, + } + + public enum BinaryArtifacts : uint + { + Undefined = 0u, + PlcFamily = 2147483649u, + PlcMc7plusData = 2147483650u, + PlcOptimizationInfoData = 2147483651u, + PlcClosedImmediateData = 2147483652u, + SimulatorFamily = 2147483665u, + SimulatorMc7plusData = 2147483666u, + SimulatorOptimizationInfoData = 2147483667u, + SimulatorClosedImmediateData = 2147483668u, + VirtualPlcFamilyKey = 2147483681u, + VirtualPlcMc7plusDataKey = 2147483682u, + VirtualPlcOptimizationInfoDataKey = 2147483683u, + VirtualPlcClosedImmediateDataKey = 2147483684u + } + + public class BlockInfo + { + public string name; // Name of the datablock + public UInt32 number; // Number of the datablock + public BlockType type; + public ProgrammingLanguage lang; + public UInt32 db_block_relid; // RID of the datablock + public UInt32 db_block_ti_relid; // Type-Info RID of the datablock + }; + + public int BrowseAllBlocks(out List exploreData) + { + int res; + Browser vars = new Browser(); + ExploreRequest exploreReq; + ExploreResponse exploreRes; + + #region Read all objects + + exploreData = new List(); + + exploreReq = new ExploreRequest(ProtocolVersion.V2); + exploreReq.ExploreId = Ids.NativeObjects_thePLCProgram_Rid; + exploreReq.ExploreRequestId = Ids.None; + exploreReq.ExploreChildsRecursive = 1; + exploreReq.ExploreParents = 0; + + // We want to know the following attributes + exploreReq.AddressList.Add(Ids.ObjectVariableTypeName); + exploreReq.AddressList.Add(Ids.Block_BlockNumber); + exploreReq.AddressList.Add(Ids.Block_BlockLanguage); + + 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 + + #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) + { + case Ids.DB_Class_Rid: + case Ids.FB_Class_Rid: + case Ids.FC_Class_Rid: + case Ids.OB_Class_Rid: + UInt32 relid = ob.RelationId; + UInt32 area = (relid >> 16); + UInt32 num = relid & 0xffff; + + var name = (ValueWString)(ob.GetAttribute(Ids.ObjectVariableTypeName)); + var data = new BlockInfo(); + data.db_block_relid = relid; + data.name = name.GetValue(); + data.number = num; + data.type = ob.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, + }; + + var lang = ((ValueUInt)ob.Attributes[Ids.Block_BlockLanguage]).GetValue(); + data.lang = (ProgrammingLanguage)lang; + exploreData.Add(data); + break; + } + } + + #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 BlockType blockType, out string xml_linecomment, out Dictionary 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 + // datatype informations, that we get from the other browsing method. Needs to be tested which one is more efficient on network traffic or plc load. + // If we keep use browsing for the comments, at least we would be able to read all information in one request. + xml_linecomment = String.Empty; + xml_comment = new(); + interfaceDescription = String.Empty; + blockBody = new string[0]; + fuctionalObjectCode = String.Empty; + intRef = new string[0]; + extRef = new string[0]; + blockName = null; + lang = ProgrammingLanguage.Undef; + blockNumber = relid & 0xffff; + blockType = BlockType.unkown; + + var exploreReq = new ExploreRequest(ProtocolVersion.V2); + exploreReq.ExploreId = relid; + exploreReq.ExploreRequestId = Ids.None; + exploreReq.ExploreChildsRecursive = 1; + exploreReq.ExploreParents = 0; + + // We want to know the following attributes + exploreReq.AddressList.Add(Ids.ObjectVariableTypeName); + //exploreReq.AddressList.Add(Ids.Block_BlockNumber); + exploreReq.AddressList.Add(Ids.Block_BlockLanguage); + + exploreReq.AddressList.Add(Ids.ASObjectES_Comment); + exploreReq.AddressList.Add(Ids.DataInterface_LineComments); + exploreReq.AddressList.Add(Ids.DataInterface_InterfaceDescription); + exploreReq.AddressList.Add(Ids.Block_BodyDescription); + exploreReq.AddressList.Add(Ids.FunctionalObject_extRefData); + exploreReq.AddressList.Add(Ids.FunctionalObject_intRefData); + + res = SendS7plusFunctionObject(exploreReq); + if (res != 0) + { + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + + var exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); + res = checkResponseWithIntegrity(exploreReq, exploreRes); + if (res != 0) + { + return res; + } + + 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.UDT_Class_Rid => BlockType.UDT, + Ids.OB_Class_Rid => BlockType.OB, // OB + 2637 => BlockType.OB, // ACCcommunicationOB + 2639 => BlockType.OB, // CPUredundancyErrorOB + 2640 => BlockType.OB, // CyclicOB + 2641 => BlockType.OB, // DiagnosticErrorOB + 2642 => BlockType.OB, // IOaccessErrorOB + 2643 => BlockType.OB, // IOredundancyErrorOB + 2644 => BlockType.OB, // PeripheralAccessErrorOB + 2645 => BlockType.OB, // ProcessEventOB + 2646 => BlockType.OB, // ProfileEventOB + 2647 => BlockType.OB, // ProgramCycleOB (OB1) + 2648 => BlockType.OB, // ProgrammingErrorOB + 2649 => BlockType.OB, // PullPlugEventOB + 2650 => BlockType.OB, // RackStationFailureOB + 2651 => BlockType.OB, // StartupOB + 2652 => BlockType.OB, // StatusEventOB + 2653 => BlockType.OB, // SynchronousCycleOB + 2654 => BlockType.OB, // TechnologyEventOB + 2655 => BlockType.OB, // TimeDelayOB + 2656 => BlockType.OB, // TimeErrorOB + 2657 => BlockType.OB, // TimeOfDayOB + 2658 => BlockType.OB, // UpdateEventOB + 8440 => BlockType.OB, // LookAheadOB + }; + + + foreach (var att in obj.Attributes) + { + switch (att.Key) + { + case Ids.ObjectVariableTypeName: + { + blockName = ((ValueWString)att.Value).GetValue(); + break; + } + case Ids.Block_BlockNumber: + { + break; + } + case Ids.Block_BlockLanguage: + { + var l = ((ValueUInt)att.Value).GetValue(); + lang = (ProgrammingLanguage)l; + break; + } + case Ids.FunctionalObject_extRefData: + { + var xx = (ValueBlobSparseArray)att.Value; + BlobDecompressor bd3 = new BlobDecompressor(); + var blob_sp3 = xx.GetValue(); + extRef = new string[blob_sp3.Count]; + var i = 0; + foreach (var key in blob_sp3.Keys) + { + if (blob_sp3[key].value != null) + extRef[i++] = bd3.decompress(blob_sp3[key].value, 4); + } + break; + } + case Ids.FunctionalObject_intRefData: + { + var xx = (ValueBlobSparseArray)att.Value; + BlobDecompressor bd3 = new BlobDecompressor(); + var blob_sp3 = xx.GetValue(); + intRef = new string[blob_sp3.Count]; + var i = 0; + foreach (var key in blob_sp3.Keys) + { + if (blob_sp3[key].value != null) + intRef[i++] = bd3.decompress(blob_sp3[key].value, 4); + } + break; + } + case Ids.ASObjectES_Comment: + { + var att_comment = (ValueWStringSparseArray)att.Value; + xml_comment = att_comment.GetValue(); + break; + } + case Ids.DataInterface_LineComments: + { + var att_linecomment = (ValueBlobSparseArray)att.Value; + BlobDecompressor bd = new BlobDecompressor(); + var blob_sp = att_linecomment.GetValue(); + // In DBs we get the data with Sparsearray key = 1, in M-Area with key = 2. + // For now, just take the first, don't know where the key ids are for. + foreach (var key in blob_sp.Keys) + { + xml_linecomment = bd.decompress(blob_sp[key].value, 4); // Offset of 4, as we have a header for the zlib dictionary version + break; + } + break; + } + case Ids.DataInterface_InterfaceDescription: + { + var att_ifsescr = (ValueBlob)att.Value; + BlobDecompressor bd2 = new BlobDecompressor(); + var blob_sp2 = att_ifsescr.GetValue(); + interfaceDescription = bd2.decompress(blob_sp2, 4); // Offset of 4, as we have a header for the zlib dictionary version + break; + } + case Ids.Block_BodyDescription: + { + var xx = (ValueBlobSparseArray)att.Value; + BlobDecompressor bd3 = new BlobDecompressor(); + var blob_sp3 = xx.GetValue(); + blockBody = new string[blob_sp3.Where(x => x.Key < (uint)BinaryArtifacts.PlcFamily).Count()]; + var i = 0; + foreach (var key in blob_sp3.Keys.OrderBy(x => x)) + { + if (!(key < (uint)BinaryArtifacts.PlcFamily)) + { + //TODO: what to do with binary artifacts? + var binaryArtifactType = (BinaryArtifacts)key; + continue; + } + + if (blob_sp3[key].value != null) + { + var code = bd3.decompress(blob_sp3[key].value, 4); + blockBody[i++] = code; + } + } + break; + } + } + } + } + return 0; + } + + public int RunExploreRequest(uint relid, uint[] attributes, out List objects, byte exploreChildsRecursive = 1, byte exploreParents = 0) + { + int res; + + objects = null; + + var exploreReq = new ExploreRequest(ProtocolVersion.V2); + exploreReq.ExploreId = relid; + exploreReq.ExploreRequestId = Ids.None; + exploreReq.ExploreChildsRecursive = exploreChildsRecursive; + exploreReq.ExploreParents = exploreParents; + + if (attributes != null && attributes.Length > 0) + { + // We want to know the following attributes + exploreReq.AddressList.AddRange(attributes); + } + + res = SendS7plusFunctionObject(exploreReq); + if (res != 0) + { + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + + var exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true); + res = checkResponseWithIntegrity(exploreReq, exploreRes); + if (res != 0) + { + return res; + } + + objects = exploreRes.Objects; + + return 0; + } + + public int RunGetVarSubstreamedRequest(uint objectId, ushort address, out PValue value) + { + int res; + value = null; + + var getVarSubstreamedReq = new GetVarSubstreamedRequest(ProtocolVersion.V2); + getVarSubstreamedReq.InObjectId = objectId; + getVarSubstreamedReq.SessionId = m_SessionId; + getVarSubstreamedReq.Address = address; + res = SendS7plusFunctionObject(getVarSubstreamedReq); + if (res != 0) + { + return res; + } + m_LastError = 0; + WaitForNewS7plusReceived(m_ReadTimeout); + if (m_LastError != 0) + { + return m_LastError; + } + + + var getVarSubstreamedRes = GetVarSubstreamedResponse.DeserializeFromPdu(m_ReceivedPDU); + if (getVarSubstreamedRes == null) + { + return S7Consts.errIsoInvalidPDU8; + } + + value = getVarSubstreamedRes.Value; + + return 0; + } + + public class CpuInfo + { + public string PlcName { get; set; } + public string ProjectName { get; set; } + + public Version VersionTia { get; set; } + public Version Version2 { get; set; } + public string CpuMlfb { get; set; } + public string CpuSerial { get; set; } + public Version CpuFirmware { get; set; } + } + + public int GetCpuInfos(out CpuInfo cpuInfo) + { + cpuInfo = null; + + var res = this.RunGetVarSubstreamedRequest(Ids.NativeObjects_theASRoot_Rid, 2459, out var pValueVersions); + if (res != 0) + return res; + var arrVersions = ((ValueUSIntArray)pValueVersions).GetValue(); + var version1 = new Version(arrVersions[0], arrVersions[1], arrVersions[2], arrVersions[3]); + var version2 = new Version(arrVersions[4], arrVersions[5], arrVersions[6], arrVersions[7]); + + res = this.RunGetVarSubstreamedRequest(Ids.NativeObjects_theCPUCommon_Rid, 233, out var pValuePlcName); + if (res != 0) + return res; + var cpuName = ((ValueWString)pValuePlcName).GetValue(); + + res = this.RunGetVarSubstreamedRequest(Ids.NativeObjects_theCPUProxy_Rid, 3753, out var pValueMlfbSerial); + if (res != 0) + return res; + var data = ((ValueBlob)pValueMlfbSerial).GetValue(); + var mlfb = Encoding.ASCII.GetString(data[8..27]); + //space + var serial = Encoding.ASCII.GetString(data[28..44]); + //nulbyte + var hardware = data[46]; + var firmware = new Version(data[47], data[48], data[49], data[50]); + //data maybe conatins more: + //rack (1byte), slot (1byte), + + res = this.RunGetVarSubstreamedRequest(Ids.ReleaseMngmtRoot_Rid, 8342, out var pValueVersionsAndName); + if (res != 0) + return res; + var versionsAndName = ((ValueWStringArray)pValueVersionsAndName).GetValue(); + + cpuInfo = new CpuInfo() + { + PlcName = cpuName, + ProjectName = versionsAndName[2], + VersionTia = version1, + Version2 = version2, + CpuMlfb = mlfb, + CpuSerial = serial, + CpuFirmware = firmware + }; + + return 0; + } + } +} diff --git a/src/S7CommPlusDriver/S7CommPlusDriver.csproj b/src/S7CommPlusDriver/S7CommPlusDriver.csproj index e64d62c..64a7c26 100644 --- a/src/S7CommPlusDriver/S7CommPlusDriver.csproj +++ b/src/S7CommPlusDriver/S7CommPlusDriver.csproj @@ -1,148 +1,44 @@ - - - - - Debug - AnyCPU - {781951D8-80DE-4E2F-92CA-A5FEF0059415} - Library - S7CommPlusDriver - S7CommPlusDriver - v4.7.2 - 512 - true - true - - - - - - true - bin\x64\Debug\ - TRACE;DEBUG;_WIN64 - full - x64 - 7.3 - prompt - - - bin\x64\Release\ - TRACE;_WIN64 - true - pdbonly - x64 - 7.3 - prompt - - - true - bin\x86\Debug\ - TRACE;DEBUG;_WIN32 - full - x86 - 7.3 - prompt - - - bin\x86\Release\ - TRACE;_WIN32 - true - pdbonly - x86 - 7.3 - prompt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {0c89b7a2-a218-49e4-b545-5b044a45f977} - Zlib.net - - - - - - - - - xcopy /y /d "$(ProjectDir)OpenSSL-dll-$(PlatformName)\*.dll" "$(ProjectDir)$(OutDir)" - + + + net6.0;net8.0;net9.0 + Library + false + 10.0 + + + + + + + + + + PreserveNewest + true + runtimes/ + + + + + + + + + + + + + + S7CommPlusDriver + S7CommPlusDriver + Copyright © 2025, DotNetProjects, Thomas Wiens + 0.1.0.0 + 0.1.0.0 + True + DotNetProjects.$(AssemblyName) + DotNetProjects.$(AssemblyName) + DotNetProjects + https://github.com/dotnetprojects/S7CommPlusDriver + LGPL-3.0-or-later + \ No newline at end of file diff --git a/src/S7CommPlusDriver/build/net8.0/CopyNativeFiles.targets b/src/S7CommPlusDriver/build/net8.0/CopyNativeFiles.targets new file mode 100644 index 0000000..c8f567b --- /dev/null +++ b/src/S7CommPlusDriver/build/net8.0/CopyNativeFiles.targets @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/src/S7CommPlusDriver/runtimes/info.txt b/src/S7CommPlusDriver/runtimes/info.txt new file mode 100644 index 0000000..ba13b34 --- /dev/null +++ b/src/S7CommPlusDriver/runtimes/info.txt @@ -0,0 +1,17 @@ +Runtime Libs: + +MacOS: + + Arm64: 3.4.0 + ./Configure darwin64-arm64-cc --prefix="/tmp/openssl-arm" no-asm + make + make install + + X64: 3.4.0 + ./Configure darwin64-x64-cc --prefix="/tmp/openssl-x64" + make + make install + +Windows + + all versions from: https://slproweb.com/products/Win32OpenSSL.html \ No newline at end of file diff --git a/src/S7CommPlusDriver/runtimes/osx-arm64/native/libcrypto.3.dylib b/src/S7CommPlusDriver/runtimes/osx-arm64/native/libcrypto.3.dylib new file mode 100644 index 0000000..4cc9236 Binary files /dev/null and b/src/S7CommPlusDriver/runtimes/osx-arm64/native/libcrypto.3.dylib differ diff --git a/src/S7CommPlusDriver/runtimes/osx-arm64/native/libssl.3.dylib b/src/S7CommPlusDriver/runtimes/osx-arm64/native/libssl.3.dylib new file mode 100644 index 0000000..f500d94 Binary files /dev/null and b/src/S7CommPlusDriver/runtimes/osx-arm64/native/libssl.3.dylib differ diff --git a/src/S7CommPlusDriver/runtimes/win-arm64/native/libcrypto-3-arm64.dll b/src/S7CommPlusDriver/runtimes/win-arm64/native/libcrypto-3-arm64.dll new file mode 100644 index 0000000..f0196a5 Binary files /dev/null and b/src/S7CommPlusDriver/runtimes/win-arm64/native/libcrypto-3-arm64.dll differ diff --git a/src/S7CommPlusDriver/runtimes/win-arm64/native/libssl-3-arm64.dll b/src/S7CommPlusDriver/runtimes/win-arm64/native/libssl-3-arm64.dll new file mode 100644 index 0000000..5143603 Binary files /dev/null and b/src/S7CommPlusDriver/runtimes/win-arm64/native/libssl-3-arm64.dll differ diff --git a/src/S7CommPlusDriver/runtimes/win-x64/native/libcrypto-3-x64.dll b/src/S7CommPlusDriver/runtimes/win-x64/native/libcrypto-3-x64.dll new file mode 100644 index 0000000..1f50b91 Binary files /dev/null and b/src/S7CommPlusDriver/runtimes/win-x64/native/libcrypto-3-x64.dll differ diff --git a/src/S7CommPlusDriver/runtimes/win-x64/native/libssl-3-x64.dll b/src/S7CommPlusDriver/runtimes/win-x64/native/libssl-3-x64.dll new file mode 100644 index 0000000..c68aa73 Binary files /dev/null and b/src/S7CommPlusDriver/runtimes/win-x64/native/libssl-3-x64.dll differ diff --git a/src/S7CommPlusDriver/runtimes/win-x86/native/libcrypto-3.dll b/src/S7CommPlusDriver/runtimes/win-x86/native/libcrypto-3.dll new file mode 100644 index 0000000..cdd5684 Binary files /dev/null and b/src/S7CommPlusDriver/runtimes/win-x86/native/libcrypto-3.dll differ diff --git a/src/S7CommPlusDriver/runtimes/win-x86/native/libssl-3.dll b/src/S7CommPlusDriver/runtimes/win-x86/native/libssl-3.dll new file mode 100644 index 0000000..dd52338 Binary files /dev/null and b/src/S7CommPlusDriver/runtimes/win-x86/native/libssl-3.dll differ diff --git a/src/S7CommPlusGUIBrowser/App.config b/src/S7CommPlusGUIBrowser/App.config deleted file mode 100644 index 56efbc7..0000000 --- a/src/S7CommPlusGUIBrowser/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/S7CommPlusGUIBrowser/Properties/AssemblyInfo.cs b/src/S7CommPlusGUIBrowser/Properties/AssemblyInfo.cs deleted file mode 100644 index df3272c..0000000 --- a/src/S7CommPlusGUIBrowser/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("S7CommPlusGUIBrowser")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("S7CommPlusGUIBrowser")] -[assembly: AssemblyCopyright("Copyright © 2024")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly -// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von -// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("beb37276-b3b3-4dee-a1ea-d95eb774223b")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -// indem Sie "*" wie unten gezeigt eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/S7CommPlusGUIBrowser/Properties/Resources.Designer.cs b/src/S7CommPlusGUIBrowser/Properties/Resources.Designer.cs deleted file mode 100644 index 869a851..0000000 --- a/src/S7CommPlusGUIBrowser/Properties/Resources.Designer.cs +++ /dev/null @@ -1,62 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion: 4.0.30319.42000 -// -// Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn -// der Code neu generiert wird. -// -//------------------------------------------------------------------------------ - -namespace S7CommPlusGUIBrowser.Properties { - - - /// - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - /// - // Diese Klasse wurde von der StronglyTypedResourceBuilder-Klasse - // über ein Tool wie ResGen oder Visual Studio automatisch generiert. - // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - // mit der Option /str erneut aus, oder erstellen Sie Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if ((resourceMan == null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("S7CommPlusGUIBrowser.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenlookups, die diese stark typisierte Ressourcenklasse verwenden. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/src/S7CommPlusGUIBrowser/Properties/Resources.resx b/src/S7CommPlusGUIBrowser/Properties/Resources.resx deleted file mode 100644 index ffecec8..0000000 --- a/src/S7CommPlusGUIBrowser/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/src/S7CommPlusGUIBrowser/Properties/Settings.Designer.cs b/src/S7CommPlusGUIBrowser/Properties/Settings.Designer.cs deleted file mode 100644 index e62375c..0000000 --- a/src/S7CommPlusGUIBrowser/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace S7CommPlusGUIBrowser.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/src/S7CommPlusGUIBrowser/Properties/Settings.settings b/src/S7CommPlusGUIBrowser/Properties/Settings.settings deleted file mode 100644 index abf36c5..0000000 --- a/src/S7CommPlusGUIBrowser/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/S7CommPlusGUIBrowser/S7CommPlusGUIBrowser.csproj b/src/S7CommPlusGUIBrowser/S7CommPlusGUIBrowser.csproj index 1d43460..d2fd6c8 100644 --- a/src/S7CommPlusGUIBrowser/S7CommPlusGUIBrowser.csproj +++ b/src/S7CommPlusGUIBrowser/S7CommPlusGUIBrowser.csproj @@ -1,114 +1,20 @@ - - - - - Debug - AnyCPU - {BEB37276-B3B3-4DEE-A1EA-D95EB774223B} - WinExe - S7CommPlusGUIBrowser - S7CommPlusGUIBrowser - v4.7.2 - 512 - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - 7.3 - prompt - true - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - 7.3 - prompt - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - 7.3 - prompt - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - 7.3 - prompt - true - - - - - - - - - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - {781951d8-80de-4e2f-92ca-a5fef0059415} - S7CommPlusDriver - - - - - xcopy /y /d "$(SolutionDir)S7CommPlusDriver\OpenSSL-dll-$(PlatformName)\*.dll" "$(ProjectDir)$(OutDir)" - + + + net8.0-windows + WinExe + false + true + true + true + + + 1701;1702;CA1416 + + + + + + + + \ No newline at end of file diff --git a/src/Zlib.net/Adler32.cs b/src/Zlib.net/Adler32.cs deleted file mode 100644 index 6b9fd62..0000000 --- a/src/Zlib.net/Adler32.cs +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - sealed class Adler32 - { - - // largest prime smaller than 65536 - private const int BASE = 65521; - // NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 - private const int NMAX = 5552; - - internal long adler32(long adler, byte[] buf, int index, int len) - { - if (buf == null) - { - return 1L; - } - - long s1 = adler & 0xffff; - long s2 = (adler >> 16) & 0xffff; - int k; - - while (len > 0) - { - k = len < NMAX?len:NMAX; - len -= k; - while (k >= 16) - { - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - s1 += (buf[index++] & 0xff); s2 += s1; - k -= 16; - } - if (k != 0) - { - do - { - s1 += (buf[index++] & 0xff); s2 += s1; - } - while (--k != 0); - } - s1 %= BASE; - s2 %= BASE; - } - return (s2 << 16) | s1; - } - - } -} \ No newline at end of file diff --git a/src/Zlib.net/AssemblyInfo.cs b/src/Zlib.net/AssemblyInfo.cs deleted file mode 100644 index 1faa426..0000000 --- a/src/Zlib.net/AssemblyInfo.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// -[assembly: AssemblyTitle("ZLIB.NET")] -[assembly: AssemblyDescription("ZLIB.NET")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("ComponentAce")] -[assembly: AssemblyProduct("ZLIB.NET")] -[assembly: AssemblyCopyright("ComponentAce")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: AssemblyVersion("1.0.3.0")] - -// -// In order to sign your assembly you must specify a key to use. Refer to the -// Microsoft .NET Framework documentation for more information on assembly signing. -// -// Use the attributes below to control which key is used for signing. -// -// Notes: -// (*) If no key is specified, the assembly is not signed. -// (*) KeyName refers to a key that has been installed in the Crypto Service -// Provider (CSP) on your machine. KeyFile refers to a file which contains -// a key. -// (*) If the KeyFile and the KeyName values are both specified, the -// following processing occurs: -// (1) If the KeyName can be found in the CSP, that key is used. -// (2) If the KeyName does not exist and the KeyFile does exist, the key -// in the KeyFile is installed into the CSP and used. -// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. -// When specifying the KeyFile, the location of the KeyFile should be -// relative to the project output directory which is -// %Project Directory%\obj\. For example, if your KeyFile is -// located in the project directory, you would specify the AssemblyKeyFile -// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] -// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework -// documentation for more information on this. -// -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] -[assembly: AssemblyKeyName("")] diff --git a/src/Zlib.net/Deflate.cs b/src/Zlib.net/Deflate.cs deleted file mode 100644 index 24a25d3..0000000 --- a/src/Zlib.net/Deflate.cs +++ /dev/null @@ -1,1799 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - public sealed class Deflate - { - - private const int MAX_MEM_LEVEL = 9; - - private const int Z_DEFAULT_COMPRESSION = - 1; - - private const int MAX_WBITS = 15; // 32K LZ77 window - private const int DEF_MEM_LEVEL = 8; - - internal class Config - { - internal int good_length; // reduce lazy search above this match length - internal int max_lazy; // do not perform lazy search above this match length - internal int nice_length; // quit search above this match length - internal int max_chain; - internal int func; - internal Config(int good_length, int max_lazy, int nice_length, int max_chain, int func) - { - this.good_length = good_length; - this.max_lazy = max_lazy; - this.nice_length = nice_length; - this.max_chain = max_chain; - this.func = func; - } - } - - private const int STORED = 0; - private const int FAST = 1; - private const int SLOW = 2; - private static Config[] config_table; - - private static readonly System.String[] z_errmsg = new System.String[]{"need dictionary", "stream end", "", "file error", "stream error", "data error", "insufficient memory", "buffer error", "incompatible version", ""}; - - // block not completed, need more input or more output - private const int NeedMore = 0; - - // block flush performed - private const int BlockDone = 1; - - // finish started, need only more output at next deflate - private const int FinishStarted = 2; - - // finish done, accept no more input or output - private const int FinishDone = 3; - - // preset dictionary flag in zlib header - private const int PRESET_DICT = 0x20; - - private const int Z_FILTERED = 1; - private const int Z_HUFFMAN_ONLY = 2; - private const int Z_DEFAULT_STRATEGY = 0; - - private const int Z_NO_FLUSH = 0; - private const int Z_PARTIAL_FLUSH = 1; - private const int Z_SYNC_FLUSH = 2; - private const int Z_FULL_FLUSH = 3; - private const int Z_FINISH = 4; - - private const int Z_OK = 0; - private const int Z_STREAM_END = 1; - private const int Z_NEED_DICT = 2; - private const int Z_ERRNO = - 1; - private const int Z_STREAM_ERROR = - 2; - private const int Z_DATA_ERROR = - 3; - private const int Z_MEM_ERROR = - 4; - private const int Z_BUF_ERROR = - 5; - private const int Z_VERSION_ERROR = - 6; - - private const int INIT_STATE = 42; - private const int BUSY_STATE = 113; - private const int FINISH_STATE = 666; - - // The deflate compression method - private const int Z_DEFLATED = 8; - - private const int STORED_BLOCK = 0; - private const int STATIC_TREES = 1; - private const int DYN_TREES = 2; - - // The three kinds of block type - private const int Z_BINARY = 0; - private const int Z_ASCII = 1; - private const int Z_UNKNOWN = 2; - - private const int Buf_size = 8 * 2; - - // repeat previous bit length 3-6 times (2 bits of repeat count) - private const int REP_3_6 = 16; - - // repeat a zero length 3-10 times (3 bits of repeat count) - private const int REPZ_3_10 = 17; - - // repeat a zero length 11-138 times (7 bits of repeat count) - private const int REPZ_11_138 = 18; - - private const int MIN_MATCH = 3; - private const int MAX_MATCH = 258; - private static readonly int MIN_LOOKAHEAD = (MAX_MATCH + MIN_MATCH + 1); - - private const int MAX_BITS = 15; - private const int D_CODES = 30; - private const int BL_CODES = 19; - private const int LENGTH_CODES = 29; - private const int LITERALS = 256; - private static readonly int L_CODES = (LITERALS + 1 + LENGTH_CODES); - private static readonly int HEAP_SIZE = (2 * L_CODES + 1); - - private const int END_BLOCK = 256; - - internal ZStream strm; // pointer back to this zlib stream - internal int status; // as the name implies - internal byte[] pending_buf; // output still pending - internal int pending_buf_size; // size of pending_buf - internal int pending_out; // next pending byte to output to the stream - internal int pending; // nb of bytes in the pending buffer - internal int noheader; // suppress zlib header and adler32 - internal byte data_type; // UNKNOWN, BINARY or ASCII - internal byte method; // STORED (for zip only) or DEFLATED - internal int last_flush; // value of flush param for previous deflate call - - internal int w_size; // LZ77 window size (32K by default) - internal int w_bits; // log2(w_size) (8..16) - internal int w_mask; // w_size - 1 - - internal byte[] window; - // Sliding window. Input bytes are read into the second half of the window, - // and move to the first half later to keep a dictionary of at least wSize - // bytes. With this organization, matches are limited to a distance of - // wSize-MAX_MATCH bytes, but this ensures that IO is always - // performed with a length multiple of the block size. Also, it limits - // the window size to 64K, which is quite useful on MSDOS. - // To do: use the user input buffer as sliding window. - - internal int window_size; - // Actual size of window: 2*wSize, except when the user input buffer - // is directly used as sliding window. - - internal short[] prev; - // Link to older string with same hash index. To limit the size of this - // array to 64K, this link is maintained only for the last 32K strings. - // An index in this array is thus a window index modulo 32K. - - internal short[] head; // Heads of the hash chains or NIL. - - internal int ins_h; // hash index of string to be inserted - internal int hash_size; // number of elements in hash table - internal int hash_bits; // log2(hash_size) - internal int hash_mask; // hash_size-1 - - // Number of bits by which ins_h must be shifted at each input - // step. It must be such that after MIN_MATCH steps, the oldest - // byte no longer takes part in the hash key, that is: - // hash_shift * MIN_MATCH >= hash_bits - internal int hash_shift; - - // Window position at the beginning of the current output block. Gets - // negative when the window is moved backwards. - - internal int block_start; - - internal int match_length; // length of best match - internal int prev_match; // previous match - internal int match_available; // set if previous match exists - internal int strstart; // start of string to insert - internal int match_start; // start of matching string - internal int lookahead; // number of valid bytes ahead in window - - // Length of the best match at previous step. Matches not greater than this - // are discarded. This is used in the lazy match evaluation. - internal int prev_length; - - // To speed up deflation, hash chains are never searched beyond this - // length. A higher limit improves compression ratio but degrades the speed. - internal int max_chain_length; - - // Attempt to find a better match only when the current match is strictly - // smaller than this value. This mechanism is used only for compression - // levels >= 4. - internal int max_lazy_match; - - // Insert new strings in the hash table only if the match length is not - // greater than this length. This saves time but degrades compression. - // max_insert_length is used only for compression levels <= 3. - - internal int level; // compression level (1..9) - internal int strategy; // favor or force Huffman coding - - // Use a faster search when the previous match is longer than this - internal int good_match; - - // Stop searching when current match exceeds this - internal int nice_match; - - internal short[] dyn_ltree; // literal and length tree - internal short[] dyn_dtree; // distance tree - internal short[] bl_tree; // Huffman tree for bit lengths - - internal Tree l_desc = new Tree(); // desc for literal tree - internal Tree d_desc = new Tree(); // desc for distance tree - internal Tree bl_desc = new Tree(); // desc for bit length tree - - // number of codes at each bit length for an optimal tree - internal short[] bl_count = new short[MAX_BITS + 1]; - - // heap used to build the Huffman trees - internal int[] heap = new int[2 * L_CODES + 1]; - - internal int heap_len; // number of elements in the heap - internal int heap_max; // element of largest frequency - // The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. - // The same heap array is used to build all trees. - - // Depth of each subtree used as tie breaker for trees of equal frequency - internal byte[] depth = new byte[2 * L_CODES + 1]; - - internal int l_buf; // index for literals or lengths */ - - // Size of match buffer for literals/lengths. There are 4 reasons for - // limiting lit_bufsize to 64K: - // - frequencies can be kept in 16 bit counters - // - if compression is not successful for the first block, all input - // data is still in the window so we can still emit a stored block even - // when input comes from standard input. (This can also be done for - // all blocks if lit_bufsize is not greater than 32K.) - // - if compression is not successful for a file smaller than 64K, we can - // even emit a stored file instead of a stored block (saving 5 bytes). - // This is applicable only for zip (not gzip or zlib). - // - creating new Huffman trees less frequently may not provide fast - // adaptation to changes in the input data statistics. (Take for - // example a binary file with poorly compressible code followed by - // a highly compressible string table.) Smaller buffer sizes give - // fast adaptation but have of course the overhead of transmitting - // trees more frequently. - // - I can't count above 4 - internal int lit_bufsize; - - internal int last_lit; // running index in l_buf - - // Buffer for distances. To simplify the code, d_buf and l_buf have - // the same number of elements. To use different lengths, an extra flag - // array would be necessary. - - internal int d_buf; // index of pendig_buf - - internal int opt_len; // bit length of current block with optimal trees - internal int static_len; // bit length of current block with static trees - internal int matches; // number of string matches in current block - internal int last_eob_len; // bit length of EOB code for last block - - // Output buffer. bits are inserted starting at the bottom (least - // significant bits). - internal short bi_buf; - - // Number of valid bits in bi_buf. All bits above the last valid bit - // are always zero. - internal int bi_valid; - - internal Deflate() - { - dyn_ltree = new short[HEAP_SIZE * 2]; - dyn_dtree = new short[(2 * D_CODES + 1) * 2]; // distance tree - bl_tree = new short[(2 * BL_CODES + 1) * 2]; // Huffman tree for bit lengths - } - - internal void lm_init() - { - window_size = 2 * w_size; - - head[hash_size - 1] = 0; - for (int i = 0; i < hash_size - 1; i++) - { - head[i] = 0; - } - - // Set the default configuration parameters: - max_lazy_match = Deflate.config_table[level].max_lazy; - good_match = Deflate.config_table[level].good_length; - nice_match = Deflate.config_table[level].nice_length; - max_chain_length = Deflate.config_table[level].max_chain; - - strstart = 0; - block_start = 0; - lookahead = 0; - match_length = prev_length = MIN_MATCH - 1; - match_available = 0; - ins_h = 0; - } - - // Initialize the tree data structures for a new zlib stream. - internal void tr_init() - { - - l_desc.dyn_tree = dyn_ltree; - l_desc.stat_desc = StaticTree.static_l_desc; - - d_desc.dyn_tree = dyn_dtree; - d_desc.stat_desc = StaticTree.static_d_desc; - - bl_desc.dyn_tree = bl_tree; - bl_desc.stat_desc = StaticTree.static_bl_desc; - - bi_buf = 0; - bi_valid = 0; - last_eob_len = 8; // enough lookahead for inflate - - // Initialize the first block of the first file: - init_block(); - } - - internal void init_block() - { - // Initialize the trees. - for (int i = 0; i < L_CODES; i++) - dyn_ltree[i * 2] = 0; - for (int i = 0; i < D_CODES; i++) - dyn_dtree[i * 2] = 0; - for (int i = 0; i < BL_CODES; i++) - bl_tree[i * 2] = 0; - - dyn_ltree[END_BLOCK * 2] = 1; - opt_len = static_len = 0; - last_lit = matches = 0; - } - - // Restore the heap property by moving down the tree starting at node k, - // exchanging a node with the smallest of its two sons if necessary, stopping - // when the heap property is re-established (each father smaller than its - // two sons). - internal void pqdownheap(short[] tree, int k) - { - int v = heap[k]; - int j = k << 1; // left son of k - while (j <= heap_len) - { - // Set j to the smallest of the two sons: - if (j < heap_len && smaller(tree, heap[j + 1], heap[j], depth)) - { - j++; - } - // Exit if v is smaller than both sons - if (smaller(tree, v, heap[j], depth)) - break; - - // Exchange v with the smallest son - heap[k] = heap[j]; k = j; - // And continue down the tree, setting j to the left son of k - j <<= 1; - } - heap[k] = v; - } - - internal static bool smaller(short[] tree, int n, int m, byte[] depth) - { - return (tree[n * 2] < tree[m * 2] || (tree[n * 2] == tree[m * 2] && depth[n] <= depth[m])); - } - - // Scan a literal or distance tree to determine the frequencies of the codes - // in the bit length tree. - internal void scan_tree(short[] tree, int max_code) - { - int n; // iterates over all tree elements - int prevlen = - 1; // last emitted length - int curlen; // length of current code - int nextlen = tree[0 * 2 + 1]; // length of next code - int count = 0; // repeat count of the current code - int max_count = 7; // max repeat count - int min_count = 4; // min repeat count - - if (nextlen == 0) - { - max_count = 138; min_count = 3; - } - tree[(max_code + 1) * 2 + 1] = (short) SupportClass.Identity(0xffff); // guard - - for (n = 0; n <= max_code; n++) - { - curlen = nextlen; nextlen = tree[(n + 1) * 2 + 1]; - if (++count < max_count && curlen == nextlen) - { - continue; - } - else if (count < min_count) - { - bl_tree[curlen * 2] = (short) (bl_tree[curlen * 2] + count); - } - else if (curlen != 0) - { - if (curlen != prevlen) - bl_tree[curlen * 2]++; - bl_tree[REP_3_6 * 2]++; - } - else if (count <= 10) - { - bl_tree[REPZ_3_10 * 2]++; - } - else - { - bl_tree[REPZ_11_138 * 2]++; - } - count = 0; prevlen = curlen; - if (nextlen == 0) - { - max_count = 138; min_count = 3; - } - else if (curlen == nextlen) - { - max_count = 6; min_count = 3; - } - else - { - max_count = 7; min_count = 4; - } - } - } - - // Construct the Huffman tree for the bit lengths and return the index in - // bl_order of the last bit length code to send. - internal int build_bl_tree() - { - int max_blindex; // index of last bit length code of non zero freq - - // Determine the bit length frequencies for literal and distance trees - scan_tree(dyn_ltree, l_desc.max_code); - scan_tree(dyn_dtree, d_desc.max_code); - - // Build the bit length tree: - bl_desc.build_tree(this); - // opt_len now includes the length of the tree representations, except - // the lengths of the bit lengths codes and the 5+5+4 bits for the counts. - - // Determine the number of bit length codes to send. The pkzip format - // requires that at least 4 bit length codes be sent. (appnote.txt says - // 3 but the actual value used is 4.) - for (max_blindex = BL_CODES - 1; max_blindex >= 3; max_blindex--) - { - if (bl_tree[Tree.bl_order[max_blindex] * 2 + 1] != 0) - break; - } - // Update opt_len to include the bit length tree and counts - opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4; - - return max_blindex; - } - - - // Send the header for a block using dynamic Huffman trees: the counts, the - // lengths of the bit length codes, the literal tree and the distance tree. - // IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. - internal void send_all_trees(int lcodes, int dcodes, int blcodes) - { - int rank; // index in bl_order - - send_bits(lcodes - 257, 5); // not +255 as stated in appnote.txt - send_bits(dcodes - 1, 5); - send_bits(blcodes - 4, 4); // not -3 as stated in appnote.txt - for (rank = 0; rank < blcodes; rank++) - { - send_bits(bl_tree[Tree.bl_order[rank] * 2 + 1], 3); - } - send_tree(dyn_ltree, lcodes - 1); // literal tree - send_tree(dyn_dtree, dcodes - 1); // distance tree - } - - // Send a literal or distance tree in compressed form, using the codes in - // bl_tree. - internal void send_tree(short[] tree, int max_code) - { - int n; // iterates over all tree elements - int prevlen = - 1; // last emitted length - int curlen; // length of current code - int nextlen = tree[0 * 2 + 1]; // length of next code - int count = 0; // repeat count of the current code - int max_count = 7; // max repeat count - int min_count = 4; // min repeat count - - if (nextlen == 0) - { - max_count = 138; min_count = 3; - } - - for (n = 0; n <= max_code; n++) - { - curlen = nextlen; nextlen = tree[(n + 1) * 2 + 1]; - if (++count < max_count && curlen == nextlen) - { - continue; - } - else if (count < min_count) - { - do - { - send_code(curlen, bl_tree); - } - while (--count != 0); - } - else if (curlen != 0) - { - if (curlen != prevlen) - { - send_code(curlen, bl_tree); count--; - } - send_code(REP_3_6, bl_tree); - send_bits(count - 3, 2); - } - else if (count <= 10) - { - send_code(REPZ_3_10, bl_tree); - send_bits(count - 3, 3); - } - else - { - send_code(REPZ_11_138, bl_tree); - send_bits(count - 11, 7); - } - count = 0; prevlen = curlen; - if (nextlen == 0) - { - max_count = 138; min_count = 3; - } - else if (curlen == nextlen) - { - max_count = 6; min_count = 3; - } - else - { - max_count = 7; min_count = 4; - } - } - } - - // Output a byte on the stream. - // IN assertion: there is enough room in pending_buf. - internal void put_byte(byte[] p, int start, int len) - { - Array.Copy(p, start, pending_buf, pending, len); - pending += len; - } - - internal void put_byte(byte c) - { - pending_buf[pending++] = c; - } - internal void put_short(int w) - { - put_byte((byte) (w)); - put_byte((byte) (SupportClass.URShift(w, 8))); - } - internal void putShortMSB(int b) - { - put_byte((byte) (b >> 8)); - put_byte((byte) (b)); - } - - internal void send_code(int c, short[] tree) - { - send_bits((tree[c * 2] & 0xffff), (tree[c * 2 + 1] & 0xffff)); - } - - internal void send_bits(int value_Renamed, int length) - { - int len = length; - if (bi_valid > (int) Buf_size - len) - { - int val = value_Renamed; - // bi_buf |= (val << bi_valid); - bi_buf = (short) ((ushort) bi_buf | (ushort) (((val << bi_valid) & 0xffff))); - put_short(bi_buf); - bi_buf = (short) (SupportClass.URShift(val, (Buf_size - bi_valid))); - bi_valid += len - Buf_size; - } - else - { - // bi_buf |= (value) << bi_valid; - bi_buf = (short)((ushort)bi_buf | (ushort)((((value_Renamed) << bi_valid) & 0xffff))); - bi_valid += len; - } - } - - // Send one empty static block to give enough lookahead for inflate. - // This takes 10 bits, of which 7 may remain in the bit buffer. - // The current inflate code requires 9 bits of lookahead. If the - // last two codes for the previous block (real code plus EOB) were coded - // on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode - // the last real code. In this case we send two empty static blocks instead - // of one. (There are no problems if the previous block is stored or fixed.) - // To simplify the code, we assume the worst case of last real code encoded - // on one bit only. - internal void _tr_align() - { - send_bits(STATIC_TREES << 1, 3); - send_code(END_BLOCK, StaticTree.static_ltree); - - bi_flush(); - - // Of the 10 bits for the empty block, we have already sent - // (10 - bi_valid) bits. The lookahead for the last real code (before - // the EOB of the previous block) was thus at least one plus the length - // of the EOB plus what we have just sent of the empty static block. - if (1 + last_eob_len + 10 - bi_valid < 9) - { - send_bits(STATIC_TREES << 1, 3); - send_code(END_BLOCK, StaticTree.static_ltree); - bi_flush(); - } - last_eob_len = 7; - } - - - // Save the match info and tally the frequency counts. Return true if - // the current block must be flushed. - internal bool _tr_tally(int dist, int lc) - { - - pending_buf[d_buf + last_lit * 2] = (byte) (SupportClass.URShift(dist, 8)); - pending_buf[d_buf + last_lit * 2 + 1] = (byte) dist; - - pending_buf[l_buf + last_lit] = (byte) lc; last_lit++; - - if (dist == 0) - { - // lc is the unmatched char - dyn_ltree[lc * 2]++; - } - else - { - matches++; - // Here, lc is the match length - MIN_MATCH - dist--; // dist = match distance - 1 - dyn_ltree[(Tree._length_code[lc] + LITERALS + 1) * 2]++; - dyn_dtree[Tree.d_code(dist) * 2]++; - } - - if ((last_lit & 0x1fff) == 0 && level > 2) - { - // Compute an upper bound for the compressed length - int out_length = last_lit * 8; - int in_length = strstart - block_start; - int dcode; - for (dcode = 0; dcode < D_CODES; dcode++) - { - out_length = (int) (out_length + (int) dyn_dtree[dcode * 2] * (5L + Tree.extra_dbits[dcode])); - } - out_length = SupportClass.URShift(out_length, 3); - if ((matches < (last_lit / 2)) && out_length < in_length / 2) - return true; - } - - return (last_lit == lit_bufsize - 1); - // We avoid equality with lit_bufsize because of wraparound at 64K - // on 16 bit machines and because stored blocks are restricted to - // 64K-1 bytes. - } - - // Send the block data compressed using the given Huffman trees - internal void compress_block(short[] ltree, short[] dtree) - { - int dist; // distance of matched string - int lc; // match length or unmatched char (if dist == 0) - int lx = 0; // running index in l_buf - int code; // the code to send - int extra; // number of extra bits to send - - if (last_lit != 0) - { - do - { - dist = ((pending_buf[d_buf + lx * 2] << 8) & 0xff00) | (pending_buf[d_buf + lx * 2 + 1] & 0xff); - lc = (pending_buf[l_buf + lx]) & 0xff; lx++; - - if (dist == 0) - { - send_code(lc, ltree); // send a literal byte - } - else - { - // Here, lc is the match length - MIN_MATCH - code = Tree._length_code[lc]; - - send_code(code + LITERALS + 1, ltree); // send the length code - extra = Tree.extra_lbits[code]; - if (extra != 0) - { - lc -= Tree.base_length[code]; - send_bits(lc, extra); // send the extra length bits - } - dist--; // dist is now the match distance - 1 - code = Tree.d_code(dist); - - send_code(code, dtree); // send the distance code - extra = Tree.extra_dbits[code]; - if (extra != 0) - { - dist -= Tree.base_dist[code]; - send_bits(dist, extra); // send the extra distance bits - } - } // literal or match pair ? - - // Check that the overlay between pending_buf and d_buf+l_buf is ok: - } - while (lx < last_lit); - } - - send_code(END_BLOCK, ltree); - last_eob_len = ltree[END_BLOCK * 2 + 1]; - } - - // Set the data type to ASCII or BINARY, using a crude approximation: - // binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise. - // IN assertion: the fields freq of dyn_ltree are set and the total of all - // frequencies does not exceed 64K (to fit in an int on 16 bit machines). - internal void set_data_type() - { - int n = 0; - int ascii_freq = 0; - int bin_freq = 0; - while (n < 7) - { - bin_freq += dyn_ltree[n * 2]; n++; - } - while (n < 128) - { - ascii_freq += dyn_ltree[n * 2]; n++; - } - while (n < LITERALS) - { - bin_freq += dyn_ltree[n * 2]; n++; - } - data_type = (byte) (bin_freq > (SupportClass.URShift(ascii_freq, 2))?Z_BINARY:Z_ASCII); - } - - // Flush the bit buffer, keeping at most 7 bits in it. - internal void bi_flush() - { - if (bi_valid == 16) - { - put_short(bi_buf); - bi_buf = 0; - bi_valid = 0; - } - else if (bi_valid >= 8) - { - put_byte((byte) bi_buf); - bi_buf = (short) (SupportClass.URShift(bi_buf, 8)); - bi_valid -= 8; - } - } - - // Flush the bit buffer and align the output on a byte boundary - internal void bi_windup() - { - if (bi_valid > 8) - { - put_short(bi_buf); - } - else if (bi_valid > 0) - { - put_byte((byte) bi_buf); - } - bi_buf = 0; - bi_valid = 0; - } - - // Copy a stored block, storing first the length and its - // one's complement if requested. - internal void copy_block(int buf, int len, bool header) - { - - bi_windup(); // align on byte boundary - last_eob_len = 8; // enough lookahead for inflate - - if (header) - { - put_short((short) len); - put_short((short) ~ len); - } - - // while(len--!=0) { - // put_byte(window[buf+index]); - // index++; - // } - put_byte(window, buf, len); - } - - internal void flush_block_only(bool eof) - { - _tr_flush_block(block_start >= 0?block_start:- 1, strstart - block_start, eof); - block_start = strstart; - strm.flush_pending(); - } - - // Copy without compression as much as possible from the input stream, return - // the current block state. - // This function does not insert new strings in the dictionary since - // uncompressible data is probably not useful. This function is used - // only for the level=0 compression option. - // NOTE: this function should be optimized to avoid extra copying from - // window to pending_buf. - internal int deflate_stored(int flush) - { - // Stored blocks are limited to 0xffff bytes, pending_buf is limited - // to pending_buf_size, and each stored block has a 5 byte header: - - int max_block_size = 0xffff; - int max_start; - - if (max_block_size > pending_buf_size - 5) - { - max_block_size = pending_buf_size - 5; - } - - // Copy as much as possible from input to output: - while (true) - { - // Fill the window as much as possible: - if (lookahead <= 1) - { - fill_window(); - if (lookahead == 0 && flush == Z_NO_FLUSH) - return NeedMore; - if (lookahead == 0) - break; // flush the current block - } - - strstart += lookahead; - lookahead = 0; - - // Emit a stored block if pending_buf will be full: - max_start = block_start + max_block_size; - if (strstart == 0 || strstart >= max_start) - { - // strstart == 0 is possible when wraparound on 16-bit machine - lookahead = (int) (strstart - max_start); - strstart = (int) max_start; - - flush_block_only(false); - if (strm.avail_out == 0) - return NeedMore; - } - - // Flush if we may have to slide, otherwise block_start may become - // negative and the data will be gone: - if (strstart - block_start >= w_size - MIN_LOOKAHEAD) - { - flush_block_only(false); - if (strm.avail_out == 0) - return NeedMore; - } - } - - flush_block_only(flush == Z_FINISH); - if (strm.avail_out == 0) - return (flush == Z_FINISH)?FinishStarted:NeedMore; - - return flush == Z_FINISH?FinishDone:BlockDone; - } - - // Send a stored block - internal void _tr_stored_block(int buf, int stored_len, bool eof) - { - send_bits((STORED_BLOCK << 1) + (eof?1:0), 3); // send block type - copy_block(buf, stored_len, true); // with header - } - - // Determine the best encoding for the current block: dynamic trees, static - // trees or store, and output the encoded block to the zip file. - internal void _tr_flush_block(int buf, int stored_len, bool eof) - { - int opt_lenb, static_lenb; // opt_len and static_len in bytes - int max_blindex = 0; // index of last bit length code of non zero freq - - // Build the Huffman trees unless a stored block is forced - if (level > 0) - { - // Check if the file is ascii or binary - if (data_type == Z_UNKNOWN) - set_data_type(); - - // Construct the literal and distance trees - l_desc.build_tree(this); - - d_desc.build_tree(this); - - // At this point, opt_len and static_len are the total bit lengths of - // the compressed block data, excluding the tree representations. - - // Build the bit length tree for the above two trees, and get the index - // in bl_order of the last bit length code to send. - max_blindex = build_bl_tree(); - - // Determine the best encoding. Compute first the block length in bytes - opt_lenb = SupportClass.URShift((opt_len + 3 + 7), 3); - static_lenb = SupportClass.URShift((static_len + 3 + 7), 3); - - if (static_lenb <= opt_lenb) - opt_lenb = static_lenb; - } - else - { - opt_lenb = static_lenb = stored_len + 5; // force a stored block - } - - if (stored_len + 4 <= opt_lenb && buf != - 1) - { - // 4: two words for the lengths - // The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. - // Otherwise we can't have processed more than WSIZE input bytes since - // the last block flush, because compression would have been - // successful. If LIT_BUFSIZE <= WSIZE, it is never too late to - // transform a block into a stored block. - _tr_stored_block(buf, stored_len, eof); - } - else if (static_lenb == opt_lenb) - { - send_bits((STATIC_TREES << 1) + (eof?1:0), 3); - compress_block(StaticTree.static_ltree, StaticTree.static_dtree); - } - else - { - send_bits((DYN_TREES << 1) + (eof?1:0), 3); - send_all_trees(l_desc.max_code + 1, d_desc.max_code + 1, max_blindex + 1); - compress_block(dyn_ltree, dyn_dtree); - } - - // The above check is made mod 2^32, for files larger than 512 MB - // and uLong implemented on 32 bits. - - init_block(); - - if (eof) - { - bi_windup(); - } - } - - // Fill the window when the lookahead becomes insufficient. - // Updates strstart and lookahead. - // - // IN assertion: lookahead < MIN_LOOKAHEAD - // OUT assertions: strstart <= window_size-MIN_LOOKAHEAD - // At least one byte has been read, or avail_in == 0; reads are - // performed for at least two bytes (required for the zip translate_eol - // option -- not supported here). - internal void fill_window() - { - int n, m; - int p; - int more; // Amount of free space at the end of the window. - - do - { - more = (window_size - lookahead - strstart); - - // Deal with !@#$% 64K limit: - if (more == 0 && strstart == 0 && lookahead == 0) - { - more = w_size; - } - else if (more == - 1) - { - // Very unlikely, but possible on 16 bit machine if strstart == 0 - // and lookahead == 1 (input done one byte at time) - more--; - - // If the window is almost full and there is insufficient lookahead, - // move the upper half to the lower one to make room in the upper half. - } - else if (strstart >= w_size + w_size - MIN_LOOKAHEAD) - { - Array.Copy(window, w_size, window, 0, w_size); - match_start -= w_size; - strstart -= w_size; // we now have strstart >= MAX_DIST - block_start -= w_size; - - // Slide the hash table (could be avoided with 32 bit values - // at the expense of memory usage). We slide even when level == 0 - // to keep the hash table consistent if we switch back to level > 0 - // later. (Using level 0 permanently is not an optimal usage of - // zlib, so we don't care about this pathological case.) - - n = hash_size; - p = n; - do - { - m = (head[--p] & 0xffff); - head[p] = (short)(m >= w_size?(m - w_size):0); - //head[p] = (m >= w_size?(short) (m - w_size):0); - } - while (--n != 0); - - n = w_size; - p = n; - do - { - m = (prev[--p] & 0xffff); - prev[p] = (short)(m >= w_size?(m - w_size):0); - //prev[p] = (m >= w_size?(short) (m - w_size):0); - // If n is not on any hash chain, prev[n] is garbage but - // its value will never be used. - } - while (--n != 0); - more += w_size; - } - - if (strm.avail_in == 0) - return ; - - // If there was no sliding: - // strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && - // more == window_size - lookahead - strstart - // => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) - // => more >= window_size - 2*WSIZE + 2 - // In the BIG_MEM or MMAP case (not yet supported), - // window_size == input_size + MIN_LOOKAHEAD && - // strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. - // Otherwise, window_size == 2*WSIZE so more >= 2. - // If there was sliding, more >= WSIZE. So in all cases, more >= 2. - - n = strm.read_buf(window, strstart + lookahead, more); - lookahead += n; - - // Initialize the hash value now that we have some input: - if (lookahead >= MIN_MATCH) - { - ins_h = window[strstart] & 0xff; - ins_h = (((ins_h) << hash_shift) ^ (window[strstart + 1] & 0xff)) & hash_mask; - } - // If the whole input has less than MIN_MATCH bytes, ins_h is garbage, - // but this is not important since only literal bytes will be emitted. - } - while (lookahead < MIN_LOOKAHEAD && strm.avail_in != 0); - } - - // Compress as much as possible from the input stream, return the current - // block state. - // This function does not perform lazy evaluation of matches and inserts - // new strings in the dictionary only for unmatched strings or for short - // matches. It is used only for the fast compression options. - internal int deflate_fast(int flush) - { - // short hash_head = 0; // head of the hash chain - int hash_head = 0; // head of the hash chain - bool bflush; // set if current block must be flushed - - while (true) - { - // Make sure that we always have enough lookahead, except - // at the end of the input file. We need MAX_MATCH bytes - // for the next match, plus MIN_MATCH bytes to insert the - // string following the next match. - if (lookahead < MIN_LOOKAHEAD) - { - fill_window(); - if (lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) - { - return NeedMore; - } - if (lookahead == 0) - break; // flush the current block - } - - // Insert the string window[strstart .. strstart+2] in the - // dictionary, and set hash_head to the head of the hash chain: - if (lookahead >= MIN_MATCH) - { - ins_h = (((ins_h) << hash_shift) ^ (window[(strstart) + (MIN_MATCH - 1)] & 0xff)) & hash_mask; - - // prev[strstart&w_mask]=hash_head=head[ins_h]; - hash_head = (head[ins_h] & 0xffff); - prev[strstart & w_mask] = head[ins_h]; - head[ins_h] = (short) strstart; - } - - // Find the longest match, discarding those <= prev_length. - // At this point we have always match_length < MIN_MATCH - - if (hash_head != 0L && ((strstart - hash_head) & 0xffff) <= w_size - MIN_LOOKAHEAD) - { - // To simplify the code, we prevent matches with the string - // of window index 0 (in particular we have to avoid a match - // of the string with itself at the start of the input file). - if (strategy != Z_HUFFMAN_ONLY) - { - match_length = longest_match(hash_head); - } - // longest_match() sets match_start - } - if (match_length >= MIN_MATCH) - { - // check_match(strstart, match_start, match_length); - - bflush = _tr_tally(strstart - match_start, match_length - MIN_MATCH); - - lookahead -= match_length; - - // Insert new strings in the hash table only if the match length - // is not too large. This saves time but degrades compression. - if (match_length <= max_lazy_match && lookahead >= MIN_MATCH) - { - match_length--; // string at strstart already in hash table - do - { - strstart++; - - ins_h = ((ins_h << hash_shift) ^ (window[(strstart) + (MIN_MATCH - 1)] & 0xff)) & hash_mask; - // prev[strstart&w_mask]=hash_head=head[ins_h]; - hash_head = (head[ins_h] & 0xffff); - prev[strstart & w_mask] = head[ins_h]; - head[ins_h] = (short) strstart; - - // strstart never exceeds WSIZE-MAX_MATCH, so there are - // always MIN_MATCH bytes ahead. - } - while (--match_length != 0); - strstart++; - } - else - { - strstart += match_length; - match_length = 0; - ins_h = window[strstart] & 0xff; - - ins_h = (((ins_h) << hash_shift) ^ (window[strstart + 1] & 0xff)) & hash_mask; - // If lookahead < MIN_MATCH, ins_h is garbage, but it does not - // matter since it will be recomputed at next deflate call. - } - } - else - { - // No match, output a literal byte - - bflush = _tr_tally(0, window[strstart] & 0xff); - lookahead--; - strstart++; - } - if (bflush) - { - - flush_block_only(false); - if (strm.avail_out == 0) - return NeedMore; - } - } - - flush_block_only(flush == Z_FINISH); - if (strm.avail_out == 0) - { - if (flush == Z_FINISH) - return FinishStarted; - else - return NeedMore; - } - return flush == Z_FINISH?FinishDone:BlockDone; - } - - // Same as above, but achieves better compression. We use a lazy - // evaluation for matches: a match is finally adopted only if there is - // no better match at the next window position. - internal int deflate_slow(int flush) - { - // short hash_head = 0; // head of hash chain - int hash_head = 0; // head of hash chain - bool bflush; // set if current block must be flushed - - // Process the input block. - while (true) - { - // Make sure that we always have enough lookahead, except - // at the end of the input file. We need MAX_MATCH bytes - // for the next match, plus MIN_MATCH bytes to insert the - // string following the next match. - - if (lookahead < MIN_LOOKAHEAD) - { - fill_window(); - if (lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) - { - return NeedMore; - } - if (lookahead == 0) - break; // flush the current block - } - - // Insert the string window[strstart .. strstart+2] in the - // dictionary, and set hash_head to the head of the hash chain: - - if (lookahead >= MIN_MATCH) - { - ins_h = (((ins_h) << hash_shift) ^ (window[(strstart) + (MIN_MATCH - 1)] & 0xff)) & hash_mask; - // prev[strstart&w_mask]=hash_head=head[ins_h]; - hash_head = (head[ins_h] & 0xffff); - prev[strstart & w_mask] = head[ins_h]; - head[ins_h] = (short) strstart; - } - - // Find the longest match, discarding those <= prev_length. - prev_length = match_length; prev_match = match_start; - match_length = MIN_MATCH - 1; - - if (hash_head != 0 && prev_length < max_lazy_match && ((strstart - hash_head) & 0xffff) <= w_size - MIN_LOOKAHEAD) - { - // To simplify the code, we prevent matches with the string - // of window index 0 (in particular we have to avoid a match - // of the string with itself at the start of the input file). - - if (strategy != Z_HUFFMAN_ONLY) - { - match_length = longest_match(hash_head); - } - // longest_match() sets match_start - - if (match_length <= 5 && (strategy == Z_FILTERED || (match_length == MIN_MATCH && strstart - match_start > 4096))) - { - - // If prev_match is also MIN_MATCH, match_start is garbage - // but we will ignore the current match anyway. - match_length = MIN_MATCH - 1; - } - } - - // If there was a match at the previous step and the current - // match is not better, output the previous match: - if (prev_length >= MIN_MATCH && match_length <= prev_length) - { - int max_insert = strstart + lookahead - MIN_MATCH; - // Do not insert strings in hash table beyond this. - - // check_match(strstart-1, prev_match, prev_length); - - bflush = _tr_tally(strstart - 1 - prev_match, prev_length - MIN_MATCH); - - // Insert in hash table all strings up to the end of the match. - // strstart-1 and strstart are already inserted. If there is not - // enough lookahead, the last two strings are not inserted in - // the hash table. - lookahead -= (prev_length - 1); - prev_length -= 2; - do - { - if (++strstart <= max_insert) - { - ins_h = (((ins_h) << hash_shift) ^ (window[(strstart) + (MIN_MATCH - 1)] & 0xff)) & hash_mask; - //prev[strstart&w_mask]=hash_head=head[ins_h]; - hash_head = (head[ins_h] & 0xffff); - prev[strstart & w_mask] = head[ins_h]; - head[ins_h] = (short) strstart; - } - } - while (--prev_length != 0); - match_available = 0; - match_length = MIN_MATCH - 1; - strstart++; - - if (bflush) - { - flush_block_only(false); - if (strm.avail_out == 0) - return NeedMore; - } - } - else if (match_available != 0) - { - - // If there was no match at the previous position, output a - // single literal. If there was a match but the current match - // is longer, truncate the previous match to a single literal. - - bflush = _tr_tally(0, window[strstart - 1] & 0xff); - - if (bflush) - { - flush_block_only(false); - } - strstart++; - lookahead--; - if (strm.avail_out == 0) - return NeedMore; - } - else - { - // There is no previous match to compare with, wait for - // the next step to decide. - - match_available = 1; - strstart++; - lookahead--; - } - } - - if (match_available != 0) - { - bflush = _tr_tally(0, window[strstart - 1] & 0xff); - match_available = 0; - } - flush_block_only(flush == Z_FINISH); - - if (strm.avail_out == 0) - { - if (flush == Z_FINISH) - return FinishStarted; - else - return NeedMore; - } - - return flush == Z_FINISH?FinishDone:BlockDone; - } - - internal int longest_match(int cur_match) - { - int chain_length = max_chain_length; // max hash chain length - int scan = strstart; // current string - int match; // matched string - int len; // length of current match - int best_len = prev_length; // best match length so far - int limit = strstart > (w_size - MIN_LOOKAHEAD)?strstart - (w_size - MIN_LOOKAHEAD):0; - int nice_match = this.nice_match; - - // Stop when cur_match becomes <= limit. To simplify the code, - // we prevent matches with the string of window index 0. - - int wmask = w_mask; - - int strend = strstart + MAX_MATCH; - byte scan_end1 = window[scan + best_len - 1]; - byte scan_end = window[scan + best_len]; - - // The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. - // It is easy to get rid of this optimization if necessary. - - // Do not waste too much time if we already have a good match: - if (prev_length >= good_match) - { - chain_length >>= 2; - } - - // Do not look for matches beyond the end of the input. This is necessary - // to make deflate deterministic. - if (nice_match > lookahead) - nice_match = lookahead; - - do - { - match = cur_match; - - // Skip to next match if the match length cannot increase - // or if the match length is less than 2: - if (window[match + best_len] != scan_end || window[match + best_len - 1] != scan_end1 || window[match] != window[scan] || window[++match] != window[scan + 1]) - continue; - - // The check at best_len-1 can be removed because it will be made - // again later. (This heuristic is not always a win.) - // It is not necessary to compare scan[2] and match[2] since they - // are always equal when the other bytes match, given that - // the hash keys are equal and that HASH_BITS >= 8. - scan += 2; match++; - - // We check for insufficient lookahead only every 8th comparison; - // the 256th check will be made at strstart+258. - do - { - } - while (window[++scan] == window[++match] && window[++scan] == window[++match] && window[++scan] == window[++match] && window[++scan] == window[++match] && window[++scan] == window[++match] && window[++scan] == window[++match] && window[++scan] == window[++match] && window[++scan] == window[++match] && scan < strend); - - len = MAX_MATCH - (int) (strend - scan); - scan = strend - MAX_MATCH; - - if (len > best_len) - { - match_start = cur_match; - best_len = len; - if (len >= nice_match) - break; - scan_end1 = window[scan + best_len - 1]; - scan_end = window[scan + best_len]; - } - } - while ((cur_match = (prev[cur_match & wmask] & 0xffff)) > limit && --chain_length != 0); - - if (best_len <= lookahead) - return best_len; - return lookahead; - } - - internal int deflateInit(ZStream strm, int level, int bits) - { - return deflateInit2(strm, level, Z_DEFLATED, bits, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY); - } - internal int deflateInit(ZStream strm, int level) - { - return deflateInit(strm, level, MAX_WBITS); - } - internal int deflateInit2(ZStream strm, int level, int method, int windowBits, int memLevel, int strategy) - { - int noheader = 0; - // byte[] my_version=ZLIB_VERSION; - - // - // if (version == null || version[0] != my_version[0] - // || stream_size != sizeof(z_stream)) { - // return Z_VERSION_ERROR; - // } - - strm.msg = null; - - if (level == Z_DEFAULT_COMPRESSION) - level = 6; - - if (windowBits < 0) - { - // undocumented feature: suppress zlib header - noheader = 1; - windowBits = - windowBits; - } - - if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || windowBits < 9 || windowBits > 15 || level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) - { - return Z_STREAM_ERROR; - } - - strm.dstate = (Deflate) this; - - this.noheader = noheader; - w_bits = windowBits; - w_size = 1 << w_bits; - w_mask = w_size - 1; - - hash_bits = memLevel + 7; - hash_size = 1 << hash_bits; - hash_mask = hash_size - 1; - hash_shift = ((hash_bits + MIN_MATCH - 1) / MIN_MATCH); - - window = new byte[w_size * 2]; - prev = new short[w_size]; - head = new short[hash_size]; - - lit_bufsize = 1 << (memLevel + 6); // 16K elements by default - - // We overlay pending_buf and d_buf+l_buf. This works since the average - // output size for (length,distance) codes is <= 24 bits. - pending_buf = new byte[lit_bufsize * 4]; - pending_buf_size = lit_bufsize * 4; - - d_buf = lit_bufsize; - l_buf = (1 + 2) * lit_bufsize; - - this.level = level; - - //System.out.println("level="+level); - - this.strategy = strategy; - this.method = (byte) method; - - return deflateReset(strm); - } - - internal int deflateReset(ZStream strm) - { - strm.total_in = strm.total_out = 0; - strm.msg = null; // - strm.data_type = Z_UNKNOWN; - - pending = 0; - pending_out = 0; - - if (noheader < 0) - { - noheader = 0; // was set to -1 by deflate(..., Z_FINISH); - } - status = (noheader != 0)?BUSY_STATE:INIT_STATE; - strm.adler = strm._adler.adler32(0, null, 0, 0); - - last_flush = Z_NO_FLUSH; - - tr_init(); - lm_init(); - return Z_OK; - } - - internal int deflateEnd() - { - if (status != INIT_STATE && status != BUSY_STATE && status != FINISH_STATE) - { - return Z_STREAM_ERROR; - } - // Deallocate in reverse order of allocations: - pending_buf = null; - head = null; - prev = null; - window = null; - // free - // dstate=null; - return status == BUSY_STATE?Z_DATA_ERROR:Z_OK; - } - - internal int deflateParams(ZStream strm, int _level, int _strategy) - { - int err = Z_OK; - - if (_level == Z_DEFAULT_COMPRESSION) - { - _level = 6; - } - if (_level < 0 || _level > 9 || _strategy < 0 || _strategy > Z_HUFFMAN_ONLY) - { - return Z_STREAM_ERROR; - } - - if (config_table[level].func != config_table[_level].func && strm.total_in != 0) - { - // Flush the last buffer: - err = strm.deflate(Z_PARTIAL_FLUSH); - } - - if (level != _level) - { - level = _level; - max_lazy_match = config_table[level].max_lazy; - good_match = config_table[level].good_length; - nice_match = config_table[level].nice_length; - max_chain_length = config_table[level].max_chain; - } - strategy = _strategy; - return err; - } - - internal int deflateSetDictionary(ZStream strm, byte[] dictionary, int dictLength) - { - int length = dictLength; - int index = 0; - - if (dictionary == null || status != INIT_STATE) - return Z_STREAM_ERROR; - - strm.adler = strm._adler.adler32(strm.adler, dictionary, 0, dictLength); - - if (length < MIN_MATCH) - return Z_OK; - if (length > w_size - MIN_LOOKAHEAD) - { - length = w_size - MIN_LOOKAHEAD; - index = dictLength - length; // use the tail of the dictionary - } - Array.Copy(dictionary, index, window, 0, length); - strstart = length; - block_start = length; - - // Insert all strings in the hash table (except for the last two bytes). - // s->lookahead stays null, so s->ins_h will be recomputed at the next - // call of fill_window. - - ins_h = window[0] & 0xff; - ins_h = (((ins_h) << hash_shift) ^ (window[1] & 0xff)) & hash_mask; - - for (int n = 0; n <= length - MIN_MATCH; n++) - { - ins_h = (((ins_h) << hash_shift) ^ (window[(n) + (MIN_MATCH - 1)] & 0xff)) & hash_mask; - prev[n & w_mask] = head[ins_h]; - head[ins_h] = (short) n; - } - return Z_OK; - } - - internal int deflate(ZStream strm, int flush) - { - int old_flush; - - if (flush > Z_FINISH || flush < 0) - { - return Z_STREAM_ERROR; - } - - if (strm.next_out == null || (strm.next_in == null && strm.avail_in != 0) || (status == FINISH_STATE && flush != Z_FINISH)) - { - strm.msg = z_errmsg[Z_NEED_DICT - (Z_STREAM_ERROR)]; - return Z_STREAM_ERROR; - } - if (strm.avail_out == 0) - { - strm.msg = z_errmsg[Z_NEED_DICT - (Z_BUF_ERROR)]; - return Z_BUF_ERROR; - } - - this.strm = strm; // just in case - old_flush = last_flush; - last_flush = flush; - - // Write the zlib header - if (status == INIT_STATE) - { - int header = (Z_DEFLATED + ((w_bits - 8) << 4)) << 8; - int level_flags = ((level - 1) & 0xff) >> 1; - - if (level_flags > 3) - level_flags = 3; - header |= (level_flags << 6); - if (strstart != 0) - header |= PRESET_DICT; - header += 31 - (header % 31); - - status = BUSY_STATE; - putShortMSB(header); - - - // Save the adler32 of the preset dictionary: - if (strstart != 0) - { - putShortMSB((int) (SupportClass.URShift(strm.adler, 16))); - putShortMSB((int) (strm.adler & 0xffff)); - } - strm.adler = strm._adler.adler32(0, null, 0, 0); - } - - // Flush as much pending output as possible - if (pending != 0) - { - strm.flush_pending(); - if (strm.avail_out == 0) - { - //System.out.println(" avail_out==0"); - // Since avail_out is 0, deflate will be called again with - // more output space, but possibly with both pending and - // avail_in equal to zero. There won't be anything to do, - // but this is not an error situation so make sure we - // return OK instead of BUF_ERROR at next call of deflate: - last_flush = - 1; - return Z_OK; - } - - // Make sure there is something to do and avoid duplicate consecutive - // flushes. For repeated and useless calls with Z_FINISH, we keep - // returning Z_STREAM_END instead of Z_BUFF_ERROR. - } - else if (strm.avail_in == 0 && flush <= old_flush && flush != Z_FINISH) - { - strm.msg = z_errmsg[Z_NEED_DICT - (Z_BUF_ERROR)]; - return Z_BUF_ERROR; - } - - // User must not provide more input after the first FINISH: - if (status == FINISH_STATE && strm.avail_in != 0) - { - strm.msg = z_errmsg[Z_NEED_DICT - (Z_BUF_ERROR)]; - return Z_BUF_ERROR; - } - - // Start a new block or continue the current one. - if (strm.avail_in != 0 || lookahead != 0 || (flush != Z_NO_FLUSH && status != FINISH_STATE)) - { - int bstate = - 1; - switch (config_table[level].func) - { - - case STORED: - bstate = deflate_stored(flush); - break; - - case FAST: - bstate = deflate_fast(flush); - break; - - case SLOW: - bstate = deflate_slow(flush); - break; - - default: - break; - - } - - if (bstate == FinishStarted || bstate == FinishDone) - { - status = FINISH_STATE; - } - if (bstate == NeedMore || bstate == FinishStarted) - { - if (strm.avail_out == 0) - { - last_flush = - 1; // avoid BUF_ERROR next call, see above - } - return Z_OK; - // If flush != Z_NO_FLUSH && avail_out == 0, the next call - // of deflate should use the same flush parameter to make sure - // that the flush is complete. So we don't have to output an - // empty block here, this will be done at next call. This also - // ensures that for a very small output buffer, we emit at most - // one empty block. - } - - if (bstate == BlockDone) - { - if (flush == Z_PARTIAL_FLUSH) - { - _tr_align(); - } - else - { - // FULL_FLUSH or SYNC_FLUSH - _tr_stored_block(0, 0, false); - // For a full flush, this empty block will be recognized - // as a special marker by inflate_sync(). - if (flush == Z_FULL_FLUSH) - { - //state.head[s.hash_size-1]=0; - for (int i = 0; i < hash_size; i++) - // forget history - head[i] = 0; - } - } - strm.flush_pending(); - if (strm.avail_out == 0) - { - last_flush = - 1; // avoid BUF_ERROR at next call, see above - return Z_OK; - } - } - } - - if (flush != Z_FINISH) - return Z_OK; - if (noheader != 0) - return Z_STREAM_END; - - // Write the zlib trailer (adler32) - putShortMSB((int) (SupportClass.URShift(strm.adler, 16))); - putShortMSB((int) (strm.adler & 0xffff)); - strm.flush_pending(); - - // If avail_out is zero, the application will call deflate again - // to flush the rest. - noheader = - 1; // write the trailer only once! - return pending != 0?Z_OK:Z_STREAM_END; - } - static Deflate() - { - { - config_table = new Config[10]; - // good lazy nice chain - config_table[0] = new Config(0, 0, 0, 0, STORED); - config_table[1] = new Config(4, 4, 8, 4, FAST); - config_table[2] = new Config(4, 5, 16, 8, FAST); - config_table[3] = new Config(4, 6, 32, 32, FAST); - - config_table[4] = new Config(4, 4, 16, 16, SLOW); - config_table[5] = new Config(8, 16, 32, 32, SLOW); - config_table[6] = new Config(8, 16, 128, 128, SLOW); - config_table[7] = new Config(8, 32, 128, 256, SLOW); - config_table[8] = new Config(32, 128, 258, 1024, SLOW); - config_table[9] = new Config(32, 258, 258, 4096, SLOW); - } - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/InfBlocks.cs b/src/Zlib.net/InfBlocks.cs deleted file mode 100644 index 9d28592..0000000 --- a/src/Zlib.net/InfBlocks.cs +++ /dev/null @@ -1,720 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - sealed class InfBlocks - { - private const int MANY = 1440; - - // And'ing with mask[n] masks the lower n bits - private static readonly int[] inflate_mask = new int[]{0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff, 0x0000ffff}; - - // Table for deflate from PKZIP's appnote.txt. - internal static readonly int[] border = new int[]{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - - private const int Z_OK = 0; - private const int Z_STREAM_END = 1; - private const int Z_NEED_DICT = 2; - private const int Z_ERRNO = - 1; - private const int Z_STREAM_ERROR = - 2; - private const int Z_DATA_ERROR = - 3; - private const int Z_MEM_ERROR = - 4; - private const int Z_BUF_ERROR = - 5; - private const int Z_VERSION_ERROR = - 6; - - private const int TYPE = 0; // get type bits (3, including end bit) - private const int LENS = 1; // get lengths for stored - private const int STORED = 2; // processing stored block - private const int TABLE = 3; // get table lengths - private const int BTREE = 4; // get bit lengths tree for a dynamic block - private const int DTREE = 5; // get length, distance trees for a dynamic block - private const int CODES = 6; // processing fixed or dynamic block - private const int DRY = 7; // output remaining window bytes - private const int DONE = 8; // finished last block, done - private const int BAD = 9; // ot a data error--stuck here - - internal int mode; // current inflate_block mode - - internal int left; // if STORED, bytes left to copy - - internal int table; // table lengths (14 bits) - internal int index; // index into blens (or border) - internal int[] blens; // bit lengths of codes - internal int[] bb = new int[1]; // bit length tree depth - internal int[] tb = new int[1]; // bit length decoding tree - - internal InfCodes codes; // if CODES, current state - - internal int last; // true if this block is the last block - - // mode independent information - internal int bitk; // bits in bit buffer - internal int bitb; // bit buffer - internal int[] hufts; // single malloc for tree space - internal byte[] window; // sliding window - internal int end; // one byte after sliding window - internal int read; // window read pointer - internal int write; // window write pointer - internal System.Object checkfn; // check function - internal long check; // check on output - - internal InfBlocks(ZStream z, System.Object checkfn, int w) - { - hufts = new int[MANY * 3]; - window = new byte[w]; - end = w; - this.checkfn = checkfn; - mode = TYPE; - reset(z, null); - } - - internal void reset(ZStream z, long[] c) - { - if (c != null) - c[0] = check; - if (mode == BTREE || mode == DTREE) - { - blens = null; - } - if (mode == CODES) - { - codes.free(z); - } - mode = TYPE; - bitk = 0; - bitb = 0; - read = write = 0; - - if (checkfn != null) - z.adler = check = z._adler.adler32(0L, null, 0, 0); - } - - internal int proc(ZStream z, int r) - { - int t; // temporary storage - int b; // bit buffer - int k; // bits in bit buffer - int p; // input data pointer - int n; // bytes available there - int q; // output window write pointer - int m; // bytes to end of window or read pointer - - // copy input/output information to locals (UPDATE macro restores) - { - p = z.next_in_index; n = z.avail_in; b = bitb; k = bitk; - } - { - q = write; m = (int) (q < read?read - q - 1:end - q); - } - - // process input based on current state - while (true) - { - switch (mode) - { - - case TYPE: - - while (k < (3)) - { - if (n != 0) - { - r = Z_OK; - } - else - { - bitb = b; bitk = k; - z.avail_in = n; - z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - ; - n--; - b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - t = (int) (b & 7); - last = t & 1; - - switch (SupportClass.URShift(t, 1)) - { - - case 0: // stored - { - b = SupportClass.URShift(b, (3)); k -= (3); - } - t = k & 7; // go to byte boundary - - { - b = SupportClass.URShift(b, (t)); k -= (t); - } - mode = LENS; // get length of stored block - break; - - case 1: // fixed - { - int[] bl = new int[1]; - int[] bd = new int[1]; - int[][] tl = new int[1][]; - int[][] td = new int[1][]; - - InfTree.inflate_trees_fixed(bl, bd, tl, td, z); - codes = new InfCodes(bl[0], bd[0], tl[0], td[0], z); - } - - { - b = SupportClass.URShift(b, (3)); k -= (3); - } - - mode = CODES; - break; - - case 2: // dynamic - - { - b = SupportClass.URShift(b, (3)); k -= (3); - } - - mode = TABLE; - break; - - case 3: // illegal - - { - b = SupportClass.URShift(b, (3)); k -= (3); - } - mode = BAD; - z.msg = "invalid block type"; - r = Z_DATA_ERROR; - - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - break; - - case LENS: - - while (k < (32)) - { - if (n != 0) - { - r = Z_OK; - } - else - { - bitb = b; bitk = k; - z.avail_in = n; - z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - ; - n--; - b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - - if (((SupportClass.URShift((~ b), 16)) & 0xffff) != (b & 0xffff)) - { - mode = BAD; - z.msg = "invalid stored block lengths"; - r = Z_DATA_ERROR; - - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - left = (b & 0xffff); - b = k = 0; // dump bits - mode = left != 0?STORED:(last != 0?DRY:TYPE); - break; - - case STORED: - if (n == 0) - { - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - - if (m == 0) - { - if (q == end && read != 0) - { - q = 0; m = (int) (q < read?read - q - 1:end - q); - } - if (m == 0) - { - write = q; - r = inflate_flush(z, r); - q = write; m = (int) (q < read?read - q - 1:end - q); - if (q == end && read != 0) - { - q = 0; m = (int) (q < read?read - q - 1:end - q); - } - if (m == 0) - { - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - } - } - r = Z_OK; - - t = left; - if (t > n) - t = n; - if (t > m) - t = m; - Array.Copy(z.next_in, p, window, q, t); - p += t; n -= t; - q += t; m -= t; - if ((left -= t) != 0) - break; - mode = last != 0?DRY:TYPE; - break; - - case TABLE: - - while (k < (14)) - { - if (n != 0) - { - r = Z_OK; - } - else - { - bitb = b; bitk = k; - z.avail_in = n; - z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - ; - n--; - b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - - table = t = (b & 0x3fff); - if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29) - { - mode = BAD; - z.msg = "too many length or distance symbols"; - r = Z_DATA_ERROR; - - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f); - blens = new int[t]; - - { - b = SupportClass.URShift(b, (14)); k -= (14); - } - - index = 0; - mode = BTREE; - goto case BTREE; - - case BTREE: - while (index < 4 + (SupportClass.URShift(table, 10))) - { - while (k < (3)) - { - if (n != 0) - { - r = Z_OK; - } - else - { - bitb = b; bitk = k; - z.avail_in = n; - z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - ; - n--; - b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - - blens[border[index++]] = b & 7; - - { - b = SupportClass.URShift(b, (3)); k -= (3); - } - } - - while (index < 19) - { - blens[border[index++]] = 0; - } - - bb[0] = 7; - t = InfTree.inflate_trees_bits(blens, bb, tb, hufts, z); - if (t != Z_OK) - { - r = t; - if (r == Z_DATA_ERROR) - { - blens = null; - mode = BAD; - } - - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - - index = 0; - mode = DTREE; - goto case DTREE; - - case DTREE: - while (true) - { - t = table; - if (!(index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))) - { - break; - } - - - int i, j, c; - - t = bb[0]; - - while (k < (t)) - { - if (n != 0) - { - r = Z_OK; - } - else - { - bitb = b; bitk = k; - z.avail_in = n; - z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - ; - n--; - b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - - if (tb[0] == - 1) - { - //System.err.println("null..."); - } - - t = hufts[(tb[0] + (b & inflate_mask[t])) * 3 + 1]; - c = hufts[(tb[0] + (b & inflate_mask[t])) * 3 + 2]; - - if (c < 16) - { - b = SupportClass.URShift(b, (t)); k -= (t); - blens[index++] = c; - } - else - { - // c == 16..18 - i = c == 18?7:c - 14; - j = c == 18?11:3; - - while (k < (t + i)) - { - if (n != 0) - { - r = Z_OK; - } - else - { - bitb = b; bitk = k; - z.avail_in = n; - z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - ; - n--; - b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - - b = SupportClass.URShift(b, (t)); k -= (t); - - j += (b & inflate_mask[i]); - - b = SupportClass.URShift(b, (i)); k -= (i); - - i = index; - t = table; - if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) || (c == 16 && i < 1)) - { - blens = null; - mode = BAD; - z.msg = "invalid bit length repeat"; - r = Z_DATA_ERROR; - - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - - c = c == 16?blens[i - 1]:0; - do - { - blens[i++] = c; - } - while (--j != 0); - index = i; - } - } - - tb[0] = - 1; - { - int[] bl = new int[1]; - int[] bd = new int[1]; - int[] tl = new int[1]; - int[] td = new int[1]; - - - bl[0] = 9; // must be <= 9 for lookahead assumptions - bd[0] = 6; // must be <= 9 for lookahead assumptions - t = table; - t = InfTree.inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), blens, bl, bd, tl, td, hufts, z); - if (t != Z_OK) - { - if (t == Z_DATA_ERROR) - { - blens = null; - mode = BAD; - } - r = t; - - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - - codes = new InfCodes(bl[0], bd[0], hufts, tl[0], hufts, td[0], z); - } - blens = null; - mode = CODES; - goto case CODES; - - case CODES: - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - - if ((r = codes.proc(this, z, r)) != Z_STREAM_END) - { - return inflate_flush(z, r); - } - r = Z_OK; - codes.free(z); - - p = z.next_in_index; n = z.avail_in; b = bitb; k = bitk; - q = write; m = (int) (q < read?read - q - 1:end - q); - - if (last == 0) - { - mode = TYPE; - break; - } - mode = DRY; - goto case DRY; - - case DRY: - write = q; - r = inflate_flush(z, r); - q = write; m = (int) (q < read?read - q - 1:end - q); - if (read != write) - { - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - } - mode = DONE; - goto case DONE; - - case DONE: - r = Z_STREAM_END; - - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - - case BAD: - r = Z_DATA_ERROR; - - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - - - default: - r = Z_STREAM_ERROR; - - bitb = b; bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - write = q; - return inflate_flush(z, r); - - } - } - } - - internal void free(ZStream z) - { - reset(z, null); - window = null; - hufts = null; - //ZFREE(z, s); - } - - internal void set_dictionary(byte[] d, int start, int n) - { - Array.Copy(d, start, window, 0, n); - read = write = n; - } - - // Returns true if inflate is currently at the end of a block generated - // by Z_SYNC_FLUSH or Z_FULL_FLUSH. - internal int sync_point() - { - return mode == LENS?1:0; - } - - // copy as much as possible from the sliding window to the output area - internal int inflate_flush(ZStream z, int r) - { - int n; - int p; - int q; - - // local copies of source and destination pointers - p = z.next_out_index; - q = read; - - // compute number of bytes to copy as far as end of window - n = (int) ((q <= write?write:end) - q); - if (n > z.avail_out) - n = z.avail_out; - if (n != 0 && r == Z_BUF_ERROR) - r = Z_OK; - - // update counters - z.avail_out -= n; - z.total_out += n; - - // update check information - if (checkfn != null) - z.adler = check = z._adler.adler32(check, window, q, n); - - // copy as far as end of window - Array.Copy(window, q, z.next_out, p, n); - p += n; - q += n; - - // see if more to copy at beginning of window - if (q == end) - { - // wrap pointers - q = 0; - if (write == end) - write = 0; - - // compute bytes to copy - n = write - q; - if (n > z.avail_out) - n = z.avail_out; - if (n != 0 && r == Z_BUF_ERROR) - r = Z_OK; - - // update counters - z.avail_out -= n; - z.total_out += n; - - // update check information - if (checkfn != null) - z.adler = check = z._adler.adler32(check, window, q, n); - - // copy - Array.Copy(window, q, z.next_out, p, n); - p += n; - q += n; - } - - // update pointers - z.next_out_index = p; - read = q; - - // done - return r; - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/InfCodes.cs b/src/Zlib.net/InfCodes.cs deleted file mode 100644 index ee279a1..0000000 --- a/src/Zlib.net/InfCodes.cs +++ /dev/null @@ -1,716 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - sealed class InfCodes - { - - private static readonly int[] inflate_mask = new int[]{0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff, 0x0000ffff}; - - private const int Z_OK = 0; - private const int Z_STREAM_END = 1; - private const int Z_NEED_DICT = 2; - private const int Z_ERRNO = - 1; - private const int Z_STREAM_ERROR = - 2; - private const int Z_DATA_ERROR = - 3; - private const int Z_MEM_ERROR = - 4; - private const int Z_BUF_ERROR = - 5; - private const int Z_VERSION_ERROR = - 6; - - // waiting for "i:"=input, - // "o:"=output, - // "x:"=nothing - private const int START = 0; // x: set up for LEN - private const int LEN = 1; // i: get length/literal/eob next - private const int LENEXT = 2; // i: getting length extra (have base) - private const int DIST = 3; // i: get distance next - private const int DISTEXT = 4; // i: getting distance extra - private const int COPY = 5; // o: copying bytes in window, waiting for space - private const int LIT = 6; // o: got literal, waiting for output space - private const int WASH = 7; // o: got eob, possibly still output waiting - private const int END = 8; // x: got eob and all data flushed - private const int BADCODE = 9; // x: got error - - internal int mode; // current inflate_codes mode - - // mode dependent information - internal int len; - - internal int[] tree; // pointer into tree - internal int tree_index = 0; - internal int need; // bits needed - - internal int lit; - - // if EXT or COPY, where and how much - internal int get_Renamed; // bits to get for extra - internal int dist; // distance back to copy from - - internal byte lbits; // ltree bits decoded per branch - internal byte dbits; // dtree bits decoder per branch - internal int[] ltree; // literal/length/eob tree - internal int ltree_index; // literal/length/eob tree - internal int[] dtree; // distance tree - internal int dtree_index; // distance tree - - internal InfCodes(int bl, int bd, int[] tl, int tl_index, int[] td, int td_index, ZStream z) - { - mode = START; - lbits = (byte) bl; - dbits = (byte) bd; - ltree = tl; - ltree_index = tl_index; - dtree = td; - dtree_index = td_index; - } - - internal InfCodes(int bl, int bd, int[] tl, int[] td, ZStream z) - { - mode = START; - lbits = (byte) bl; - dbits = (byte) bd; - ltree = tl; - ltree_index = 0; - dtree = td; - dtree_index = 0; - } - - internal int proc(InfBlocks s, ZStream z, int r) - { - int j; // temporary storage - //int[] t; // temporary pointer - int tindex; // temporary pointer - int e; // extra bits or operation - int b = 0; // bit buffer - int k = 0; // bits in bit buffer - int p = 0; // input data pointer - int n; // bytes available there - int q; // output window write pointer - int m; // bytes to end of window or read pointer - int f; // pointer to copy strings from - - // copy input/output information to locals (UPDATE macro restores) - p = z.next_in_index; n = z.avail_in; b = s.bitb; k = s.bitk; - q = s.write; m = q < s.read?s.read - q - 1:s.end - q; - - // process input and output based on current state - while (true) - { - switch (mode) - { - - // waiting for "i:"=input, "o:"=output, "x:"=nothing - case START: // x: set up for LEN - if (m >= 258 && n >= 10) - { - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - r = inflate_fast(lbits, dbits, ltree, ltree_index, dtree, dtree_index, s, z); - - p = z.next_in_index; n = z.avail_in; b = s.bitb; k = s.bitk; - q = s.write; m = q < s.read?s.read - q - 1:s.end - q; - - if (r != Z_OK) - { - mode = r == Z_STREAM_END?WASH:BADCODE; - break; - } - } - need = lbits; - tree = ltree; - tree_index = ltree_index; - - mode = LEN; - goto case LEN; - - case LEN: // i: get length/literal/eob next - j = need; - - while (k < (j)) - { - if (n != 0) - r = Z_OK; - else - { - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - } - n--; - b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - - tindex = (tree_index + (b & inflate_mask[j])) * 3; - - b = SupportClass.URShift(b, (tree[tindex + 1])); - k -= (tree[tindex + 1]); - - e = tree[tindex]; - - if (e == 0) - { - // literal - lit = tree[tindex + 2]; - mode = LIT; - break; - } - if ((e & 16) != 0) - { - // length - get_Renamed = e & 15; - len = tree[tindex + 2]; - mode = LENEXT; - break; - } - if ((e & 64) == 0) - { - // next table - need = e; - tree_index = tindex / 3 + tree[tindex + 2]; - break; - } - if ((e & 32) != 0) - { - // end of block - mode = WASH; - break; - } - mode = BADCODE; // invalid code - z.msg = "invalid literal/length code"; - r = Z_DATA_ERROR; - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - - - case LENEXT: // i: getting length extra (have base) - j = get_Renamed; - - while (k < (j)) - { - if (n != 0) - r = Z_OK; - else - { - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - } - n--; b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - - len += (b & inflate_mask[j]); - - b >>= j; - k -= j; - - need = dbits; - tree = dtree; - tree_index = dtree_index; - mode = DIST; - goto case DIST; - - case DIST: // i: get distance next - j = need; - - while (k < (j)) - { - if (n != 0) - r = Z_OK; - else - { - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - } - n--; b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - - tindex = (tree_index + (b & inflate_mask[j])) * 3; - - b >>= tree[tindex + 1]; - k -= tree[tindex + 1]; - - e = (tree[tindex]); - if ((e & 16) != 0) - { - // distance - get_Renamed = e & 15; - dist = tree[tindex + 2]; - mode = DISTEXT; - break; - } - if ((e & 64) == 0) - { - // next table - need = e; - tree_index = tindex / 3 + tree[tindex + 2]; - break; - } - mode = BADCODE; // invalid code - z.msg = "invalid distance code"; - r = Z_DATA_ERROR; - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - - - case DISTEXT: // i: getting distance extra - j = get_Renamed; - - while (k < (j)) - { - if (n != 0) - r = Z_OK; - else - { - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - } - n--; b |= (z.next_in[p++] & 0xff) << k; - k += 8; - } - - dist += (b & inflate_mask[j]); - - b >>= j; - k -= j; - - mode = COPY; - goto case COPY; - - case COPY: // o: copying bytes in window, waiting for space - f = q - dist; - while (f < 0) - { - // modulo window size-"while" instead - f += s.end; // of "if" handles invalid distances - } - while (len != 0) - { - - if (m == 0) - { - if (q == s.end && s.read != 0) - { - q = 0; m = q < s.read?s.read - q - 1:s.end - q; - } - if (m == 0) - { - s.write = q; r = s.inflate_flush(z, r); - q = s.write; m = q < s.read?s.read - q - 1:s.end - q; - - if (q == s.end && s.read != 0) - { - q = 0; m = q < s.read?s.read - q - 1:s.end - q; - } - - if (m == 0) - { - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - } - } - } - - s.window[q++] = s.window[f++]; m--; - - if (f == s.end) - f = 0; - len--; - } - mode = START; - break; - - case LIT: // o: got literal, waiting for output space - if (m == 0) - { - if (q == s.end && s.read != 0) - { - q = 0; m = q < s.read?s.read - q - 1:s.end - q; - } - if (m == 0) - { - s.write = q; r = s.inflate_flush(z, r); - q = s.write; m = q < s.read?s.read - q - 1:s.end - q; - - if (q == s.end && s.read != 0) - { - q = 0; m = q < s.read?s.read - q - 1:s.end - q; - } - if (m == 0) - { - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - } - } - } - r = Z_OK; - - s.window[q++] = (byte) lit; m--; - - mode = START; - break; - - case WASH: // o: got eob, possibly more output - if (k > 7) - { - // return unused byte, if any - k -= 8; - n++; - p--; // can always return one - } - - s.write = q; r = s.inflate_flush(z, r); - q = s.write; m = q < s.read?s.read - q - 1:s.end - q; - - if (s.read != s.write) - { - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - } - mode = END; - goto case END; - - case END: - r = Z_STREAM_END; - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - - - case BADCODE: // x: got error - - r = Z_DATA_ERROR; - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - - - default: - r = Z_STREAM_ERROR; - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - return s.inflate_flush(z, r); - - } - } - } - - internal void free(ZStream z) - { - // ZFREE(z, c); - } - - // Called with number of bytes left to write in window at least 258 - // (the maximum string length) and number of input bytes available - // at least ten. The ten bytes are six bytes for the longest length/ - // distance pair plus four bytes for overloading the bit buffer. - - internal int inflate_fast(int bl, int bd, int[] tl, int tl_index, int[] td, int td_index, InfBlocks s, ZStream z) - { - int t; // temporary pointer - int[] tp; // temporary pointer - int tp_index; // temporary pointer - int e; // extra bits or operation - int b; // bit buffer - int k; // bits in bit buffer - int p; // input data pointer - int n; // bytes available there - int q; // output window write pointer - int m; // bytes to end of window or read pointer - int ml; // mask for literal/length tree - int md; // mask for distance tree - int c; // bytes to copy - int d; // distance back to copy from - int r; // copy source pointer - - // load input, output, bit values - p = z.next_in_index; n = z.avail_in; b = s.bitb; k = s.bitk; - q = s.write; m = q < s.read?s.read - q - 1:s.end - q; - - // initialize masks - ml = inflate_mask[bl]; - md = inflate_mask[bd]; - - // do until not enough input or output space for fast loop - do - { - // assume called with m >= 258 && n >= 10 - // get literal/length code - while (k < (20)) - { - // max bits for literal/length code - n--; - b |= (z.next_in[p++] & 0xff) << k; k += 8; - } - - t = b & ml; - tp = tl; - tp_index = tl_index; - if ((e = tp[(tp_index + t) * 3]) == 0) - { - b >>= (tp[(tp_index + t) * 3 + 1]); k -= (tp[(tp_index + t) * 3 + 1]); - - s.window[q++] = (byte) tp[(tp_index + t) * 3 + 2]; - m--; - continue; - } - do - { - - b >>= (tp[(tp_index + t) * 3 + 1]); k -= (tp[(tp_index + t) * 3 + 1]); - - if ((e & 16) != 0) - { - e &= 15; - c = tp[(tp_index + t) * 3 + 2] + ((int) b & inflate_mask[e]); - - b >>= e; k -= e; - - // decode distance base of block to copy - while (k < (15)) - { - // max bits for distance code - n--; - b |= (z.next_in[p++] & 0xff) << k; k += 8; - } - - t = b & md; - tp = td; - tp_index = td_index; - e = tp[(tp_index + t) * 3]; - - do - { - - b >>= (tp[(tp_index + t) * 3 + 1]); k -= (tp[(tp_index + t) * 3 + 1]); - - if ((e & 16) != 0) - { - // get extra bits to add to distance base - e &= 15; - while (k < (e)) - { - // get extra bits (up to 13) - n--; - b |= (z.next_in[p++] & 0xff) << k; k += 8; - } - - d = tp[(tp_index + t) * 3 + 2] + (b & inflate_mask[e]); - - b >>= (e); k -= (e); - - // do the copy - m -= c; - if (q >= d) - { - // offset before dest - // just copy - r = q - d; - if (q - r > 0 && 2 > (q - r)) - { - s.window[q++] = s.window[r++]; c--; // minimum count is three, - s.window[q++] = s.window[r++]; c--; // so unroll loop a little - } - else - { - Array.Copy(s.window, r, s.window, q, 2); - q += 2; r += 2; c -= 2; - } - } - else - { - // else offset after destination - r = q - d; - do - { - r += s.end; // force pointer in window - } - while (r < 0); // covers invalid distances - e = s.end - r; - if (c > e) - { - // if source crosses, - c -= e; // wrapped copy - if (q - r > 0 && e > (q - r)) - { - do - { - s.window[q++] = s.window[r++]; - } - while (--e != 0); - } - else - { - Array.Copy(s.window, r, s.window, q, e); - q += e; r += e; e = 0; - } - r = 0; // copy rest from start of window - } - } - - // copy all or what's left - if (q - r > 0 && c > (q - r)) - { - do - { - s.window[q++] = s.window[r++]; - } - while (--c != 0); - } - else - { - Array.Copy(s.window, r, s.window, q, c); - q += c; r += c; c = 0; - } - break; - } - else if ((e & 64) == 0) - { - t += tp[(tp_index + t) * 3 + 2]; - t += (b & inflate_mask[e]); - e = tp[(tp_index + t) * 3]; - } - else - { - z.msg = "invalid distance code"; - - c = z.avail_in - n; c = (k >> 3) < c?k >> 3:c; n += c; p -= c; k -= (c << 3); - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - - return Z_DATA_ERROR; - } - } - while (true); - break; - } - - if ((e & 64) == 0) - { - t += tp[(tp_index + t) * 3 + 2]; - t += (b & inflate_mask[e]); - if ((e = tp[(tp_index + t) * 3]) == 0) - { - - b >>= (tp[(tp_index + t) * 3 + 1]); k -= (tp[(tp_index + t) * 3 + 1]); - - s.window[q++] = (byte) tp[(tp_index + t) * 3 + 2]; - m--; - break; - } - } - else if ((e & 32) != 0) - { - - c = z.avail_in - n; c = (k >> 3) < c?k >> 3:c; n += c; p -= c; k -= (c << 3); - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - - return Z_STREAM_END; - } - else - { - z.msg = "invalid literal/length code"; - - c = z.avail_in - n; c = (k >> 3) < c?k >> 3:c; n += c; p -= c; k -= (c << 3); - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - - return Z_DATA_ERROR; - } - } - while (true); - } - while (m >= 258 && n >= 10); - - // not enough input or output--restore pointers and return - c = z.avail_in - n; c = (k >> 3) < c?k >> 3:c; n += c; p -= c; k -= (c << 3); - - s.bitb = b; s.bitk = k; - z.avail_in = n; z.total_in += p - z.next_in_index; z.next_in_index = p; - s.write = q; - - return Z_OK; - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/InfTree.cs b/src/Zlib.net/InfTree.cs deleted file mode 100644 index 16e55a1..0000000 --- a/src/Zlib.net/InfTree.cs +++ /dev/null @@ -1,377 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - sealed class InfTree - { - - private const int MANY = 1440; - - private const int Z_OK = 0; - private const int Z_STREAM_END = 1; - private const int Z_NEED_DICT = 2; - private const int Z_ERRNO = - 1; - private const int Z_STREAM_ERROR = - 2; - private const int Z_DATA_ERROR = - 3; - private const int Z_MEM_ERROR = - 4; - private const int Z_BUF_ERROR = - 5; - private const int Z_VERSION_ERROR = - 6; - - internal const int fixed_bl = 9; - internal const int fixed_bd = 5; - - - internal static readonly int[] fixed_tl = new int[]{96, 7, 256, 0, 8, 80, 0, 8, 16, 84, 8, 115, 82, 7, 31, 0, 8, 112, 0, 8, 48, 0, 9, 192, 80, 7, 10, 0, 8, 96, 0, 8, 32, 0, 9, 160, 0, 8, 0, 0, 8, 128, 0, 8, 64, 0, 9, 224, 80, 7, 6, 0, 8, 88, 0, 8, 24, 0, 9, 144, 83, 7, 59, 0, 8, 120, 0, 8, 56, 0, 9, 208, 81, 7, 17, 0, 8, 104, 0, 8, 40, 0, 9, 176, 0, 8, 8, 0, 8, 136, 0, 8, 72, 0, 9, 240, 80, 7, 4, 0, 8, 84, 0, 8, 20, 85, 8, 227, 83, 7, 43, 0, 8, 116, 0, 8, 52, 0, 9, 200, 81, 7, 13, 0, 8, 100, 0, 8, 36, 0, 9, 168, 0, 8, 4, 0, 8, 132, 0, 8, 68, 0, 9, 232, 80, 7, 8, 0, 8, 92, 0, 8, 28, 0, 9, 152, 84, 7, 83, 0, 8, 124, 0, 8, 60, 0, 9, 216, 82, 7, 23, 0, 8, 108, 0, 8, 44, 0, 9, 184, 0, 8, 12, 0, 8, 140, 0, 8, 76, 0, 9, 248, 80, 7, 3, 0, 8, 82, 0, 8, 18, 85, 8, 163, 83, 7, 35, 0, 8, 114, 0, 8, 50, 0, 9, 196, 81, 7, 11, 0, 8, 98, 0, 8, 34, 0, 9, 164, 0, 8, 2, 0, 8, 130, 0, 8, 66, 0, 9, 228, 80, 7, 7, 0, 8, 90, 0, 8, 26, 0, 9, 148, 84, 7, 67, 0, 8, 122, 0, 8, 58, 0, 9, 212, 82, 7, 19, 0, 8, 106, 0, 8, 42, 0, 9, 180, 0, 8, 10, 0, 8, 138, 0, 8, 74, 0, 9, 244, 80, 7, 5, 0, 8, 86, 0, 8, 22, 192, 8, 0, 83, 7, 51, 0, 8, 118, 0, 8, 54, 0, 9, 204, 81, 7, 15, 0, 8, 102, 0, 8, 38, 0, 9, 172, 0, 8, 6, 0, 8, 134, 0, 8, 70, 0, 9, 236, 80, 7, 9, 0, 8, 94, 0, 8, 30, 0, 9, 156, 84, 7, 99, 0, 8, 126, 0, 8, 62, 0, 9, 220, 82, 7, 27, 0, 8, 110, 0, 8, 46, 0, 9, 188, 0, 8, 14, 0, 8, 142, 0, 8, 78, 0, 9, 252, 96, 7, 256, 0, 8, 81, 0, 8, 17, 85, 8, 131, 82, 7, 31, 0, 8, 113, 0, 8, 49, 0, 9, 194, 80, 7, 10, 0, 8, 97, 0, 8, 33, 0, 9, 162, 0, 8, 1, 0, 8, 129, 0, 8, 65, 0, 9, 226, 80, 7, 6, 0, 8, 89, 0, 8, 25, 0, 9, 146, 83, 7, 59, 0, 8, 121, 0, 8, 57, 0, 9, 210, 81, 7, 17, 0, 8, 105, 0, 8, 41, 0, 9, 178, 0, 8, 9, 0, 8, 137, 0, 8, 73, 0, 9, 242, 80, 7, 4, 0, 8, 85, 0, 8, 21, 80, 8, 258, 83, 7, 43, 0, 8, 117, 0, 8, 53, 0, 9, 202, 81, 7, 13, 0, 8, 101, 0, 8, 37, 0, 9, 170, 0, 8, 5, 0, 8, 133, 0, 8, 69, 0, 9, 234, 80, 7, 8, 0, 8, 93, 0, 8, 29, 0, 9, 154, 84, 7, 83, 0, 8, 125, 0, 8, 61, 0, 9, 218, 82, 7, 23, 0, 8, 109, 0, 8, 45, 0, 9, 186, - 0, 8, 13, 0, 8, 141, 0, 8, 77, 0, 9, 250, 80, 7, 3, 0, 8, 83, 0, 8, 19, 85, 8, 195, 83, 7, 35, 0, 8, 115, 0, 8, 51, 0, 9, 198, 81, 7, 11, 0, 8, 99, 0, 8, 35, 0, 9, 166, 0, 8, 3, 0, 8, 131, 0, 8, 67, 0, 9, 230, 80, 7, 7, 0, 8, 91, 0, 8, 27, 0, 9, 150, 84, 7, 67, 0, 8, 123, 0, 8, 59, 0, 9, 214, 82, 7, 19, 0, 8, 107, 0, 8, 43, 0, 9, 182, 0, 8, 11, 0, 8, 139, 0, 8, 75, 0, 9, 246, 80, 7, 5, 0, 8, 87, 0, 8, 23, 192, 8, 0, 83, 7, 51, 0, 8, 119, 0, 8, 55, 0, 9, 206, 81, 7, 15, 0, 8, 103, 0, 8, 39, 0, 9, 174, 0, 8, 7, 0, 8, 135, 0, 8, 71, 0, 9, 238, 80, 7, 9, 0, 8, 95, 0, 8, 31, 0, 9, 158, 84, 7, 99, 0, 8, 127, 0, 8, 63, 0, 9, 222, 82, 7, 27, 0, 8, 111, 0, 8, 47, 0, 9, 190, 0, 8, 15, 0, 8, 143, 0, 8, 79, 0, 9, 254, 96, 7, 256, 0, 8, 80, 0, 8, 16, 84, 8, 115, 82, 7, 31, 0, 8, 112, 0, 8, 48, 0, 9, 193, 80, 7, 10, 0, 8, 96, 0, 8, 32, 0, 9, 161, 0, 8, 0, 0, 8, 128, 0, 8, 64, 0, 9, 225, 80, 7, 6, 0, 8, 88, 0, 8, 24, 0, 9, 145, 83, 7, 59, 0, 8, 120, 0, 8, 56, 0, 9, 209, 81, 7, 17, 0, 8, 104, 0, 8, 40, 0, 9, 177, 0, 8, 8, 0, 8, 136, 0, 8, 72, 0, 9, 241, 80, 7, 4, 0, 8, 84, 0, 8, 20, 85, 8, 227, 83, 7, 43, 0, 8, 116, 0, 8, 52, 0, 9, 201, 81, 7, 13, 0, 8, 100, 0, 8, 36, 0, 9, 169, 0, 8, 4, 0, 8, 132, 0, 8, 68, 0, 9, 233, 80, 7, 8, 0, 8, 92, 0, 8, 28, 0, 9, 153, 84, 7, 83, 0, 8, 124, 0, 8, 60, 0, 9, 217, 82, 7, 23, 0, 8, 108, 0, 8, 44, 0, 9, 185, 0, 8, 12, 0, 8, 140, 0, 8, 76, 0, 9, 249, 80, 7, 3, 0, 8, 82, 0, 8, 18, 85, 8, 163, 83, 7, 35, 0, 8, 114, 0, 8, 50, 0, 9, 197, 81, 7, 11, 0, 8, 98, 0, 8, 34, 0, 9, 165, 0, 8, 2, 0, 8, 130, 0, 8, 66, 0, 9, 229, 80, 7, 7, 0, 8, 90, 0, 8, 26, 0, 9, 149, 84, 7, 67, 0, 8, 122, 0, 8, 58, 0, 9, 213, 82, 7, 19, 0, 8, 106, 0, 8, 42, 0, 9, 181, 0, 8, 10, 0, 8, 138, 0, 8, 74, 0, 9, 245, 80, 7, 5, 0, 8, 86, 0, 8, 22, 192, 8, 0, 83, 7, 51, 0, 8, 118, 0, 8, 54, 0, 9, 205, 81, 7, 15, 0, 8, 102, 0, 8, 38, 0, 9, 173, 0, 8, 6, 0, 8, 134, 0, 8, 70, 0, 9, 237, 80, 7, 9, 0, 8, 94, 0, 8, 30, 0, 9, 157, 84, 7, 99, 0, 8, 126, 0, 8, 62, 0, 9, 221, 82, 7, 27, 0, 8, 110, 0, 8, 46, 0, 9, 189, 0, 8, - 14, 0, 8, 142, 0, 8, 78, 0, 9, 253, 96, 7, 256, 0, 8, 81, 0, 8, 17, 85, 8, 131, 82, 7, 31, 0, 8, 113, 0, 8, 49, 0, 9, 195, 80, 7, 10, 0, 8, 97, 0, 8, 33, 0, 9, 163, 0, 8, 1, 0, 8, 129, 0, 8, 65, 0, 9, 227, 80, 7, 6, 0, 8, 89, 0, 8, 25, 0, 9, 147, 83, 7, 59, 0, 8, 121, 0, 8, 57, 0, 9, 211, 81, 7, 17, 0, 8, 105, 0, 8, 41, 0, 9, 179, 0, 8, 9, 0, 8, 137, 0, 8, 73, 0, 9, 243, 80, 7, 4, 0, 8, 85, 0, 8, 21, 80, 8, 258, 83, 7, 43, 0, 8, 117, 0, 8, 53, 0, 9, 203, 81, 7, 13, 0, 8, 101, 0, 8, 37, 0, 9, 171, 0, 8, 5, 0, 8, 133, 0, 8, 69, 0, 9, 235, 80, 7, 8, 0, 8, 93, 0, 8, 29, 0, 9, 155, 84, 7, 83, 0, 8, 125, 0, 8, 61, 0, 9, 219, 82, 7, 23, 0, 8, 109, 0, 8, 45, 0, 9, 187, 0, 8, 13, 0, 8, 141, 0, 8, 77, 0, 9, 251, 80, 7, 3, 0, 8, 83, 0, 8, 19, 85, 8, 195, 83, 7, 35, 0, 8, 115, 0, 8, 51, 0, 9, 199, 81, 7, 11, 0, 8, 99, 0, 8, 35, 0, 9, 167, 0, 8, 3, 0, 8, 131, 0, 8, 67, 0, 9, 231, 80, 7, 7, 0, 8, 91, 0, 8, 27, 0, 9, 151, 84, 7, 67, 0, 8, 123, 0, 8, 59, 0, 9, 215, 82, 7, 19, 0, 8, 107, 0, 8, 43, 0, 9, 183, 0, 8, 11, 0, 8, 139, 0, 8, 75, 0, 9, 247, 80, 7, 5, 0, 8, 87, 0, 8, 23, 192, 8, 0, 83, 7, 51, 0, 8, 119, 0, 8, 55, 0, 9, 207, 81, 7, 15, 0, 8, 103, 0, 8, 39, 0, 9, 175, 0, 8, 7, 0, 8, 135, 0, 8, 71, 0, 9, 239, 80, 7, 9, 0, 8, 95, 0, 8, 31, 0, 9, 159, 84, 7, 99, 0, 8, 127, 0, 8, 63, 0, 9, 223, 82, 7, 27, 0, 8, 111, 0, 8, 47, 0, 9, 191, 0, 8, 15, 0, 8, 143, 0, 8, 79, 0, 9, 255}; - - internal static readonly int[] fixed_td = new int[]{80, 5, 1, 87, 5, 257, 83, 5, 17, 91, 5, 4097, 81, 5, 5, 89, 5, 1025, 85, 5, 65, 93, 5, 16385, 80, 5, 3, 88, 5, 513, 84, 5, 33, 92, 5, 8193, 82, 5, 9, 90, 5, 2049, 86, 5, 129, 192, 5, 24577, 80, 5, 2, 87, 5, 385, 83, 5, 25, 91, 5, 6145, 81, 5, 7, 89, 5, 1537, 85, 5, 97, 93, 5, 24577, 80, 5, 4, 88, 5, 769, 84, 5, 49, 92, 5, 12289, 82, 5, 13, 90, 5, 3073, 86, 5, 193, 192, 5, 24577}; - - // Tables for deflate from PKZIP's appnote.txt. - internal static readonly int[] cplens = new int[]{3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; - - internal static readonly int[] cplext = new int[]{0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; - - internal static readonly int[] cpdist = new int[]{1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577}; - - internal static readonly int[] cpdext = new int[]{0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; - - // If BMAX needs to be larger than 16, then h and x[] should be uLong. - internal const int BMAX = 15; // maximum bit length of any code - - internal static int huft_build(int[] b, int bindex, int n, int s, int[] d, int[] e, int[] t, int[] m, int[] hp, int[] hn, int[] v) - { - // Given a list of code lengths and a maximum table size, make a set of - // tables to decode that set of codes. Return Z_OK on success, Z_BUF_ERROR - // if the given code set is incomplete (the tables are still built in this - // case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of - // lengths), or Z_MEM_ERROR if not enough memory. - - int a; // counter for codes of length k - int[] c = new int[BMAX + 1]; // bit length count table - int f; // i repeats in table every f entries - int g; // maximum code length - int h; // table level - int i; // counter, current code - int j; // counter - int k; // number of bits in current code - int l; // bits per table (returned in m) - int mask; // (1 << w) - 1, to avoid cc -O bug on HP - int p; // pointer into c[], b[], or v[] - int q; // points to current table - int[] r = new int[3]; // table entry for structure assignment - int[] u = new int[BMAX]; // table stack - int w; // bits before this table == (l * h) - int[] x = new int[BMAX + 1]; // bit offsets, then code stack - int xp; // pointer into x - int y; // number of dummy codes added - int z; // number of entries in current table - - // Generate counts for each bit length - - p = 0; i = n; - do - { - c[b[bindex + p]]++; p++; i--; // assume all entries <= BMAX - } - while (i != 0); - - if (c[0] == n) - { - // null input--all zero length codes - t[0] = - 1; - m[0] = 0; - return Z_OK; - } - - // Find minimum and maximum length, bound *m by those - l = m[0]; - for (j = 1; j <= BMAX; j++) - if (c[j] != 0) - break; - k = j; // minimum code length - if (l < j) - { - l = j; - } - for (i = BMAX; i != 0; i--) - { - if (c[i] != 0) - break; - } - g = i; // maximum code length - if (l > i) - { - l = i; - } - m[0] = l; - - // Adjust last length count to fill out codes, if needed - for (y = 1 << j; j < i; j++, y <<= 1) - { - if ((y -= c[j]) < 0) - { - return Z_DATA_ERROR; - } - } - if ((y -= c[i]) < 0) - { - return Z_DATA_ERROR; - } - c[i] += y; - - // Generate starting offsets into the value table for each length - x[1] = j = 0; - p = 1; xp = 2; - while (--i != 0) - { - // note that i == g from above - x[xp] = (j += c[p]); - xp++; - p++; - } - - // Make a table of values in order of bit lengths - i = 0; p = 0; - do - { - if ((j = b[bindex + p]) != 0) - { - v[x[j]++] = i; - } - p++; - } - while (++i < n); - n = x[g]; // set n to length of v - - // Generate the Huffman codes and for each, make the table entries - x[0] = i = 0; // first Huffman code is zero - p = 0; // grab values in bit order - h = - 1; // no tables yet--level -1 - w = - l; // bits decoded == (l * h) - u[0] = 0; // just to keep compilers happy - q = 0; // ditto - z = 0; // ditto - - // go through the bit lengths (k already is bits in shortest code) - for (; k <= g; k++) - { - a = c[k]; - while (a-- != 0) - { - // here i is the Huffman code of length k bits for value *p - // make tables up to required level - while (k > w + l) - { - h++; - w += l; // previous table always l bits - // compute minimum size table less than or equal to l bits - z = g - w; - z = (z > l)?l:z; // table size upper limit - if ((f = 1 << (j = k - w)) > a + 1) - { - // try a k-w bit table - // too few codes for k-w bit table - f -= (a + 1); // deduct codes from patterns left - xp = k; - if (j < z) - { - while (++j < z) - { - // try smaller tables up to z bits - if ((f <<= 1) <= c[++xp]) - break; // enough codes to use up j bits - f -= c[xp]; // else deduct codes from patterns - } - } - } - z = 1 << j; // table entries for j-bit table - - // allocate new table - if (hn[0] + z > MANY) - // (note: doesn't matter for fixed) - return Z_DATA_ERROR; // overflow of MANY - u[h] = q = hn[0]; // DEBUG - hn[0] += z; - - // connect to last table, if there is one - if (h != 0) - { - x[h] = i; // save pattern for backing up - r[0] = (byte) j; // bits in this table - r[1] = (byte) l; // bits to dump before this table - j = SupportClass.URShift(i, (w - l)); - r[2] = (int) (q - u[h - 1] - j); // offset to this table - Array.Copy(r, 0, hp, (u[h - 1] + j) * 3, 3); // connect to last table - } - else - { - t[0] = q; // first table is returned result - } - } - - // set up table entry in r - r[1] = (byte) (k - w); - if (p >= n) - { - r[0] = 128 + 64; // out of values--invalid code - } - else if (v[p] < s) - { - r[0] = (byte) (v[p] < 256?0:32 + 64); // 256 is end-of-block - r[2] = v[p++]; // simple code is just the value - } - else - { - r[0] = (byte) (e[v[p] - s] + 16 + 64); // non-simple--look up in lists - r[2] = d[v[p++] - s]; - } - - // fill code-like entries with r - f = 1 << (k - w); - for (j = SupportClass.URShift(i, w); j < z; j += f) - { - Array.Copy(r, 0, hp, (q + j) * 3, 3); - } - - // backwards increment the k-bit code i - for (j = 1 << (k - 1); (i & j) != 0; j = SupportClass.URShift(j, 1)) - { - i ^= j; - } - i ^= j; - - // backup over finished tables - mask = (1 << w) - 1; // needed on HP, cc -O bug - while ((i & mask) != x[h]) - { - h--; // don't need to update q - w -= l; - mask = (1 << w) - 1; - } - } - } - // Return Z_BUF_ERROR if we were given an incomplete table - return y != 0 && g != 1?Z_BUF_ERROR:Z_OK; - } - - internal static int inflate_trees_bits(int[] c, int[] bb, int[] tb, int[] hp, ZStream z) - { - int r; - int[] hn = new int[1]; // hufts used in space - int[] v = new int[19]; // work area for huft_build - - r = huft_build(c, 0, 19, 19, null, null, tb, bb, hp, hn, v); - - if (r == Z_DATA_ERROR) - { - z.msg = "oversubscribed dynamic bit lengths tree"; - } - else if (r == Z_BUF_ERROR || bb[0] == 0) - { - z.msg = "incomplete dynamic bit lengths tree"; - r = Z_DATA_ERROR; - } - return r; - } - - internal static int inflate_trees_dynamic(int nl, int nd, int[] c, int[] bl, int[] bd, int[] tl, int[] td, int[] hp, ZStream z) - { - int r; - int[] hn = new int[1]; // hufts used in space - int[] v = new int[288]; // work area for huft_build - - // build literal/length tree - r = huft_build(c, 0, nl, 257, cplens, cplext, tl, bl, hp, hn, v); - if (r != Z_OK || bl[0] == 0) - { - if (r == Z_DATA_ERROR) - { - z.msg = "oversubscribed literal/length tree"; - } - else if (r != Z_MEM_ERROR) - { - z.msg = "incomplete literal/length tree"; - r = Z_DATA_ERROR; - } - return r; - } - - // build distance tree - r = huft_build(c, nl, nd, 0, cpdist, cpdext, td, bd, hp, hn, v); - - if (r != Z_OK || (bd[0] == 0 && nl > 257)) - { - if (r == Z_DATA_ERROR) - { - z.msg = "oversubscribed distance tree"; - } - else if (r == Z_BUF_ERROR) - { - z.msg = "incomplete distance tree"; - r = Z_DATA_ERROR; - } - else if (r != Z_MEM_ERROR) - { - z.msg = "empty distance tree with lengths"; - r = Z_DATA_ERROR; - } - return r; - } - - return Z_OK; - } - - internal static int inflate_trees_fixed(int[] bl, int[] bd, int[][] tl, int[][] td, ZStream z) - { - bl[0] = fixed_bl; - bd[0] = fixed_bd; - tl[0] = fixed_tl; - td[0] = fixed_td; - return Z_OK; - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/Inflate.cs b/src/Zlib.net/Inflate.cs deleted file mode 100644 index d7d8fa3..0000000 --- a/src/Zlib.net/Inflate.cs +++ /dev/null @@ -1,450 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - sealed class Inflate - { - - private const int MAX_WBITS = 15; // 32K LZ77 window - - // preset dictionary flag in zlib header - private const int PRESET_DICT = 0x20; - - internal const int Z_NO_FLUSH = 0; - internal const int Z_PARTIAL_FLUSH = 1; - internal const int Z_SYNC_FLUSH = 2; - internal const int Z_FULL_FLUSH = 3; - internal const int Z_FINISH = 4; - - private const int Z_DEFLATED = 8; - - private const int Z_OK = 0; - private const int Z_STREAM_END = 1; - private const int Z_NEED_DICT = 2; - private const int Z_ERRNO = - 1; - private const int Z_STREAM_ERROR = - 2; - private const int Z_DATA_ERROR = - 3; - private const int Z_MEM_ERROR = - 4; - private const int Z_BUF_ERROR = - 5; - private const int Z_VERSION_ERROR = - 6; - - private const int METHOD = 0; // waiting for method byte - private const int FLAG = 1; // waiting for flag byte - private const int DICT4 = 2; // four dictionary check bytes to go - private const int DICT3 = 3; // three dictionary check bytes to go - private const int DICT2 = 4; // two dictionary check bytes to go - private const int DICT1 = 5; // one dictionary check byte to go - private const int DICT0 = 6; // waiting for inflateSetDictionary - private const int BLOCKS = 7; // decompressing blocks - private const int CHECK4 = 8; // four check bytes to go - private const int CHECK3 = 9; // three check bytes to go - private const int CHECK2 = 10; // two check bytes to go - private const int CHECK1 = 11; // one check byte to go - private const int DONE = 12; // finished check, done - private const int BAD = 13; // got an error--stay here - - internal int mode; // current inflate mode - - // mode dependent information - internal int method; // if FLAGS, method byte - - // if CHECK, check values to compare - internal long[] was = new long[1]; // computed check value - internal long need; // stream check value - - // if BAD, inflateSync's marker bytes count - internal int marker; - - // mode independent information - internal int nowrap; // flag for no wrapper - internal int wbits; // log2(window size) (8..15, defaults to 15) - - internal InfBlocks blocks; // current inflate_blocks state - - internal int inflateReset(ZStream z) - { - if (z == null || z.istate == null) - return Z_STREAM_ERROR; - - z.total_in = z.total_out = 0; - z.msg = null; - z.istate.mode = z.istate.nowrap != 0?BLOCKS:METHOD; - z.istate.blocks.reset(z, null); - return Z_OK; - } - - internal int inflateEnd(ZStream z) - { - if (blocks != null) - blocks.free(z); - blocks = null; - // ZFREE(z, z->state); - return Z_OK; - } - - internal int inflateInit(ZStream z, int w) - { - z.msg = null; - blocks = null; - - // handle undocumented nowrap option (no zlib header or check) - nowrap = 0; - if (w < 0) - { - w = - w; - nowrap = 1; - } - - // set window size - if (w < 8 || w > 15) - { - inflateEnd(z); - return Z_STREAM_ERROR; - } - wbits = w; - - z.istate.blocks = new InfBlocks(z, z.istate.nowrap != 0?null:this, 1 << w); - - // reset state - inflateReset(z); - return Z_OK; - } - - internal int inflate(ZStream z, int f) - { - int r; - int b; - - if (z == null || z.istate == null || z.next_in == null) - return Z_STREAM_ERROR; - f = f == Z_FINISH?Z_BUF_ERROR:Z_OK; - r = Z_BUF_ERROR; - while (true) - { - //System.out.println("mode: "+z.istate.mode); - switch (z.istate.mode) - { - - case METHOD: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - if (((z.istate.method = z.next_in[z.next_in_index++]) & 0xf) != Z_DEFLATED) - { - z.istate.mode = BAD; - z.msg = "unknown compression method"; - z.istate.marker = 5; // can't try inflateSync - break; - } - if ((z.istate.method >> 4) + 8 > z.istate.wbits) - { - z.istate.mode = BAD; - z.msg = "invalid window size"; - z.istate.marker = 5; // can't try inflateSync - break; - } - z.istate.mode = FLAG; - goto case FLAG; - - case FLAG: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - b = (z.next_in[z.next_in_index++]) & 0xff; - - if ((((z.istate.method << 8) + b) % 31) != 0) - { - z.istate.mode = BAD; - z.msg = "incorrect header check"; - z.istate.marker = 5; // can't try inflateSync - break; - } - - if ((b & PRESET_DICT) == 0) - { - z.istate.mode = BLOCKS; - break; - } - z.istate.mode = DICT4; - goto case DICT4; - - case DICT4: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - z.istate.need = ((long)(z.next_in[z.next_in_index++] & 0xff) << 24) & unchecked((int) 0xff000000L); - z.istate.mode = DICT3; - goto case DICT3; - - case DICT3: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - z.istate.need += (((long)(z.next_in[z.next_in_index++] & 0xff) << 16) & 0xff0000L); - z.istate.mode = DICT2; - goto case DICT2; - - case DICT2: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - z.istate.need += (((long)(z.next_in[z.next_in_index++] & 0xff) << 8) & 0xff00L); - z.istate.mode = DICT1; - goto case DICT1; - - case DICT1: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - z.istate.need += (long)(z.next_in[z.next_in_index++] & 0xffL); - z.adler = z.istate.need; - z.istate.mode = DICT0; - return Z_NEED_DICT; - - case DICT0: - z.istate.mode = BAD; - z.msg = "need dictionary"; - z.istate.marker = 0; // can try inflateSync - return Z_STREAM_ERROR; - - case BLOCKS: - - r = z.istate.blocks.proc(z, r); - if (r == Z_DATA_ERROR) - { - z.istate.mode = BAD; - z.istate.marker = 0; // can try inflateSync - break; - } - if (r == Z_OK) - { - r = f; - } - if (r != Z_STREAM_END) - { - return r; - } - r = f; - z.istate.blocks.reset(z, z.istate.was); - if (z.istate.nowrap != 0) - { - z.istate.mode = DONE; - break; - } - z.istate.mode = CHECK4; - goto case CHECK4; - - case CHECK4: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - z.istate.need = ((z.next_in[z.next_in_index++] & 0xff) << 24) & unchecked((int) 0xff000000L); - z.istate.mode = CHECK3; - goto case CHECK3; - - case CHECK3: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - z.istate.need += (((z.next_in[z.next_in_index++] & 0xff) << 16) & 0xff0000L); - z.istate.mode = CHECK2; - goto case CHECK2; - - case CHECK2: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - z.istate.need += (((z.next_in[z.next_in_index++] & 0xff) << 8) & 0xff00L); - z.istate.mode = CHECK1; - goto case CHECK1; - - case CHECK1: - - if (z.avail_in == 0) - return r; r = f; - - z.avail_in--; z.total_in++; - z.istate.need += (z.next_in[z.next_in_index++] & 0xffL); - - if (((int) (z.istate.was[0])) != ((int) (z.istate.need))) - { - z.istate.mode = BAD; - z.msg = "incorrect data check"; - z.istate.marker = 5; // can't try inflateSync - break; - } - - z.istate.mode = DONE; - goto case DONE; - - case DONE: - return Z_STREAM_END; - - case BAD: - return Z_DATA_ERROR; - - default: - return Z_STREAM_ERROR; - - } - } - } - - - internal int inflateSetDictionary(ZStream z, byte[] dictionary, int dictLength) - { - int index = 0; - int length = dictLength; - if (z == null || z.istate == null || z.istate.mode != DICT0) - return Z_STREAM_ERROR; - - if (z._adler.adler32(1L, dictionary, 0, dictLength) != z.adler) - { - return Z_DATA_ERROR; - } - - z.adler = z._adler.adler32(0, null, 0, 0); - - if (length >= (1 << z.istate.wbits)) - { - length = (1 << z.istate.wbits) - 1; - index = dictLength - length; - } - z.istate.blocks.set_dictionary(dictionary, index, length); - z.istate.mode = BLOCKS; - return Z_OK; - } - - private static byte[] mark = new byte[]{(byte) 0, (byte) 0, (byte) SupportClass.Identity(0xff), (byte) SupportClass.Identity(0xff)}; - - internal int inflateSync(ZStream z) - { - int n; // number of bytes to look at - int p; // pointer to bytes - int m; // number of marker bytes found in a row - long r, w; // temporaries to save total_in and total_out - - // set up - if (z == null || z.istate == null) - return Z_STREAM_ERROR; - if (z.istate.mode != BAD) - { - z.istate.mode = BAD; - z.istate.marker = 0; - } - if ((n = z.avail_in) == 0) - return Z_BUF_ERROR; - p = z.next_in_index; - m = z.istate.marker; - - // search - while (n != 0 && m < 4) - { - if (z.next_in[p] == mark[m]) - { - m++; - } - else if (z.next_in[p] != 0) - { - m = 0; - } - else - { - m = 4 - m; - } - p++; n--; - } - - // restore - z.total_in += p - z.next_in_index; - z.next_in_index = p; - z.avail_in = n; - z.istate.marker = m; - - // return no joy or set up to restart on a new block - if (m != 4) - { - return Z_DATA_ERROR; - } - r = z.total_in; w = z.total_out; - inflateReset(z); - z.total_in = r; z.total_out = w; - z.istate.mode = BLOCKS; - return Z_OK; - } - - // Returns true if inflate is currently at the end of a block generated - // by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP - // implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH - // but removes the length bytes of the resulting empty stored block. When - // decompressing, PPP checks that at the end of input packet, inflate is - // waiting for these length bytes. - internal int inflateSyncPoint(ZStream z) - { - if (z == null || z.istate == null || z.istate.blocks == null) - return Z_STREAM_ERROR; - return z.istate.blocks.sync_point(); - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/LICENSE b/src/Zlib.net/LICENSE deleted file mode 100644 index afe88e5..0000000 --- a/src/Zlib.net/LICENSE +++ /dev/null @@ -1,10 +0,0 @@ -Copyright (c) 2006-2007, ComponentAce -http://www.componentace.com -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/Zlib.net/README.md b/src/Zlib.net/README.md deleted file mode 100644 index cd11688..0000000 --- a/src/Zlib.net/README.md +++ /dev/null @@ -1,84 +0,0 @@ -ZLIB.NET: README -================================================== - -Contents --------- - - Program information - Company information - Description - Specification - Other ComponentAce compression products - - - -Program information -------------------- - -Program Name: - ZLIB.NET -License Type: freeware - -Program Version: - 1.04 -Program Release Date: - 03/28/2007 -Program Purpose: - version of ZLIB compression library for .NET framework -Target Environment: - Visual Studio 2003, Visual Studio 2005, Borland Developer Studio 2005, Borland Developer Studio 2006 and other - - -Company information -------------------- - -Company Name: - ComponentAce -Contact E-mail Address: - support@componentace.com -Contact WWW URL: - http://www.componentace.com - - -Description ------------ - -100% managed version of ZLIB compression library. -Based on JZlib library (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. - -The zlib compression library was written by Jean-loup Gailly gzip@prep.ai.mit.edu and Mark Adler madler@alumni.caltech.edu. - -The primary site for the zlib compression library is http://www.zlib.org. - -Copyright and license ---------------------- - -See "LICENSE" file. - - -Warranty and guarantee ----------------------- - -See "LICENSE" file. - - -Other ComponentAce compression products ---------------------------------------- - -ZipForge.NET ------------- - -ZipForge.NET is an advanced ZIP compression library for .NET framework. -ZipForge.NET features include streaming support, transaction system, ZIP encryption, repair, -progress indication, Zip64 support, SFX (self-extracting) archives, unicode filenames, spanning support and much more. - -FlexCompress.NET ----------------- - -FlexCompress.NET is an advanced compression and encryption .NET component designed to provide archive -functionality for your applications. This solution provides flexible compression and strong encryption algorithms that -allows you to integrate archiving or backup features into your programs in a fast and easy way. -FlexCompres.NET uses its own file format which allows to achieve high compression rate. - -For more info visit -http://www.componentace.com/.NET_components \ No newline at end of file diff --git a/src/Zlib.net/StaticTree.cs b/src/Zlib.net/StaticTree.cs deleted file mode 100644 index da83fb8..0000000 --- a/src/Zlib.net/StaticTree.cs +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - sealed class StaticTree - { - private const int MAX_BITS = 15; - - private const int BL_CODES = 19; - private const int D_CODES = 30; - private const int LITERALS = 256; - private const int LENGTH_CODES = 29; - private static readonly int L_CODES = (LITERALS + 1 + LENGTH_CODES); - - // Bit length codes must not exceed MAX_BL_BITS bits - internal const int MAX_BL_BITS = 7; - - internal static readonly short[] static_ltree = new short[]{12, 8, 140, 8, 76, 8, 204, 8, 44, 8, 172, 8, 108, 8, 236, 8, 28, 8, 156, 8, 92, 8, 220, 8, 60, 8, 188, 8, 124, 8, 252, 8, 2, 8, 130, 8, 66, 8, 194, 8, 34, 8, 162, 8, 98, 8, 226, 8, 18, 8, 146, 8, 82, 8, 210, 8, 50, 8, 178, 8, 114, 8, 242, 8, 10, 8, 138, 8, 74, 8, 202, 8, 42, 8, 170, 8, 106, 8, 234, 8, 26, 8, 154, 8, 90, 8, 218, 8, 58, 8, 186, 8, 122, 8, 250, 8, 6, 8, 134, 8, 70, 8, 198, 8, 38, 8, 166, 8, 102, 8, 230, 8, 22, 8, 150, 8, 86, 8, 214, 8, 54, 8, 182, 8, 118, 8, 246, 8, 14, 8, 142, 8, 78, 8, 206, 8, 46, 8, 174, 8, 110, 8, 238, 8, 30, 8, 158, 8, 94, 8, 222, 8, 62, 8, 190, 8, 126, 8, 254, 8, 1, 8, 129, 8, 65, 8, 193, 8, 33, 8, 161, 8, 97, 8, 225, 8, 17, 8, 145, 8, 81, 8, 209, 8, 49, 8, 177, 8, 113, 8, 241, 8, 9, 8, 137, 8, 73, 8, 201, 8, 41, 8, 169, 8, 105, 8, 233, 8, 25, 8, 153, 8, 89, 8, 217, 8, 57, 8, 185, 8, 121, 8, 249, 8, 5, 8, 133, 8, 69, 8, 197, 8, 37, 8, 165, 8, 101, 8, 229, 8, 21, 8, 149, 8, 85, 8, 213, 8, 53, 8, 181, 8, 117, 8, 245, 8, 13, 8, 141, 8, 77, 8, 205, 8, 45, 8, 173, 8, 109, 8, 237, 8, 29, 8, 157, 8, 93, 8, 221, 8, 61, 8, 189, 8, 125, 8, 253, 8, 19, 9, 275, 9, 147, 9, 403, 9, 83, 9, 339, 9, 211, 9, 467, 9, 51, 9, 307, 9, 179, 9, 435, 9, 115, 9, 371, 9, 243, 9, 499, 9, 11, 9, 267, 9, 139, 9, 395, 9, 75, 9, 331, 9, 203, 9, 459, 9, 43, 9, 299, 9, 171, 9, 427, 9, 107, 9, 363, 9, 235, 9, 491, 9, 27, 9, 283, 9, 155, 9, 411, 9, 91, 9, 347, 9, 219, 9, 475, 9, 59, 9, 315, 9, 187, 9, 443, 9, 123, 9, 379, 9, 251, 9, 507, 9, 7, 9, 263, 9, 135, 9, 391, 9, 71, 9, 327, 9, 199, 9, 455, 9, 39, 9, 295, 9, 167, 9, 423, 9, 103, 9, 359, 9, 231, 9, 487, 9, 23, 9, 279, 9, 151, 9, 407, 9, 87, 9, 343, 9, 215, 9, 471, 9, 55, 9, 311, 9, 183, 9, 439, 9, 119, 9, 375, 9, 247, 9, 503, 9, 15, 9, 271, 9, 143, 9, 399, 9, 79, 9, 335, 9, 207, 9, 463, 9, 47, 9, 303, 9, 175, 9, 431, 9, 111, 9, 367, 9, 239, 9, 495, 9, 31, 9, 287, 9, 159, 9, 415, 9, 95, 9, 351, 9, 223, 9, 479, 9, 63, 9, 319, 9, 191, 9, 447, 9, 127, 9, 383, 9, 255, 9, 511, 9, 0, 7, 64, 7 - , 32, 7, 96, 7, 16, 7, 80, 7, 48, 7, 112, 7, 8, 7, 72, 7, 40, 7, 104, 7, 24, 7, 88, 7, 56, 7, 120, 7, 4, 7, 68, 7, 36, 7, 100, 7, 20, 7, 84, 7, 52, 7, 116, 7, 3, 8, 131, 8, 67, 8, 195, 8, 35, 8, 163, 8, 99, 8, 227, 8}; - - internal static readonly short[] static_dtree = new short[]{0, 5, 16, 5, 8, 5, 24, 5, 4, 5, 20, 5, 12, 5, 28, 5, 2, 5, 18, 5, 10, 5, 26, 5, 6, 5, 22, 5, 14, 5, 30, 5, 1, 5, 17, 5, 9, 5, 25, 5, 5, 5, 21, 5, 13, 5, 29, 5, 3, 5, 19, 5, 11, 5, 27, 5, 7, 5, 23, 5}; - - internal static StaticTree static_l_desc; - - internal static StaticTree static_d_desc; - - internal static StaticTree static_bl_desc; - - internal short[] static_tree; // static tree or null - internal int[] extra_bits; // extra bits for each code or null - internal int extra_base; // base index for extra_bits - internal int elems; // max number of elements in the tree - internal int max_length; // max bit length for the codes - - internal StaticTree(short[] static_tree, int[] extra_bits, int extra_base, int elems, int max_length) - { - this.static_tree = static_tree; - this.extra_bits = extra_bits; - this.extra_base = extra_base; - this.elems = elems; - this.max_length = max_length; - } - static StaticTree() - { - static_l_desc = new StaticTree(static_ltree, Tree.extra_lbits, LITERALS + 1, L_CODES, MAX_BITS); - static_d_desc = new StaticTree(static_dtree, Tree.extra_dbits, 0, D_CODES, MAX_BITS); - static_bl_desc = new StaticTree(null, Tree.extra_blbits, 0, BL_CODES, MAX_BL_BITS); - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/SupportClass.cs b/src/Zlib.net/SupportClass.cs deleted file mode 100644 index dc6cc2d..0000000 --- a/src/Zlib.net/SupportClass.cs +++ /dev/null @@ -1,171 +0,0 @@ - -using System; - - -namespace ComponentAce.Compression.Libs.zlib -{ - public class SupportClass - { - /// - /// This method returns the literal value received - /// - /// The literal to return - /// The received value - public static long Identity(long literal) - { - return literal; - } - - /// - /// This method returns the literal value received - /// - /// The literal to return - /// The received value - public static ulong Identity(ulong literal) - { - return literal; - } - - /// - /// This method returns the literal value received - /// - /// The literal to return - /// The received value - public static float Identity(float literal) - { - return literal; - } - - /// - /// This method returns the literal value received - /// - /// The literal to return - /// The received value - public static double Identity(double literal) - { - return literal; - } - - /*******************************/ - /// - /// Performs an unsigned bitwise right shift with the specified number - /// - /// Number to operate on - /// Ammount of bits to shift - /// The resulting number from the shift operation - public static int URShift(int number, int bits) - { - if ( number >= 0) - return number >> bits; - else - return (number >> bits) + (2 << ~bits); - } - - /// - /// Performs an unsigned bitwise right shift with the specified number - /// - /// Number to operate on - /// Ammount of bits to shift - /// The resulting number from the shift operation - public static int URShift(int number, long bits) - { - return URShift(number, (int)bits); - } - - /// - /// Performs an unsigned bitwise right shift with the specified number - /// - /// Number to operate on - /// Ammount of bits to shift - /// The resulting number from the shift operation - public static long URShift(long number, int bits) - { - if ( number >= 0) - return number >> bits; - else - return (number >> bits) + (2L << ~bits); - } - - /// - /// Performs an unsigned bitwise right shift with the specified number - /// - /// Number to operate on - /// Ammount of bits to shift - /// The resulting number from the shift operation - public static long URShift(long number, long bits) - { - return URShift(number, (int)bits); - } - - /*******************************/ - /// Reads a number of characters from the current source Stream and writes the data to the target array at the specified index. - /// The source Stream to read from. - /// Contains the array of characteres read from the source Stream. - /// The starting index of the target array. - /// The maximum number of characters to read from the source Stream. - /// The number of characters read. The number will be less than or equal to count depending on the data available in the source Stream. Returns -1 if the end of the stream is reached. - public static System.Int32 ReadInput(System.IO.Stream sourceStream, byte[] target, int start, int count) - { - // Returns 0 bytes if not enough space in target - if (target.Length == 0) - return 0; - - byte[] receiver = new byte[target.Length]; - int bytesRead = sourceStream.Read(receiver, start, count); - - // Returns -1 if EOF - if (bytesRead == 0) - return -1; - - for(int i = start; i < start + bytesRead; i++) - target[i] = (byte)receiver[i]; - - return bytesRead; - } - - /// Reads a number of characters from the current source TextReader and writes the data to the target array at the specified index. - /// The source TextReader to read from - /// Contains the array of characteres read from the source TextReader. - /// The starting index of the target array. - /// The maximum number of characters to read from the source TextReader. - /// The number of characters read. The number will be less than or equal to count depending on the data available in the source TextReader. Returns -1 if the end of the stream is reached. - public static System.Int32 ReadInput(System.IO.TextReader sourceTextReader, byte[] target, int start, int count) - { - // Returns 0 bytes if not enough space in target - if (target.Length == 0) return 0; - - char[] charArray = new char[target.Length]; - int bytesRead = sourceTextReader.Read(charArray, start, count); - - // Returns -1 if EOF - if (bytesRead == 0) return -1; - - for(int index=start; index - /// Converts a string to an array of bytes - /// - /// The string to be converted - /// The new array of bytes - public static byte[] ToByteArray(System.String sourceString) - { - return System.Text.UTF8Encoding.UTF8.GetBytes(sourceString); - } - - /// - /// Converts an array of bytes to an array of chars - /// - /// The array of bytes to convert - /// The new array of chars - public static char[] ToCharArray(byte[] byteArray) - { - return System.Text.UTF8Encoding.UTF8.GetChars(byteArray); - } - - - } -} \ No newline at end of file diff --git a/src/Zlib.net/Tree.cs b/src/Zlib.net/Tree.cs deleted file mode 100644 index 41ea02c..0000000 --- a/src/Zlib.net/Tree.cs +++ /dev/null @@ -1,349 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - sealed class Tree - { - private const int MAX_BITS = 15; - private const int BL_CODES = 19; - private const int D_CODES = 30; - private const int LITERALS = 256; - private const int LENGTH_CODES = 29; - private static readonly int L_CODES = (LITERALS + 1 + LENGTH_CODES); - private static readonly int HEAP_SIZE = (2 * L_CODES + 1); - - // Bit length codes must not exceed MAX_BL_BITS bits - internal const int MAX_BL_BITS = 7; - - // end of block literal code - internal const int END_BLOCK = 256; - - // repeat previous bit length 3-6 times (2 bits of repeat count) - internal const int REP_3_6 = 16; - - // repeat a zero length 3-10 times (3 bits of repeat count) - internal const int REPZ_3_10 = 17; - - // repeat a zero length 11-138 times (7 bits of repeat count) - internal const int REPZ_11_138 = 18; - - // extra bits for each length code - internal static readonly int[] extra_lbits = new int[]{0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0}; - - // extra bits for each distance code - internal static readonly int[] extra_dbits = new int[]{0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; - - // extra bits for each bit length code - internal static readonly int[] extra_blbits = new int[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7}; - - internal static readonly byte[] bl_order = new byte[]{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - - - // The lengths of the bit length codes are sent in order of decreasing - // probability, to avoid transmitting the lengths for unused bit - // length codes. - - internal const int Buf_size = 8 * 2; - - // see definition of array dist_code below - internal const int DIST_CODE_LEN = 512; - - internal static readonly byte[] _dist_code = new byte[]{0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, 18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29}; - - internal static readonly byte[] _length_code = new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28}; - - internal static readonly int[] base_length = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 0}; - - internal static readonly int[] base_dist = new int[]{0, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576}; - - // Mapping from a distance to a distance code. dist is the distance - 1 and - // must not have side effects. _dist_code[256] and _dist_code[257] are never - // used. - internal static int d_code(int dist) - { - return ((dist) < 256?_dist_code[dist]:_dist_code[256 + (SupportClass.URShift((dist), 7))]); - } - - internal short[] dyn_tree; // the dynamic tree - internal int max_code; // largest code with non zero frequency - internal StaticTree stat_desc; // the corresponding static tree - - // Compute the optimal bit lengths for a tree and update the total bit length - // for the current block. - // IN assertion: the fields freq and dad are set, heap[heap_max] and - // above are the tree nodes sorted by increasing frequency. - // OUT assertions: the field len is set to the optimal bit length, the - // array bl_count contains the frequencies for each bit length. - // The length opt_len is updated; static_len is also updated if stree is - // not null. - internal void gen_bitlen(Deflate s) - { - short[] tree = dyn_tree; - short[] stree = stat_desc.static_tree; - int[] extra = stat_desc.extra_bits; - int base_Renamed = stat_desc.extra_base; - int max_length = stat_desc.max_length; - int h; // heap index - int n, m; // iterate over the tree elements - int bits; // bit length - int xbits; // extra bits - short f; // frequency - int overflow = 0; // number of elements with bit length too large - - for (bits = 0; bits <= MAX_BITS; bits++) - s.bl_count[bits] = 0; - - // In a first pass, compute the optimal bit lengths (which may - // overflow in the case of the bit length tree). - tree[s.heap[s.heap_max] * 2 + 1] = 0; // root of the heap - - for (h = s.heap_max + 1; h < HEAP_SIZE; h++) - { - n = s.heap[h]; - bits = tree[tree[n * 2 + 1] * 2 + 1] + 1; - if (bits > max_length) - { - bits = max_length; overflow++; - } - tree[n * 2 + 1] = (short) bits; - // We overwrite tree[n*2+1] which is no longer needed - - if (n > max_code) - continue; // not a leaf node - - s.bl_count[bits]++; - xbits = 0; - if (n >= base_Renamed) - xbits = extra[n - base_Renamed]; - f = tree[n * 2]; - s.opt_len += f * (bits + xbits); - if (stree != null) - s.static_len += f * (stree[n * 2 + 1] + xbits); - } - if (overflow == 0) - return ; - - // This happens for example on obj2 and pic of the Calgary corpus - // Find the first bit length which could increase: - do - { - bits = max_length - 1; - while (s.bl_count[bits] == 0) - bits--; - s.bl_count[bits]--; // move one leaf down the tree - s.bl_count[bits + 1] = (short) (s.bl_count[bits + 1] + 2); // move one overflow item as its brother - s.bl_count[max_length]--; - // The brother of the overflow item also moves one step up, - // but this does not affect bl_count[max_length] - overflow -= 2; - } - while (overflow > 0); - - for (bits = max_length; bits != 0; bits--) - { - n = s.bl_count[bits]; - while (n != 0) - { - m = s.heap[--h]; - if (m > max_code) - continue; - if (tree[m * 2 + 1] != bits) - { - s.opt_len = (int) (s.opt_len + ((long) bits - (long) tree[m * 2 + 1]) * (long) tree[m * 2]); - tree[m * 2 + 1] = (short) bits; - } - n--; - } - } - } - - // Construct one Huffman tree and assigns the code bit strings and lengths. - // Update the total bit length for the current block. - // IN assertion: the field freq is set for all tree elements. - // OUT assertions: the fields len and code are set to the optimal bit length - // and corresponding code. The length opt_len is updated; static_len is - // also updated if stree is not null. The field max_code is set. - internal void build_tree(Deflate s) - { - short[] tree = dyn_tree; - short[] stree = stat_desc.static_tree; - int elems = stat_desc.elems; - int n, m; // iterate over heap elements - int max_code = - 1; // largest code with non zero frequency - int node; // new node being created - - // Construct the initial heap, with least frequent element in - // heap[1]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. - // heap[0] is not used. - s.heap_len = 0; - s.heap_max = HEAP_SIZE; - - for (n = 0; n < elems; n++) - { - if (tree[n * 2] != 0) - { - s.heap[++s.heap_len] = max_code = n; - s.depth[n] = 0; - } - else - { - tree[n * 2 + 1] = 0; - } - } - - // The pkzip format requires that at least one distance code exists, - // and that at least one bit should be sent even if there is only one - // possible code. So to avoid special checks later on we force at least - // two codes of non zero frequency. - while (s.heap_len < 2) - { - node = s.heap[++s.heap_len] = (max_code < 2?++max_code:0); - tree[node * 2] = 1; - s.depth[node] = 0; - s.opt_len--; - if (stree != null) - s.static_len -= stree[node * 2 + 1]; - // node is 0 or 1 so it does not have extra bits - } - this.max_code = max_code; - - // The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, - // establish sub-heaps of increasing lengths: - - for (n = s.heap_len / 2; n >= 1; n--) - s.pqdownheap(tree, n); - - // Construct the Huffman tree by repeatedly combining the least two - // frequent nodes. - - node = elems; // next internal node of the tree - do - { - // n = node of least frequency - n = s.heap[1]; - s.heap[1] = s.heap[s.heap_len--]; - s.pqdownheap(tree, 1); - m = s.heap[1]; // m = node of next least frequency - - s.heap[--s.heap_max] = n; // keep the nodes sorted by frequency - s.heap[--s.heap_max] = m; - - // Create a new node father of n and m - tree[node * 2] = (short) (tree[n * 2] + tree[m * 2]); - s.depth[node] = (byte) (System.Math.Max((byte) s.depth[n], (byte) s.depth[m]) + 1); - tree[n * 2 + 1] = tree[m * 2 + 1] = (short) node; - - // and insert the new node in the heap - s.heap[1] = node++; - s.pqdownheap(tree, 1); - } - while (s.heap_len >= 2); - - s.heap[--s.heap_max] = s.heap[1]; - - // At this point, the fields freq and dad are set. We can now - // generate the bit lengths. - - gen_bitlen(s); - - // The field len is now set, we can generate the bit codes - gen_codes(tree, max_code, s.bl_count); - } - - // Generate the codes for a given tree and bit counts (which need not be - // optimal). - // IN assertion: the array bl_count contains the bit length statistics for - // the given tree and the field len is set for all tree elements. - // OUT assertion: the field code is set for all tree elements of non - // zero code length. - internal static void gen_codes(short[] tree, int max_code, short[] bl_count) - { - short[] next_code = new short[MAX_BITS + 1]; // next code value for each bit length - short code = 0; // running code value - int bits; // bit index - int n; // code index - - // The distribution counts are first used to generate the code values - // without bit reversal. - for (bits = 1; bits <= MAX_BITS; bits++) - { - next_code[bits] = code = (short) ((code + bl_count[bits - 1]) << 1); - } - - // Check that the bit counts in bl_count are consistent. The last code - // must be all ones. - //Assert (code + bl_count[MAX_BITS]-1 == (1< 0); - return SupportClass.URShift(res, 1); - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/ZInputStream.cs b/src/Zlib.net/ZInputStream.cs deleted file mode 100644 index ba04825..0000000 --- a/src/Zlib.net/ZInputStream.cs +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2001 Lapo Luchini. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS -OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - public class ZInputStream:System.IO.BinaryReader - { - internal void InitBlock() - { - flush = zlibConst.Z_NO_FLUSH; - buf = new byte[bufsize]; - } - virtual public int FlushMode - { - get - { - return (flush); - } - - set - { - this.flush = value; - } - - } - /// Returns the total number of bytes input so far. - virtual public long TotalIn - { - get - { - return z.total_in; - } - - } - /// Returns the total number of bytes output so far. - virtual public long TotalOut - { - get - { - return z.total_out; - } - - } - - protected ZStream z = new ZStream(); - protected int bufsize = 512; - protected int flush; - protected byte[] buf, buf1 = new byte[1]; - protected bool compress; - - internal System.IO.Stream in_Renamed = null; - - public ZInputStream(System.IO.Stream in_Renamed):base(in_Renamed) - { - InitBlock(); - this.in_Renamed = in_Renamed; - z.inflateInit(); - compress = false; - z.next_in = buf; - z.next_in_index = 0; - z.avail_in = 0; - } - - public ZInputStream(System.IO.Stream in_Renamed, int level):base(in_Renamed) - { - InitBlock(); - this.in_Renamed = in_Renamed; - z.deflateInit(level); - compress = true; - z.next_in = buf; - z.next_in_index = 0; - z.avail_in = 0; - } - - /*public int available() throws IOException { - return inf.finished() ? 0 : 1; - }*/ - - public override int Read() - { - if (read(buf1, 0, 1) == - 1) - return (- 1); - return (buf1[0] & 0xFF); - } - - internal bool nomoreinput = false; - - public int read(byte[] b, int off, int len) - { - if (len == 0) - return (0); - int err; - z.next_out = b; - z.next_out_index = off; - z.avail_out = len; - do - { - if ((z.avail_in == 0) && (!nomoreinput)) - { - // if buffer is empty and more input is avaiable, refill it - z.next_in_index = 0; - z.avail_in = SupportClass.ReadInput(in_Renamed, buf, 0, bufsize); //(bufsize Returns the total number of bytes input so far. - virtual public long TotalIn - { - get - { - return z.total_in; - } - - } - /// Returns the total number of bytes output so far. - virtual public long TotalOut - { - get - { - return z.total_out; - } - - } - - protected internal ZStream z = new ZStream(); - protected internal int bufsize = 4096; - protected internal int flush_Renamed_Field; - protected internal byte[] buf, buf1 = new byte[1]; - protected internal bool compress; - - private System.IO.Stream out_Renamed; - - public ZOutputStream(System.IO.Stream out_Renamed):base() - { - InitBlock(); - this.out_Renamed = out_Renamed; - z.inflateInit(); - compress = false; - } - - public ZOutputStream(System.IO.Stream out_Renamed, int level):base() - { - InitBlock(); - this.out_Renamed = out_Renamed; - z.deflateInit(level); - compress = true; - } - - public void WriteByte(int b) - { - buf1[0] = (byte) b; - Write(buf1, 0, 1); - } - //UPGRADE_TODO: The differences in the Expected value of parameters for method 'WriteByte' may cause compilation errors. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1092_3"' - public override void WriteByte(byte b) - { - WriteByte((int) b); - } - - public override void Write(System.Byte[] b1, int off, int len) - { - if (len == 0) - return ; - int err; - byte[] b = new byte[b1.Length]; - System.Array.Copy(b1, 0, b, 0, b1.Length); - z.next_in = b; - z.next_in_index = off; - z.avail_in = len; - do - { - z.next_out = buf; - z.next_out_index = 0; - z.avail_out = bufsize; - if (compress) - err = z.deflate(flush_Renamed_Field); - else - err = z.inflate(flush_Renamed_Field); - if (err != zlibConst.Z_OK && err != zlibConst.Z_STREAM_END) - throw new ZStreamException((compress?"de":"in") + "flating: " + z.msg); - out_Renamed.Write(buf, 0, bufsize - z.avail_out); - } - while (z.avail_in > 0 || z.avail_out == 0); - } - - public virtual void finish() - { - int err; - do - { - z.next_out = buf; - z.next_out_index = 0; - z.avail_out = bufsize; - if (compress) - { - err = z.deflate(zlibConst.Z_FINISH); - } - else - { - err = z.inflate(zlibConst.Z_FINISH); - } - if (err != zlibConst.Z_STREAM_END && err != zlibConst.Z_OK) - throw new ZStreamException((compress?"de":"in") + "flating: " + z.msg); - if (bufsize - z.avail_out > 0) - { - out_Renamed.Write(buf, 0, bufsize - z.avail_out); - } - } - while (z.avail_in > 0 || z.avail_out == 0); - try - { - Flush(); - } - catch - { - } - } - public virtual void end() - { - if (compress) - { - z.deflateEnd(); - } - else - { - z.inflateEnd(); - } - z.free(); - z = null; - } - public override void Close() - { - try - { - try - { - finish(); - } - catch - { - } - } - finally - { - end(); - out_Renamed.Close(); - out_Renamed = null; - } - } - - public override void Flush() - { - out_Renamed.Flush(); - } - //UPGRADE_TODO: The following method was automatically generated and it must be implemented in order to preserve the class logic. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1232_3"' - public override System.Int32 Read(System.Byte[] buffer, System.Int32 offset, System.Int32 count) - { - return 0; - } - //UPGRADE_TODO: The following method was automatically generated and it must be implemented in order to preserve the class logic. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1232_3"' - public override void SetLength(System.Int64 value) - { - } - //UPGRADE_TODO: The following method was automatically generated and it must be implemented in order to preserve the class logic. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1232_3"' - public override System.Int64 Seek(System.Int64 offset, System.IO.SeekOrigin origin) - { - return 0; - } - //UPGRADE_TODO: The following property was automatically generated and it must be implemented in order to preserve the class logic. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1232_3"' - public override System.Boolean CanRead - { - get - { - return false; - } - - } - //UPGRADE_TODO: The following property was automatically generated and it must be implemented in order to preserve the class logic. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1232_3"' - public override System.Boolean CanSeek - { - get - { - return false; - } - - } - //UPGRADE_TODO: The following property was automatically generated and it must be implemented in order to preserve the class logic. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1232_3"' - public override System.Boolean CanWrite - { - get - { - return false; - } - - } - //UPGRADE_TODO: The following property was automatically generated and it must be implemented in order to preserve the class logic. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1232_3"' - public override System.Int64 Length - { - get - { - return 0; - } - - } - //UPGRADE_TODO: The following property was automatically generated and it must be implemented in order to preserve the class logic. 'ms-help://MS.VSCC.2003/commoner/redir/redirect.htm?keyword="jlca1232_3"' - public override System.Int64 Position - { - get - { - return 0; - } - - set - { - } - - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/ZStream.cs b/src/Zlib.net/ZStream.cs deleted file mode 100644 index 2601b44..0000000 --- a/src/Zlib.net/ZStream.cs +++ /dev/null @@ -1,233 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - sealed public class ZStream - { - - private const int MAX_WBITS = 15; // 32K LZ77 window - private static readonly int DEF_WBITS = MAX_WBITS; - - private const int Z_NO_FLUSH = 0; - private const int Z_PARTIAL_FLUSH = 1; - private const int Z_SYNC_FLUSH = 2; - private const int Z_FULL_FLUSH = 3; - private const int Z_FINISH = 4; - - private const int MAX_MEM_LEVEL = 9; - - private const int Z_OK = 0; - private const int Z_STREAM_END = 1; - private const int Z_NEED_DICT = 2; - private const int Z_ERRNO = - 1; - private const int Z_STREAM_ERROR = - 2; - private const int Z_DATA_ERROR = - 3; - private const int Z_MEM_ERROR = - 4; - private const int Z_BUF_ERROR = - 5; - private const int Z_VERSION_ERROR = - 6; - - public byte[] next_in; // next input byte - public int next_in_index; - public int avail_in; // number of bytes available at next_in - public long total_in; // total nb of input bytes read so far - - public byte[] next_out; // next output byte should be put there - public int next_out_index; - public int avail_out; // remaining free space at next_out - public long total_out; // total nb of bytes output so far - - public System.String msg; - - internal Deflate dstate; - internal Inflate istate; - - internal int data_type; // best guess about the data type: ascii or binary - - public long adler; - internal Adler32 _adler = new Adler32(); - - public int inflateInit() - { - return inflateInit(DEF_WBITS); - } - public int inflateInit(int w) - { - istate = new Inflate(); - return istate.inflateInit(this, w); - } - - public int inflate(int f) - { - if (istate == null) - return Z_STREAM_ERROR; - return istate.inflate(this, f); - } - public int inflateEnd() - { - if (istate == null) - return Z_STREAM_ERROR; - int ret = istate.inflateEnd(this); - istate = null; - return ret; - } - public int inflateSync() - { - if (istate == null) - return Z_STREAM_ERROR; - return istate.inflateSync(this); - } - public int inflateSetDictionary(byte[] dictionary, int dictLength) - { - if (istate == null) - return Z_STREAM_ERROR; - return istate.inflateSetDictionary(this, dictionary, dictLength); - } - - public int deflateInit(int level) - { - return deflateInit(level, MAX_WBITS); - } - public int deflateInit(int level, int bits) - { - dstate = new Deflate(); - return dstate.deflateInit(this, level, bits); - } - public int deflate(int flush) - { - if (dstate == null) - { - return Z_STREAM_ERROR; - } - return dstate.deflate(this, flush); - } - public int deflateEnd() - { - if (dstate == null) - return Z_STREAM_ERROR; - int ret = dstate.deflateEnd(); - dstate = null; - return ret; - } - public int deflateParams(int level, int strategy) - { - if (dstate == null) - return Z_STREAM_ERROR; - return dstate.deflateParams(this, level, strategy); - } - public int deflateSetDictionary(byte[] dictionary, int dictLength) - { - if (dstate == null) - return Z_STREAM_ERROR; - return dstate.deflateSetDictionary(this, dictionary, dictLength); - } - - // Flush as much pending output as possible. All deflate() output goes - // through this function so some applications may wish to modify it - // to avoid allocating a large strm->next_out buffer and copying into it. - // (See also read_buf()). - internal void flush_pending() - { - int len = dstate.pending; - - if (len > avail_out) - len = avail_out; - if (len == 0) - return ; - - if (dstate.pending_buf.Length <= dstate.pending_out || next_out.Length <= next_out_index || dstate.pending_buf.Length < (dstate.pending_out + len) || next_out.Length < (next_out_index + len)) - { - //System.Console.Out.WriteLine(dstate.pending_buf.Length + ", " + dstate.pending_out + ", " + next_out.Length + ", " + next_out_index + ", " + len); - //System.Console.Out.WriteLine("avail_out=" + avail_out); - } - - Array.Copy(dstate.pending_buf, dstate.pending_out, next_out, next_out_index, len); - - next_out_index += len; - dstate.pending_out += len; - total_out += len; - avail_out -= len; - dstate.pending -= len; - if (dstate.pending == 0) - { - dstate.pending_out = 0; - } - } - - // Read a new buffer from the current input stream, update the adler32 - // and total number of bytes read. All deflate() input goes through - // this function so some applications may wish to modify it to avoid - // allocating a large strm->next_in buffer and copying from it. - // (See also flush_pending()). - internal int read_buf(byte[] buf, int start, int size) - { - int len = avail_in; - - if (len > size) - len = size; - if (len == 0) - return 0; - - avail_in -= len; - - if (dstate.noheader == 0) - { - adler = _adler.adler32(adler, next_in, next_in_index, len); - } - Array.Copy(next_in, next_in_index, buf, start, len); - next_in_index += len; - total_in += len; - return len; - } - - public void free() - { - next_in = null; - next_out = null; - msg = null; - _adler = null; - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/ZStreamException.cs b/src/Zlib.net/ZStreamException.cs deleted file mode 100644 index 062e237..0000000 --- a/src/Zlib.net/ZStreamException.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - - public class ZStreamException:System.IO.IOException - { - public ZStreamException():base() - { - } - public ZStreamException(System.String s):base(s) - { - } - } -} \ No newline at end of file diff --git a/src/Zlib.net/Zlib.cs b/src/Zlib.net/Zlib.cs deleted file mode 100644 index 85f4f1d..0000000 --- a/src/Zlib.net/Zlib.cs +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright (c) 2006, ComponentAce -// http://www.componentace.com -// All rights reserved. - -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -// Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -// Neither the name of ComponentAce nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -/* -Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -3. The names of the authors may not be used to endorse or promote products -derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -/* -* This program is based on zlib-1.1.3, so all credit should go authors -* Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu) -* and contributors of zlib. -*/ -using System; -namespace ComponentAce.Compression.Libs.zlib -{ - - sealed public class zlibConst - { - private const System.String version_Renamed_Field = "1.0.2"; - public static System.String version() - { - return version_Renamed_Field; - } - - // compression levels - public const int Z_NO_COMPRESSION = 0; - public const int Z_BEST_SPEED = 1; - public const int Z_BEST_COMPRESSION = 9; - public const int Z_DEFAULT_COMPRESSION = (- 1); - - // compression strategy - public const int Z_FILTERED = 1; - public const int Z_HUFFMAN_ONLY = 2; - public const int Z_DEFAULT_STRATEGY = 0; - - public const int Z_NO_FLUSH = 0; - public const int Z_PARTIAL_FLUSH = 1; - public const int Z_SYNC_FLUSH = 2; - public const int Z_FULL_FLUSH = 3; - public const int Z_FINISH = 4; - - public const int Z_OK = 0; - public const int Z_STREAM_END = 1; - public const int Z_NEED_DICT = 2; - public const int Z_ERRNO = - 1; - public const int Z_STREAM_ERROR = - 2; - public const int Z_DATA_ERROR = - 3; - public const int Z_MEM_ERROR = - 4; - public const int Z_BUF_ERROR = - 5; - public const int Z_VERSION_ERROR = - 6; - } -} \ No newline at end of file diff --git a/src/Zlib.net/Zlib.net.csproj b/src/Zlib.net/Zlib.net.csproj deleted file mode 100644 index 69ae647..0000000 --- a/src/Zlib.net/Zlib.net.csproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - Local - 7.10.3077 - 2.0 - {0C89B7A2-A218-49E4-B545-5B044A45F977} - Debug - AnyCPU - - - zlib.net - - JScript - Grid - IE50 - false - Library - zlib - OnBuildSuccess - - - - - - 0.0 - v4.7.2 - - - - true - bin\x86\Debug\ - DEBUG;TRACE - 285212672 - 4096 - full - x86 - 7.3 - prompt - - - bin\x86\Release\ - TRACE - 285212672 - true - 4096 - x86 - 7.3 - prompt - - - true - bin\x64\Debug\ - DEBUG;TRACE - 285212672 - 4096 - full - x64 - 7.3 - prompt - - - bin\x64\Release\ - TRACE - 285212672 - true - 4096 - x64 - 7.3 - prompt - - - - System - - - System.Data - - - System.XML - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - \ No newline at end of file diff --git a/src/Zlib.net/history.txt b/src/Zlib.net/history.txt deleted file mode 100644 index 61a65b4..0000000 --- a/src/Zlib.net/history.txt +++ /dev/null @@ -1,29 +0,0 @@ -ZLIB.NET: History of changes -============================= - -version 1.04 (03/28/2007) - - - Problem with decompression some files is solved - - -version 1.03 (03/05/2007) - - - Problem with decomressing some files is solved - - -version 1.02 (01/29/2007) - - - Problem with decompressing large files using ZOutputStream is solved - - -version 1.01 (08/17/2006) - - - Demos are updated - - Some minor bugs are fixed - - -version 1.0 (07/06/2006) - - - -