diff --git a/skyscraper8/DvbNip/DvbNipReceiver.cs b/skyscraper8/DvbNip/DvbNipReceiver.cs index 2a6c6c2..dde6ca5 100644 --- a/skyscraper8/DvbNip/DvbNipReceiver.cs +++ b/skyscraper8/DvbNip/DvbNipReceiver.cs @@ -127,10 +127,6 @@ namespace skyscraper8.DvbNip SetFileAssociations(fluteListener, fdtAnnouncement); } } - else - { - Console.WriteLine("aaa"); - } fluteStream.Close(); fluteStream.Dispose(); flutes.Remove(fluteCoordinate); diff --git a/skyscraper8/DvbNip/DvbNipUtilities.cs b/skyscraper8/DvbNip/DvbNipUtilities.cs index c0c49ae..55a6223 100644 --- a/skyscraper8/DvbNip/DvbNipUtilities.cs +++ b/skyscraper8/DvbNip/DvbNipUtilities.cs @@ -5,6 +5,7 @@ using skyscraper8.Ietf.FLUTE; using System; using System.Collections.Generic; using System.Collections.Specialized; +using System.IO.Compression; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -57,6 +58,9 @@ namespace skyscraper8.DvbNip public static bool IsMime(Stream s) { + if (s is GZipStream) + return false; + if (s.GetAvailableBytes() <= MimeVersionMagic.Length) { return false; diff --git a/skyscraper8/InteractionChannel/Model/Tim.cs b/skyscraper8/InteractionChannel/Model/Tim.cs index e53e470..9c28816 100644 --- a/skyscraper8/InteractionChannel/Model/Tim.cs +++ b/skyscraper8/InteractionChannel/Model/Tim.cs @@ -329,7 +329,10 @@ namespace skyscraper5.src.InteractionChannel.Model handler.OnReturnTransmissionMOdes(macAddress, (_0xb2_ReturnTransmissionModesDescriptor)descriptor); break; case 0xb7: - handler.OnFramePayloadFormatAnnouncement(networkId.Value, (_0xb7_FramePayloadFormatDescriptor)descriptor); + if (networkId.HasValue) + { + handler.OnFramePayloadFormatAnnouncement(networkId.Value, (_0xb7_FramePayloadFormatDescriptor)descriptor); + } break; case 0xb9: handler.LogonResponseDescriptor(macAddress, (_0xb9_LogonResponseDescriptor)descriptor); diff --git a/skyscraper8/Properties/launchSettings.json b/skyscraper8/Properties/launchSettings.json index 3ce0d08..976ed90 100644 --- a/skyscraper8/Properties/launchSettings.json +++ b/skyscraper8/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "skyscraper8": { "commandName": "Project", - "commandLineArgs": "\"Z:\\Persönliches\\Satellitescommunity\\65W11304V.TS\"", + "commandLineArgs": "\"C:\\devel\\skyscraper8\\skyscraper8\\bin\\Debug\\net8.0\\testsuite\\thor_11049v_simmin-radiomidun.ts\"", "remoteDebugEnabled": false }, "Container (Dockerfile)": { diff --git a/skyscraper8/Skyscraper/IO/StreamExtensions.cs b/skyscraper8/Skyscraper/IO/StreamExtensions.cs index c2d5fe2..7010270 100644 --- a/skyscraper8/Skyscraper/IO/StreamExtensions.cs +++ b/skyscraper8/Skyscraper/IO/StreamExtensions.cs @@ -2,7 +2,9 @@ using System.ComponentModel; using System.Diagnostics; using System.IO; +using System.IO.Compression; using System.Net.Sockets; +using System.Runtime.CompilerServices; using System.Text; namespace skyscraper5.Skyscraper.IO @@ -156,6 +158,12 @@ namespace skyscraper5.Skyscraper.IO [DebuggerStepThrough] public static long GetAvailableBytes(this Stream stream) { + if (stream is GZipStream) + { + GZipStream gzip = (GZipStream)stream; + long baseStreamPosition = gzip.BaseStream.Length - gzip.BaseStream.Position; + return baseStreamPosition; + } return stream.Length - stream.Position; } diff --git a/skyscraper8/VersionInfo.cs b/skyscraper8/VersionInfo.cs index 39a5854..5977d87 100644 --- a/skyscraper8/VersionInfo.cs +++ b/skyscraper8/VersionInfo.cs @@ -4,7 +4,7 @@ namespace skyscraper8; public class VersionInfo { - private const int PUBLIC_RELEASE = 14; + private const int PUBLIC_RELEASE = 15; public static int GetPublicReleaseNumber() {