skyscraper8.Tests/Tests/CoverageTests/MathTests.cs

@@ -1,19 +0,0 @@
-using skyscraper8.Skyscraper.Math;
-
-namespace skyscraper8.Tests.NUnit.Tests.CoverageTests;
-
-[TestFixture]
-public class MathTests
-{
-    [Test]
-    public void TestPlsConversions()
-    {
-        int originalGoldCode = 131070;
-
-        int calculatedRootCode = PlsCodeConverter.GoldToRoot(originalGoldCode);
-        Assert.That(calculatedRootCode, Is.EqualTo(16416));
-
-        int calculatedGoldCode = PlsCodeConverter.RootToGold(calculatedRootCode);
-        Assert.That(calculatedGoldCode, Is.EqualTo(originalGoldCode));
-    }
-}

skyscraper8.sln.DotSettings.user

@@ -17,7 +17,6 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffd0d7846a16a4147ad767b7c3ae2cf57b2e200_003F4a_003Ff8de026f_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFastResourceComparer_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F8f_003Ffb4ed86c_003FFastResourceComparer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFileInfo_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe1ab690537c44e02a014076312b886b7b2e200_003F5a_003Fcf76af61_003FFileInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIDisposable_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2026_002E2_003Fresharper_002Dhost_003FSourcesCache_003Ff98216d3aaee47d6a9f523673a3ec107d83a00_003F_005Fbb40f_003FIDisposable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInterop_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003Fea_003F7d70064b_003FInterop_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonSerializerInternalReader_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FSourcesCache_003F52f3815551fa6e6d408ea7dbf6748f7efe35caea15eb53ee27ee1bb406d62c8_003FJsonSerializerInternalReader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F6b_003Fa410ee2c_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -27,7 +26,6 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMethodBaseInvoker_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FSourcesCache_003F3ad82f9910d5c82d76b445db10584a60305639dcad2533e08e6c47f85e3b6d83_003FMethodBaseInvoker_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMethodBaseInvoker_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F7a_003F86728bdc_003FMethodBaseInvoker_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMethodBaseInvoker_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f03371654aa41ca984353e7e344e822b2e200_003Fc3_003F355fe836_003FMethodBaseInvoker_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANetworkStream_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2026_002E2_003Fresharper_002Dhost_003FSourcesCache_003F02ece58f2cb8b2c950c683cf599a9e387c8c8bd47c4514c6534331316be3_003FNetworkStream_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANotImplementedException_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003Fa3_003F2c4f9089_003FNotImplementedException_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANullable_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F0d_003F6549c49b_003FNullable_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANullAsserts_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F3f4719f7ce375226774d6991a6afc2f6932e58b42fd58ff13c7c03771642e_003FNullAsserts_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -40,7 +38,6 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASafeFileHandle_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003Fc6_003Fd8e0f2f2_003FSafeFileHandle_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASafeFileHandle_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffd0d7846a16a4147ad767b7c3ae2cf57b2e200_003F95_003Ff0feb47b_003FSafeFileHandle_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASkip_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fd8c543d93f1559af2ea2be8e9d55839b5bb1a3605f22daa45ea63772e3b4bc_003FSkip_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASocket_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2026_002E2_003Fresharper_002Dhost_003FSourcesCache_003F6879915f5af210e93c5b87791d557eb99403cbfe54398263cd7efae55e3a67_003FSocket_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASpan_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F48f7bf031b2942d3831d66d46fe3bc99b2e200_003F49_003F017cad58_003FSpan_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASpan_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffd0d7846a16a4147ad767b7c3ae2cf57b2e200_003F35_003F161711de_003FSpan_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASR_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F4d_003F7edc51d9_003FSR_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

skyscraper8/Isdb/Matenro.cs

@@ -248,7 +248,7 @@ public class Matenro : IPatEventHandler, ICatEventHandler, IBatEventHandler, IEi
             if (pidsReferencedByPmt[pmtStream.ElementaryPid])
                 continue;
             
