Multicast service resolver data

Author: ThadHouse

WPILib.sln

@@ -53,6 +53,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "datalog.test", "test\datalo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "hal.test", "test\hal.test\hal.test.csproj", "{88C326DC-0E40-40B9-86B5-95157FF37D95}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wpinet.test", "test\wpinet.test\wpinet.test.csproj", "{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -315,6 +317,18 @@ Global
 		{88C326DC-0E40-40B9-86B5-95157FF37D95}.Release|x64.Build.0 = Release|Any CPU
 		{88C326DC-0E40-40B9-86B5-95157FF37D95}.Release|x86.ActiveCfg = Release|Any CPU
 		{88C326DC-0E40-40B9-86B5-95157FF37D95}.Release|x86.Build.0 = Release|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Debug|x64.Build.0 = Debug|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Debug|x86.Build.0 = Debug|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Release|x64.ActiveCfg = Release|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Release|x64.Build.0 = Release|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Release|x86.ActiveCfg = Release|Any CPU
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -340,5 +354,6 @@ Global
 		{92BE0A00-437A-43BF-9793-2995FDB3DC23} = {DB664556-4BF0-4874-8CB6-DC24E60A67AF}
 		{49B1AC50-4FD0-4524-85BA-FC26AD1EEBBA} = {AD95ECD8-E708-4FB4-9B7E-A8A8EF3FCB3E}
 		{88C326DC-0E40-40B9-86B5-95157FF37D95} = {AD95ECD8-E708-4FB4-9B7E-A8A8EF3FCB3E}
+		{3ACBB266-7A74-47EE-B1F2-115EA0FF64E3} = {AD95ECD8-E708-4FB4-9B7E-A8A8EF3FCB3E}
 	EndGlobalSection
 EndGlobal

src/wpinet/Natives/MulticastServiceResolver.cs

@@ -49,7 +49,7 @@ public static partial class MulticastServiceResolver
     [return: MarshalUsing(typeof(ManagedFreeArrayMarshaller<,>), CountElementName = nameof(dataCount))]
     public static unsafe partial ServiceData[] GetMulticastServiceResolverData(MulticastServiceResolverHandle handle, out int dataCount);
 
-    [LibraryImport("wpinet", EntryPoint = "WPI_FreeMulticastServiceResolverData")]
+    [LibraryImport("wpinet", EntryPoint = "WPI_FreeServiceData")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
     public static unsafe partial void FreeMulticastServiceResolverData(ServiceDataRaw* serviceData, int dataCount);
 }

test/wpinet.test/SymbolVerifier.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+using Xunit;
+
+namespace WPINet.Test;
+
+public class SymbolVerifier
+{
+    [Fact]
+    public void VerifySymbols()
+    {
+        Assembly assemblyType = typeof(ServiceData).Assembly;
+        // Find all native methods
+        var foundMethods =
+            assemblyType.GetTypes()
+                .SelectMany(x => x.GetMethods(BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public))
+                .Where(x => x.Attributes.HasFlag(MethodAttributes.PinvokeImpl))
+                .Select(x => (x, x.GetCustomAttribute<DllImportAttribute>()))
+                .Where(x => x.Item2 != null)
+                .Select(x => (Method: x.x, Dll: x.Item2!.Value, EntryPoint: x.Item2.EntryPoint ?? x.x.Name));
+
+        Dictionary<string, nint> libraries = [];
+        foreach (var method in foundMethods)
+        {
+            if (!libraries.ContainsKey(method.Dll))
+            {
+                libraries[method.Dll] = NativeLibrary.Load(method.Dll, assemblyType, DllImportSearchPath.UseDllDirectoryForDependencies);
+            }
+
+            var library = libraries[method.Dll];
+            Assert.True(NativeLibrary.TryGetExport(library, method.EntryPoint, out _),
+                $"Failed to find symbol {method.EntryPoint} in {method.Dll}");
+        }
+    }
+}

test/wpinet.test/wpinet.test.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\wpinet\wpinet.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>