Patches for Voile to display contents from DVB-NIP file deliveries.

skyscraper8/DvbNip/DvbNipReceiver.cs

@@ -379,5 +379,13 @@ namespace skyscraper8.DvbNip
 		{
 			this.sourceHash = sourceHash;
 		}
+
+		public void Reset()
+		{
+			bootstrapped = false;
+			fluteHits = 0;
+			fluteMisses = 0;
+			flutes = null;
+		}
 	}
 }

skyscraper8/DvbNip/DvbNipUtilities.cs

@@ -250,5 +250,6 @@ namespace skyscraper8.DvbNip
 			listener.TrimmedLength = stream.Position;
 			return listener;
 		}
+
 	}
 }

skyscraper8/Ietf/FLUTE/FLUTE-FDT.cs

@@ -12,6 +12,7 @@
 // This source code was auto-generated by xsd, Version=4.8.9037.0.
 // 
 namespace skyscraper8.Ietf.FLUTE {
+	using System.ComponentModel;
 	using System.Xml.Serialization;
     
     
@@ -23,6 +24,7 @@ namespace skyscraper8.Ietf.FLUTE {
     [System.Xml.Serialization.XmlTypeAttribute(TypeName="FDT-InstanceType", Namespace="urn:IETF:metadata:2005:FLUTE:FDT")]
     [System.Xml.Serialization.XmlRootAttribute("FDT-Instance", Namespace="urn:IETF:metadata:2005:FLUTE:FDT", IsNullable=false)]
     public partial class FDTInstanceType {
+        [TypeConverter(typeof(ExpandableObjectConverter))]
 
 		private FileType[] fileField;
         

skyscraper8/Skyscraper/Ini.cs

@@ -169,6 +169,18 @@ namespace skyscraper5.Skyscraper
 			IniSection section = this[category];
 			section[key] = value.ToString(CultureInfo.InvariantCulture);
         }
+
+        public static void WriteIniValue(FileInfo outputIni, string category, string key, string value)
+        {
+            Ini ini;
+            if (outputIni.Exists)
+                ini = new Ini(outputIni.FullName);
+            else
+                ini = new Ini();
+
+            ini.WriteValue(category, key, value);
+            ini.Export(outputIni);
+        }
     }
 
     public class IniSection : Dictionary<string,string>

skyscraper8/Skyscraper/Net/Pcap/PcapIpTrafficHandler.cs

@@ -1,4 +1,5 @@
 using log4net;
+using skyscraper5.Skyscraper.IO;
 using skyscraper5.Skyscraper.Net.Pcap;
 using skyscraper5.Skyscraper.Plugins;
 using skyscraper8.Skyscraper.Scraper.Storage;
@@ -17,13 +18,31 @@ namespace skyscraper8.Skyscraper.Net.Pcap
 	{
 		private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name);
 		private PcapWriter[] pcapWriters;
+		private DirectoryInfo outputDirectory;
+
+
 		public void HandlePacket(int pid, byte[] payload)
 		{
 			if (pcapWriters == null)
+			{
 				pcapWriters = new PcapWriter[0x1fff];
+
+				PluginManager pluginManager = PluginManager.GetInstance();
+				string outDirPath = pluginManager.Ini.ReadValue("pcapwriter", "outdir", null);
+				if (!string.IsNullOrEmpty(outDirPath))
+				{
+					outputDirectory = new DirectoryInfo(outDirPath);
+					if (!outputDirectory.Exists)
+						outputDirectory.EnsureExists();
+				}
+			}
 			if (pcapWriters[pid] == null)
 			{
 				string fname = String.Format("{0:X4},{1}.pcap", pid, DateTime.Now.Ticks);
+				if (outputDirectory != null)
+				{
+					fname = Path.Combine(outputDirectory.FullName, fname);
+				}
 				logger.InfoFormat("Opening file for writing: {0}", fname);
 				FileStream fs = File.OpenWrite(fname);
 				pcapWriters[pid] = new PcapWriter(fs, TcpdumpNetworkType.RawIp);

skyscraper8/Skyscraper/Plugins/ConfigureFromForeignApplication.cs

@@ -0,0 +1,43 @@
+using skyscraper5.Skyscraper;
+using skyscraper5.Skyscraper.Plugins;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace skyscraper8.Skyscraper.Plugins
+{
+	public class ConfigureFromForeignApplication
+	{
+		private ConfigureFromForeignApplication() 
+		{
+			pluginManager = PluginManager.GetInstance();
+		}
+
+		private PluginManager pluginManager;
+
+		private static ConfigureFromForeignApplication instance;
+		public static ConfigureFromForeignApplication GetInstance()
+		{
+			if (instance == null)
+			{
+				instance = new ConfigureFromForeignApplication();
+			}
+			return instance;
+		}
+
+		public void SaveConfig()
+		{
+			pluginManager.SaveConfiguration();
+		}
+
+		public Ini Ini
+		{
+			get
+			{
+				return pluginManager.Ini;
+			}
+		}
+	}
+}

skyscraper8/Skyscraper/Plugins/ISkyscraperMpePlugin.cs

@@ -10,5 +10,6 @@ namespace skyscraper5.Skyscraper.Plugins
 		bool CanHandlePacket(InternetHeader internetHeader, byte[] ipv4Packet);
 		void HandlePacket(InternetHeader internetHeader, byte[] ipv4Packet);
 		bool StopProcessingAfterThis();
+
 	}
 }

skyscraper8/Skyscraper/Plugins/PluginManager.cs

@@ -22,6 +22,7 @@ using skyscraper8.Skyscraper.Net.Pcap;
 using skyscraper8.Skyscraper.Plugins;
 using skyscraper8.Skyscraper.Scraper.Storage;
 using skyscraper8.Skyscraper.Text;
+using skyscraper5.src.InteractionChannel.Model.Descriptors;
 
 namespace skyscraper5.Skyscraper.Plugins
 {
@@ -31,7 +32,7 @@ namespace skyscraper5.Skyscraper.Plugins
 
 		private PluginManager()
 		{
-			_mpePlugins = new List<ISkyscraperMpePlugin>();
+			_mpePluginTypes = new List<Type>();
 			_gpsReceiverFactories = new Dictionary<int, IGpsReceiverFactory>();
 			descriptorBannedTables = new Dictionary<string, bool[]>();
 			descriptorMap = new Dictionary<string, ConstructorInfo[]>();
@@ -48,7 +49,32 @@ namespace skyscraper5.Skyscraper.Plugins
 
 			FileInfo skyscraperMainAssembly = GetSkyscraperMainAssembly();
 			DirectoryInfo skyscraperHome = skyscraperMainAssembly.Directory;
+			LoadIni(skyscraperHome);
 
+			if (skyscraperMainAssembly != null)
+			{
+				DirectoryInfo directory = skyscraperMainAssembly.Directory;
+				logger.DebugFormat("Found skyscraper main assembly at: {0}", directory.FullName);
+				FileInfo[] fileInfos = directory.GetFiles("skyscraper5.*.dll");
+				foreach (FileInfo fileInfo in fileInfos)
+				{
+					try
+					{
+						logger.Info(String.Format("Trying to load: {0}", fileInfo.Name));
+						Assembly loadFile = Assembly.LoadFile(fileInfo.FullName);
+						ScanAssembly(loadFile);
+						logger.Debug(String.Format("Loaded {0}", fileInfo.Name));
+					}
+					catch (Exception e)
+					{
+						logger.ErrorFormat("Failed to scan assembly {0}", fileInfo.Name);
+					}
+				}
+			}
+		}
+
+		private void LoadIni(DirectoryInfo skyscraperHome)
+		{
 			iniFileInfo = new FileInfo(Path.Combine(skyscraperHome.FullName, iniFilename));
 			if (iniFileInfo.Exists)
 			{
@@ -84,28 +110,6 @@ namespace skyscraper5.Skyscraper.Plugins
 				Debug.WriteLine(String.Format("{0} was not found. Create it using the UI!", iniFileInfo.FullName));
 				Ini = new Ini();
 			}
-
-			
-			if (skyscraperMainAssembly != null)
-			{
-				DirectoryInfo directory = skyscraperMainAssembly.Directory;
-				logger.DebugFormat("Found skyscraper main assembly at: {0}", directory.FullName);
-				FileInfo[] fileInfos = directory.GetFiles("skyscraper5.*.dll");
-				foreach (FileInfo fileInfo in fileInfos)
-				{
-					try
-					{
-						logger.Info(String.Format("Trying to load: {0}", fileInfo.Name));
-						Assembly loadFile = Assembly.LoadFile(fileInfo.FullName);
-						ScanAssembly(loadFile);
-						logger.Debug(String.Format("Loaded {0}", fileInfo.Name));
-					}
-					catch (Exception e)
-					{
-						logger.ErrorFormat("Failed to scan assembly {0}", fileInfo.Name);
-					}
-				}
-			}
 		}
 
 		private FileInfo GetSkyscraperMainAssembly()
@@ -193,6 +197,14 @@ namespace skyscraper5.Skyscraper.Plugins
 			return _instance;
 		}
 
+		public static void NotifyIniUpdate(Ini newIni)
+		{
+			if (_instance == null)
+				return;
+
+			_instance.Ini = newIni;
+		}
+
 		private Type storageIdAttributeTyoe = typeof(StorageIdAttribute);
 		private Type objectStorageFactoryType = typeof(ObjectStorageFactory);
 		private Type dataStorageFactoryType = typeof(DataStorageFactory);
@@ -210,7 +222,7 @@ namespace skyscraper5.Skyscraper.Plugins
 		private Type ipTrafficHandler = typeof(IpTrafficHandler);
 
 		private List<IDnsParser> _dnsParsers;
-		private List<ISkyscraperMpePlugin> _mpePlugins;
+		private List<Type> _mpePluginTypes;
 		private Dictionary<int, IGpsReceiverFactory> _gpsReceiverFactories;
 		private Dictionary<string, ConstructorInfo[]> descriptorMap;
 		private Dictionary<string, bool[]> descriptorBannedTables;
@@ -252,8 +264,7 @@ namespace skyscraper5.Skyscraper.Plugins
 
 				if (type.IsAssignableTo(mpePluginType))
 				{
-					ISkyscraperMpePlugin mpePlugin = (ISkyscraperMpePlugin)Activator.CreateInstance(type);
+					_mpePluginTypes.Add(type);
-					_mpePlugins.Add(mpePlugin);
 					continue;
 				}
 				else if (type.IsAssignableTo(gpsReceiverFactoryType))
@@ -338,7 +349,7 @@ namespace skyscraper5.Skyscraper.Plugins
 				throw new NotImplementedException();
 			}
 			
