Merge pull request #9 from shellrow/8-add-interface-type-win

issue-8 add interface types

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "default-net"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["shellrow <shellrow@protonmail.com>"]
 edition = "2018"
 description = "Cross-platform library for network interface and gateway"

README.md

@@ -18,7 +18,7 @@
 Add `default-net` to your dependencies  
 ```toml:Cargo.toml
 [dependencies]
-default-net = "0.8.1"
+default-net = "0.8.2"
 ```
 
 ## Example 

src/interface/mod.rs

@@ -1,6 +1,9 @@
 mod shared;
 pub use self::shared::*;
 
+mod types;
+pub use self::types::*;
+
 #[cfg(any(target_os = "linux", target_os = "macos", target_os = "openbsd", target_os = "freebsd", target_os = "netbsd", target_os = "ios", target_os = "android"))]
 mod unix;
 #[cfg(any(target_os = "linux", target_os = "macos", target_os = "openbsd", target_os = "freebsd", target_os = "netbsd", target_os = "ios", target_os = "android"))]

src/interface/types.rs

@@ -0,0 +1,155 @@
+use std::convert::TryFrom;
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum InterfaceType {
+    Unknown,
+    Ethernet,
+    TokenRing,
+    Fddi,
+    BasicIsdn,
+    PrimaryIsdn,
+    Ppp,
+    Loopback,
+    Ethernet3Megabit,
+    Slip,
+    Atm,
+    GenericModem,
+    FastEthernetT,
+    Isdn,
+    FastEthernetFx,
+    Wireless80211,
+    AsymmetricDsl,
+    RateAdaptDsl,
+    SymmetricDsl,
+    VeryHighSpeedDsl,
+    IPOverAtm,
+    GigabitEthernet,
+    Tunnel,
+    MultiRateSymmetricDsl,
+    HighPerformanceSerialBus,
+    Wman,
+    Wwanpp,
+    Wwanpp2,
+}
+
+impl InterfaceType {
+    #[cfg(target_os = "windows")]
+    pub fn value(&self) -> u32 {
+        match *self {
+            InterfaceType::Unknown => 1,
+            InterfaceType::Ethernet => 6,
+            InterfaceType::TokenRing => 9,
+            InterfaceType::Fddi => 15,
+            InterfaceType::BasicIsdn => 20,
+            InterfaceType::PrimaryIsdn => 21,
+            InterfaceType::Ppp => 23,
+            InterfaceType::Loopback => 24,
+            InterfaceType::Ethernet3Megabit => 26,
+            InterfaceType::Slip => 28,
+            InterfaceType::Atm => 37,
+            InterfaceType::GenericModem => 48,
+            InterfaceType::FastEthernetT => 62,
+            InterfaceType::Isdn => 63,
+            InterfaceType::FastEthernetFx => 69,
+            InterfaceType::Wireless80211 => 71,
+            InterfaceType::AsymmetricDsl => 94,
+            InterfaceType::RateAdaptDsl => 95,
+            InterfaceType::SymmetricDsl => 96,
+            InterfaceType::VeryHighSpeedDsl => 97,
+            InterfaceType::IPOverAtm => 114,
+            InterfaceType::GigabitEthernet => 117,
+            InterfaceType::Tunnel => 131,
+            InterfaceType::MultiRateSymmetricDsl => 143,
+            InterfaceType::HighPerformanceSerialBus => 144,
+            InterfaceType::Wman => 237,
+            InterfaceType::Wwanpp => 243,
+            InterfaceType::Wwanpp2 => 244,
+        }
+    }
+
+    #[cfg(any(target_os = "linux", target_os = "android"))]
+    pub fn value(&self) -> u32 {
+        // TODO
+        match *self {
+            _ => 0,
+        }
+    }
+
+    #[cfg(any(target_os = "macos", target_os = "openbsd", target_os = "freebsd", target_os = "netbsd", target_os = "ios"))]
+    pub fn value(&self) -> u32 {
+        // TODO
+        match *self {
+            _ => 0,
+        }
+    }
+
+    pub fn name(&self) -> String {
+        match *self {
+            InterfaceType::Unknown => String::from("Unknown"),
+            InterfaceType::Ethernet => String::from("Ethernet"),
+            InterfaceType::TokenRing => String::from("Token Ring"),
+            InterfaceType::Fddi => String::from("FDDI"),
+            InterfaceType::BasicIsdn => String::from("Basic ISDN"),
+            InterfaceType::PrimaryIsdn => String::from("Primary ISDN"),
+            InterfaceType::Ppp => String::from("PPP"),
+            InterfaceType::Loopback => String::from("Loopback"),
+            InterfaceType::Ethernet3Megabit => String::from("Ethernet 3 megabit"),
+            InterfaceType::Slip => String::from("SLIP"),
+            InterfaceType::Atm => String::from("ATM"),
+            InterfaceType::GenericModem => String::from("Generic Modem"),
+            InterfaceType::FastEthernetT => String::from("Fast Ethernet T"),
+            InterfaceType::Isdn => String::from("ISDN"),
+            InterfaceType::FastEthernetFx => String::from("Fast Ethernet FX"),
+            InterfaceType::Wireless80211 => String::from("Wireless IEEE 802.11"),
+            InterfaceType::AsymmetricDsl => String::from("Asymmetric DSL"),
+            InterfaceType::RateAdaptDsl => String::from("Rate Adaptive DSL"),
+            InterfaceType::SymmetricDsl => String::from("Symmetric DSL"),
+            InterfaceType::VeryHighSpeedDsl => String::from("Very High Data Rate DSL"),
+            InterfaceType::IPOverAtm => String::from("IP over ATM"),
+            InterfaceType::GigabitEthernet => String::from("Gigabit Ethernet"),
+            InterfaceType::Tunnel => String::from("Tunnel"),
+            InterfaceType::MultiRateSymmetricDsl => String::from("Multi-Rate Symmetric DSL"),
+            InterfaceType::HighPerformanceSerialBus => String::from("High Performance Serial Bus"),
+            InterfaceType::Wman => String::from("WMAN"),
+            InterfaceType::Wwanpp => String::from("WWANPP"),
+            InterfaceType::Wwanpp2 => String::from("WWANPP2"),
+        }
+    }
+}
+
+impl TryFrom<u32> for InterfaceType {
+    type Error = ();
+    fn try_from(v: u32) -> Result<Self, Self::Error> {
+        match v {
+            x if x == InterfaceType::Unknown.value() => Ok(InterfaceType::Unknown),
+            x if x == InterfaceType::Ethernet.value() => Ok(InterfaceType::Ethernet),
+            x if x == InterfaceType::TokenRing.value() => Ok(InterfaceType::TokenRing),
+            x if x == InterfaceType::Fddi.value() => Ok(InterfaceType::Fddi),
+            x if x == InterfaceType::BasicIsdn.value() => Ok(InterfaceType::BasicIsdn),
+            x if x == InterfaceType::PrimaryIsdn.value() => Ok(InterfaceType::PrimaryIsdn),
+            x if x == InterfaceType::Ppp.value() => Ok(InterfaceType::Ppp),
+            x if x == InterfaceType::Loopback.value() => Ok(InterfaceType::Loopback),
+            x if x == InterfaceType::Ethernet3Megabit.value() => Ok(InterfaceType::Ethernet3Megabit),
+            x if x == InterfaceType::Slip.value() => Ok(InterfaceType::Slip),
+            x if x == InterfaceType::Atm.value() => Ok(InterfaceType::Atm),
+            x if x == InterfaceType::GenericModem.value() => Ok(InterfaceType::GenericModem),
+            x if x == InterfaceType::FastEthernetT.value() => Ok(InterfaceType::FastEthernetT),
+            x if x == InterfaceType::Isdn.value() => Ok(InterfaceType::Isdn),
+            x if x == InterfaceType::FastEthernetFx.value() => Ok(InterfaceType::FastEthernetFx),
+            x if x == InterfaceType::Wireless80211.value() => Ok(InterfaceType::Wireless80211),
+            x if x == InterfaceType::AsymmetricDsl.value() => Ok(InterfaceType::AsymmetricDsl),
+            x if x == InterfaceType::RateAdaptDsl.value() => Ok(InterfaceType::RateAdaptDsl),
+            x if x == InterfaceType::SymmetricDsl.value() => Ok(InterfaceType::SymmetricDsl),
+            x if x == InterfaceType::VeryHighSpeedDsl.value() => Ok(InterfaceType::VeryHighSpeedDsl),
+            x if x == InterfaceType::IPOverAtm.value() => Ok(InterfaceType::IPOverAtm),
+            x if x == InterfaceType::GigabitEthernet.value() => Ok(InterfaceType::GigabitEthernet),
+            x if x == InterfaceType::Tunnel.value() => Ok(InterfaceType::Tunnel),
+            x if x == InterfaceType::MultiRateSymmetricDsl.value() => Ok(InterfaceType::MultiRateSymmetricDsl),
+            x if x == InterfaceType::HighPerformanceSerialBus.value() => Ok(InterfaceType::HighPerformanceSerialBus),
+            x if x == InterfaceType::Wman.value() => Ok(InterfaceType::Wman),
+            x if x == InterfaceType::Wwanpp.value() => Ok(InterfaceType::Wwanpp),
+            x if x == InterfaceType::Wwanpp2.value() => Ok(InterfaceType::Wwanpp2),
+            _ => Err(()),
+        }
+    }
+}

