diff --git a/skyscraper8/GS/GSE-RollingSyncByte/GseWithRollingSyncByteReader.cs b/skyscraper8/GS/GSE-RollingSyncByte/GseWithRollingSyncByteReader.cs index 60e11e5..a802e8f 100644 --- a/skyscraper8/GS/GSE-RollingSyncByte/GseWithRollingSyncByteReader.cs +++ b/skyscraper8/GS/GSE-RollingSyncByte/GseWithRollingSyncByteReader.cs @@ -1,4 +1,6 @@ using log4net; +using skyscraper5.Ietf.Rfc2460; +using skyscraper5.Ietf.Rfc971; using skyscraper5.Skyscraper.IO; using skyscraper8.GSE; using skyscraper8.GSE.GSE; @@ -150,11 +152,16 @@ public class GseWithRollingSyncByteReader : IMisHandler private ulong aolSerial; private void HandleProprietaryAolJunk(byte[] buffer, ushort protocolType) { - aolSerial++; + if (buffer[0] == 0x45) + { + Context.IpOutput.OnIpDatagram(0x0118, buffer); + return; + } + /*aolSerial++; string dumpPath = String.Format("{0}{1}{2}.bin", protocolType, Path.DirectorySeparatorChar, aolSerial); FileInfo dumpFile = new FileInfo(dumpPath); dumpFile.Directory.EnsureExists(); - File.WriteAllBytes(dumpFile.FullName, buffer); + File.WriteAllBytes(dumpFile.FullName, buffer);*/ } private void HandleAssembledFrame(ushort protocolType, byte[] buffer, GseLabel label) diff --git a/skyscraper8/Ietf/Rfc971_IPv4/InternetHeader.cs b/skyscraper8/Ietf/Rfc971_IPv4/InternetHeader.cs index 9c05e04..86b4bf8 100644 --- a/skyscraper8/Ietf/Rfc971_IPv4/InternetHeader.cs +++ b/skyscraper8/Ietf/Rfc971_IPv4/InternetHeader.cs @@ -49,6 +49,8 @@ namespace skyscraper5.Ietf.Rfc971 Options = ms.ReadBytes(optionsLength); CalculateChecksum(ipv4Header, IHL); + + NextHeaderOffset = (int)ms.Position; } public InternetHeader(int trafficClass, int flowLabel, ushort payloadLength, byte nextHeader, byte hopLimit, IPAddress sourceAddress, IPAddress destinationAddress) @@ -142,5 +144,7 @@ namespace skyscraper5.Ietf.Rfc971 public bool ChecksumValid { get; private set; } public ushort CalculatedChecksum { get; private set; } public bool IsDestinationMulticast { get; } + + public int NextHeaderOffset { get; private set; } } } diff --git a/skyscraper8/Properties/launchSettings.json b/skyscraper8/Properties/launchSettings.json index f8cec80..311a2e0 100644 --- a/skyscraper8/Properties/launchSettings.json +++ b/skyscraper8/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "skyscraper8": { "commandName": "Project", - "commandLineArgs": "\"F:\\utena2\\dvb-sis_eutelsat5_12522_v.ts\"", + "commandLineArgs": "\"C:\\Users\\Sascha Schiemann\\Downloads\\11476 H_GSE_(1)\\11476 V_GSE_.ts\"", "remoteDebugEnabled": false }, "Container (Dockerfile)": {