-			_mpePlugins.Sort(sorter);
+			_mpePluginTypes.Sort(sorter);
 		}
 
 		private void HandleIpTrafficHandler(Type type)
@@ -682,7 +693,15 @@ namespace skyscraper5.Skyscraper.Plugins
 
 		public ReadOnlyCollection<ISkyscraperMpePlugin> GetMpePlugins()
 		{
-			return _mpePlugins.AsReadOnly();
+			List<ISkyscraperMpePlugin> result = new List<ISkyscraperMpePlugin>();
+			foreach(Type t in _mpePluginTypes)
+			{
+				object? v = Activator.CreateInstance(t);
+				ISkyscraperMpePlugin mpePlugin = v as ISkyscraperMpePlugin;
+				if (mpePlugin != null)
+					result.Add(mpePlugin);
+			}
+			return result.AsReadOnly();
 		}
 
 		public ReadOnlyDictionary<int, IGpsReceiverFactory> GetGpsReceiverFactories()

skyscraper8/Skyscraper/Scraper/ISkyscraperUiJunction.cs

@@ -210,13 +210,14 @@ namespace skyscraper5.Skyscraper.Scraper
 		void OnDvbNipCarrierDetected(NipActualCarrierInformation currentCarrierInformation);
 		void OnDvbNipPrivateDataSignallingManifest(PrivateDataSignallingManifestType privateDataSignallingManifest);
 		void OnDvbNipServiceListEntryPoints(NipActualCarrierInformation currentCarrierInformation, ServiceListEntryPoints serviceListEntryPoints, DateTime dvbNipTime);
