Skip to content

Commit

Permalink
build(deps): bump the rust-dependencies group with 10 updates (#659)
Browse files Browse the repository at this point in the history
* build(deps): bump the rust-dependencies group with 10 updates

Bumps the rust-dependencies group with 10 updates:

| Package | From | To |
| --- | --- | --- |
| [socket2](https://github.com/rust-lang/socket2) | `0.5.7` | `0.5.8` |
| [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust) | `0.27.0` | `0.27.1` |
| [opentelemetry_sdk](https://github.com/open-telemetry/opentelemetry-rust) | `0.27.0` | `0.27.1` |
| [bytes](https://github.com/tokio-rs/bytes) | `1.8.0` | `1.9.0` |
| [libc](https://github.com/rust-lang/libc) | `0.2.164` | `0.2.167` |
| [smoltcp](https://github.com/smoltcp-rs/smoltcp) | `0.11.0` | `0.12.0` |
| [tracing](https://github.com/tokio-rs/tracing) | `0.1.40` | `0.1.41` |
| [tracing-subscriber](https://github.com/tokio-rs/tracing) | `0.3.18` | `0.3.19` |
| [tuic](https://github.com/Itsusinn/tuic) | `v1.3.4` | `v1.3.5` |
| [tuic-quinn](https://github.com/Itsusinn/tuic) | `v1.3.4` | `v1.3.5` |


Updates `socket2` from 0.5.7 to 0.5.8
- [Release notes](https://github.com/rust-lang/socket2/releases)
- [Changelog](https://github.com/rust-lang/socket2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/socket2/commits)

Updates `opentelemetry` from 0.27.0 to 0.27.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases)
- [Commits](open-telemetry/opentelemetry-rust@opentelemetry-0.27.0...opentelemetry-0.27.1)

Updates `opentelemetry_sdk` from 0.27.0 to 0.27.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases)
- [Commits](open-telemetry/opentelemetry-rust@opentelemetry_sdk-0.27.0...opentelemetry_sdk-0.27.1)

Updates `bytes` from 1.8.0 to 1.9.0
- [Release notes](https://github.com/tokio-rs/bytes/releases)
- [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md)
- [Commits](tokio-rs/bytes@v1.8.0...v1.9.0)

Updates `libc` from 0.2.164 to 0.2.167
- [Release notes](https://github.com/rust-lang/libc/releases)
- [Changelog](https://github.com/rust-lang/libc/blob/0.2.167/CHANGELOG.md)
- [Commits](rust-lang/libc@0.2.164...0.2.167)

Updates `smoltcp` from 0.11.0 to 0.12.0
- [Release notes](https://github.com/smoltcp-rs/smoltcp/releases)
- [Changelog](https://github.com/smoltcp-rs/smoltcp/blob/main/CHANGELOG.md)
- [Commits](smoltcp-rs/smoltcp@v0.11.0...v0.12.0)

Updates `tracing` from 0.1.40 to 0.1.41
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](tokio-rs/tracing@tracing-0.1.40...tracing-0.1.41)

Updates `tracing-subscriber` from 0.3.18 to 0.3.19
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](tokio-rs/tracing@tracing-subscriber-0.3.18...tracing-subscriber-0.3.19)

Updates `tuic` from v1.3.4 to v1.3.5
- [Release notes](https://github.com/Itsusinn/tuic/releases)
- [Commits](Itsusinn/tuic@333f80d...2bb3ba7)

Updates `tuic-quinn` from v1.3.4 to v1.3.5
- [Release notes](https://github.com/Itsusinn/tuic/releases)
- [Commits](Itsusinn/tuic@333f80d...2bb3ba7)

---
updated-dependencies:
- dependency-name: socket2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: opentelemetry
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: opentelemetry_sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: bytes
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-dependencies
- dependency-name: libc
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: smoltcp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rust-dependencies
- dependency-name: tracing
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: tracing-subscriber
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: rust-dependencies
- dependency-name: tuic
  dependency-type: direct:production
  dependency-group: rust-dependencies
- dependency-name: tuic-quinn
  dependency-type: direct:production
  dependency-group: rust-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* up

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dev0 <dev@watfaq.com>
  • Loading branch information
dependabot[bot] and ibigbug authored Dec 3, 2024
1 parent 866f844 commit 6775cb5
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 53 deletions.
74 changes: 37 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions clash_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ tun = { git = "https://github.com/Watfaq/rust-tun.git", rev = "8f7568190f1200d3e
netstack-lwip = { git = "https://github.com/Watfaq/netstack-lwip.git", rev = "2817bf82740e04bbee6b7bf1165f55657a6ed163" }

boringtun = { version = "0.6", git = "https://github.com/cloudflare/boringtun.git", rev = "f672bb6c1e1e371240a8d151f15854687eb740bb" }
smoltcp = { version = "0.11", default-features = false, features = ["std", "log", "medium-ip", "proto-ipv4", "proto-ipv6", "socket-udp", "socket-tcp"] }
smoltcp = { version = "0.12", default-features = false, features = ["std", "log", "medium-ip", "proto-ipv4", "proto-ipv6", "socket-udp", "socket-tcp"] }

serde = { version = "1", features=["derive"] }
serde_yaml = "0.9"
Expand Down Expand Up @@ -120,8 +120,8 @@ arti-client = { version = "0.24", optional = true, default-features = false, fea
tor-rtcompat = { version = "0.24", optional = true, default-features = false }

# tuic
tuic = { tag = "v1.3.4", optional = true, git = "https://github.com/Itsusinn/tuic.git" }
tuic-quinn = { tag = "v1.3.4", optional = true, git = "https://github.com/Itsusinn/tuic.git" }
tuic = { tag = "v1.3.5", optional = true, git = "https://github.com/Itsusinn/tuic.git" }
tuic-quinn = { tag = "v1.3.5", optional = true, git = "https://github.com/Itsusinn/tuic.git" }
register-count = { version = "0.1", optional = true }

quinn = { version = "0.11", default-features = false, features = ["futures-io", "runtime-tokio", "rustls"] }
Expand Down
9 changes: 3 additions & 6 deletions clash_lib/src/app/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ use opentelemetry::{
KeyValue,
};
use opentelemetry_otlp::SpanExporter;
use opentelemetry_sdk::{
trace::{Config, TracerProvider},
Resource,
};
use opentelemetry_sdk::{trace::TracerProvider, Resource};
use opentelemetry_semantic_conventions::{
resource::{DEPLOYMENT_ENVIRONMENT_NAME, SERVICE_NAME, SERVICE_VERSION},
SCHEMA_URL,
Expand Down Expand Up @@ -105,7 +102,7 @@ pub fn setup_logging(
let exporter = SpanExporter::builder().with_tonic().build()?;

let provider = TracerProvider::builder()
.with_config(Config::default().with_resource(Resource::from_schema_url(
.with_resource(Resource::from_schema_url(
[
KeyValue::new(SERVICE_NAME, env!("CARGO_PKG_NAME")),
KeyValue::new(SERVICE_VERSION, env!("CARGO_PKG_VERSION")),
Expand All @@ -115,7 +112,7 @@ pub fn setup_logging(
),
],
SCHEMA_URL,
)))
))
.with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio)
.build();

Expand Down
2 changes: 1 addition & 1 deletion clash_lib/src/proxy/wg/device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ pub struct RxToken {
impl smoltcp::phy::RxToken for RxToken {
fn consume<R, F>(mut self, f: F) -> R
where
F: FnOnce(&mut [u8]) -> R,
F: FnOnce(&[u8]) -> R,
{
f(&mut self.buffer)
}
Expand Down
8 changes: 2 additions & 6 deletions clash_lib/src/proxy/wg/wireguard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,7 @@ impl WireguardTunnel {
match IpVersion::of_packet(packet) {
Ok(IpVersion::Ipv4) => Ipv4Packet::new_checked(&packet)
.ok()
.filter(|packet| {
Ipv4Addr::from(packet.dst_addr()) == self.source_peer_ip
})
.filter(|packet| packet.dst_addr() == self.source_peer_ip)
.and_then(|packet| {
match packet.next_header() {
IpProtocol::Tcp => Some(PortProtocol::Tcp),
Expand All @@ -394,9 +392,7 @@ impl WireguardTunnel {
}),
Ok(IpVersion::Ipv6) => Ipv6Packet::new_checked(&packet)
.ok()
.filter(|packet| {
Some(Ipv6Addr::from(packet.dst_addr())) == self.source_peer_ipv6
})
.filter(|packet| Some(packet.dst_addr()) == self.source_peer_ipv6)
.and_then(|packet| {
match packet.next_header() {
IpProtocol::Tcp => Some(PortProtocol::Tcp),
Expand Down

0 comments on commit 6775cb5

Please sign in to comment.