mirror of
https://github.com/rust-lang/rust.git
synced 2025-05-04 14:07:36 +00:00
ac77392f8a
This commit stabilizes a few remaining bits of the `io::Error` type: * The `Error::new` method is now stable. The last `detail` parameter was removed and the second `desc` parameter was generalized to `E: Into<Box<Error>>` to allow creating an I/O error from any form of error. Currently there is no form of downcasting, but this will be added in time. * An implementation of `From<&str> for Box<Error>` was added to liballoc to allow construction of errors from raw strings. * The `Error::raw_os_error` method was stabilized as-is. * Trait impls for `Clone`, `Eq`, and `PartialEq` were removed from `Error` as it is not possible to use them with trait objects. This is a breaking change due to the modification of the `new` method as well as the removal of the trait implementations for the `Error` type. [breaking-change]
76 lines
2.1 KiB
Rust
76 lines
2.1 KiB
Rust
// Copyright 2015 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.
|
|
|
|
use prelude::v1::*;
|
|
|
|
use ffi::CStr;
|
|
use io;
|
|
use libc::{self, c_int, size_t};
|
|
use str;
|
|
use sys::c;
|
|
use net::SocketAddr;
|
|
use sys::fd::FileDesc;
|
|
use sys_common::AsInner;
|
|
|
|
pub use sys::{cvt, cvt_r};
|
|
|
|
pub type wrlen_t = size_t;
|
|
|
|
pub struct Socket(FileDesc);
|
|
|
|
pub fn init() {}
|
|
|
|
pub fn cvt_gai(err: c_int) -> io::Result<()> {
|
|
if err == 0 { return Ok(()) }
|
|
|
|
let detail = unsafe {
|
|
str::from_utf8(CStr::from_ptr(c::gai_strerror(err)).to_bytes()).unwrap()
|
|
.to_string()
|
|
};
|
|
Err(io::Error::new(io::ErrorKind::Other,
|
|
&format!("failed to lookup address information: {}",
|
|
detail)[..]))
|
|
}
|
|
|
|
impl Socket {
|
|
pub fn new(addr: &SocketAddr, ty: c_int) -> io::Result<Socket> {
|
|
let fam = match *addr {
|
|
SocketAddr::V4(..) => libc::AF_INET,
|
|
SocketAddr::V6(..) => libc::AF_INET6,
|
|
};
|
|
unsafe {
|
|
let fd = try!(cvt(libc::socket(fam, ty, 0)));
|
|
Ok(Socket(FileDesc::new(fd)))
|
|
}
|
|
}
|
|
|
|
pub fn accept(&self, storage: *mut libc::sockaddr,
|
|
len: *mut libc::socklen_t) -> io::Result<Socket> {
|
|
let fd = try!(cvt_r(|| unsafe {
|
|
libc::accept(self.0.raw(), storage, len)
|
|
}));
|
|
Ok(Socket(FileDesc::new(fd)))
|
|
}
|
|
|
|
pub fn duplicate(&self) -> io::Result<Socket> {
|
|
cvt(unsafe { libc::dup(self.0.raw()) }).map(|fd| {
|
|
Socket(FileDesc::new(fd))
|
|
})
|
|
}
|
|
|
|
pub fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
|
|
self.0.read(buf)
|
|
}
|
|
}
|
|
|
|
impl AsInner<c_int> for Socket {
|
|
fn as_inner(&self) -> &c_int { self.0.as_inner() }
|
|
}
|