-		void OnDvbNipServiceList(NipActualCarrierInformation currentCarrierInformation, string serviceListId1, string serviceListId2);
+		void OnDvbNipServiceList(NipActualCarrierInformation currentCarrierInformation, string serviceListId1, ServiceListType serviceListId2);
 		void OnDvbNipTimeOffsetFile(NipActualCarrierInformation currentCarrierInformation, TimeOffsetFileType timeOffsetFile);
 		void OnDvbNipNetworkInformationFile(NipActualCarrierInformation currentCarrierInformation, NetworkInformationFileType networkInformationFile);
 		void DvbNipServiceInformation(NipActualCarrierInformation currentCarrierInformation, ServiceInformationFileType serviceInformationFile);
 		void OnDvbNipFileAnnouncement(FDTInstanceType flute);
 		void OnAstraSgtList(SgtList list);
 		void OnAstraSgtService(SgtService child);
+		void NotifyTransportStreamId(int tsid, int nid);
 
 		TaskQueue Tasks { get; set; }
 

skyscraper8/Skyscraper/Scraper/SkyscraperContext.cs

@@ -1395,13 +1395,14 @@ namespace skyscraper5.Skyscraper.Scraper
 
         public void NotifyFileArrival(VfsFile vfsFile)
         {
-            UiJunction?.DsmCcVfs(vfsFile);
-
             if (!CurrentTransportStreamId.HasValue)
                 return;
             if (!CurrentNetworkId.HasValue)
                 return;
 
+            UiJunction?.NotifyTransportStreamId(CurrentTransportStreamId.Value, CurrentNetworkId.Value);
+			UiJunction?.DsmCcVfs(vfsFile);
+
 			if (ObjectStorage.ObjectCarouselFileArrival(vfsFile, CurrentTransportStreamId.Value, CurrentNetworkId.Value))
             {
                 LogEvent(SkyscraperContextEvent.FileArrival, String.Format("PID {0:X4}, Path {1}", vfsFile.SourcePid, vfsFile.ToString()));
@@ -2980,7 +2981,7 @@ namespace skyscraper5.Skyscraper.Scraper
 		public void OnServiceList(NipActualCarrierInformation currentCarrierInformation, string serviceListId,
 			ServiceListType serviceList)
 		{
-            UiJunction?.OnDvbNipServiceList(currentCarrierInformation, serviceListId, serviceListId);
+            UiJunction?.OnDvbNipServiceList(currentCarrierInformation, serviceListId, serviceList);
 
 			List<DvbIService> services = DvbIUtils.FlattenServiceList(serviceList).ToList();
 			DvbIDataStorage dataStorage = DataStorage;

skyscraper8/Skyscraper/Scraper/Storage/Filesystem/FilesystemStorage.cs

@@ -1623,6 +1623,7 @@ namespace skyscraper5.Skyscraper.Scraper.Storage.Filesystem
 		public bool DvbNipTestForFile(string announcedFileContentLocation)
 		{
 			string saneFilename = DvbNipUtilities.MakeFilename(announcedFileContentLocation);
+			saneFilename = Path.Combine(rootDirectory.FullName, "DVB-NIP-Content", saneFilename);
 			FileInfo fi = new FileInfo(saneFilename);
 			return fi.Exists;
 		}
@@ -1630,6 +1631,7 @@ namespace skyscraper5.Skyscraper.Scraper.Storage.Filesystem
 		public void DvbNipFileArrival(NipActualCarrierInformation carrier, FluteListener listener)
 		{
 			string filename = DvbNipUtilities.MakeFilename(listener.FileAssociation.ContentLocation);
+            filename = Path.Combine(rootDirectory.FullName, "DVB-NIP-Content", filename);
 			FileInfo fi = new FileInfo(filename);
 			fi.Directory.EnsureExists();
 			FileStream outStream = fi.OpenWrite();
@@ -2000,5 +2002,31 @@ namespace skyscraper5.Skyscraper.Scraper.Storage.Filesystem
             fileStream.Flush();
             fileStream.Close();
         }
+
+		public bool TestForObjectCarouselFileArrival(string file, int transportStreamId, int pid, int networkId)
+		{
+            if (file.StartsWith("\\"))
+                file = file.Substring(1);
+			string combine = Path.Combine(rootDirectory.FullName, "DSM-CC_Objects", networkId.ToString(), transportStreamId.ToString(), pid.ToString(), file);
+			FileInfo fi = new FileInfo(combine);
+            return fi.Exists;
+		}
+
+		public byte[] GetObjectCarouselFileArrival(string file, int transportStreamId, int pid, int networkId)
+		{
+			if (file.StartsWith("\\"))
+				file = file.Substring(1);
+			string combine = Path.Combine(rootDirectory.FullName, "DSM-CC_Objects", networkId.ToString(), transportStreamId.ToString(), pid.ToString(), file);
+			FileInfo fi = new FileInfo(combine);
+			return File.ReadAllBytes(fi.FullName);
+		}
+
+		public byte[] DvbNipGetFile(string path)
+		{
+			string saneFilename = DvbNipUtilities.MakeFilename(path);
+			saneFilename = Path.Combine(rootDirectory.FullName, "DVB-NIP-Content", saneFilename);
+			FileInfo fi = new FileInfo(saneFilename);
+            return File.ReadAllBytes(fi.FullName);
+		}
 	}
 }

skyscraper8/Skyscraper/Scraper/Storage/NullObjectStorage.cs

@@ -148,5 +148,20 @@ namespace skyscraper8.Skyscraper.Scraper.Storage
         {
             throw new NotImplementedException();
         }
+
+		public bool TestForObjectCarouselFileArrival(string vfsFile, int transportStreamId, int pid, int networkId)
+		{
+			throw new NotImplementedException();
+		}
+
+		public byte[] GetObjectCarouselFileArrival(string vfsFile, int transportStreamId, int pid, int networkId)
+		{
+			throw new NotImplementedException();
+		}
+
+		public byte[] DvbNipGetFile(string path)
+		{
+			return new byte[0] { };
+		}
 	}
 }

