Rename ExitTimeout to RemoteNetworkTimeout.
This commit is contained in:
parent
4db586cf00
commit
034c5ba9f5
|
@ -232,7 +232,7 @@ impl tor_error::HasKind for ErrorDetail {
|
|||
use ErrorKind as EK;
|
||||
match self {
|
||||
E::ObtainExitCircuit { cause, .. } => cause.kind(),
|
||||
E::ExitTimeout => EK::ExitTimeout,
|
||||
E::ExitTimeout => EK::RemoteNetworkTimeout,
|
||||
E::BootstrapRequired { .. } => EK::BootstrapRequired,
|
||||
E::CircMgrSetup(e) => e.kind(),
|
||||
E::DirMgr(e) => e.kind(),
|
||||
|
|
|
@ -198,7 +198,7 @@ where
|
|||
// send an error. See what kind it is.
|
||||
//
|
||||
let reply = match e.kind() {
|
||||
ErrorKind::ExitTimeout => {
|
||||
ErrorKind::RemoteNetworkTimeout => {
|
||||
request.reply(tor_socksproto::SocksStatus::TTL_EXPIRED, None)
|
||||
}
|
||||
_ => request.reply(tor_socksproto::SocksStatus::GENERAL_FAILURE, None),
|
||||
|
|
|
@ -92,7 +92,7 @@ impl HasKind for Error {
|
|||
use Error as E;
|
||||
use ErrorKind as EK;
|
||||
match self {
|
||||
E::DirTimeout => EK::ExitTimeout,
|
||||
E::DirTimeout => EK::RemoteNetworkTimeout,
|
||||
E::TruncatedHeaders => EK::TorProtocolViolation,
|
||||
E::HttpStatus(_) => EK::RemoteRefused,
|
||||
E::ResponseTooLong(_) => EK::TorProtocolViolation,
|
||||
|
|
|
@ -199,7 +199,7 @@ pub enum ErrorKind {
|
|||
///
|
||||
/// In either case, trying later, or on a different circuit, might help.
|
||||
#[display(fmt = "operation timed out at exit")]
|
||||
ExitTimeout,
|
||||
RemoteNetworkTimeout,
|
||||
|
||||
/// One or more configuration values were invalid or incompatible.
|
||||
///
|
||||
|
|
Loading…
Reference in New Issue