diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-03-12 17:04:34 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-03-13 15:52:37 -0700 |
| commit | a63deeb3d32fc21f36d484d62a3ea1d3d0c82500 (patch) | |
| tree | 09421405ec3085de6217dfdef14cc119fd6da596 /src/libstd | |
| parent | 3316a0e6b2ad9352bab58e7c046ef3d212411d82 (diff) | |
| download | rust-a63deeb3d32fc21f36d484d62a3ea1d3d0c82500.tar.gz rust-a63deeb3d32fc21f36d484d62a3ea1d3d0c82500.zip | |
io: Bind to shutdown() for TCP streams
This is something that is plausibly useful, and is provided by libuv. This is not currently surfaced as part of the `TcpStream` type, but it may possibly appear in the future. For now only the raw functionality is provided through the Rtio objects.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/net/tcp.rs | 18 | ||||
| -rw-r--r-- | src/libstd/libc.rs | 18 | ||||
| -rw-r--r-- | src/libstd/rt/rtio.rs | 1 |
3 files changed, 37 insertions, 0 deletions
diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 53129f3df9b..95be3add0db 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -751,5 +751,23 @@ mod test { p.recv(); }) + + iotest!(fn shutdown_smoke() { + use rt::rtio::RtioTcpStream; + + let addr = next_test_ip4(); + let a = TcpListener::bind(addr).unwrap().listen(); + spawn(proc() { + let mut a = a; + let mut c = a.accept().unwrap(); + assert_eq!(c.read_to_end(), Ok(~[])); + c.write([1]).unwrap(); + }); + + let mut s = TcpStream::connect(addr).unwrap(); + assert!(s.obj.close_write().is_ok()); + assert!(s.write([1]).is_err()); + assert_eq!(s.read_to_end(), Ok(~[1])); + }) } diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs index afd524e9d7a..585ffebd979 100644 --- a/src/libstd/libc.rs +++ b/src/libstd/libc.rs @@ -1611,6 +1611,10 @@ pub mod consts { pub static SO_KEEPALIVE: c_int = 8; pub static SO_BROADCAST: c_int = 32; pub static SO_REUSEADDR: c_int = 4; + + pub static SHUT_RD: c_int = 0; + pub static SHUT_WR: c_int = 1; + pub static SHUT_RDWR: c_int = 2; } pub mod extra { use libc::types::os::arch::c95::c_int; @@ -2391,6 +2395,10 @@ pub mod consts { pub static SO_KEEPALIVE: c_int = 9; pub static SO_BROADCAST: c_int = 6; pub static SO_REUSEADDR: c_int = 2; + + pub static SHUT_RD: c_int = 0; + pub static SHUT_WR: c_int = 1; + pub static SHUT_RDWR: c_int = 2; } #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")] @@ -2842,6 +2850,10 @@ pub mod consts { pub static SO_KEEPALIVE: c_int = 0x0008; pub static SO_BROADCAST: c_int = 0x0020; pub static SO_REUSEADDR: c_int = 0x0004; + + pub static SHUT_RD: c_int = 0; + pub static SHUT_WR: c_int = 1; + pub static SHUT_RDWR: c_int = 2; } pub mod extra { use libc::types::os::arch::c95::c_int; @@ -3221,6 +3233,10 @@ pub mod consts { pub static SO_KEEPALIVE: c_int = 0x0008; pub static SO_BROADCAST: c_int = 0x0020; pub static SO_REUSEADDR: c_int = 0x0004; + + pub static SHUT_RD: c_int = 0; + pub static SHUT_WR: c_int = 1; + pub static SHUT_RDWR: c_int = 2; } pub mod extra { use libc::types::os::arch::c95::c_int; @@ -3939,6 +3955,7 @@ pub mod funcs { pub fn sendto(socket: c_int, buf: *c_void, len: size_t, flags: c_int, addr: *sockaddr, addrlen: socklen_t) -> ssize_t; + pub fn shutdown(socket: c_int, how: c_int) -> c_int; } } @@ -3975,6 +3992,7 @@ pub mod funcs { pub fn sendto(socket: SOCKET, buf: *c_void, len: c_int, flags: c_int, addr: *sockaddr, addrlen: c_int) -> c_int; + pub fn shutdown(socket: SOCKET, how: c_int) -> c_int; } } diff --git a/src/libstd/rt/rtio.rs b/src/libstd/rt/rtio.rs index edb480fe4cb..0dc1a11d267 100644 --- a/src/libstd/rt/rtio.rs +++ b/src/libstd/rt/rtio.rs @@ -206,6 +206,7 @@ pub trait RtioTcpStream : RtioSocket { fn keepalive(&mut self, delay_in_seconds: uint) -> Result<(), IoError>; fn letdie(&mut self) -> Result<(), IoError>; fn clone(&self) -> ~RtioTcpStream; + fn close_write(&mut self) -> Result<(), IoError>; } pub trait RtioSocket { |