skyscraper8/Skyscraper/Scraper/Storage/ObjectStorage.cs

@@ -18,6 +18,9 @@ namespace skyscraper8.Skyscraper.Scraper.Storage
     public interface ObjectStorage : ISsdpCache
     {
         bool ObjectCarouselFileArrival(VfsFile vfsFile, int transportStreamId, int networkId);
+        bool TestForObjectCarouselFileArrival(string vfsFile, int transportStreamId, int pid, int networkId);
+        byte[] GetObjectCarouselFileArrival(string vfsFile, int transportStreamId, int pid, int networkId);
+
         void DataCarouselModuleArrival(int currentNetworkId, int currentTransportStreamId, int elementaryPid, ushort moduleModuleId, byte moduleModuleVersion, Stream result);
         bool IsDsmCcModuleWanted(int currentNetworkId, int currentTransportStreamId, int elementaryPid, ushort moduleId, byte moduleVersion);
         bool TestForFramegrab(int currentNetworkId, int transportStreamId, ushort mappingProgramNumber, int mappingStreamElementaryPid);
@@ -39,5 +42,6 @@ namespace skyscraper8.Skyscraper.Scraper.Storage
         bool NdsSsuTestFile(int? currentNetworkId, int? currentTransportStreamId, int pid, ushort tableIdExtension);
         bool TestForSisDsaci(int value1, int value2, ushort groupId, int versionNumber);
         void StoreSisDsaci(int value1, int value2, ushort currentDsaGroupId, int versionNumber, Stream dsaci);
+		byte[] DvbNipGetFile(string path);
 	}
 }

