a57889a580
Prior to this commit, TcpStream::connect and TcpListener::bind took a single SocketAddr argument. This worked well enough, but the API felt a little too "low level" for most simple use cases. A great example is connecting to rust-lang.org on port 80. Rust users would need to: 1. resolve the IP address of rust-lang.org using io::net::addrinfo::get_host_addresses. 2. check for errors 3. if all went well, use the returned IP address and the port number to construct a SocketAddr 4. pass this SocketAddr to TcpStream::connect. I'm modifying the type signature of TcpStream::connect and TcpListener::bind so that the API is a little easier to use. TcpStream::connect now accepts two arguments: a string describing the host/IP of the host we wish to connect to, and a u16 representing the remote port number. Similarly, TcpListener::bind has been modified to take two arguments: a string describing the local interface address (e.g. "0.0.0.0" or "127.0.0.1") and a u16 port number. Here's how to port your Rust code to use the new TcpStream::connect API: // old ::connect API let addr = SocketAddr{ip: Ipv4Addr{127, 0, 0, 1}, port: 8080}; let stream = TcpStream::connect(addr).unwrap() // new ::connect API (minimal change) let addr = SocketAddr{ip: Ipv4Addr{127, 0, 0, 1}, port: 8080}; let stream = TcpStream::connect(addr.ip.to_str(), addr.port()).unwrap() // new ::connect API (more compact) let stream = TcpStream::connect("127.0.0.1", 8080).unwrap() // new ::connect API (hostname) let stream = TcpStream::connect("rust-lang.org", 80) Similarly, for TcpListener::bind: // old ::bind API let addr = SocketAddr{ip: Ipv4Addr{0, 0, 0, 0}, port: 8080}; let mut acceptor = TcpListener::bind(addr).listen(); // new ::bind API (minimal change) let addr = SocketAddr{ip: Ipv4Addr{0, 0, 0, 0}, port: 8080}; let mut acceptor = TcpListener::bind(addr.ip.to_str(), addr.port()).listen() // new ::bind API (more compact) let mut acceptor = TcpListener::bind("0.0.0.0", 8080).listen() [breaking-change]
97 lines
2.8 KiB
Rust
97 lines
2.8 KiB
Rust
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
// ignore-pretty
|
|
// compile-flags:--test
|
|
// exec-env:RUST_TEST_TASKS=1
|
|
|
|
// Tests for the connect_timeout() function on a TcpStream. This runs with only
|
|
// one test task to ensure that errors are timeouts, not file descriptor
|
|
// exhaustion.
|
|
|
|
#![feature(macro_rules, globs)]
|
|
#![allow(experimental)]
|
|
|
|
extern crate native;
|
|
extern crate green;
|
|
extern crate rustuv;
|
|
|
|
#[cfg(test)] #[start]
|
|
fn start(argc: int, argv: **u8) -> int {
|
|
green::start(argc, argv, rustuv::event_loop, __test::main)
|
|
}
|
|
|
|
macro_rules! iotest (
|
|
{ fn $name:ident() $b:block $(#[$a:meta])* } => (
|
|
mod $name {
|
|
#![allow(unused_imports)]
|
|
|
|
use std::io::*;
|
|
use std::io::net::tcp::*;
|
|
use std::io::test::*;
|
|
use std::io;
|
|
|
|
fn f() $b
|
|
|
|
$(#[$a])* #[test] fn green() { f() }
|
|
$(#[$a])* #[test] fn native() {
|
|
use native;
|
|
let (tx, rx) = channel();
|
|
native::task::spawn(proc() { tx.send(f()) });
|
|
rx.recv();
|
|
}
|
|
}
|
|
)
|
|
)
|
|
|
|
iotest!(fn eventual_timeout() {
|
|
use native;
|
|
let addr = next_test_ip4();
|
|
let host = addr.ip.to_str();
|
|
let port = addr.port;
|
|
|
|
// Use a native task to receive connections because it turns out libuv is
|
|
// really good at accepting connections and will likely run out of file
|
|
// descriptors before timing out.
|
|
let (tx1, rx1) = channel();
|
|
let (_tx2, rx2) = channel::<()>();
|
|
native::task::spawn(proc() {
|
|
let _l = TcpListener::bind(host, port).unwrap().listen();
|
|
tx1.send(());
|
|
let _ = rx2.recv_opt();
|
|
});
|
|
rx1.recv();
|
|
|
|
let mut v = Vec::new();
|
|
for _ in range(0, 10000) {
|
|
match TcpStream::connect_timeout(addr, 100) {
|
|
Ok(e) => v.push(e),
|
|
Err(ref e) if e.kind == io::TimedOut => return,
|
|
Err(e) => fail!("other error: {}", e),
|
|
}
|
|
}
|
|
fail!("never timed out!");
|
|
} #[ignore(cfg(target_os = "freebsd"))])
|
|
|
|
iotest!(fn timeout_success() {
|
|
let addr = next_test_ip4();
|
|
let host = addr.ip.to_str();
|
|
let port = addr.port;
|
|
let _l = TcpListener::bind(host, port).unwrap().listen();
|
|
|
|
assert!(TcpStream::connect_timeout(addr, 1000).is_ok());
|
|
})
|
|
|
|
iotest!(fn timeout_error() {
|
|
let addr = next_test_ip4();
|
|
|
|
assert!(TcpStream::connect_timeout(addr, 1000).is_err());
|
|
})
|