vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'error-socksproto-autoconvert' into 'main' 

Provide, and use From impl for InternalError

See merge request tpo/core/arti!315
This commit is contained in:
Nick Mathewson 2022-02-14 20:57:24 +00:00
parent 72221b0b77 31075e8046
commit e80d472beb
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/tor-socksproto/src/err.rs
View File

@ -41,7 +41,7 @@ pub enum Error {
/// Something went wrong with the programming of this module.
#[error("Internal programming error while handling SOCKS handshake")]
Internal(InternalError),
Internal(#[from] InternalError),
}
// Note: at present, tor-socksproto isn't used in any settings where ErrorKind

19
crates/tor-socksproto/src/handshake.rs
View File

@ -113,10 +113,7 @@ impl SocksHandshake {
let mut r = Reader::from_slice(input);
let version = r.take_u8()?.try_into()?;
if version != SocksVersion::V4 {
return Err(Error::Internal(internal!(
"called s4 on wrong type {:?}",
version
)));
return Err(internal!("called s4 on wrong type {:?}", version).into());
}
let cmd: SocksCmd = r.take_u8()?.into();
@ -157,10 +154,7 @@ impl SocksHandshake {
let mut r = Reader::from_slice(input);
let version: SocksVersion = r.take_u8()?.try_into()?;
if version != SocksVersion::V5 {
return Err(Error::Internal(internal!(
"called on wrong handshake type {:?}",
version
)));
return Err(internal!("called on wrong handshake type {:?}", version).into());
}
/// Constant for Username/Password-style authentication.
@ -220,10 +214,9 @@ impl SocksHandshake {
let version: SocksVersion = r.take_u8()?.try_into()?;
if version != SocksVersion::V5 {
return Err(Error::Internal(internal!(
"called s5 on non socks5 handshake with type {:?}",
version
)));
return Err(
internal!("called s5 on non socks5 handshake with type {:?}", version).into(),
);
}
let cmd = r.take_u8()?.into();
let _ignore = r.take_u8()?;
@ -233,7 +226,7 @@ impl SocksHandshake {
let auth = self
.socks5_auth
.take()
.ok_or_else(|| Error::Internal(internal!("called s5 without negotiating auth")))?;
.ok_or_else(|| internal!("called s5 without negotiating auth"))?;
let request = SocksRequest::new(version, cmd, addr, port, auth)?;