Skip to content

Commit d6fb92d

Browse files
BornToBeRootBornToBeRoot
committed
Update
1 parent 2df1fe5 commit d6fb92d

66 files changed

Lines changed: 472 additions & 133 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/NETworkManager.Models/Export/ExportManager.ExportFileType.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
namespace NETworkManager.Models.Export
2+
{
3+
public static partial class ExportManager
4+
{
5+
public enum ExportFileType
6+
{
7+
CSV,
8+
XML,
9+
JSON,
10+
TXT
11+
}
12+
}
13+
}

Source/NETworkManager/Models/Export/ExportManager.cs renamed to Source/NETworkManager.Models/Export/ExportManager.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace NETworkManager.Models.Export
1313
{
14-
public static class ExportManager
14+
public static partial class ExportManager
1515
{
1616
#region Variables
1717
private static readonly XDeclaration DefaultXDeclaration = new XDeclaration("1.0", "utf-8", "yes");
@@ -885,14 +885,7 @@ public static string GetFileExtensionAsString(ExportFileType fileExtension)
885885
return string.Empty;
886886
}
887887
}
888-
#endregion
889888

890-
public enum ExportFileType
891-
{
892-
CSV,
893-
XML,
894-
JSON,
895-
TXT
896-
}
889+
#endregion
897890
}
898891
}

Source/NETworkManager/Models/Lookup/OUIInfo.cs renamed to Source/NETworkManager.Models/Lookup/OUIInfo.cs

File renamed without changes.

Source/NETworkManager/Models/Lookup/OUILookup.cs renamed to Source/NETworkManager.Models/Lookup/OUILookup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Linq;
33
using System.Threading.Tasks;
44
using System.IO;
5-
using NETworkManager.Models.Settings;
5+
//using NETworkManager.Models.Settings;
66
using System.Text.RegularExpressions;
77
using System;
88
using System.Xml;
@@ -12,7 +12,7 @@ namespace NETworkManager.Models.Lookup
1212
public static class OUILookup
1313
{
1414
#region Variables
15-
private static readonly string OuiFilePath = Path.Combine(ConfigurationManager.Current.ExecutionPath, "Resources", "OUI.xml");
15+
private static readonly string OuiFilePath = ""; // ToDo // Path.Combine(ConfigurationManager.Current.ExecutionPath, "Resources", "OUI.xml");
1616

1717
private static readonly List<OUIInfo> OUIInfoList;
1818
private static readonly Lookup<string, OUIInfo> OUIInfoLookup;

‎Source/NETworkManager.Models/Lookup/PortLookup.Protocol.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
namespace NETworkManager.Models.Lookup
2+
{
3+
public static partial class PortLookup
4+
{
5+
public enum Protocol
6+
{
7+
Tcp,
8+
Udp,
9+
Sctp,
10+
Dccp
11+
}
12+
}
13+
}

Source/NETworkManager/Models/Lookup/PortLookup.cs renamed to Source/NETworkManager.Models/Lookup/PortLookup.cs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
using System.Collections.Generic;
22
using System.Linq;
33
using System.Threading.Tasks;
4-
using System.IO;
5-
using NETworkManager.Models.Settings;
4+
//using NETworkManager.Models.Settings;
65
using System;
76
using System.Xml;
87

98
namespace NETworkManager.Models.Lookup
109
{
11-
public static class PortLookup
10+
public static partial class PortLookup
1211
{
1312
#region Variables
14-
private static readonly string PortsFilePath = Path.Combine(ConfigurationManager.Current.ExecutionPath, "Resources", "Ports.xml");
13+
private static readonly string PortsFilePath = ""; // ToDo //Path.Combine(ConfigurationManager.Current.ExecutionPath, "Resources", "Ports.xml");
1514

1615
private static readonly List<PortLookupInfo> PortList;
1716
private static readonly Lookup<int, PortLookupInfo> Ports;
@@ -32,7 +31,7 @@ static PortLookup()
3231
continue;
3332

3433
int.TryParse(node.SelectSingleNode("Number")?.InnerText, out var port);
35-
System.Enum.TryParse<Protocol>(node.SelectSingleNode("Protocol")?.InnerText, true, out var protocol);
34+
Enum.TryParse<Protocol>(node.SelectSingleNode("Protocol")?.InnerText, true, out var protocol);
3635

3736
PortList.Add(new PortLookupInfo(port, protocol, node.SelectSingleNode("Name")?.InnerText, node.SelectSingleNode("Description")?.InnerText));
3837
}
@@ -73,16 +72,7 @@ public static List<PortLookupInfo> LookupByService(List<string> portsByService)
7372
return list;
7473

7574
}
76-
#endregion
7775

78-
public enum Protocol
79-
{
80-
Tcp,
81-
Udp,
82-
// ReSharper disable once UnusedMember.Global
83-
Sctp,
84-
// ReSharper disable once UnusedMember.Global
85-
Dccp
86-
}
76+
#endregion
8777
}
8878
}

