use GetExtended tables method from windows crate

Author: GyulyVGC

Cargo.toml

@@ -17,6 +17,7 @@ windows = { version = "0.62", features = [
     "Win32_Foundation",
     "Win32_System_Diagnostics_ToolHelp",
     "Win32_System_Threading",
+    "Win32_NetworkManagement_IpHelper"
 ] }
 
 [target.'cfg(target_os = "macos")'.dependencies]

src/platform/windows/c_iphlpapi.rs

@@ -4,7 +4,6 @@ use proto_listener::{PidNamePathCache, ProtoListener, pname_ppath};
 
 use crate::{Listener, Process, Protocol};
 
-mod c_iphlpapi;
 mod proto_listener;
 mod socket_table;
 mod statics;

src/platform/windows/mod.rs

@@ -1,20 +1,17 @@
 use std::ffi::{c_ulong, c_void};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
+use super::statics::UDP_TABLE_OWNER_PID;
 use crate::Protocol;
-use crate::platform::target_os::c_iphlpapi::GetExtendedTcpTable;
 use crate::platform::target_os::proto_listener::ProtoListener;
-use crate::platform::target_os::statics::FALSE;
 use crate::platform::windows::statics::{
     AF_INET, AF_INET6, ERROR_INSUFFICIENT_BUFFER, NO_ERROR, TCP_TABLE_OWNER_PID_ALL,
 };
 use crate::platform::windows::tcp_table::TcpTable;
 use crate::platform::windows::tcp6_table::Tcp6Table;
 use crate::platform::windows::udp_table::UdpTable;
 use crate::platform::windows::udp6_table::Udp6Table;
-
-use super::c_iphlpapi::GetExtendedUdpTable;
-use super::statics::UDP_TABLE_OWNER_PID;
+use windows::Win32::NetworkManagement::IpHelper::{GetExtendedTcpTable, GetExtendedUdpTable};
 
 pub(super) trait SocketTable {
     fn get_table() -> crate::Result<Vec<u8>>;
@@ -178,9 +175,9 @@ fn get_udp_table(address_family: c_ulong) -> crate::Result<Vec<u8>> {
     let mut table_size: c_ulong = 0;
     let mut err_code = unsafe {
         GetExtendedUdpTable(
-            std::ptr::null_mut(),
+            None,
             &raw mut table_size,
-            FALSE,
+            false,
             address_family,
             UDP_TABLE_OWNER_PID,
             0,
@@ -192,9 +189,9 @@ fn get_udp_table(address_family: c_ulong) -> crate::Result<Vec<u8>> {
         table = Vec::<u8>::with_capacity(table_size as usize);
         err_code = unsafe {
             GetExtendedUdpTable(
-                table.as_mut_ptr().cast::<c_void>(),
+                Some(table.as_mut_ptr().cast::<c_void>()),
                 &raw mut table_size,
-                FALSE,
+                false,
                 address_family,
                 UDP_TABLE_OWNER_PID,
                 0,
@@ -216,9 +213,9 @@ fn get_tcp_table(address_family: c_ulong) -> crate::Result<Vec<u8>> {
     let mut table_size: c_ulong = 0;
     let mut err_code = unsafe {
         GetExtendedTcpTable(
-            std::ptr::null_mut(),
+            None,
             &raw mut table_size,
-            FALSE,
+            false,
             address_family,
             TCP_TABLE_OWNER_PID_ALL,
             0,
@@ -230,9 +227,9 @@ fn get_tcp_table(address_family: c_ulong) -> crate::Result<Vec<u8>> {
         table = Vec::<u8>::with_capacity(table_size as usize);
         err_code = unsafe {
             GetExtendedTcpTable(
-                table.as_mut_ptr().cast::<c_void>(),
+                Some(table.as_mut_ptr().cast::<c_void>()),
                 &raw mut table_size,
-                FALSE,
+                false,
                 address_family,
                 TCP_TABLE_OWNER_PID_ALL,
                 0,

src/platform/windows/socket_table.rs

@@ -1,10 +1,9 @@
 use std::ffi::{c_int, c_ulong};
+use windows::Win32::NetworkManegement::IpHelper::{TCP_TABLE_CLASS, UDP_TABLE_CLASS};
 
-pub(super) const TCP_TABLE_OWNER_PID_ALL: c_ulong = 5;
-pub(super) const UDP_TABLE_OWNER_PID: c_ulong = 1;
-pub(super) const FALSE: c_int = 0;
+pub(super) const TCP_TABLE_OWNER_PID_ALL: TCP_TABLE_CLASS = TCP_TABLE_CLASS(5);
+pub(super) const UDP_TABLE_OWNER_PID: UDP_TABLE_CLASS = UDP_TABLE_CLASS(1);
 pub(super) const ERROR_INSUFFICIENT_BUFFER: c_ulong = 0x7A;
 pub(super) const NO_ERROR: c_ulong = 0;
 pub(super) const AF_INET: c_ulong = 2;
 pub(super) const AF_INET6: c_ulong = 23;
-// pub(super) const LISTEN: c_ulong = 2;