gio: Merge pull request #315 from GuillaumeGomez/inet-addr

Inet addr

Author: sdroege

src/inet_address.rs

@@ -1,8 +1,12 @@
 use gio_sys;
+use glib::object::IsA;
 use glib::translate::*;
 use InetAddress;
+use InetAddressExt;
 use SocketFamily;
 
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
+
 #[derive(Debug)]
 pub enum InetAddressBytes<'a> {
     V4(&'a [u8; 4]),
@@ -22,13 +26,11 @@ impl<'a> InetAddressBytes<'a> {
 
 impl InetAddress {
     pub fn from_bytes(inet_address_bytes: InetAddressBytes) -> Self {
-        use self::InetAddressBytes::*;
-
         let bytes = inet_address_bytes.deref();
 
         let family = match inet_address_bytes {
-            V4(_) => SocketFamily::Ipv4,
-            V6(_) => SocketFamily::Ipv6,
+            InetAddressBytes::V4(_) => SocketFamily::Ipv4,
+            InetAddressBytes::V6(_) => SocketFamily::Ipv6,
         };
         unsafe {
             from_glib_full(gio_sys::g_inet_address_new_from_bytes(
@@ -38,3 +40,49 @@ impl InetAddress {
         }
     }
 }
+
+pub trait InetAddressExtManual {
+    fn to_bytes<'a>(&'a self) -> Option<InetAddressBytes<'a>>;
+}
+
+impl<O: IsA<InetAddress>> InetAddressExtManual for O {
+    /// Returns `None` in case the address has a native size different than 4 and 16.
+    fn to_bytes<'a>(&'a self) -> Option<InetAddressBytes<'a>> {
+        let size = self.get_native_size();
+        unsafe {
+            let bytes = gio_sys::g_inet_address_to_bytes(self.as_ref().to_glib_none().0);
+            if size == 4 {
+                Some(InetAddressBytes::V4(&*(bytes as *const [u8; 4])))
+            } else if size == 16 {
+                Some(InetAddressBytes::V6(&*(bytes as *const [u8; 16])))
+            } else {
+                None
+            }
+        }
+    }
+}
+
+impl From<IpAddr> for InetAddress {
+    fn from(addr: IpAddr) -> Self {
+        match addr {
+            IpAddr::V4(v4) => InetAddress::from_bytes(InetAddressBytes::V4(&v4.octets())),
+            IpAddr::V6(v6) => InetAddress::from_bytes(InetAddressBytes::V6(&v6.octets())),
+        }
+    }
+}
+
+impl Into<IpAddr> for InetAddress {
+    fn into(self) -> IpAddr {
+        let size = self.get_native_size();
+        unsafe {
+            let bytes = gio_sys::g_inet_address_to_bytes(self.to_glib_none().0);
+            if size == 4 {
+                IpAddr::V4(Ipv4Addr::from(*(bytes as *const [u8; 4])))
+            } else if size == 16 {
+                IpAddr::V6(Ipv6Addr::from(*(bytes as *const [u16; 8])))
+            } else {
+                panic!("Unknown IP kind");
+            }
+        }
+    }
+}

src/prelude.rs

@@ -18,6 +18,7 @@ pub use data_input_stream::DataInputStreamExtManual;
 #[cfg(any(all(not(windows), not(target_os = "macos")), feature = "dox"))]
 pub use desktop_app_info::DesktopAppInfoExtManual;
 pub use file::FileExtManual;
+pub use inet_address::InetAddressExtManual;
 pub use input_stream::InputStreamExtManual;
 pub use io_stream::IOStreamExtManual;
 #[cfg(any(feature = "v2_44", feature = "dox"))]