src/interface/windows.rs

@@ -1,14 +1,14 @@
 use windows::Win32::Foundation::{ERROR_BUFFER_OVERFLOW, NO_ERROR};
 use windows::Win32::NetworkManagement::IpHelper::{GetAdaptersInfo, IP_ADAPTER_INFO, IP_ADDR_STRING, SendARP};
-use windows::Win32::NetworkManagement::IpHelper::{MIB_IF_TYPE_ETHERNET, MIB_IF_TYPE_FDDI, MIB_IF_TYPE_LOOPBACK, MIB_IF_TYPE_OTHER, MIB_IF_TYPE_PPP, MIB_IF_TYPE_SLIP, MIB_IF_TYPE_TOKENRING};
 use std::convert::TryInto;
 use std::mem;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 use std::ffi::CStr;
+use std::convert::TryFrom;
 use core::ffi::c_void;
 
 use crate::ip::{Ipv4Net, Ipv6Net};
-use crate::interface::{Interface, MacAddr};
+use crate::interface::{Interface, MacAddr,InterfaceType};
 use crate::gateway::Gateway;
 
 // Convert C string to Rust string without trailing null bytes
@@ -77,15 +77,9 @@ pub fn interfaces() -> Vec<Interface> {
 	p_adaptor = unsafe { mem::transmute(&raw_adaptor_mem) };
     while p_adaptor as u64 != 0 {
         let adapter: IP_ADAPTER_INFO = unsafe { *p_adaptor };
-        match adapter.Type {
-            MIB_IF_TYPE_ETHERNET => {}, 
-            MIB_IF_TYPE_FDDI => {}, 
-            MIB_IF_TYPE_LOOPBACK => {}, 
-            MIB_IF_TYPE_OTHER => {}, 
-            MIB_IF_TYPE_PPP => {}, 
-            MIB_IF_TYPE_SLIP => {}, 
-            MIB_IF_TYPE_TOKENRING => {},
-            _ => {
+        match InterfaceType::try_from(adapter.Type) {
+            Ok(_) => {},
+            Err(_) => {
                 unsafe { p_adaptor = (*p_adaptor).Next; }
                 continue;
             },