skyscraper8/Skyscraper/Scraper/Storage/Tar/TarObjectStorage.cs

@@ -210,5 +210,23 @@ namespace skyscraper8.Skyscraper.Scraper.Storage.Tar
 			string filename = String.Format("dvb-sis/{0}/{1}/Group{2}_Version{3}.xml", nid, tsid, currentDsaGroupId, versionNumber);
 			tarArchive.WriteEntry(filename, dsaci);
 		}
+
+		public bool TestForObjectCarouselFileArrival(string vfsFile, int transportStreamId, int pid, int networkId)
+		{
+			string filename = string.Format("dsm-cc/objects/{0}/{1}/{2}/{3}", networkId, transportStreamId, pid, vfsFile.ToString());
+			return tarArchive.HasEntry(filename);
+		}
+
+		public byte[] GetObjectCarouselFileArrival(string vfsFile, int transportStreamId, int pid, int networkId)
+		{
+			string filename = string.Format("dsm-cc/objects/{0}/{1}/{2}/{3}", networkId, transportStreamId, pid, vfsFile.ToString());
+			return tarArchive.ReadEntry(filename);
+		}
+
+		public byte[] DvbNipGetFile(string path)
+		{
+			string filename = "/nip/" + DvbNipUtilities.MakeFilename(path);
+			return tarArchive.ReadEntry(filename);
+		}
 	}
 }