-            pidsReferencedByPmt[pmtStream.ElementaryPid] = true;
+            pidsReferencedByPmt[sourcePid] = true;
             StreamType streamType = DetectStreamType(pmtStream);
             switch (streamType)
             {
@@ -282,12 +282,10 @@ public class Matenro : IPatEventHandler, ICatEventHandler, IBatEventHandler, IEi
                 case 0x0008:
                     //STD-B24
                     //Sub-clause 9.6.1, Part 3, Vol. 1
-                    logger.DebugFormat("PID 0x{0:X4} is ISDB Teletext",pmtStream.ElementaryPid);
                     return StreamType.IsdbTeletext;
                 case 0x0012:
                     //Sub-clause 9.6.1, Part 3, Vol. 1
                     //content descriptor = Sub-clause 9.6.2, Part 3, Vol. 1
-                    logger.DebugFormat("PID 0x{0:X4} is ISDB Subtitle",pmtStream.ElementaryPid);
                     return StreamType.IsdbSubtitles;
                 default:
                     throw new IsdbException(String.Format("Unknown ISDB Data Component 0x{0:X4}", pmtStream.DataComponent.DataComponentId));

skyscraper8/Program.cs

@@ -118,8 +118,7 @@ namespace skyscraper5
                     M3U8Stream m3U8Stream = new M3U8Stream(args[0]);
                     DataStorage dataStorage = new InMemoryScraperStorage();
                     ObjectStorage objectStorage = new FilesystemStorage(new DirectoryInfo("."));
-		            SkyscraperContext skyscraperContext =
+                    SkyscraperContext skyscraperContext = new SkyscraperContext(new TsContext(), dataStorage, objectStorage);
-			            new SkyscraperContext(new TsContext(), dataStorage, objectStorage);
                     skyscraperContext.InitalizeFilterChain();
                     skyscraperContext.IngestFromStream(m3U8Stream);
                     return;
@@ -131,8 +130,7 @@ namespace skyscraper5
 	                FileStream fstream = fi.OpenRead();
 	                
 	                TsContext mpeg2 = new TsContext();
-		            SkyscraperContext skyscraper = new SkyscraperContext(mpeg2, new InMemoryScraperStorage(),
+	                SkyscraperContext skyscraper = new SkyscraperContext(mpeg2, new InMemoryScraperStorage(), new BlackholeObjectStorage());
-			            new BlackholeObjectStorage());
                     skyscraper.InitalizeFilterChain();
 
                     MultiprotocolEncapsulationDecoder mpeDecoder = new MultiprotocolEncapsulationDecoder(skyscraper);
@@ -141,25 +139,21 @@ namespace skyscraper5
 
 					skyscraper.IngestFromStream(fstream);
                 }
-
                 if (args[0].Equals("aactest"))
                 {
 	                new AacTestProgram().Run();
 	                return;
                 }
-
                 if (args[0].ToLowerInvariant().Equals("cscan"))
                 {
                     HandleCrazyScanToTestingSystem(args[1]);
                     return;
                 }
-
 				if (args[0].ToLowerInvariant().Equals("cscan-live"))
 				{
 					HandleCrazyScanToLiveSystem(args[1]);
 					return;
 				}
-
 				if (args[0].ToLowerInvariant().Equals("cscan-live-notimeout"))
 				{
                     HandleCrazyScanToLiveSystem(args[1], false);
@@ -171,7 +165,6 @@ namespace skyscraper5
                     HandleUdpTesting();
                     return;
                 }
-
                 if (args[0].ToLowerInvariant().Equals("udp-agent"))
                 {
                     HandleUdpLive();
@@ -186,7 +179,6 @@ namespace skyscraper5
                         Console.WriteLine("{0} not found", fi.FullName);
                         return;
                     }
-
                     AbertisDemoProgram abertisDemo = new AbertisDemoProgram(fi);
                     abertisDemo.Run();
                     return;
@@ -326,21 +318,18 @@ namespace skyscraper5
 		                Console.WriteLine("Specify ONE file, please.");
 		                return;
 	                }
-
 	                FileInfo fi = new FileInfo(args[1]);
 	                if (!fi.Exists)
 	                {
 		                Console.WriteLine("{0} doesn't exist.", fi.FullName);
 		                return;
 	                }
-
 	                FileStream fileStream = fi.OpenRead();
 	                EntropyCalculatorStream entropyCalculatorStream = new EntropyCalculatorStream();
 	                fileStream.CopyTo(entropyCalculatorStream);
                     fileStream.Close();
                     fileStream.Dispose();
-		            Console.WriteLine("Entropy value: {0} ({1}%)", entropyCalculatorStream.Entropy,
+                    Console.WriteLine("Entropy value: {0} ({1}%)", entropyCalculatorStream.Entropy, entropyCalculatorStream.Percentage);
-			            entropyCalculatorStream.Percentage);
                     return;
                 }
 
@@ -349,7 +338,6 @@ namespace skyscraper5
 	                TogglePcapConfiguration(1);
 	                return;
                 }
-
                 if (args[0].ToLowerInvariant().Equals("pcap-off"))
                 {
 	                TogglePcapConfiguration(2);
@@ -410,7 +398,6 @@ namespace skyscraper5
                     catalogueGenerator.Dispose();
                     return;
                 }
-
                 if (args[0].ToLowerInvariant().Equals("rotation-catalogue"))
                 {
                     TsRotationToCsv rotator = new TsRotationToCsv();
@@ -426,13 +413,6 @@ namespace skyscraper5
 	                salvager.Run(args);
 	                return;
                 }
