source/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-02-09 01:59:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update dependency `byteorder` from 0.3.x to 0.5.x

Browse Source
This commit is contained in:
Meitian Huang
2016-03-23 13:30:35 +11:00
parent 2179eae6a0
commit 52fd0aefaa
2 changed files with 8 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -50,7 +50,7 @@ path = "src/bin/ssurl.rs"
[dependencies]
rustc-serialize = "^0.3.15"
log = "^0.3.1"
byteorder = "^0.3.11"
byteorder = "^0.5.0"
rand = "^0.3.9"
time = "^0.1.32"
clap = "^1.1.6"

63
src/relay/socks5.rs
View File

@@ -28,7 +28,7 @@ use std::vec;
use std::error;
use std::convert::From;
use byteorder::{self, ReadBytesExt, WriteBytesExt, BigEndian};
use byteorder::{ReadBytesExt, WriteBytesExt, BigEndian};
const SOCKS5_VERSION : u8 = 0x05;
@@ -178,13 +178,6 @@ impl From<io::Error> for Error {
}
}
impl From<byteorder::Error> for Error {
fn from(err: byteorder::Error) -> Error {
let io_err: io::Error = <io::Error as From<byteorder::Error>>::from(err);
<Error as From<io::Error>>::from(io_err)
}
}
#[derive(Clone, PartialEq, Eq, Hash)]
pub enum Address {
SocketAddress(SocketAddr),
@@ -391,61 +384,19 @@ fn write_addr<W: Write + Sized>(addr: &Address, buf: &mut W) -> io::Result<()> {
try!(buf.write_all(&addr.ip().octets()));
},
SocketAddr::V6(addr) => {
try!(buf.write_u8(SOCKS5_ADDR_TYPE_IPV6).map_err(|err| {
match err {
byteorder::Error::UnexpectedEOF => {
io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
},
byteorder::Error::Io(err) => err
}
}));
try!(buf.write_u8(SOCKS5_ADDR_TYPE_IPV6));
for seg in addr.ip().segments().iter() {
try!(buf.write_u16::<BigEndian>(*seg).map_err(|err| {
match err {
byteorder::Error::UnexpectedEOF => {
io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
},
byteorder::Error::Io(err) => err
}
}));
try!(buf.write_u16::<BigEndian>(*seg));
}
}
}
try!(buf.write_u16::<BigEndian>(addr.port()).map_err(|err| {
match err {
byteorder::Error::UnexpectedEOF => {
io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
},
byteorder::Error::Io(err) => err
}
}));
try!(buf.write_u16::<BigEndian>(addr.port()));
},
&Address::DomainNameAddress(ref dnaddr, port) => {
try!(buf.write_u8(SOCKS5_ADDR_TYPE_DOMAIN_NAME).map_err(|err| {
match err {
byteorder::Error::UnexpectedEOF => {
io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
},
byteorder::Error::Io(err) => err
}
}));
try!(buf.write_u8(dnaddr.len() as u8).map_err(|err| {
match err {
byteorder::Error::UnexpectedEOF => {
io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
},
byteorder::Error::Io(err) => err
}
}));
try!(buf.write_u8(SOCKS5_ADDR_TYPE_DOMAIN_NAME));
try!(buf.write_u8(dnaddr.len() as u8));
try!(buf.write_all(dnaddr[..].as_bytes()));
try!(buf.write_u16::<BigEndian>(port).map_err(|err| {
match err {
byteorder::Error::UnexpectedEOF => {
io::Error::new(io::ErrorKind::Other, "Unexpected EOF")
},
byteorder::Error::Io(err) => err
}
}));
try!(buf.write_u16::<BigEndian>(port));
}
}