skyscraper8/Skyscraper/Scraper/Storage/Utilities/DatabaseKeyNipMulticastGatewayConfigurationTransportSession.cs

@@ -43,22 +43,25 @@ namespace skyscraper8.Skyscraper.Scraper.Storage.Utilities
 
 		public ushort CarrierId { get; set; }
 
-		protected bool Equals(DatabaseKeyNipMulticastGatewayConfigurationTransportSession other)
-		{
-			return TSI == other.TSI && DestinationPort == other.DestinationPort && DestinationAddress.Equals(other.DestinationAddress) && SourceAddress.Equals(other.SourceAddress) && ServiceId == other.ServiceId && NetworkId == other.NetworkId && LinkId == other.LinkId && CarrierId == other.CarrierId;
-		}
-
 		public override bool Equals(object? obj)
 		{
-			if (ReferenceEquals(null, obj)) return false;
+			return obj is DatabaseKeyNipMulticastGatewayConfigurationTransportSession session &&
-			if (ReferenceEquals(this, obj)) return true;
+				   TSI == session.TSI &&
-			if (obj.GetType() != this.GetType()) return false;
+				   DestinationPort == session.DestinationPort &&
-			return Equals((DatabaseKeyNipMulticastGatewayConfigurationTransportSession)obj);
+				   EqualityComparer<IPAddress>.Default.Equals(DestinationAddress, session.DestinationAddress) &&
+				   EqualityComparer<IPAddress>.Default.Equals(SourceAddress, session.SourceAddress) &&
+				   ServiceId == session.ServiceId &&
+				   NetworkId == session.NetworkId &&
+				   LinkId == session.LinkId &&
+				   CarrierId == session.CarrierId;
 		}
 
 		public override int GetHashCode()
 		{
 			return HashCode.Combine(TSI, DestinationPort, DestinationAddress, SourceAddress, ServiceId, NetworkId, LinkId, CarrierId);
 		}
+
+
+
 	}
 }