From b8cf2e187a0d6c60b87f20e1ca7302cd7dd3f2cf Mon Sep 17 00:00:00 2001
From: Trivalik <3148279+trivalik@users.noreply.github.com>
Date: Mon, 2 Dec 2024 12:41:30 +0100
Subject: [PATCH 1/2] npcap to work with similar behavior as winpcap, tests
without physical adapter possible
---
.gitignore | 4 +-
PcapDotNet/src/Directory.Build.props | 20 +-
.../PcapDotNet.Base.Test.csproj | 9 +-
.../src/PcapDotNet.Base.Test/UInt128Tests.cs | 4 +-
.../src/PcapDotNet.Base/IListExtensions.cs | 5 +-
.../LivePacketDeviceExtensions.cs | 21 +-
.../NetworkInterfaceExtensions.cs | 7 +-
.../PcapDotNet.Core.Extensions.csproj | 9 +-
.../TaskExtensions.cs | 41 +
.../BerkeleyPacketFilterTests.cs | 10 +-
.../LivePacketDeviceExtensionsTests.cs | 32 +-
.../LivePacketDeviceTests.cs | 189 +-
.../OfflinePacketDeviceTests.cs | 192 +-
.../PacketDumpFileTests.cs | 9 +-
.../PacketSendBufferTests.cs | 23 +-
.../PcapDotNet.Core.Test/PcapDataLinkTests.cs | 17 +-
.../PcapDotNet.Core.Test.csproj | 14 +-
.../src/PcapDotNet.Core.Test/PcapLibTests.cs | 26 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../TestablePacketCommunicator.cs | 1746 +++++++++++++++++
.../WiresharkCompareTests.cs | 35 +-
.../WiresharkDatagramComparer.cs | 6 +-
.../WiresharkDatagramComparerDns.cs | 4 +-
.../WiresharkDatagramComparerGre.cs | 6 +-
.../WiresharkDatagramComparerIpV4.cs | 8 +-
.../WiresharkDatagramComparerIpV6.cs | 2 +-
...sharkDatagramComparerIpV6MobilityHeader.cs | 8 +-
.../WiresharkDatagramComparerTcp.cs | 8 +-
.../PcapDotNet.Core/BerkeleyPacketFilter.cs | 2 +-
.../Marshaling/PcapPacketHeader.cs | 4 +-
.../src/PcapDotNet.Core/Native/IPcapPal.cs | 10 +-
.../src/PcapDotNet.Core/Native/Interop.cs | 8 +-
.../src/PcapDotNet.Core/Native/PcapHandle.cs | 13 +-
.../Native/PcapInterfaceHandle.cs | 8 +-
.../Native/PcapStringMarshaler.cs | 35 +-
.../src/PcapDotNet.Core/Native/PcapUnixPal.cs | 180 +-
.../Native/PcapUnmanagedStructures.cs | 6 +-
.../PcapDotNet.Core/Native/PcapWindowsPal.cs | 100 +-
.../LivePacketCommunicator.cs | 15 +-
.../OfflinePacketCommunicator.cs | 24 +-
.../PacketCommunicator/PacketCommunicator.cs | 36 +-
.../PacketDevice/IpV4SocketAddress.cs | 4 +-
.../PacketDevice/IpV6SocketAddress.cs | 5 +-
.../PacketDevice/LivePacketDevice.cs | 26 +-
.../PacketDevice/OfflinePacketDevice.cs | 6 +-
.../PacketDevice/SocketAddress.cs | 4 +-
.../src/PcapDotNet.Core/PacketSendBuffer.cs | 7 +-
.../PcapDotNet.Core/PacketTotalStatistics.cs | 2 +-
PcapDotNet/src/PcapDotNet.Core/Pcap.cs | 6 -
.../src/PcapDotNet.Core/PcapDataLink.cs | 11 +-
.../PcapDotNet.Core/PcapDotNet.Core.csproj | 4 +
PcapDotNet/src/PcapDotNet.Core/PcapError.cs | 5 +-
.../src/PcapDotNet.Packets.Test/ArpTests.cs | 3 +-
.../src/PcapDotNet.Packets.Test/DnsTests.cs | 9 +-
.../PcapDotNet.Packets.Test/EthernetTests.cs | 3 +-
.../src/PcapDotNet.Packets.Test/HttpTests.cs | 6 +-
.../src/PcapDotNet.Packets.Test/IgmpTests.cs | 4 +-
.../PcapDotNet.Packets.Test/PacketTests.cs | 4 +-
.../PcapDotNet.Packets.Test.csproj | 11 +-
.../RandomArpExtensions.cs | 5 +-
.../RandomDnsExtensions.cs | 3 +-
.../RandomGreExtensions.cs | 5 +-
.../RandomIgmpExtensions.cs | 5 +-
.../PcapDotNet.Packets/ByteArrayExtensions.cs | 3 +-
.../src/PcapDotNet.Packets/DataSegment.cs | 3 +-
.../Dns/ResourceData/DnsResourceData.cs | 4 +-
.../Dns/ResourceData/DnsResourceDataA6.cs | 5 +-
.../DnsResourceDataHostIdentityProtocol.cs | 7 +-
.../Ethernet/EthernetBaseDatagram.cs | 3 +-
.../PcapDotNet.Packets/Ethernet/MacAddress.cs | 2 +-
.../Gre/GreSourceRouteEntryAs.cs | 3 +-
.../Gre/GreSourceRouteEntryIp.cs | 3 +-
.../src/PcapDotNet.Packets/Http/HttpField.cs | 5 +-
.../src/PcapDotNet.Packets/Http/HttpParser.cs | 5 +-
.../src/PcapDotNet.Packets/Http/HttpRegex.cs | 5 +-
.../Http/HttpRequestLayer.cs | 5 +-
.../Icmp/IcmpDatagramFactory.cs | 12 +-
.../Igmp/IgmpQueryVersion3Layer.cs | 3 +-
.../Igmp/IgmpReportVersion3Layer.cs | 3 +-
.../Ip/OptionComplexFactory.cs | 12 +-
.../ExtensionHeaders/IpV6ExtensionHeader.cs | 1 +
...RoutingProtocolLowPowerAndLossyNetworks.cs | 3 +-
.../IpV6ExtensionHeaderRoutingSourceRoute.cs | 3 +-
.../IpV6ExtensionHeaderStandard.cs | 3 +-
.../PcapDotNet.Packets/IpV6/IpV6Address.cs | 3 +-
.../IpV6AccessNetworkIdentifierSubOptions.cs | 9 +-
.../IpV6FlowIdentificationSubOptions.cs | 9 +-
.../IpV6/Options/IpV6MobilityOptions.cs | 9 +-
.../IpV6/Options/IpV6Options.cs | 9 +-
.../src/PcapDotNet.TestUtils/MoreAssert.cs | 8 +-
.../PcapDotNet.TestUtils.csproj | 3 +-
.../PcapDotNet.TestUtils/RandomExtensions.cs | 3 +-
PcapDotNet/src/PcapDotNet.sln.DotSettings | 3 +
Tools/tshark/libGeoIP-1.dll | Bin 0 -> 358614 bytes
Tools/tshark/libcares-2.dll | Bin 0 -> 186259 bytes
Tools/tshark/libffi-6.dll | Bin 0 -> 32585 bytes
Tools/tshark/libgcrypt-20.dll | Bin 0 -> 572416 bytes
Tools/tshark/libglib-2.0-0.dll | Bin 0 -> 1179790 bytes
Tools/tshark/libgmodule-2.0-0.dll | Bin 0 -> 26882 bytes
Tools/tshark/libgmp-10.dll | Bin 0 -> 447977 bytes
Tools/tshark/libgnutls-28.dll | Bin 0 -> 1019430 bytes
Tools/tshark/libgpg-error6-0.dll | Bin 0 -> 95232 bytes
Tools/tshark/libhogweed-2-4.dll | Bin 0 -> 184907 bytes
Tools/tshark/libintl-8.dll | Bin 0 -> 120252 bytes
Tools/tshark/libnettle-4-6.dll | Bin 0 -> 182365 bytes
Tools/tshark/libp11-kit-0.dll | Bin 0 -> 247415 bytes
Tools/tshark/libsmi-2.dll | Bin 0 -> 731675 bytes
Tools/tshark/libtasn1-6.dll | Bin 0 -> 80653 bytes
Tools/tshark/libwireshark.dll | Bin 0 -> 49030744 bytes
Tools/tshark/libwsutil.dll | Bin 0 -> 138328 bytes
Tools/tshark/lua52.dll | Bin 0 -> 255488 bytes
Tools/tshark/tshark.exe | Bin 0 -> 546904 bytes
Tools/tshark/wiretap-1.12.0.dll | Bin 0 -> 351320 bytes
Tools/tshark/zlib1.dll | Bin 0 -> 77312 bytes
114 files changed, 2729 insertions(+), 460 deletions(-)
create mode 100644 PcapDotNet/src/PcapDotNet.Core.Extensions/TaskExtensions.cs
create mode 100644 PcapDotNet/src/PcapDotNet.Core.Test/TestablePacketCommunicator.cs
create mode 100644 Tools/tshark/libGeoIP-1.dll
create mode 100644 Tools/tshark/libcares-2.dll
create mode 100644 Tools/tshark/libffi-6.dll
create mode 100644 Tools/tshark/libgcrypt-20.dll
create mode 100644 Tools/tshark/libglib-2.0-0.dll
create mode 100644 Tools/tshark/libgmodule-2.0-0.dll
create mode 100644 Tools/tshark/libgmp-10.dll
create mode 100644 Tools/tshark/libgnutls-28.dll
create mode 100644 Tools/tshark/libgpg-error6-0.dll
create mode 100644 Tools/tshark/libhogweed-2-4.dll
create mode 100644 Tools/tshark/libintl-8.dll
create mode 100644 Tools/tshark/libnettle-4-6.dll
create mode 100644 Tools/tshark/libp11-kit-0.dll
create mode 100644 Tools/tshark/libsmi-2.dll
create mode 100644 Tools/tshark/libtasn1-6.dll
create mode 100644 Tools/tshark/libwireshark.dll
create mode 100644 Tools/tshark/libwsutil.dll
create mode 100644 Tools/tshark/lua52.dll
create mode 100644 Tools/tshark/tshark.exe
create mode 100644 Tools/tshark/wiretap-1.12.0.dll
create mode 100644 Tools/tshark/zlib1.dll
diff --git a/.gitignore b/.gitignore
index 8ed99823..b733cc2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ PcapDotNet/src/TestResults
PcapDotNet.DevelopersPack/3rdParty/
artifacts/
.vs/
+.idea/
+.vscode/
TemporaryGeneratedFile_*
*.cache
*.csproj.FileListAbsolute.txt
@@ -15,6 +17,6 @@ TemporaryGeneratedFile_*
*.pdb
*.sdf
*.suo
-*.vcxproj.user
+*.user
*.db
*.opendb
diff --git a/PcapDotNet/src/Directory.Build.props b/PcapDotNet/src/Directory.Build.props
index 285115ee..1aae6d64 100644
--- a/PcapDotNet/src/Directory.Build.props
+++ b/PcapDotNet/src/Directory.Build.props
@@ -16,36 +16,22 @@
True
True
False
+ net40;net80
- netstandard2.0
true
$(MSBuildThisFileDirectory)PcapDotNet.snk
-
-
-
-
-
+
- netstandard2.0
False
-
-
-
-
-
-
- net48;net8.0
- False
-
-
+
diff --git a/PcapDotNet/src/PcapDotNet.Base.Test/PcapDotNet.Base.Test.csproj b/PcapDotNet/src/PcapDotNet.Base.Test/PcapDotNet.Base.Test.csproj
index e6e31e4e..a99a8d99 100644
--- a/PcapDotNet/src/PcapDotNet.Base.Test/PcapDotNet.Base.Test.csproj
+++ b/PcapDotNet/src/PcapDotNet.Base.Test/PcapDotNet.Base.Test.csproj
@@ -2,8 +2,13 @@
-
-
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/PcapDotNet/src/PcapDotNet.Base.Test/UInt128Tests.cs b/PcapDotNet/src/PcapDotNet.Base.Test/UInt128Tests.cs
index 3239a891..12d00a41 100644
--- a/PcapDotNet/src/PcapDotNet.Base.Test/UInt128Tests.cs
+++ b/PcapDotNet/src/PcapDotNet.Base.Test/UInt128Tests.cs
@@ -70,7 +70,7 @@ public void CastToULongOverflow()
}
catch (Exception)
{
- Assert.Fail();
+ Assert.False(true);
return;
}
Assert.Equal(overflow, (ulong)value);
@@ -251,4 +251,4 @@ public void ToStringTestFirstBitIsOne()
Assert.Equal(ValueString, value.ToString("x32"));
}
}
-}
\ No newline at end of file
+}
diff --git a/PcapDotNet/src/PcapDotNet.Base/IListExtensions.cs b/PcapDotNet/src/PcapDotNet.Base/IListExtensions.cs
index 697a6a55..1bbb968b 100644
--- a/PcapDotNet/src/PcapDotNet.Base/IListExtensions.cs
+++ b/PcapDotNet/src/PcapDotNet.Base/IListExtensions.cs
@@ -11,6 +11,7 @@ namespace PcapDotNet.Base
public static class IListExtensions
// ReSharper restore InconsistentNaming
{
+#if !NET7_0_OR_GREATER
///
/// Wraps a list with a ReadOnlyCollection.
///
@@ -21,7 +22,7 @@ public static ReadOnlyCollection AsReadOnly(this IList list)
{
return new ReadOnlyCollection(list);
}
-
+#endif
///
/// Returns an enumerable of all the elements in the given list starting in a specific offset and taking no more than a specific count.
///
@@ -37,4 +38,4 @@ public static IEnumerable Range(this IList list, int offset, int count)
yield return list[i];
}
}
-}
\ No newline at end of file
+}
diff --git a/PcapDotNet/src/PcapDotNet.Core.Extensions/LivePacketDeviceExtensions.cs b/PcapDotNet/src/PcapDotNet.Core.Extensions/LivePacketDeviceExtensions.cs
index 8e350017..92a4503f 100644
--- a/PcapDotNet/src/PcapDotNet.Core.Extensions/LivePacketDeviceExtensions.cs
+++ b/PcapDotNet/src/PcapDotNet.Core.Extensions/LivePacketDeviceExtensions.cs
@@ -4,6 +4,7 @@
using System.Management;
using System.Net.NetworkInformation;
using Microsoft.Win32;
+using PcapDotNet.Core.Native;
using PcapDotNet.Packets;
using PcapDotNet.Packets.Ethernet;
@@ -31,6 +32,8 @@ public static string GetGuid(this LivePacketDevice livePacketDevice)
throw new ArgumentNullException("livePacketDevice");
string livePacketDeviceName = livePacketDevice.Name;
+ if (Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX)
+ return livePacketDeviceName;
if (!livePacketDeviceName.StartsWith(NamePrefix, StringComparison.Ordinal))
{
throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture,
@@ -50,11 +53,14 @@ public static string GetGuid(this LivePacketDevice livePacketDevice)
/// When the PNPDeviceID cannot be retrieved from the registry.
public static string GetPnpDeviceId(this LivePacketDevice livePacketDevice)
{
+ if (Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX)
+ throw new InvalidOperationException("Platform not supported");
+
string guid = livePacketDevice.GetGuid();
using (RegistryKey key = Registry.LocalMachine.OpenSubKey(NetworkConnectionConfigKey + @"\" + guid + @"\Connection"))
{
- string pnpDeviceId = key.GetValue("PnpInstanceID") as string;
+ string pnpDeviceId = key?.GetValue("PnpInstanceID") as string;
if (pnpDeviceId == null)
throw new InvalidOperationException("Could not find PNP Device ID in the registry");
return pnpDeviceId;
@@ -75,7 +81,7 @@ public static NetworkInterface GetNetworkInterface(this LivePacketDevice livePac
throw new ArgumentNullException("livePacketDevice");
string guid = GetGuid(livePacketDevice);
- return NetworkInterface.GetAllNetworkInterfaces().FirstOrDefault(networkInterface => networkInterface.Id == guid);
+ return Interop.Pcap.GetAllNetworkInterfacesByDotNet().FirstOrDefault(networkInterface => networkInterface.Id == guid);
}
///
@@ -95,6 +101,12 @@ public static MacAddress GetMacAddress(this LivePacketDevice livePacketDevice)
return new MacAddress(addressBytes.ReadUInt48(0, Endianity.Big));
}
+ if (Environment.OSVersion.Platform != PlatformID.Unix && Environment.OSVersion.Platform != PlatformID.MacOSX
+ && livePacketDevice.Name == "rpcap://\\Device\\NPF_Loopback")
+ {
+ return new MacAddress();
+ }
+
return livePacketDevice.GetMacAddressWmi();
}
@@ -107,6 +119,9 @@ public static MacAddress GetMacAddress(this LivePacketDevice livePacketDevice)
/// When the cannot be retrieved using WMI.
private static MacAddress GetMacAddressWmi(this LivePacketDevice livePacketDevice)
{
+ if (Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX)
+ throw new InvalidOperationException("No MAC Address on device: " + livePacketDevice.Name);
+
string pnpDeviceId = livePacketDevice.GetPnpDeviceId();
string escapedPnpDeviceId = pnpDeviceId.Replace(@"\", @"\\");
@@ -128,4 +143,4 @@ private static MacAddress GetMacAddressWmi(this LivePacketDevice livePacketDevic
throw new InvalidOperationException("No MAC Address for WMI instance with PNP Device ID: " + pnpDeviceId);
}
}
-}
\ No newline at end of file
+}
diff --git a/PcapDotNet/src/PcapDotNet.Core.Extensions/NetworkInterfaceExtensions.cs b/PcapDotNet/src/PcapDotNet.Core.Extensions/NetworkInterfaceExtensions.cs
index 62a09f94..18206ab4 100644
--- a/PcapDotNet/src/PcapDotNet.Core.Extensions/NetworkInterfaceExtensions.cs
+++ b/PcapDotNet/src/PcapDotNet.Core.Extensions/NetworkInterfaceExtensions.cs
@@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Net.NetworkInformation;
+using System.Runtime.InteropServices;
namespace PcapDotNet.Core.Extensions
{
@@ -21,7 +22,9 @@ public static LivePacketDevice GetLivePacketDevice(this NetworkInterface network
if (networkInterface == null)
throw new ArgumentNullException("networkInterface");
- return LivePacketDevice.AllLocalMachine.FirstOrDefault(device => device.Name == LivePacketDeviceExtensions.NamePrefix + networkInterface.Id);
+ return LivePacketDevice.AllLocalMachine.FirstOrDefault(device => Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX
+ ? device.Name == networkInterface.Id
+ : device.Name == LivePacketDeviceExtensions.NamePrefix + networkInterface.Id);
}
}
-}
\ No newline at end of file
+}
diff --git a/PcapDotNet/src/PcapDotNet.Core.Extensions/PcapDotNet.Core.Extensions.csproj b/PcapDotNet/src/PcapDotNet.Core.Extensions/PcapDotNet.Core.Extensions.csproj
index 7c82e536..13156947 100644
--- a/PcapDotNet/src/PcapDotNet.Core.Extensions/PcapDotNet.Core.Extensions.csproj
+++ b/PcapDotNet/src/PcapDotNet.Core.Extensions/PcapDotNet.Core.Extensions.csproj
@@ -7,8 +7,11 @@
-
-
+
-
\ No newline at end of file
+
+
+
+
+
diff --git a/PcapDotNet/src/PcapDotNet.Core.Extensions/TaskExtensions.cs b/PcapDotNet/src/PcapDotNet.Core.Extensions/TaskExtensions.cs
new file mode 100644
index 00000000..de19ff13
--- /dev/null
+++ b/PcapDotNet/src/PcapDotNet.Core.Extensions/TaskExtensions.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PcapDotNet.Core.Extensions
+{
+ ///
+ /// Extension methods for Task class.
+ ///
+ public static class TaskExtensions
+ {
+ ///
+ /// Creates a Task that will complete after a time delay.
+ ///
+ /// The time span to wait before completing the returned Task
+ /// A Task that represents the time delay
+ ///
+ /// The is less than -1 or greater than the maximum allowed timer duration.
+ ///
+ ///
+ /// After the specified time delay, the Task is completed in RanToCompletion state.
+ ///
+ public static Task Delay(TimeSpan delay)
+ {
+ // timer inaccuracy https://github.com/dotnet/runtime/issues/100455
+#if NETCOREAPP1_0_OR_GREATER
+ return Task.Delay(delay.Add(TimeSpan.FromMilliseconds(1))); // +1 is to workaround, random return less than 1 ms too early
+#else
+ var tcs = new TaskCompletionSource