Ipv6 on windows, debugging large alloc

.github/workflows/CI.yml

@@ -154,7 +154,7 @@ jobs:
     - uses: messense/maturin-action@v1
       with:
         command: build
-        args: --release -o dist --universal2
+        args: --release -o dist
     - uses: actions/setup-python@v4
       with:
         python-version: |

Cargo.toml

@@ -8,6 +8,9 @@ edition = "2021"
 name = "netifaces"
 crate-type = ["cdylib"]
 
+[dependencies]
+thiserror = "1.0.51"
+
 [target.'cfg(windows)'.dependencies]
 windows = { version = "0.42.0", features = [
     "Data_Xml_Dom",
@@ -21,9 +24,9 @@ windows = { version = "0.42.0", features = [
     "Win32_NetworkManagement_IpHelper",
     "Win32_Networking"] }
 
-[target.'cfg(unix)'.dependencies]
-nix = { version = "0.25.0" }
-
 [dependencies.pyo3]
 version = "0.17.1"
 features = ["extension-module", "abi3-py37"]
+
+[target.'cfg(unix)'.dependencies]
+nix = { version = "0.25.0" }

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["maturin>=0.14,<0.15"]
+requires = ["maturin>=1.4.0"]
 build-backend = "maturin"
 
 [project]
@@ -8,23 +8,23 @@ description = "Portable network interface information"
 version = "0.0.20"
 requires-python = ">=3.7"
 readme = "README.md"
-license = {file = "LICENSE"}
+license = { file = "LICENSE" }
 dependencies = ['typing-extensions']
 classifiers = [
-  "Programming Language :: Rust",
-  "Programming Language :: Python :: Implementation :: CPython",
-  "Programming Language :: Python :: Implementation :: PyPy",
-  "License :: OSI Approved :: MIT License",
-  "Operating System :: POSIX :: Linux",
-  "Operating System :: MacOS",
-  "Operating System :: Microsoft :: Windows",
-  "Topic :: System :: Networking"
+    "Programming Language :: Rust",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+    "Topic :: System :: Networking"
 ]
 authors = [
-  {name = "Samuel Yvon", email = "[email protected]"}
+    { name = "Samuel Yvon", email = "[email protected]" }
 ]
 maintainers = [
-  {name = "Samuel Yvon", email = "[email protected]"}
+    { name = "Samuel Yvon", email = "[email protected]" }
 ]
 
 [project.urls]
@@ -33,22 +33,24 @@ Issues = "https://github.com/SamuelYvon/netifaces-2/issues"
 
 [project.optional-dependencies]
 dev = [
-  "mypy >= 0.991",
-  "black >= 23.1.0",
-  "ruff >= 0.0.240",
-  "pytest >= 7.1.1"
+    "mypy >= 0.991",
+    "black >= 23.1.0",
+    "ruff >= 0.0.240",
+    "pytest >= 7.1.1"
 ]
 
 [tool.black]
 target-version = ["py311", "py310", "py39", "py38", "py37"]
 
 [tool.maturin]
+python-source = "python"
+module-name = "netifaces"
 bindings = "pyo3"
 
 [tool.mypy]
 python_version = "3.7"
 exclude = ['venv/.*/*\.py$']
-strict=true
+strict = true
 
 [[tool.mypy.overrides]]
 module = 'netifaces.netifaces'
@@ -58,14 +60,14 @@ ignore_missing_imports = true
 src = ["netifaces"]
 target-version = "py37"
 select = [
-  "B", # flake8-bugbear
-  "C4", # flake8-comprehensions
-  "E", # pycodestyle
-  "F", # pyflakes
-  "W", # pycodestyle
-  "RUF", # ruff
-  "I", # isort
-  "PT",   # flake8-pytest-style
+    "B", # flake8-bugbear
+    "C4", # flake8-comprehensions
+    "E", # pycodestyle
+    "F", # pyflakes
+    "W", # pycodestyle
+    "RUF", # ruff
+    "I", # isort
+    "PT", # flake8-pytest-style
 ]
 
 [tool.coverage.report]

src/common.rs

@@ -0,0 +1,7 @@
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum NetifacesError {
+    #[error("Failed to use a system function (module {0}, error code {1})")]
+    SystemErrorCode(String, u32),
+}

src/lib.rs

@@ -14,6 +14,7 @@ mod linux;
 #[cfg(not(target_family = "windows"))]
 use linux::{linux_ifaddresses as ifaddresses, linux_interfaces as interfaces};
 
+mod common;
 #[cfg(target_family = "windows")]
 mod win;
 
@@ -40,11 +41,11 @@ pub fn ip_to_string(ip: u32) -> String {
 
 /// Given the bytes that makes up a mac address, return the String
 /// representation as it would be expected in the colloquial form.
-pub fn mac_to_string(mac: &[u8; 6]) -> String {
+pub fn mac_to_string(mac: &Vec<u8>) -> String {
     let mut s = String::new();
 
     for i in 0..mac.len() {
-        write!(&mut s, "{:X?}", mac[i]).unwrap();
+        write!(&mut s, "{:02X?}", mac[i]).unwrap();
         if i + 1 < mac.len() {
             s.push(':');
         }

src/linux.rs

@@ -16,7 +16,7 @@ pub fn linux_interfaces() -> Result<Vec<String>, Box<dyn std::error::Error>> {
         s.insert(addr.interface_name);
     }
 
-    Ok(Vec::from_iter(s.into_iter()))
+    Ok(Vec::from_iter(s))
 }
 
 fn add_to_types_mat(
@@ -26,7 +26,7 @@ fn add_to_types_mat(
     types_mat: &mut HashMap<i32, Vec<AddrPairs>>,
     any: &mut bool,
 ) {
-    let e = types_mat.entry(af_class.into()).or_insert_with(Vec::new);
+    let e = types_mat.entry(af_class.into()).or_default();
 
     if !*any {
         *any = true;