---

yaml
---
r: 158700
b: refs/heads/snap-stage3
c: ac84674
h: refs/heads/master
v: v3

Author: netvl

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 0b48001c28329392b26961eaf1c3ed293a352d6f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: d97bfb22f8c4958909c5669c256c50f124c17d58
+refs/heads/snap-stage3: ac846749f0abbd0b6107406ba2f97886605e1ad4
 refs/heads/try: f58aad6dce273570fb130b4df008ef9acd5a5be2
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libstd/io/net/mod.rs

@@ -10,8 +10,11 @@
 
 //! Networking I/O
 
+use io::{IoError, InvalidInput};
+use option::None;
+use result::{Result, Ok, Err};
 use rt::rtio;
-use self::ip::{Ipv4Addr, Ipv6Addr, IpAddr};
+use self::ip::{Ipv4Addr, Ipv6Addr, IpAddr, ToSocketAddr};
 
 pub use self::addrinfo::get_host_addresses;
 
@@ -38,3 +41,25 @@ fn from_rtio(ip: rtio::IpAddr) -> IpAddr {
         }
     }
 }
+
+fn with_addresses<A: ToSocketAddr, T>(
+    addr: A, 
+    action: |&mut rtio::IoFactory, rtio::SocketAddr| -> Result<T, rtio::IoError>
+) -> Result<T, IoError> {
+    const DEFAULT_ERROR: IoError = IoError {
+        kind: InvalidInput,
+        desc: "no addresses found for hostname",
+        detail: None
+    };
+
+    let addresses = try!(addr.to_socket_addr_all());
+    let mut err = DEFAULT_ERROR;
+    for addr in addresses.into_iter() {
+        let addr = rtio::SocketAddr { ip: to_rtio(addr.ip), port: addr.port };
+        match rtio::LocalIo::maybe_raise(|io| action(io, addr)) {
+            Ok(r) => return Ok(r),
+            Err(e) => err = IoError::from_rtio_error(e)
+        }
+    }
+    Err(err)
+}