diff --git a/netxml2kml/Methods/CliOptionsHandlers.cs b/netxml2kml/Methods/CliOptionsHandlers.cs index 633bd81..7fc52f2 100644 --- a/netxml2kml/Methods/CliOptionsHandlers.cs +++ b/netxml2kml/Methods/CliOptionsHandlers.cs @@ -9,6 +9,57 @@ public static class CliOptionsHandlers public static void UniversalHandler(FileInfo? inputFile, FileInfo? outputFile, bool useDatabase, string? sqlQuery) { + // Validate input file + if (inputFile != null) + { + if (!inputFile.Exists) + { + Console.WriteLine("Input file doesn't exist."); + return; + } + } + + // Validate output file + if (outputFile != null) + { + if (!Directory.Exists(outputFile.DirectoryName)) + { + Console.WriteLine("Output directory doesn't exist."); + return; + } + + // If output file with the same name already exists – + // prompt user to change a name of the file + while (outputFile.Exists) + { + Console.Write("Output file already exists. Do you want to overwrite it? [y/N] "); + var opt = Console.ReadLine(); + + if (String.IsNullOrEmpty(opt) || opt.ToLower() == "no" || + opt.ToLower() == "n") + { + Console.Write("Enter a [.kml]: "); + var name = Console.ReadLine(); + + if (String.IsNullOrEmpty(name)) + { + continue; + } + + outputFile = new FileInfo( + Path.Join(outputFile.DirectoryName, name)); + continue; + } + + if (opt.ToLower() == "yes" || + opt.ToLower() == "y") + { + break; + } + } + } + + // Run some logic based on options combination if (inputFile != null && outputFile != null) { var wirelessNetworks = Helpers.DeserializeXml(inputFile); @@ -58,6 +109,11 @@ public static class CliOptionsHandlers using var dbContext = new DatabaseContext(); Console.WriteLine(dbContext.Database.ExecuteSqlRaw(sqlQuery)); } + else + { + Console.WriteLine("Options combination is unsupported or some option lacks an argument." + + "\nUse --help to see use case examples."); + } } private static string GetKmlString(IEnumerable wirelessNetworks) diff --git a/netxml2kml/Methods/Helpers.cs b/netxml2kml/Methods/Helpers.cs index 5fcec44..9f4bd04 100644 --- a/netxml2kml/Methods/Helpers.cs +++ b/netxml2kml/Methods/Helpers.cs @@ -1,5 +1,4 @@ -using System.Xml; -using System.Xml.Serialization; +using System.Xml.Linq; using netxml2kml.Models; namespace netxml2kml.Methods; @@ -9,61 +8,53 @@ public static class Helpers public static WirelessNetwork[] DeserializeXml(FileInfo inputFile) { /* Deserialize to MonoXSD autogenerated class model */ - - var xmlSerializer = new XmlSerializer(typeof(detectionrun)); - var detectionRun = (detectionrun?) xmlSerializer.Deserialize( - XmlReader.Create(inputFile.OpenRead(), - new XmlReaderSettings {DtdProcessing = DtdProcessing.Parse})); - /* Convert machine deserialization to readable class format */ + var srcTree = XDocument.Load(inputFile.OpenRead()); + var srcNets = srcTree.Root!.Elements("wireless-network") + .Where(wn => wn.Attribute("type")!.Value != "probe").ToList(); - var wirelessNetworks = - new WirelessNetwork[detectionRun!.wirelessnetwork.Count(wn => - wn.type != "probe")]; + var wirelessNetworks = new WirelessNetwork[srcNets.Count]; - for (int i = 0; i < detectionRun.wirelessnetwork.Length; i++) + for (int i = 0; i < srcNets.Count; i++) { - var detectionRunWirelessNetwork = detectionRun.wirelessnetwork[i]; + Console.WriteLine(i); + var srcNet = srcNets[i]; - // If wireless network is a client – skip - if (detectionRunWirelessNetwork.type == "probe") - { - continue; - } + var essid = srcNet.Element("SSID")!.Element("essid")!.Value; wirelessNetworks[i] = new() { - Essid = detectionRunWirelessNetwork.SSID.First().essid?.First().Value, - Encryption = detectionRunWirelessNetwork.SSID.First().encryption?.Last()?.Value, - Bssid = detectionRunWirelessNetwork.BSSID, - Manufacturer = detectionRunWirelessNetwork.manuf, - FrequencyMhz = Math.Round(Double.Parse(detectionRunWirelessNetwork.freqmhz.Substring(0, 2)) / 10, 1, MidpointRounding.ToPositiveInfinity), - MaxSignalDbm = Int32.Parse(detectionRunWirelessNetwork.snrinfo.First().max_signal_dbm), - MaxLatitude = Double.Parse(detectionRunWirelessNetwork.gpsinfo.First().maxlat), - MaxLongitude = Double.Parse(detectionRunWirelessNetwork.gpsinfo.First().maxlon), - MaxAltitude = Double.Parse(detectionRunWirelessNetwork.gpsinfo.First().maxalt), - FirstSeenDate = StringToDate(detectionRunWirelessNetwork.firsttime), - LastUpdateDate = StringToDate(detectionRunWirelessNetwork.lasttime) + Essid = essid != "" ? essid : null, + Encryption = srcNet.Element("SSID")!.Elements("encryption").LastOrDefault()?.Value, + Bssid = srcNet.Element("BSSID")!.Value, + Manufacturer = srcNet.Element("manuf")!.Value, + FrequencyMhz = Math.Round(Double.Parse(srcNet.Element("freqmhz")!.Value.Substring(0, 2)) / 10, 1, MidpointRounding.ToPositiveInfinity), + MaxSignalDbm = Int32.Parse(srcNet.Element("snr-info")!.Element("max_signal_dbm")!.Value), + MaxLatitude = Double.Parse(srcNet.Element("gps-info")!.Element("max-lat")!.Value), + MaxLongitude = Double.Parse(srcNet.Element("gps-info")!.Element("max-lon")!.Value), + MaxAltitude = Double.Parse(srcNet.Element("gps-info")!.Element("max-alt")!.Value), + FirstSeenDate = StringToDate(srcNet.Attribute("first-time")!.Value), + LastUpdateDate = StringToDate(srcNet.Attribute("last-time")!.Value) }; // If wireless network has no clients – continue - if (detectionRunWirelessNetwork.wirelessclient == null) + if (!srcNet.Elements("wireless-client").Any()) { continue; } - var wirelessConnections = new List(detectionRunWirelessNetwork.wirelessclient.Length); + var wirelessConnections = new List(srcNet.Elements("wireless-client").Count()); - foreach (var wc in detectionRunWirelessNetwork.wirelessclient) + foreach (var wc in srcNet.Elements("wireless-client").ToArray()) { wirelessConnections.Add(new WirelessConnection { WirelessClient = new WirelessClient { - Mac = wc.clientmac, - Manufacturer = wc.clientmanuf, - FirstSeenDate = StringToDate(wc.firsttime), - LastUpdateDate = StringToDate(wc.lasttime) + Mac = wc.Element("client-mac")!.Value, + Manufacturer = wc.Element("client-manuf")!.Value, + FirstSeenDate = StringToDate(wc.Attribute("first-time")!.Value), + LastUpdateDate = StringToDate(wc.Attribute("last-time")!.Value) }, WirelessNetwork = wirelessNetworks[i] }); @@ -72,7 +63,7 @@ public static class Helpers wirelessNetworks[i].WirelessConnections = wirelessConnections; } - return wirelessNetworks; + return wirelessNetworks.ToArray(); } public static DateTime StringToDate(string dateString) diff --git a/netxml2kml/Models/MonoXSD.cs b/netxml2kml/Models/MonoXSD.cs deleted file mode 100644 index df78f28..0000000 --- a/netxml2kml/Models/MonoXSD.cs +++ /dev/null @@ -1,1151 +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 - -// -//This source code was auto-generated by MonoXSD -// -namespace netxml2kml.Models { - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class packets { - - private string lLCField; - - private string dataField; - - private string cryptField; - - private string totalField; - - private string fragmentsField; - - private string retriesField; - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string LLC { - get { - return this.lLCField; - } - set { - this.lLCField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string data { - get { - return this.dataField; - } - set { - this.dataField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string crypt { - get { - return this.cryptField; - } - set { - this.cryptField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string total { - get { - return this.totalField; - } - set { - this.totalField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string fragments { - get { - return this.fragmentsField; - } - set { - this.fragmentsField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string retries { - get { - return this.retriesField; - } - set { - this.retriesField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - [System.Xml.Serialization.XmlRootAttribute("snr-info", Namespace="", IsNullable=false)] - public partial class snrinfo { - - private string last_signal_dbmField; - - private string last_noise_dbmField; - - private string last_signal_rssiField; - - private string last_noise_rssiField; - - private string min_signal_dbmField; - - private string min_noise_dbmField; - - private string min_signal_rssiField; - - private string min_noise_rssiField; - - private string max_signal_dbmField; - - private string max_noise_dbmField; - - private string max_signal_rssiField; - - private string max_noise_rssiField; - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string last_signal_dbm { - get { - return this.last_signal_dbmField; - } - set { - this.last_signal_dbmField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string last_noise_dbm { - get { - return this.last_noise_dbmField; - } - set { - this.last_noise_dbmField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string last_signal_rssi { - get { - return this.last_signal_rssiField; - } - set { - this.last_signal_rssiField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string last_noise_rssi { - get { - return this.last_noise_rssiField; - } - set { - this.last_noise_rssiField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string min_signal_dbm { - get { - return this.min_signal_dbmField; - } - set { - this.min_signal_dbmField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string min_noise_dbm { - get { - return this.min_noise_dbmField; - } - set { - this.min_noise_dbmField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string min_signal_rssi { - get { - return this.min_signal_rssiField; - } - set { - this.min_signal_rssiField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string min_noise_rssi { - get { - return this.min_noise_rssiField; - } - set { - this.min_noise_rssiField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string max_signal_dbm { - get { - return this.max_signal_dbmField; - } - set { - this.max_signal_dbmField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string max_noise_dbm { - get { - return this.max_noise_dbmField; - } - set { - this.max_noise_dbmField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string max_signal_rssi { - get { - return this.max_signal_rssiField; - } - set { - this.max_signal_rssiField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string max_noise_rssi { - get { - return this.max_noise_rssiField; - } - set { - this.max_noise_rssiField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - [System.Xml.Serialization.XmlRootAttribute("gps-info", Namespace="", IsNullable=false)] - public partial class gpsinfo { - - private string minlatField; - - private string minlonField; - - private string minaltField; - - private string minspdField; - - private string maxlatField; - - private string maxlonField; - - private string maxaltField; - - private string maxspdField; - - private string peaklatField; - - private string peaklonField; - - private string peakaltField; - - private string avglatField; - - private string avglonField; - - private string avgaltField; - - /// - [System.Xml.Serialization.XmlElementAttribute("min-lat", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string minlat { - get { - return this.minlatField; - } - set { - this.minlatField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("min-lon", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string minlon { - get { - return this.minlonField; - } - set { - this.minlonField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("min-alt", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string minalt { - get { - return this.minaltField; - } - set { - this.minaltField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("min-spd", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string minspd { - get { - return this.minspdField; - } - set { - this.minspdField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("max-lat", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string maxlat { - get { - return this.maxlatField; - } - set { - this.maxlatField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("max-lon", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string maxlon { - get { - return this.maxlonField; - } - set { - this.maxlonField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("max-alt", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string maxalt { - get { - return this.maxaltField; - } - set { - this.maxaltField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("max-spd", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string maxspd { - get { - return this.maxspdField; - } - set { - this.maxspdField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("peak-lat", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string peaklat { - get { - return this.peaklatField; - } - set { - this.peaklatField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("peak-lon", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string peaklon { - get { - return this.peaklonField; - } - set { - this.peaklonField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("peak-alt", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string peakalt { - get { - return this.peakaltField; - } - set { - this.peakaltField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("avg-lat", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string avglat { - get { - return this.avglatField; - } - set { - this.avglatField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("avg-lon", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string avglon { - get { - return this.avglonField; - } - set { - this.avglonField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("avg-alt", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string avgalt { - get { - return this.avgaltField; - } - set { - this.avgaltField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - [System.Xml.Serialization.XmlRootAttribute("detection-run", Namespace="", IsNullable=false)] - public partial class detectionrun { - - private detectionrunWirelessnetwork[] wirelessnetworkField; - - private string kismetversionField; - - private string starttimeField; - - /// - [System.Xml.Serialization.XmlElementAttribute("wireless-network", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public detectionrunWirelessnetwork[] wirelessnetwork { - get { - return this.wirelessnetworkField; - } - set { - this.wirelessnetworkField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("kismet-version")] - public string kismetversion { - get { - return this.kismetversionField; - } - set { - this.kismetversionField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("start-time")] - public string starttime { - get { - return this.starttimeField; - } - set { - this.starttimeField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class detectionrunWirelessnetwork { - - private string bSSIDField; - - private string manufField; - - private string channelField; - - private string freqmhzField; - - private string maxseenrateField; - - private string carrierField; - - private string encodingField; - - private string datasizeField; - - private string bsstimestampField; - - private string cdpdeviceField; - - private string cdpportidField; - - private detectionrunWirelessnetworkSSID[] sSIDField; - - private packets[] packetsField; - - private detectionrunWirelessnetworkWirelessclient[] wirelessclientField; - - private snrinfo[] snrinfoField; - - private gpsinfo[] gpsinfoField; - - private string numberField; - - private string typeField; - - private string firsttimeField; - - private string lasttimeField; - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string BSSID { - get { - return this.bSSIDField; - } - set { - this.bSSIDField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string manuf { - get { - return this.manufField; - } - set { - this.manufField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string channel { - get { - return this.channelField; - } - set { - this.channelField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string freqmhz { - get { - return this.freqmhzField; - } - set { - this.freqmhzField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string maxseenrate { - get { - return this.maxseenrateField; - } - set { - this.maxseenrateField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string carrier { - get { - return this.carrierField; - } - set { - this.carrierField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string encoding { - get { - return this.encodingField; - } - set { - this.encodingField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string datasize { - get { - return this.datasizeField; - } - set { - this.datasizeField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string bsstimestamp { - get { - return this.bsstimestampField; - } - set { - this.bsstimestampField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("cdp-device", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string cdpdevice { - get { - return this.cdpdeviceField; - } - set { - this.cdpdeviceField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("cdp-portid", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string cdpportid { - get { - return this.cdpportidField; - } - set { - this.cdpportidField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("SSID", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public detectionrunWirelessnetworkSSID[] SSID { - get { - return this.sSIDField; - } - set { - this.sSIDField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("packets")] - public packets[] packets { - get { - return this.packetsField; - } - set { - this.packetsField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("wireless-client", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public detectionrunWirelessnetworkWirelessclient[] wirelessclient { - get { - return this.wirelessclientField; - } - set { - this.wirelessclientField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("snr-info")] - public snrinfo[] snrinfo { - get { - return this.snrinfoField; - } - set { - this.snrinfoField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("gps-info")] - public gpsinfo[] gpsinfo { - get { - return this.gpsinfoField; - } - set { - this.gpsinfoField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string number { - get { - return this.numberField; - } - set { - this.numberField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string type { - get { - return this.typeField; - } - set { - this.typeField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("first-time")] - public string firsttime { - get { - return this.firsttimeField; - } - set { - this.firsttimeField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("last-time")] - public string lasttime { - get { - return this.lasttimeField; - } - set { - this.lasttimeField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class detectionrunWirelessnetworkSSID { - - private string typeField; - - private string maxrateField; - - private string packetsField; - - private string beaconrateField; - - private detectionrunWirelessnetworkSSIDEncryption[] encryptionField; - - private detectionrunWirelessnetworkSSIDEssid[] essidField; - - private string firsttimeField; - - private string lasttimeField; - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string type { - get { - return this.typeField; - } - set { - this.typeField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("max-rate", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string maxrate { - get { - return this.maxrateField; - } - set { - this.maxrateField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string packets { - get { - return this.packetsField; - } - set { - this.packetsField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string beaconrate { - get { - return this.beaconrateField; - } - set { - this.beaconrateField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("encryption", Form=System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable=true)] - public detectionrunWirelessnetworkSSIDEncryption[] encryption { - get { - return this.encryptionField; - } - set { - this.encryptionField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("essid", Form=System.Xml.Schema.XmlSchemaForm.Unqualified, IsNullable=true)] - public detectionrunWirelessnetworkSSIDEssid[] essid { - get { - return this.essidField; - } - set { - this.essidField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("first-time")] - public string firsttime { - get { - return this.firsttimeField; - } - set { - this.firsttimeField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("last-time")] - public string lasttime { - get { - return this.lasttimeField; - } - set { - this.lasttimeField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class detectionrunWirelessnetworkSSIDEncryption { - - private string valueField; - - /// - [System.Xml.Serialization.XmlTextAttribute()] - public string Value { - get { - return this.valueField; - } - set { - this.valueField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class detectionrunWirelessnetworkSSIDEssid { - - private string cloakedField; - - private string valueField; - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string cloaked { - get { - return this.cloakedField; - } - set { - this.cloakedField = value; - } - } - - /// - [System.Xml.Serialization.XmlTextAttribute()] - public string Value { - get { - return this.valueField; - } - set { - this.valueField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class detectionrunWirelessnetworkWirelessclient { - - private string clientmacField; - - private string clientmanufField; - - private string channelField; - - private string maxseenrateField; - - private string carrierField; - - private string encodingField; - - private packets[] packetsField; - - private snrinfo[] snrinfoField; - - private gpsinfo[] gpsinfoField; - - private string numberField; - - private string typeField; - - private string firsttimeField; - - private string lasttimeField; - - /// - [System.Xml.Serialization.XmlElementAttribute("client-mac", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string clientmac { - get { - return this.clientmacField; - } - set { - this.clientmacField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("client-manuf", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string clientmanuf { - get { - return this.clientmanufField; - } - set { - this.clientmanufField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string channel { - get { - return this.channelField; - } - set { - this.channelField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string maxseenrate { - get { - return this.maxseenrateField; - } - set { - this.maxseenrateField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string carrier { - get { - return this.carrierField; - } - set { - this.carrierField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string encoding { - get { - return this.encodingField; - } - set { - this.encodingField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("packets")] - public packets[] packets { - get { - return this.packetsField; - } - set { - this.packetsField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("snr-info")] - public snrinfo[] snrinfo { - get { - return this.snrinfoField; - } - set { - this.snrinfoField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute("gps-info")] - public gpsinfo[] gpsinfo { - get { - return this.gpsinfoField; - } - set { - this.gpsinfoField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string number { - get { - return this.numberField; - } - set { - this.numberField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute()] - public string type { - get { - return this.typeField; - } - set { - this.typeField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("first-time")] - public string firsttime { - get { - return this.firsttimeField; - } - set { - this.firsttimeField = value; - } - } - - /// - [System.Xml.Serialization.XmlAttributeAttribute("last-time")] - public string lasttime { - get { - return this.lasttimeField; - } - set { - this.lasttimeField = value; - } - } - } - - /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "0.0.0.0")] - [System.SerializableAttribute()] - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.ComponentModel.DesignerCategoryAttribute("code")] - [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class NewDataSet { - - private object[] itemsField; - - /// - [System.Xml.Serialization.XmlElementAttribute("detection-run", typeof(detectionrun))] - [System.Xml.Serialization.XmlElementAttribute("gps-info", typeof(gpsinfo))] - [System.Xml.Serialization.XmlElementAttribute("packets", typeof(packets))] - [System.Xml.Serialization.XmlElementAttribute("snr-info", typeof(snrinfo))] - public object[] Items { - get { - return this.itemsField; - } - set { - this.itemsField = value; - } - } - } -} \ No newline at end of file diff --git a/netxml2kml/Program.cs b/netxml2kml/Program.cs index 7132287..b75f3e8 100644 --- a/netxml2kml/Program.cs +++ b/netxml2kml/Program.cs @@ -1,4 +1,4 @@ -using System.CommandLine; +using System.CommandLine; using netxml2kml.Methods; namespace netxml2kml; @@ -8,22 +8,34 @@ class Program static async Task Main(string[] args) { // Define CLI parser options, commands & handlers - + var inputOption = new Option( aliases: new[] {"-i", "--input"}, - description: "Path to the file to be converted."); + description: "Path to the file to be converted.") + { + Arity = ArgumentArity.ZeroOrOne + }; var outputOption = new Option( aliases: new[] {"-o", "--output"}, - description: "The name of the file to be created."); + description: "The name of the file to be created.") + { + Arity = ArgumentArity.ZeroOrOne + }; var databaseOption = new Option( aliases: new[] {"-d", "--use-database"}, - description: "Use database. Save/retrieve wireless networks and clients to/from sqlite database."); + description: "Use database. Save/retrieve wireless networks and clients to/from sqlite database.") + { + Arity = ArgumentArity.ZeroOrOne + }; var queryOption = new Option( aliases: new[] {"-q", "--query"}, - description: "Filter input using sql query."); + description: "Filter input using sql query.") + { + Arity = ArgumentArity.ZeroOrOne + }; var rootCommand = new RootCommand("netxml2kml – .netxml to .kml converter."); rootCommand.AddOption(inputOption);