-
-	            if (args[0].ToLowerInvariant().Equals("satip-oldconfig"))
-	            {
-		            SatIpOldconfig satIpOldconfig = new SatIpOldconfig();
-		            satIpOldconfig.Run();
-		            return;
-	            }
             }
 
             /*Passing passing = new Passing();

skyscraper8/QuickAndDirtySatIpClient.cs

@@ -13,7 +13,6 @@ using skyscraper5.Mpeg2;
 using skyscraper5.Skyscraper.Scraper;
 using skyscraper5.Skyscraper.Scraper.Storage.Filesystem;
 using skyscraper5.Skyscraper.Scraper.Storage.InMemory;
-using skyscraper8.Skyscraper;
 using skyscraper8.Skyscraper.Scraper.Storage;
 
 namespace skyscraper8
@@ -21,6 +20,7 @@ namespace skyscraper8
 	internal class QuickAndDirtySatIpClient
 	{
 		private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name);
+		private const bool ENABLE_TS_WRITER = true;
 
 		public QuickAndDirtySatIpClient(string[] args)
 		{
@@ -72,7 +72,6 @@ namespace skyscraper8
 				return;
 			}
 			symbolRate = Int32.Parse(args[6]);
-			_modeOfOperation = SatIpOldconfigModeOfOperation.RunSkyscraper;
 		}
 
 		public void SetPlayoutMode(string[] args)
@@ -83,7 +82,7 @@ namespace skyscraper8
 				return;
 			}
 			destinationPort = int.Parse(args[7]);
-			_modeOfOperation = SatIpOldconfigModeOfOperation.MulticastPlayout;
+			playoutMode = true;
 			if (args.Length == 10)
 			{
 				if (args[8].ToLowerInvariant().Equals("multicast"))
@@ -125,25 +124,7 @@ namespace skyscraper8
 			rtspClient.AutoReconnect = false;
 			Keepalive();
 			DiSEqC_Opcode opcode = BuildDiseqcOpcode();
-			string url = null;
+			string url = RtspClient.MakeUrl(opcode, frequency, isS2, symbolRate, null, false);
-			if (oldconfig != null)
-			{
-				url = RtspClient.MakeUrl(oldconfig);
-			}
-			else
-			{
-				url = RtspClient.MakeUrl(opcode, frequency, isS2, symbolRate, null, false);	
-			}
-
-			if (string.IsNullOrEmpty(url))
-			{
-				logger.Fatal("Somehow I reached a code-path that didn't generate a SAT>IP String. This is a bug, tell Fey.");
-				return;
-			}
-			else
-			{
-				logger.DebugFormat("SAT>IP Tuning String: {0}", url);
-			}
 			RtspDescribeResponse describe = rtspClient.GetDescribe(url);
 			SessionDescriptionProtocol sessionDescriptionProtocol = describe.GetSessionDescriptionProtocol();
 
@@ -161,7 +142,7 @@ namespace skyscraper8
 				dataStorage = new InMemoryScraperStorage();
 			if (objectStorage == null)
 				objectStorage = new FilesystemStorage(new DirectoryInfo("."));
-			if (_modeOfOperation == SatIpOldconfigModeOfOperation.RunSkyscraper)
+			if (!playoutMode)
 			{
 				context = new SkyscraperContext(new TsContext(), dataStorage, objectStorage);
 				context.EnableTimeout = true;
@@ -173,37 +154,20 @@ namespace skyscraper8
 			DateTime lastTimestamp = DateTime.Now;
 			bool initMessagePrinted = false;
 
-			bool runLoop = true;
+			while (true)
-			while (runLoop)
 			{
-				switch (_modeOfOperation)
+				if (playoutMode)
 				{
-					case SatIpOldconfigModeOfOperation.MulticastPlayout:
 					Thread.Sleep(1000);
 					Keepalive(url);
 					if (!initMessagePrinted)
 					{
-							if (destinationPort == 0)
-							{
-								destinationPort = oldconfig.DestinationPort;
-							}
 						logger.InfoFormat("Began SAT>IP playout to port {0}", destinationPort);
 						initMessagePrinted = true;
 					}
-						break;
-					case SatIpOldconfigModeOfOperation.RecordSample:
-						TimeSpan duration = DateTime.Now - lastTimestamp;
-						if (duration.TotalSeconds > oldconfig.SampleLength)
-						{
-							runLoop = false;
-							break;
 				}
 				else
 				{
-							Thread.Sleep(100);
-						}
-						break;
-					case SatIpOldconfigModeOfOperation.RunSkyscraper:
 					if (packetQueue.Count >= 1)
 					{
 						byte[] buffer;
@@ -224,20 +188,13 @@ namespace skyscraper8
 					}
 
 					if (context.IsAbortConditionMet())
-						{
-							runLoop = false;
 						break;
-						}
 
 					if (DateTime.Now.Second != lastTimestamp.Second)
 					{
 						Keepalive(url);
 						lastTimestamp = DateTime.Now;
 					}
-
-						break;
-					default:
-						throw new NotImplementedException(_modeOfOperation.ToString());
 				}
 			}
 
@@ -276,14 +233,12 @@ namespace skyscraper8
 
 		private void DumpPacket(byte[] buffer)
 		{
-			if (_modeOfOperation != SatIpOldconfigModeOfOperation.RecordSample)
+			if (!ENABLE_TS_WRITER)
 				return;
 
 			if (fs == null)
 			{
 				string fname = String.Format("{0}.ts", DateTime.Now.Ticks);
-				FileInfo fi = new FileInfo(fname);
-				logger.InfoFormat("Writing Sample to: {0}", fi.FullName);
 				fs = File.OpenWrite(fname);
 			}
 
@@ -293,36 +248,8 @@ namespace skyscraper8
 		private int rtcps;
         private IPAddress destinationIp;
         private int destinationPort;
-        private SatIpOldconfigModeOfOperation _modeOfOperation;
+        private bool playoutMode;
 		private bool multicastMode;
-		private readonly SatIpOldconfig oldconfig;
-
-		public QuickAndDirtySatIpClient(SatIpOldconfig args)
-		{
-			this.oldconfig = args;
-			
-			if (args.ServerIp.Equals("auto"))
-			{
-				this.ipAddress = this.AutodetectIPAddress();
-			}
-			else
-			{
-				this.ipAddress = IPAddress.Parse(args.ServerIp);
-			}
-
-			this.diseqcNumber = args.Diseqc;
-			this.polarity = args.Polarity.ToUpperInvariant()[0];
-			this.frequency = args.Frequency;
-			this.isS2 = ParseDvbStandard(args.System);
-			this.symbolRate = args.SymbolRate;
-			
-			//Playout mode
-			this.destinationPort = _modeOfOperation == SatIpOldconfigModeOfOperation.MulticastPlayout ? args.DestinationPort : 0;
-			this._modeOfOperation = args.ModeOfOperation;
-			this.destinationIp = IPAddress.Parse(args.DestinationIp);
-			this.multicastMode = (_modeOfOperation == SatIpOldconfigModeOfOperation.MulticastPlayout);
-		}
-
 
         private void Setup_OnRtcpPacket(byte[] data, int length)
 		{

skyscraper8/SatIp/RtspClient.cs

@@ -5,13 +5,10 @@ using System.Net;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using log4net;
 using skyscraper5.Skyscraper;
 using skyscraper5.Skyscraper.IO.CrazycatStreamReader;
 using skyscraper8.SatIp.RtspRequests;
 using skyscraper8.SatIp.RtspResponses;
-using skyscraper8.Skyscraper;
-using skyscraper8.Skyscraper.Math;
 
 namespace skyscraper8.SatIp
 {
@@ -19,8 +16,6 @@ namespace skyscraper8.SatIp
 	{
 		private uint cseqCounter;
 		private const string USER_AGENT = "sophiaNetRtspClient/1.0";
-		private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name);
-
 
 		public RtspClient(string ip, int port)
 		{
@@ -344,62 +339,6 @@ namespace skyscraper8.SatIp
 			return sb.ToString();
 		}
 
-		public static string? MakeUrl(SatIpOldconfig config)
-		{
-			StringBuilder sb = new StringBuilder();
-			sb.AppendFormat("/?src={0}", config.Diseqc);
-			sb.AppendFormat("&freq={0}", config.Frequency);
-			sb.AppendFormat("&pol={0}", config.Polarity.ToLowerInvariant()[0]);
-			sb.AppendFormat("&msys=dvb{0}", config.System.ToLowerInvariant());
-			sb.AppendFormat("&sr={0}", config.SymbolRate);
-			sb.AppendFormat("&pids=all");
-
-			string xIsi = null;
-			int? xPls = null;
-			if (config.UseDigitalDevicesExtensions)
-			{
-				if (config.ForceBbframeOutput)
-				{
-					xIsi = "0x80000000";
-				}
-				else if (config.ForceIqOutput)
-				{
-					xIsi = "0x10000000";
-				}
-				else if (config.EnableMis)
-				{
-					xIsi = config.MisSelection.ToString();
-				}
-
-				switch (config.PlsMode)
-				{
-					case "none":
-						break;
-					case "gold":
-						xPls = config.PlsValue;
-						break;
-					case "root":
-						xPls = PlsCodeConverter.RootToGold(config.PlsValue);
-						break;
-					default:
-						logger.WarnFormat("Don't know what PLS code Type {0} is, assuming no PLS.",config.PlsMode);
-						break;
-				}
-			}
-			
-			if (!string.IsNullOrEmpty(xIsi))
-			{
-				sb.AppendFormat("&x_isi={0}", xIsi);
-			}
-
-			if (xPls.HasValue)
-			{
-				sb.AppendFormat("&x_pls={0}", xPls.Value);
-			}
-
-			return sb.ToString();
-		}
-
 		private bool disposed;
 		public void Dispose()
 		{

skyscraper8/SimpleServiceDiscoveryProtocol/SsdpClient.cs

@@ -35,20 +35,12 @@ namespace skyscraper8.SimpleServiceDiscoveryProtocol
 					byte[] addressBytes = x.Address.GetAddressBytes();
 					if (addressBytes[0] == 169 || addressBytes.Length != 4)
 					{
-						logger.WarnFormat("The address {0} will not be used because it's network type is not supported.", x.Address);
+						logger.WarnFormat("The address {0} will not be used because it's network type is not supported.", new IPAddress(addressBytes));
 						return null;
 					}
 					Socket temp = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
 					temp.Bind(x);
-					try
-					{
 					temp.SendTo(Encoding.UTF8.GetBytes(SEARCH_STRING), SocketFlags.None, remoteEndPoint);
-					}
-					catch (SocketException e)
-					{
-						logger.WarnFormat("The address {0} will not be used because an error occurred when broadcasting the search string: {1}",x.Address,e.Message);
-					}
-					
 					return temp;
 				});
 

skyscraper8/Skyscraper/Ini.cs

@@ -90,19 +90,6 @@ namespace skyscraper5.Skyscraper
             return Boolean.Parse(s);
         }
         
-        public ushort ReadValue(string category, string key, ushort defaultVaule)
-        {
-            if (!ContainsKey(category))
-                return defaultVaule;
-
-            IniSection section = this[category];
-            if (!section.ContainsKey(key))
-                return defaultVaule;
-
-            string s = section[key];
-            return ushort.Parse(s);
-        }
-        
 		public int ReadValue(string category, string key, int defaultVaule)
         {
             if (!ContainsKey(category))
@@ -116,20 +103,6 @@ namespace skyscraper5.Skyscraper
             return Int32.Parse(s);
         }
 
-        public byte ReadValue(string category, string key, byte defaultVaule)
-        {
-            if (!ContainsKey(category))
-                return defaultVaule;
-
-            IniSection section = this[category];
-            if (!section.ContainsKey(key))
-                return defaultVaule;
-
-            string s = section[key];
-            return Byte.Parse(s);
-        }
-
-        
         public string ReadValue(string category, string key, string defaultVaule)
         {
             if (!ContainsKey(category))

skyscraper8/Skyscraper/Math/PlsCodeConverter.cs

@@ -1,32 +0,0 @@
-namespace skyscraper8.Skyscraper.Math;
-
-public static class PlsCodeConverter
-{
-    public static int RootToGold(int root)
-    {
-        var g = 0;
-        var X = 1;
-        for( g = 0; g < 262144; g += 1)
-        {
-            if( X == root ) 
-                break;
-            X = ((( X ^ (X >> 7)) & 1) << 17) | (X >> 1);          
-        }
-
-        return g;
-    }
-
-    public static int GoldToRoot(int gold)
-    {
-        var g = 0;
-        var X = 1;
-        for( g = 0; g < 262143; g += 1)
-        {
-            if( g == gold ) 
-                break;
-            X = ((( X ^ (X >> 7)) & 1) << 17) | (X >> 1);          
-        }
-
-        return X;
-    }
-}

skyscraper8/Skyscraper/Net/Pcap/PcapIpTrafficHandler.cs

@@ -70,7 +70,7 @@ namespace skyscraper8.Skyscraper.Net.Pcap
 				EnsureOutputdirExists();
 			}
 
-			if (!pcapWritersLlc.ContainsKey(network))
+			if (pcapWritersLlc[network] == null)
 			{
 				string fname = String.Format("{0:X4},llc,{1}.pcap", network, DateTime.Now.Ticks);
 				if (outputDirectory != null)

skyscraper8/Skyscraper/OldconfigEngine.cs

@@ -1,159 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-public enum ConfigType { Bool, Choice, String, ValidatedString }
-
-// Delegate signature for custom validation functions
-public delegate (bool IsValid, string? ErrorMessage) ConfigValidator(string input);
-
-public class ConfigOption
-{
-    public string Id { get; set; }
-    public string Description { get; set; }
-    public ConfigType Type { get; set; } = ConfigType.Bool;
-    public string DefaultValue { get; set; } = "y";
-    public List<string> Choices { get; set; } = [];
-    public Func<Dictionary<string, string>, bool>? Dependency { get; set; }
-    
-    // Delegate for string validation rules
-    public ConfigValidator? Validator { get; set; }
-
-    public ConfigOption()
-    {
-    }
-
-    public ConfigOption(string id, string description, ConfigType type, string defaultValue)
-    {
-        Id = id;
-        Description = description;
-        Type = type;
-        DefaultValue = defaultValue;
-    }
-
-    public void SetChoices(params string[] args)
-    {
-        Choices = new List<string>(args);
-    }
-}
-
-public class OldConfigEngine
-{
-    private readonly List<ConfigOption> _schema = [];
-    private readonly Dictionary<string, string> _currentConfig = [];
-
-    public void RegisterOption(ConfigOption option) => _schema.Add(option);
-
-    public void LoadExistingConfig(string filePath)
-    {
-        if (!File.Exists(filePath)) return;
-        foreach (var line in File.ReadAllLines(filePath))
-        {
-            var trimmed = line.Trim();
-            if (string.IsNullOrEmpty(trimmed) || trimmed.StartsWith("#")) continue;
-            var parts = trimmed.Split('=', 2);
-            if (parts.Length == 2) _currentConfig[parts[0].Trim()] = parts[1].Trim();
-        }
-    }
-
-    public void RunInteractiveConfig()
-    {
-        Console.WriteLine("*");
-        Console.WriteLine("* Restart config based on current configuration");
-        Console.WriteLine("*");
-
-        foreach (var opt in _schema)
-        {
-            if (opt.Dependency != null && !opt.Dependency(_currentConfig))
-                continue;
-
-            if (_currentConfig.ContainsKey(opt.Id))
-                continue;
-
-            string selectedValue = PromptUser(opt);
-            _currentConfig[opt.Id] = selectedValue;
-        }
-
-        Console.WriteLine("\n*** End of configuration. ***");
-    }
-
-    public string PromptUser(ConfigOption opt)
-    {
-        while (true)
-        {
-            switch (opt.Type)
-            {
-                case ConfigType.Bool:
-                    string choicesHint = opt.DefaultValue.ToLower() == "y" ? "[Y/n]" : "[y/N]";
-                    Console.Write($"{opt.Description} ({opt.Id}) {choicesHint} ");
-                    
-                    var key = Console.ReadKey(intercept: false);
-                    Console.WriteLine();
-
-                    if (key.Key == ConsoleKey.Enter) 
-                        return opt.DefaultValue;
-                    if (key.Key == ConsoleKey.Y) 
-                        return "true";
-                    if (key.Key == ConsoleKey.N) 
-                        return "false";
-                    if (key.Key == ConsoleKey.Q || key.KeyChar == '?')
-                    {
-                        Console.WriteLine($"  Help: Toggles option {opt.Id}. Select Y or N.");
-                        continue;
-                    }
-                    break;
-
-                case ConfigType.Choice:
-                    Console.WriteLine($"{opt.Description} ({opt.Id})");
-                    for (int i = 0; i < opt.Choices.Count; i++)
-                    {
-                        string marker = opt.Choices[i] == opt.DefaultValue ? " (NEW)" : "";
-                        Console.WriteLine($"  {i + 1}. {opt.Choices[i]}{marker}");
-                    }
-                    Console.Write($"choice[1-{opt.Choices.Count}]: ");
-                    
-                    string? choiceInput = Console.ReadLine()?.Trim();
-                    if (string.IsNullOrEmpty(choiceInput)) return opt.DefaultValue;
-                    if (int.TryParse(choiceInput, out int idx) && idx >= 1 && idx <= opt.Choices.Count)
-                    {
-                        return opt.Choices[idx - 1];
-                    }
-                    break;
-
-                case ConfigType.String:
-                    Console.Write($"{opt.Description} ({opt.Id}) [{opt.DefaultValue}]: ");
-                    string? strInput = Console.ReadLine()?.Trim();
-                    return string.IsNullOrEmpty(strInput) ? opt.DefaultValue : strInput;
-
-                case ConfigType.ValidatedString:
-                    Console.Write($"{opt.Description} ({opt.Id}) [{opt.DefaultValue}]: ");
-                    string rawVal = Console.ReadLine()?.Trim() ?? string.Empty;
-                    string valueToValidate = string.IsNullOrEmpty(rawVal) ? opt.DefaultValue : rawVal;
-
-                    if (opt.Validator != null)
-                    {
-                        var (isValid, errorMessage) = opt.Validator(valueToValidate);
-                        if (!isValid)
-                        {
-                            Console.WriteLine($"  [Error] {errorMessage ?? "Invalid value provided."}");
-                            continue; // Re-prompt on validation failure
-                        }
-                    }
-
-                    return valueToValidate;
-            }
-            
-            Console.WriteLine("Invalid choice. Try again.");
-        }
-    }
-
-    public void SaveConfig(string filePath)
-    {
-        using var writer = new StreamWriter(filePath);
-        writer.WriteLine($"# Automatically generated config - {DateTime.UtcNow:u}");
-        foreach (var kvp in _currentConfig)
-        {
-            writer.WriteLine($"{kvp.Key}={kvp.Value}");
-        }
-    }
-}

skyscraper8/Skyscraper/SatIpOldconfig.cs

@@ -1,220 +0,0 @@
-using System.Net;
-using skyscraper5.Skyscraper;
-using skyscraper5.Skyscraper.Plugins;
-using skyscraper5.Skyscraper.Scraper;
-
-namespace skyscraper8.Skyscraper;
-
-public class SatIpOldconfig
-{
-    private const string INI_CATEGORY = "satip_oldconfig";
-    
-    public string ServerIp { get; private set; }
-    public int Diseqc{ get; private set; }
-    public string Polarity{ get; private set; }
-    public int Frequency{ get; private set; }
-    public string System{ get; private set; }
-    public int SymbolRate{ get; private set; }
-    public bool UseDigitalDevicesExtensions{ get; private set; }
-    public bool ForceBbframeOutput{ get; private set; }
-    public bool ForceIqOutput{ get; private set; }
-    public string PlsMode{ get; private set; }
-    public int PlsValue{ get; private set; }
-    public bool EnableMis{ get; private set; }
-    public byte MisSelection{ get; private set; }
-    public string DestinationIp{ get; private set; }
-    public ushort DestinationPort{ get; private set; }
-    public SatIpOldconfigModeOfOperation ModeOfOperation { get; private set; }
-    public int SampleLength { get; private set; }
-    
-    public void Run()
-    {
-        PluginManager pluginManager = PluginManager.GetInstance();
-        Ini ini = pluginManager.Ini;
-        OldConfigEngine configEngine = new OldConfigEngine();
-
-        ServerIp = ini.ReadValue(INI_CATEGORY, "ip", "auto");
-        Diseqc = ini.ReadValue(INI_CATEGORY, "diseqc", 1);
-        Polarity = ini.ReadValue(INI_CATEGORY, "polarity", "H");
-        Frequency = ini.ReadValue(INI_CATEGORY, "frequency", 11523);
-        System = ini.ReadValue(INI_CATEGORY, "system", "S2");
-        SymbolRate = ini.ReadValue(INI_CATEGORY, "symbolRate", 22000);
-        UseDigitalDevicesExtensions = ini.ReadValue(INI_CATEGORY, "digitalDevicesExtensions", false);
-        ForceBbframeOutput = ini.ReadValue(INI_CATEGORY, "forceBbframeOutput", false);
-        ForceIqOutput = ini.ReadValue(INI_CATEGORY, "forceIqOutput", false);
-        PlsMode = ini.ReadValue(INI_CATEGORY, "plsMode", "none");
-        PlsValue = ini.ReadValue(INI_CATEGORY, "plsValue", 131070);
-        EnableMis = ini.ReadValue(INI_CATEGORY, "misEnabled", false);
-        MisSelection = ini.ReadValue(INI_CATEGORY, "misSelector", (byte)1);
-        DestinationIp = ini.ReadValue(INI_CATEGORY, "destinationIp", "239.192.0.1");
-        DestinationPort = ini.ReadValue(INI_CATEGORY, "destinationPort", (ushort)6969);
-        ModeOfOperation = Enum.Parse<SatIpOldconfigModeOfOperation>(ini.ReadValue(INI_CATEGORY, "modeOfOperation", SatIpOldconfigModeOfOperation.MulticastPlayout.ToString()));
-        SampleLength = ini.ReadValue(INI_CATEGORY, "sampleLength", 60);
-
-        ConfigOption ipOption = new ConfigOption("ip", "The IP of the SAT>IP server or \"auto\"", ConfigType.ValidatedString, ServerIp);
-        ipOption.Validator = validateIpTuple;
-        ServerIp = configEngine.PromptUser(ipOption);
-
-        ConfigOption diseqcOption = new ConfigOption("diseqc", "DiSEqC Port 1,2,3 or 4?", ConfigType.ValidatedString, Diseqc.ToString());
-        diseqcOption.SetChoices("1", "2", "3", "4");
-        Diseqc = Int32.Parse(configEngine.PromptUser(diseqcOption));
-
-        ConfigOption polarityOption = new ConfigOption("polarity", "Polarity H or V?", ConfigType.Choice, Polarity);
-        polarityOption.SetChoices("H", "V");
-        Polarity = configEngine.PromptUser(polarityOption);
-
-        ConfigOption frequencyOption = new ConfigOption("frequency", "Frequency in MHz", ConfigType.ValidatedString, Frequency.ToString());
-        frequencyOption.Validator = frequencyValid;
-        Frequency = Int32.Parse(configEngine.PromptUser(frequencyOption));
-
-        ConfigOption systemOption = new ConfigOption("system", "Transmission system: S or S2?", ConfigType.Choice, System);
-        systemOption.SetChoices("S", "S2");
-        System = configEngine.PromptUser(systemOption);
-
-        ConfigOption symbolRateOption = new ConfigOption("symbolRate", "Symbol-Rate in k/syms", ConfigType.ValidatedString, SymbolRate.ToString());
-        frequencyOption.Validator = frequencyValid;
-        SymbolRate = Int32.Parse(configEngine.PromptUser(symbolRateOption));
-
-        ConfigOption ddExtensionsOption = new ConfigOption("ddExtensions", "Use Digital Devices OctopusNET extensions?", ConfigType.Bool, UseDigitalDevicesExtensions.ToString());
-        UseDigitalDevicesExtensions = Boolean.Parse(configEngine.PromptUser(ddExtensionsOption));
-
-        if (UseDigitalDevicesExtensions)
-        {
-            ConfigOption forceBbFrameOutputOption = new ConfigOption("forceBbframeOutput", "Force BBFRAME output?", ConfigType.Bool, ForceBbframeOutput.ToString());
-            ForceBbframeOutput = Boolean.Parse(configEngine.PromptUser(forceBbFrameOutputOption));
-
-            if (!ForceBbframeOutput)
-            {
-                ConfigOption forceIqOutputOption = new ConfigOption("forceIqOutput", "Output encapsulated IQ data?", ConfigType.Bool, ForceIqOutput.ToString());
-                ForceIqOutput = Boolean.Parse(configEngine.PromptUser(forceIqOutputOption));
-            }
-
-            ConfigOption plsModeOption = new ConfigOption("plsMode", "Physical Layer Scrambling Mode?", ConfigType.Choice, PlsMode);
-            plsModeOption.SetChoices("none", "root", "gold");
-            PlsMode = configEngine.PromptUser(plsModeOption);
-            if (!PlsMode.Equals("none"))
-            {
-                ConfigOption plsValueOption = new ConfigOption("plsValue", String.Format("{0} code?", PlsMode.ToUpperInvariant()), ConfigType.ValidatedString, PlsValue.ToString());
-                plsValueOption.Validator = frequencyValid;
-                PlsValue = Int32.Parse(configEngine.PromptUser(plsValueOption));
-            }
-
-            if (!ForceBbframeOutput && !ForceIqOutput)
-            {
-                ConfigOption misEnabledOption = new ConfigOption("misEnabled", "Tune for Multi Input Stream?", ConfigType.Bool, "false");
-                EnableMis = Boolean.Parse(configEngine.PromptUser(misEnabledOption));
-                if (EnableMis)
-                {
-                    ConfigOption misSelectorOptions = new ConfigOption("misValue", "Multi Input Stream Selection? (0-255)", ConfigType.ValidatedString, MisSelection.ToString());
-                    misSelectorOptions.Validator = byteValidator;
-                    MisSelection = Byte.Parse(configEngine.PromptUser(misSelectorOptions));
-                }
-            }
-        }
-
-        ConfigOption modeOfOperation = new ConfigOption("modeOfOperation", "Mode of Operation?", ConfigType.Choice, ModeOfOperation.ToString());
-        modeOfOperation.Choices = new List<string>(Enum.GetNames<SatIpOldconfigModeOfOperation>());
-        ModeOfOperation = Enum.Parse<SatIpOldconfigModeOfOperation>(configEngine.PromptUser(modeOfOperation));
-
-        switch (ModeOfOperation)
-        {
-            case SatIpOldconfigModeOfOperation.RunSkyscraper:
-                break;
-            case SatIpOldconfigModeOfOperation.RecordSample:
-                ConfigOption sampleLengthOption = new ConfigOption("sampleLength", "Sample Length in seconds?", ConfigType.ValidatedString, "60");
-                sampleLengthOption.Validator = frequencyValid;
-                SampleLength = int.Parse(configEngine.PromptUser(sampleLengthOption));
-                break;
-            case SatIpOldconfigModeOfOperation.MulticastPlayout:
-                ConfigOption destIpOption = new ConfigOption("destinationIp", "SAT>IP Multicast destination IP address?",ConfigType.ValidatedString, DestinationIp);
-                destIpOption.Validator = serverIpValidatorTuple;
-                DestinationIp = configEngine.PromptUser(destIpOption);
-
-                ConfigOption destPortOption = new ConfigOption("destinationPort", "SAT>IP Multicast destination Port?", ConfigType.ValidatedString, DestinationPort.ToString());
-                destPortOption.Validator = destinationTypeValidatorTuple;
-                DestinationPort = ushort.Parse(configEngine.PromptUser(destPortOption));
-                break;
-        }
-        
-        ini.WriteValue(INI_CATEGORY, "ip", ServerIp);
-        ini.WriteValue(INI_CATEGORY, "diseqc", Diseqc);
-        ini.WriteValue(INI_CATEGORY, "polarity", Polarity);
-        ini.WriteValue(INI_CATEGORY, "frequency", Frequency);
-        ini.WriteValue(INI_CATEGORY, "system", System);
-        ini.WriteValue(INI_CATEGORY, "sybolRate", SymbolRate);
-        ini.WriteValue(INI_CATEGORY, "digitalDevicesExtensions", UseDigitalDevicesExtensions);
-        ini.WriteValue(INI_CATEGORY, "forceBbframeOutput", ForceBbframeOutput);
-        ini.WriteValue(INI_CATEGORY, "forceIqOutput", ForceIqOutput);
-        ini.WriteValue(INI_CATEGORY, "plsMode", PlsMode);
-        ini.WriteValue(INI_CATEGORY, "plsValue", PlsValue);
-        ini.WriteValue(INI_CATEGORY, "misEnabled", EnableMis);
-        ini.WriteValue(INI_CATEGORY, "misSelector", MisSelection);
-        ini.WriteValue(INI_CATEGORY, "destinationIp", DestinationIp);
-        ini.WriteValue(INI_CATEGORY, "destinationPort", DestinationPort);
-        ini.WriteValue(INI_CATEGORY, "modeOfOperation", ModeOfOperation.ToString());
-        ini.WriteValue(INI_CATEGORY, "sampleLength", SampleLength);
-        pluginManager.SaveConfiguration();
-        Console.WriteLine("Settings saved.");
-
-        QuickAndDirtySatIpClient quickAndDirtySatIpClient = new QuickAndDirtySatIpClient(this);
-        quickAndDirtySatIpClient.Run();
-    }
-
-    private (bool IsValid, string? ErrorMessage) destinationTypeValidatorTuple(string input)
-    {
-        ushort number;
-        bool result = ushort.TryParse(input, out number);
-        if (!result)
-        {
-            return (false, "Port number must be numeric between 1024-65500");
-        }
-
-        if (number < 1024)
-        {
-            return (false, "Port Number must be above 1023");
-        }
-
-        if (number > 65500)
-        {
-            return (false, "Port Number must be below 65500");
-        }
-
-        return (true, "");
-    }
-
-    private (bool IsValid, string? ErrorMessage) serverIpValidatorTuple(string input)
-    {
-        if (input.Equals("auto"))
-        {
-            return (true, "");
-        }
-
-        IPAddress outAddress;
-        bool result = IPAddress.TryParse(input, out outAddress);
-        return (result, "Address must either be \"auto\" or a multicast IP address.");
-    }
-
-    private (bool IsValid, string? ErrorMessage) byteValidator(string input)
-    {
-        byte number;
-        bool result = Byte.TryParse(input, out number);
-        return (result, "Input must be a number between 0 and 255.");
-    }
-
-    private (bool IsValid, string? ErrorMessage) frequencyValid(string input)
-    {
-        int number;
-        bool result = Int32.TryParse(input, out number);
-        return (result, "Must be a natural 32-bit number.");
-    }
-
-    private (bool IsValid, string? ErrorMessage) validateIpTuple(string input)
-    {
-        if (input.Equals("auto"))
-            return (true,"");
-
-        IPAddress resultAddr = null;
-        bool result = IPAddress.TryParse(input, out resultAddr);
-        return (result, "Result must me a valid IPv4 address or \"auto\"");
-    }
-}

skyscraper8/Skyscraper/SatIpOldconfigModeOfOperation.cs

@@ -1,8 +0,0 @@
-namespace skyscraper8.Skyscraper;
-
-public enum SatIpOldconfigModeOfOperation : int
-{
-    RunSkyscraper = 0,
-    RecordSample = 1,
-    MulticastPlayout = 2
-}

skyscraper8/Skyscraper/Scraper/SkyscraperContext.cs

@@ -3242,10 +3242,6 @@ namespace skyscraper5.Skyscraper.Scraper
 			if (dsap == 0xff || ssap == 0xff)
 			{
 				ushort llcLength = llcStream.ReadUInt16BE();
-                if (llcLength > llcStream.Length)
-                {
-                    return;
-                }
 				if (llcLength == etherType)
 				{
 					//TEST or XID PDU, likely unneeded.