Updated dependencies, fixed connection drop for banned nodes.

pull/270/head
Revertron 2 years ago
parent 7bd7fefc12
commit a13c824f7d

24
Cargo.lock generated

@ -117,7 +117,7 @@ dependencies = [
"simplelog", "simplelog",
"sqlite", "sqlite",
"thread-priority", "thread-priority",
"time 0.3.9", "time 0.3.11",
"tinyfiledialogs", "tinyfiledialogs",
"toml", "toml",
"ureq", "ureq",
@ -735,9 +735,9 @@ dependencies = [
[[package]] [[package]]
name = "lru" name = "lru"
version = "0.7.6" version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8015d95cb7b2ddd3c0d32ca38283ceb1eea09b4713ee380bceb942d85a244228" checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a"
dependencies = [ dependencies = [
"hashbrown", "hashbrown",
] ]
@ -760,9 +760,9 @@ dependencies = [
[[package]] [[package]]
name = "mio" name = "mio"
version = "0.8.3" version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
@ -833,9 +833,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]] [[package]]
name = "open" name = "open"
version = "2.1.3" version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2423ffbf445b82e58c3b1543655968923dd06f85432f10be2bb4f1b7122f98c" checksum = "360bcc8316bf6363aa3954c3ccc4de8add167b087e0259190a043c9514f910fe"
dependencies = [ dependencies = [
"pathdiff", "pathdiff",
"windows-sys", "windows-sys",
@ -1134,7 +1134,7 @@ checksum = "48dfff04aade74dd495b007c831cd6f4e0cee19c344dd9dc0884c0289b70a786"
dependencies = [ dependencies = [
"log", "log",
"termcolor", "termcolor",
"time 0.3.9", "time 0.3.11",
] ]
[[package]] [[package]]
@ -1304,9 +1304,9 @@ dependencies = [
[[package]] [[package]]
name = "time" name = "time"
version = "0.3.9" version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217"
dependencies = [ dependencies = [
"itoa", "itoa",
"libc", "libc",
@ -1446,9 +1446,9 @@ checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.1.1" version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6d5d669b51467dcf7b2f1a796ce0f955f05f01cafda6c19d6e95f730df29238" checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
dependencies = [ dependencies = [
"getrandom 0.2.3", "getrandom 0.2.3",
"serde", "serde",

@ -33,21 +33,21 @@ base64 = "0.13.0"
num-bigint = "0.4.3" num-bigint = "0.4.3"
num-traits = "0.2.15" num-traits = "0.2.15"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }
time = "0.3.9" time = "0.3.11"
rand = { version = "0.8.5", package = "rand" } rand = { version = "0.8.5", package = "rand" }
rand-old = { package = "rand", version = "0.7.0" } # For ed25519-dalek rand-old = { package = "rand", version = "0.7.0" } # For ed25519-dalek
sqlite = "0.26.0" sqlite = "0.26.0"
uuid = { version = "1.1.1", features = ["serde", "v4"] } uuid = { version = "1.1.2", features = ["serde", "v4"] }
mio = { version = "0.8.3", features = ["os-poll", "net"] } mio = { version = "0.8.4", features = ["os-poll", "net"] }
ureq = { version = "2.4", optional = true } ureq = { version = "2.4", optional = true }
lru = "0.7.6" lru = "0.7.7"
derive_more = "0.99.17" derive_more = "0.99.17"
lazy_static = "1.4.0" lazy_static = "1.4.0"
# Optional dependencies regulated by features # Optional dependencies regulated by features
web-view = { version = "0.7.3", features = [], optional = true } web-view = { version = "0.7.3", features = [], optional = true }
tinyfiledialogs = { version = "3.9.1", optional = true } tinyfiledialogs = { version = "3.9.1", optional = true }
open = { version = "2.1.3", optional = true } open = { version = "3.0.1", optional = true }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.9", features = ["impl-default", "wincon", "shellscalingapi"] } winapi = { version = "0.3.9", features = ["impl-default", "wincon", "shellscalingapi"] }

@ -118,6 +118,10 @@ impl Network {
if self.peers.is_ignored(&address.ip()) { if self.peers.is_ignored(&address.ip()) {
debug!("Ignoring connection from banned {:?}", &address.ip()); debug!("Ignoring connection from banned {:?}", &address.ip());
stream.shutdown(Shutdown::Both).unwrap_or_else(|e| {
warn!("Error in shutdown, {}", e);
});
let _ = poll.registry().reregister(&mut server, SERVER, Interest::READABLE);
continue; continue;
} }

Loading…
Cancel
Save