deps: update to webrtc 0.9, boringtun to master (#2404)

Co-authored-by: Jamil <jamilbk@users.noreply.github.com>
This commit is contained in:
Thomas Eizinger
2023-10-19 09:05:28 +11:00
committed by GitHub
parent 5a906cb1c4
commit a65a0ad88e
7 changed files with 185 additions and 381 deletions

538
rust/Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -23,6 +23,7 @@ tracing = { version = "0.1.39" }
tracing-subscriber = { version = "0.3.17", features = ["parking_lot"] }
secrecy = "0.8"
hickory-resolver = { version = "0.24", features = ["tokio-runtime"] }
webrtc = "0.9"
connlib-client-android = { path = "connlib/clients/android"}
connlib-client-apple = { path = "connlib/clients/apple"}
@@ -34,23 +35,8 @@ connlib-shared = { path = "connlib/shared"}
firezone-tunnel = { path = "connlib/tunnel"}
phoenix-channel = { path = "phoenix-channel"}
# Patched to use https://github.com/rust-lang/cc-rs/pull/708
# (the `patch` section can't be used for build deps...)
[patch.crates-io]
# It seems that this contains a dependency that no longer points to a valid ref, so we'll try our luck with
# the mainline versions. The error from GH actions build pipeline copied here:
#
# Caused by:
# failed to load source for dependency `cc`
#
# Caused by:
# Unable to update https://github.com/youknowone/cc-rs?rev=4ca92100c25ac2df679f0cce11c4c3e830f2e455#4ca92100
#
# Caused by:
# object not found - no match for id (4ca92100c25ac2df679f0cce11c4c3e830f2e455); class=Odb (9); code=NotFound (-3)
#
# ring = { git = "https://github.com/firezone/ring", branch = "v0.16.20-cc-fix" }
boringtun = { git = "https://github.com/cloudflare/boringtun", branch = "master" } # Contains unreleased patches we need (bump of x25519-dalek)
webrtc = { git = "https://github.com/firezone/webrtc", branch = "master" }
[profile.release]

View File

@@ -21,7 +21,7 @@ connlib-shared = { workspace = true }
firezone-tunnel = { workspace = true }
serde = { version = "1.0", default-features = false, features = ["std", "derive"] }
backoff = { workspace = true }
webrtc = "0.8"
webrtc = { workspace = true }
url = { version = "2.4.1", features = ["serde"] }
time = { version = "0.3.30", features = ["formatting"] }
reqwest = { version = "0.11.22", default-features = false, features = ["stream", "rustls-tls"] }

View File

@@ -30,7 +30,7 @@ tracing = { workspace = true }
tracing-appender = "0.2"
url = { version = "2.4.1", default-features = false }
uuid = { version = "1.5", default-features = false, features = ["std", "v4", "serde"] }
webrtc = { version = "0.8" }
webrtc = { workspace = true }
ring = "0.17"
hickory-resolver = { workspace = true }

View File

@@ -29,7 +29,7 @@ futures-bounded = { git = "https://github.com/libp2p/rust-libp2p", branch = "fea
hickory-resolver = { workspace = true }
# TODO: research replacing for https://github.com/algesten/str0m
webrtc = { version = "0.8" }
webrtc = { workspace = true }
# Needed for Android logging until tracing is fixed
log = "0.4"

View File

@@ -26,7 +26,7 @@ tokio-tungstenite = { version = "0.20", default-features = false, features = ["c
tracing = { workspace = true }
tracing-subscriber = "0.3.17"
url = { version = "2.4.1", default-features = false }
webrtc = "0.8"
webrtc = { workspace = true }
[dev-dependencies]
serde_json = { version = "1.0", default-features = false, features = ["std"] }

View File

@@ -40,7 +40,7 @@ socket2 = "0.5.4"
axum = { version = "0.6.20", default-features = false, features = ["http1", "tokio"] }
[dev-dependencies]
webrtc = { version = "0.8" }
webrtc = { workspace = true }
redis = { version = "0.23.3", default-features = false, features = ["tokio-comp"] }
difference = "2.0.0"