Skip to content

Commit 73e6a6a

Browse files
committed
update dependencies
1 parent c913e6c commit 73e6a6a

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "socks5-impl"
3-
version = "0.5.2"
3+
version = "0.5.4"
44
authors = ["ssrlive <[email protected]>"]
55
description = "Fundamental abstractions and async read / write functions for SOCKS5 protocol and Relatively low-level asynchronized SOCKS5 server implementation based on tokio"
66
categories = ["network-programming", "asynchronous"]
@@ -18,19 +18,19 @@ tokio = ["dep:tokio"]
1818
as-any = "0.3"
1919
async-trait = "0.1"
2020
byteorder = "1.4"
21-
bytes = "1.4"
21+
bytes = "1.5"
2222
thiserror = "1.0"
23-
tokio = { version = "1.29", features = ["full"], optional = true }
23+
tokio = { version = "1.32", features = ["full"], optional = true }
2424

2525
[dev-dependencies]
26-
clap = { version = "4.3", features = ["derive"] }
26+
clap = { version = "4.4", features = ["derive"] }
2727
dotenvy = "0.15"
2828
env_logger = "0.10"
2929
log = "0.4"
30-
moka = { version = "0.11", features = ["future"] }
30+
moka = { version = "0.12", features = ["future"] }
3131
rand = "0.8"
32-
tokio = { version = "1.29", features = ["macros", "rt-multi-thread"] }
33-
trust-dns-proto = "0.22"
32+
tokio = { version = "1.32", features = ["macros", "rt-multi-thread"] }
33+
trust-dns-proto = "0.23"
3434

3535
[[example]]
3636
name = "demo-client"

examples/dns.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ pub fn extract_ipaddr_from_dns_message(message: &Message) -> Result<IpAddr, Stri
3434
for answer in message.answers() {
3535
match answer.data().ok_or("DNS response not contains answer data")? {
3636
RData::A(addr) => {
37-
return Ok(IpAddr::V4(*addr));
37+
return Ok(IpAddr::V4((*addr).into()));
3838
}
3939
RData::AAAA(addr) => {
40-
return Ok(IpAddr::V6(*addr));
40+
return Ok(IpAddr::V6((*addr).into()));
4141
}
4242
RData::CNAME(name) => {
4343
cname = Some(name.to_utf8());

examples/dns2socks.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ async fn udp_incoming_handler(
134134
let domain = dns::extract_domain_from_dns_message(&message)?;
135135

136136
if opt.cache_records {
137-
if let Some(cached_message) = dns_cache_get_message(&cache, &message) {
137+
if let Some(cached_message) = dns_cache_get_message(&cache, &message).await {
138138
let data = cached_message.to_vec().map_err(|e| e.to_string())?;
139139
listener.send_to(&data, &src).await?;
140140
log_dns_message("DNS query via UDP cache hit", &domain, &cached_message);
@@ -202,7 +202,7 @@ async fn handle_tcp_incoming(
202202
let domain = dns::extract_domain_from_dns_message(&message)?;
203203

204204
if opt.cache_records {
205-
if let Some(cached_message) = dns_cache_get_message(&cache, &message) {
205+
if let Some(cached_message) = dns_cache_get_message(&cache, &message).await {
206206
let data = cached_message.to_vec().map_err(|e| e.to_string())?;
207207
let len = u16::try_from(data.len()).map_err(|e| e.to_string())?.to_be_bytes().to_vec();
208208
let data = [len, data].concat();
@@ -268,8 +268,8 @@ pub(crate) fn create_dns_cache() -> Cache<Vec<Query>, Message> {
268268
.build()
269269
}
270270

271-
pub(crate) fn dns_cache_get_message(cache: &Cache<Vec<Query>, Message>, message: &Message) -> Option<Message> {
272-
if let Some(mut cached_message) = cache.get(&message.queries().to_vec()) {
271+
pub(crate) async fn dns_cache_get_message(cache: &Cache<Vec<Query>, Message>, message: &Message) -> Option<Message> {
272+
if let Some(mut cached_message) = cache.get(&message.queries().to_vec()).await {
273273
cached_message.set_id(message.id());
274274
return Some(cached_message);
275275
}

0 commit comments

Comments
 (0)