Skip to content

Commit 433f7af

Browse files
authored
RSDK-3150 - fix ice server credential type (#50)
1 parent e177376 commit 433f7af

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ tracing = {version = "0.1.34"}
4646
tracing-subscriber = {version = "0.3.11", features = ["env-filter"]}
4747
viam-mdns = "3.0.1"
4848
webpki-roots = "0.21.1"
49-
# TODO: We are using a commit hash to include a bug fix that has not yet been
50-
# released in a crate. Once the new crate is released, please use that instead
51-
# of the git revision below. As of this comment the latest version is `0.7.2`.
52-
webrtc = { git = "https://github.com/webrtc-rs/webrtc.git", rev = "5aa49c03a183a610b44fe01e9531508e4fddecb1" }
49+
webrtc = "0.7.3"
5350

5451
[dev-dependencies]
5552
async-stream = "0.3.3"

src/rpc/dial.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::gen::google;
66
use crate::gen::proto::rpc::webrtc::v1::{
77
call_response::Stage, call_update_request::Update,
88
signaling_service_client::SignalingServiceClient, CallUpdateRequest,
9-
OptionalWebRtcConfigRequest, OptionalWebRtcConfigResponse
9+
OptionalWebRtcConfigRequest, OptionalWebRtcConfigResponse,
1010
};
1111
use crate::gen::proto::rpc::webrtc::v1::{
1212
CallRequest, IceCandidate, Metadata, RequestHeaders, Strings,
@@ -753,9 +753,10 @@ async fn maybe_connect_via_webrtc(
753753
Ok(resp) => resp,
754754
Err(e) => {
755755
if e.code() == tonic::Code::Unimplemented {
756-
OptionalWebRtcConfigResponse::default();
756+
tonic::Response::new(OptionalWebRtcConfigResponse::default())
757+
} else {
758+
return Err(anyhow::anyhow!(e));
757759
}
758-
return Err(anyhow::anyhow!(e));
759760
}
760761
};
761762

src/rpc/webrtc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ fn ice_server_from_proto(ice_server: IceServer) -> RTCIceServer {
147147
urls: ice_server.urls,
148148
username: ice_server.username,
149149
credential: ice_server.credential,
150-
..Default::default()
150+
credential_type: webrtc::ice_transport::ice_credential_type::RTCIceCredentialType::Password,
151151
}
152152
}
153153

0 commit comments

Comments
 (0)