Source/NETworkManager/Models/Lookup/PortLookupInfo.cs renamed to Source/NETworkManager.Models/Lookup/PortLookupInfo.cs

File renamed without changes.

‎Source/NETworkManager.Models/NETworkManager.Models.csproj‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<Reference Include="PresentationFramework" />
3737
<Reference Include="System" />
3838
<Reference Include="System.Core" />
39+
<Reference Include="System.Numerics" />
3940
<Reference Include="System.Xml.Linq" />
4041
<Reference Include="System.Data.DataSetExtensions" />
4142
<Reference Include="Microsoft.CSharp" />
@@ -48,16 +49,46 @@
4849
<Compile Include="Application.cs" />
4950
<Compile Include="Application.Name.cs" />
5051
<Compile Include="ApplicationInfo.cs" />
52+
<Compile Include="Export\ExportManager.cs" />
53+
<Compile Include="Export\ExportManager.ExportFileType.cs" />
54+
<Compile Include="Lookup\OUIInfo.cs" />
55+
<Compile Include="Lookup\OUILookup.cs" />
56+
<Compile Include="Lookup\PortLookup.cs" />
57+
<Compile Include="Lookup\PortLookup.Protocol.cs" />
58+
<Compile Include="Lookup\PortLookupInfo.cs" />
59+
<Compile Include="Network\ARP.cs" />
60+
<Compile Include="Network\ARPInfo.cs" />
5161
<Compile Include="Network\BandwidthInfo.cs" />
62+
<Compile Include="Network\BandwidthMeter.cs" />
63+
<Compile Include="Network\BandwidthMeterSpeedArgs.cs" />
64+
<Compile Include="Network\Connection.cs" />
65+
<Compile Include="Network\Connection.Protocol.cs" />
66+
<Compile Include="Network\ConnectionInfo.cs" />
5267
<Compile Include="Network\ConnectionState.cs" />
5368
<Compile Include="Network\DiscoveryProtocol.cs" />
5469
<Compile Include="Network\DiscoveryProtocol.Protocol.cs" />
5570
<Compile Include="Network\DiscoveryProtocolErrorArgs.cs" />
5671
<Compile Include="Network\DiscoveryProtocolPackageArgs.cs" />
5772
<Compile Include="Network\DiscoveryProtocolPackageInfo.cs" />
5873
<Compile Include="Network\DiscoveryProtocolWarningArgs.cs" />
74+
<Compile Include="Network\DNSLookup.cs" />
75+
<Compile Include="Network\DNSLookupCompleteArgs.cs" />
76+
<Compile Include="Network\DNSLookupErrorArgs.cs" />
77+
<Compile Include="Network\DNSLookupRecordArgs.cs" />
78+
<Compile Include="Network\DNSLookupRecordInfo.cs" />
79+
<Compile Include="Network\DNSServer.cs" />
5980
<Compile Include="Network\DNSServerInfo.cs" />
81+
<Compile Include="Network\HostFoundArgs.cs" />
82+
<Compile Include="Network\HostInfo.cs" />
83+
<Compile Include="Network\HostNotFoundException.cs" />
84+
<Compile Include="Network\HTTPHeaders.cs" />
85+
<Compile Include="Network\HTTPHeadersOptions.cs" />
86+
<Compile Include="Network\IPNetworkInfo.cs" />
87+
<Compile Include="Network\IPScanner.cs" />
6088
<Compile Include="Network\IPv4Address.cs" />
89+
<Compile Include="Network\Listener.cs" />
90+
<Compile Include="Network\Listener.Protocol.cs" />
91+
<Compile Include="Network\ListenerInfo.cs" />
6192
<Compile Include="Network\MaximumHopsReachedArgs.cs" />
6293
<Compile Include="Network\NetworkInterface.cs" />
6394
<Compile Include="Network\NetworkInterfaceConfig.cs" />
@@ -67,13 +98,27 @@
6798
<Compile Include="Network\PingInfo.cs" />
6899
<Compile Include="Network\PingMonitorOptions.cs" />
69100
<Compile Include="Network\PingReceivedArgs.cs" />
101+
<Compile Include="Network\PortInfo.cs" />
102+
<Compile Include="Network\PortScannedArgs.cs" />
103+
<Compile Include="Network\PortScanner.cs" />
70104
<Compile Include="Network\PortState.cs" />
105+
<Compile Include="Network\ProgressChangedArgs.cs" />
106+
<Compile Include="Network\SNMP.cs" />
107+
<Compile Include="Network\SNMPReceivedArgs.cs" />
108+
<Compile Include="Network\SNMPReceivedInfo.cs" />
71109
<Compile Include="Network\Subnetmask.cs" />
72110
<Compile Include="Network\SubnetmaskInfo.cs" />
111+
<Compile Include="Network\Traceroute.cs" />
112+
<Compile Include="Network\TracerouteHopInfo.cs" />
113+
<Compile Include="Network\TracerouteHopReceivedArgs.cs" />
114+
<Compile Include="Network\WakeOnLanInfo.cs" />
115+
<Compile Include="Network\WhoisServerInfo.cs" />
73116
<Compile Include="Network\WiFi.cs" />
74117
<Compile Include="Network\WiFiAdapterInfo.cs" />
75118
<Compile Include="Network\WiFiNetworkInfo.cs" />
119+
<Compile Include="PowerShell\PowerShell.ExecutionPolicy.cs" />
76120
<Compile Include="Properties\AssemblyInfo.cs" />
121+
<Compile Include="PuTTY\PuTTY.ConnectionMode.cs" />
77122
<Compile Include="RemoteDesktop\AudioCaptureRedirectionMode.cs" />
78123
<Compile Include="RemoteDesktop\AudioRedirectionMode.cs" />
79124
<Compile Include="RemoteDesktop\KeyboardHookMode.cs" />
@@ -87,6 +132,12 @@
87132
<PackageReference Include="ControlzEx">
88133
<Version>3.0.2.4</Version>
89134
</PackageReference>
135+
<PackageReference Include="IPNetwork2">
136+
<Version>2.5.189</Version>
137+
</PackageReference>
138+
<PackageReference Include="Lextm.SharpSnmpLib">
139+
<Version>12.0.0</Version>
140+
</PackageReference>
90141
<PackageReference Include="MahApps.Metro.IconPacks">
91142
<Version>3.5.0</Version>
92143
</PackageReference>
@@ -114,5 +165,6 @@
114165
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
115166
</Content>
116167
</ItemGroup>
168+
<ItemGroup />
117169
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
118170
</Project>

Source/NETworkManager/Models/Network/ARP.cs renamed to Source/NETworkManager.Models/Network/ARP.cs

File renamed without changes.

Source/NETworkManager/Models/Network/ARPInfo.cs renamed to Source/NETworkManager.Models/Network/ARPInfo.cs

File renamed without changes.

0 commit comments

Comments
 (0)