diff --git a/script/cnc.sh b/script/cnc.sh index 8eacc64..27d4cab 100755 --- a/script/cnc.sh +++ b/script/cnc.sh @@ -73,21 +73,25 @@ fi echo "[+] Using Podman" echo "" echo "Select auth provider:" -echo " 1) telemost" -echo " 2) jazz" -echo " 3) wbstream" -read -p "Enter choice [1-3, default: 3]: " AUTH_CHOICE +echo " 1) jitsi" +echo " 2) telemost" +echo " 3) jazz" +echo " 4) wbstream" +read -p "Enter choice [1-4, default: 1]: " AUTH_CHOICE case "$AUTH_CHOICE" in - 1) + 2) AUTH="telemost" ;; - 2) + 3) AUTH="jazz" ;; - *) + 4) AUTH="wbstream" ;; + *) + AUTH="jitsi" + ;; esac echo "[*] Using auth: $AUTH" @@ -118,10 +122,14 @@ esac echo "[*] Using transport: $TRANSPORT" echo "" -read -p "Enter Room ID: " ROOM_ID +if [ "$AUTH" = "jitsi" ]; then + read -p "Enter Jitsi room URL (https://host/room or host/room): " ROOM_ID +else + read -p "Enter Room ID: " ROOM_ID +fi if [ -z "$ROOM_ID" ]; then - echo "[X] Room ID cannot be empty" + echo "[X] Room ID/URL cannot be empty" exit 1 fi @@ -380,7 +388,7 @@ echo "" echo "Container name: $CONTAINER_NAME" echo "Auth: $AUTH" echo "Transport: $TRANSPORT" -echo "Room ID: $ROOM_ID" +echo "Room ID/URL: $ROOM_ID" if [ -n "$SOCKS_USER" ]; then echo "SOCKS5 proxy: $SOCKS_IP:$SOCKS_PORT (auth: $SOCKS_USER)" else diff --git a/script/docker/olcrtc-entrypoint.sh b/script/docker/olcrtc-entrypoint.sh index cd1d9c9..a8588d9 100644 --- a/script/docker/olcrtc-entrypoint.sh +++ b/script/docker/olcrtc-entrypoint.sh @@ -55,7 +55,7 @@ case "$mode" in srv|cnc) ;; *) die "set OLCRTC_MODE to srv or cnc" ;; esac -[ -n "$carrier" ] || die "set OLCRTC_CARRIER (e.g. telemost, jazz, wbstream)" +[ -n "$carrier" ] || die "set OLCRTC_CARRIER (e.g. jitsi, telemost, jazz, wbstream)" [ -n "$transport" ] || die "set OLCRTC_TRANSPORT (e.g. datachannel, videochannel, seichannel, vp8channel)" make_key() { diff --git a/script/srv.sh b/script/srv.sh index 3a0ec1e..135c6be 100755 --- a/script/srv.sh +++ b/script/srv.sh @@ -69,21 +69,25 @@ fi echo "[+] Using Podman" echo "" echo "Select carrier:" -echo " 1) telemost" -echo " 2) jazz" -echo " 3) wbstream" -read -p "Enter choice [1-3, default: 3]: " CARRIER_CHOICE +echo " 1) jitsi" +echo " 2) telemost" +echo " 3) jazz" +echo " 4) wbstream" +read -p "Enter choice [1-4, default: 1]: " CARRIER_CHOICE case "$CARRIER_CHOICE" in - 1) + 2) CARRIER="telemost" ;; - 2) + 3) CARRIER="jazz" ;; - *) + 4) CARRIER="wbstream" ;; + *) + CARRIER="jitsi" + ;; esac echo "[*] Using carrier: $CARRIER" @@ -137,9 +141,13 @@ if [ "$CARRIER" = "jazz" ]; then ;; esac else - read -p "Enter Room ID: " ROOM_ID + if [ "$CARRIER" = "jitsi" ]; then + read -p "Enter Jitsi room URL (https://host/room or host/room): " ROOM_ID + else + read -p "Enter Room ID: " ROOM_ID + fi if [ -z "$ROOM_ID" ]; then - echo "[X] Room ID cannot be empty" + echo "[X] Room ID/URL cannot be empty" exit 1 fi fi @@ -425,7 +433,7 @@ echo "" echo "Container name: $CONTAINER_NAME" echo "Carrier: $CARRIER" echo "Transport: $TRANSPORT" -echo "Room ID: $ROOM_ID" +echo "Room ID/URL: $ROOM_ID" echo "Encryption key: $KEY" echo "" TRANSPORT_PAYLOAD=""