support insecure signaling server

3 files changed, 8 insertions, 8 deletions

diff --git a/client-native-lib/src/lib.rs b/client-native-lib/src/lib.rs
index 87242dc..25d6e57 100644
--- a/client-native-lib/src/lib.rs
+++ b/client-native-lib/src/lib.rs
@@ -31,12 +31,12 @@ pub mod state;
 pub use webrtc;
 
 pub struct Config {
-    pub signaling_host: String,
+    pub signaling_uri: String,
     pub secret: String,
 }
 
 pub async fn connect(config: Config) -> Arc<State> {
-    let (sender, mut recv) = signaling_connect(&config.signaling_host, &config.secret).await;
+    let (sender, mut recv) = signaling_connect(&config.signaling_uri, &config.secret).await;
 
     let key = crypto::Key::derive(&config.secret);
 
diff --git a/client-native-lib/src/signaling.rs b/client-native-lib/src/signaling.rs
index 6235e04..cbbd063 100644
--- a/client-native-lib/src/signaling.rs
+++ b/client-native-lib/src/signaling.rs
@@ -13,13 +13,13 @@ use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
 use tokio_tungstenite::tungstenite::{self, Message};
 
 pub async fn signaling_connect(
-    host: &str,
+    signaling_server: &str,
     secret: &str,
 ) -> (
     UnboundedSender<ServerboundPacket>,
     UnboundedReceiver<ClientboundPacket>,
 ) {
-    let uri = format!("wss://{host}/signaling/{}", hash(secret));
+    let uri = format!("{signaling_server}/signaling/{}", hash(secret));
     info!("connecting to signaling server at {uri:?}");
     let (conn, _) = tokio_tungstenite::connect_async(url::Url::parse(&uri).unwrap())
         .await
diff --git a/client-native-rift/src/main.rs b/client-native-rift/src/main.rs
index b5fcca9..0e458c4 100644
--- a/client-native-rift/src/main.rs
+++ b/client-native-rift/src/main.rs
@@ -7,7 +7,7 @@
 
 use bytes::Bytes;
 use clap::{Parser, Subcommand};
-use client_native_lib::{ connect, peer::Peer, webrtc::data_channel::RTCDataChannel, Config};
+use client_native_lib::{connect, peer::Peer, webrtc::data_channel::RTCDataChannel, Config};
 use log::{error, info};
 use std::{future::Future, pin::Pin, sync::Arc};
 use tokio::{
@@ -31,8 +31,8 @@ fn main() {
 #[derive(Parser)]
 pub struct Args {
     /// keks-meet server used for establishing p2p connection
-    #[clap(long, default_value = "meet.metamuffin.org")]
-    signaling_host: String,
+    #[clap(long, default_value = "wss://meet.metamuffin.org")]
+    signaling_uri: String,
     /// pre-shared secret (aka. room name)
     #[clap(short, long)]
     secret: String,
@@ -45,7 +45,7 @@ async fn run() {
 
     connect(Config {
         secret: args.secret.clone(),
-        signaling_host: args.signaling_host.clone(),
+        signaling_uri: args.signaling_uri.clone(),
     })
     .await;