pnet 0.6.0

Cross-platform, low level networking using the Rust programming language.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37

diff --git a/src/util.rs b/src/util.rs
index 86e3f0c..f29b262 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -17,7 +17,7 @@ use std::fmt;
 use std::str::{FromStr, from_utf8_unchecked};
 use std::mem;
 use std::u8;
-use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
+use std::net::{Ipv4Addr, Ipv6Addr};


 #[cfg(not(windows))]
@@ -135,6 +135,23 @@ pub enum IpAddr {
     V6(Ipv6Addr)
 }

+impl FromStr for IpAddr {
+    type Err = ();
+    fn from_str(s: &str) -> Result<IpAddr, ()> {
+        let ipv4: Result<Ipv4Addr, _> = FromStr::from_str(s);
+        let ipv6: Result<Ipv6Addr, _> = FromStr::from_str(s);
+        match ipv4 {
+            Ok(res) => Ok(IpAddr::V4(res)),
+            Err(_) => {
+                match ipv6 {
+                    Ok(res) => Ok(IpAddr::V6(res)),
+                    Err(_) => Err(()),
+                }
+            },
+        }
+    }
+}
+
 impl fmt::Debug for IpAddr {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         fmt::Display::fmt(self, fmt)