From f76130e90da2e3bba9943b2f1bac1c3761ba4fad Mon Sep 17 00:00:00 2001
From: zarazaex69 <zarazaex@tuta.io>
Date: Mon, 11 May 2026 14:22:32 +0300
Subject: [PATCH] fix: replace -carrier with -auth in srv.sh, cnc.sh,
 entrypoint.sh

Also add OLCRTC_CARRIER fallback in entrypoint for backwards compat
with existing docker-compose configs.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 script/cnc.sh                      |  8 ++++----
 script/docker/olcrtc-entrypoint.sh | 12 ++++++------
 script/srv.sh                      | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/script/cnc.sh b/script/cnc.sh
index 52ef7ec..c126adc 100755
--- a/script/cnc.sh
+++ b/script/cnc.sh
@@ -67,7 +67,7 @@ fi
 
 echo "[+] Using Podman"
 echo ""
-echo "Select carrier:"
+echo "Select auth:"
 echo "  1) telemost"
 echo "  2) jazz"
 echo "  3) wbstream"
@@ -85,7 +85,7 @@ case "$CARRIER_CHOICE" in
         ;;
 esac
 
-echo "[*] Using carrier: $CARRIER"
+echo "[*] Using auth: $CARRIER"
 echo ""
 
 echo "Select transport:"
@@ -284,7 +284,7 @@ podman run -d \
     -v $WORK_DIR:/app:Z \
     -w /app \
     $IMAGE_NAME \
-    ./olcrtc -mode cnc -carrier "$CARRIER" -id "$ROOM_ID" -client-id "$CLIENT_ID" -key "$KEY" \
+    ./olcrtc -mode cnc -auth "$CARRIER" -id "$ROOM_ID" -client-id "$CLIENT_ID" -key "$KEY" \
         -link direct -transport "$TRANSPORT" -dns "$DNS" -data data \
         -socks-host 0.0.0.0 -socks-port "$SOCKS_PORT" "${TRANSPORT_ARGS[@]}" "${AUTH_ARGS[@]}"
 
@@ -294,7 +294,7 @@ echo ""
 echo "[+] Client started successfully!"
 echo ""
 echo "Container name: $CONTAINER_NAME"
-echo "Carrier:        $CARRIER"
+echo "Auth:           $CARRIER"
 echo "Transport:      $TRANSPORT"
 echo "Room ID:        $ROOM_ID"
 echo "Client ID:      $CLIENT_ID"
diff --git a/script/docker/olcrtc-entrypoint.sh b/script/docker/olcrtc-entrypoint.sh
index d62d4b2..3591d07 100644
--- a/script/docker/olcrtc-entrypoint.sh
+++ b/script/docker/olcrtc-entrypoint.sh
@@ -31,7 +31,7 @@ fi
 
 mode="${OLCRTC_MODE:-srv}"
 room_id="${OLCRTC_ROOM_ID:-}"
-carrier="${OLCRTC_CARRIER:-}"
+auth="${OLCRTC_AUTH:-${OLCRTC_CARRIER:-}}"
 transport="${OLCRTC_TRANSPORT:-}"
 link="${OLCRTC_LINK:-direct}"
 data_dir="${OLCRTC_DATA_DIR:-/usr/share/olcrtc}"
@@ -57,16 +57,16 @@ vp8_fps="${OLCRTC_VP8_FPS:-0}"
 vp8_batch="${OLCRTC_VP8_BATCH:-0}"
 
 [ "$mode" = "srv" ] || die "server image defaults to OLCRTC_MODE=srv; got '$mode'"
-[ -n "$carrier" ] || die "set OLCRTC_CARRIER (e.g. telemost, jazz, wbstream)"
+[ -n "$auth" ] || die "set OLCRTC_AUTH (e.g. telemost, jazz, wbstream)"
 [ -n "$transport" ] || die "set OLCRTC_TRANSPORT (e.g. datachannel, videochannel, seichannel, vp8channel)"
 [ -n "$client_id" ] || die "set OLCRTC_CLIENT_ID to bind the expected client"
 
 if [ -z "$room_id" ]; then
-    case "$carrier" in
+    case "$auth" in
         jazz|wbstream)
             echo "olcrtc-entrypoint: OLCRTC_ROOM_ID not set, generating room via -mode gen..." >&2
-            room_id=$(/usr/local/bin/olcrtc -mode gen -carrier "$carrier" -dns "$dns_server" -amount 1 -data "$data_dir")
-            [ -n "$room_id" ] || die "room generation failed for carrier '$carrier'"
+            room_id=$(/usr/local/bin/olcrtc -mode gen -auth "$auth" -dns "$dns_server" -amount 1 -data "$data_dir")
+            [ -n "$room_id" ] || die "room generation failed for auth '$auth'"
             echo "olcrtc-entrypoint: generated room ID: $room_id" >&2
             ;;
         *)
@@ -97,7 +97,7 @@ esac
 
 set -- /usr/local/bin/olcrtc \
     -mode "$mode" \
-    -carrier "$carrier" \
+    -auth "$auth" \
     -id "$room_id" \
     -client-id "$client_id" \
     -key "$key" \
diff --git a/script/srv.sh b/script/srv.sh
index 18daa18..b7dfefe 100755
--- a/script/srv.sh
+++ b/script/srv.sh
@@ -63,7 +63,7 @@ fi
 
 echo "[+] Using Podman"
 echo ""
-echo "Select carrier:"
+echo "Select auth:"
 echo "  1) telemost"
 echo "  2) jazz"
 echo "  3) wbstream"
@@ -81,7 +81,7 @@ case "$CARRIER_CHOICE" in
         ;;
 esac
 
-echo "[*] Using carrier: $CARRIER"
+echo "[*] Using auth: $CARRIER"
 echo ""
 
 echo "Select transport:"
@@ -307,7 +307,7 @@ if [ "$GEN_ROOM" = "1" ]; then
         -v $WORK_DIR:/app:Z \
         -w /app \
         $IMAGE_NAME \
-        ./olcrtc -mode gen -carrier "$CARRIER" -dns "$DNS" -amount 1 -data data)
+        ./olcrtc -mode gen -auth "$CARRIER" -dns "$DNS" -amount 1 -data data)
     if [ -z "$ROOM_ID" ]; then
         echo "[X] Room generation failed"
         exit 1
@@ -340,7 +340,7 @@ podman run -d \
     -v $WORK_DIR:/app:Z \
     -w /app \
     $IMAGE_NAME \
-    ./olcrtc -mode srv -carrier "$CARRIER" -id "$ROOM_ID" -client-id "$CLIENT_ID" -key "$KEY" \
+    ./olcrtc -mode srv -auth "$CARRIER" -id "$ROOM_ID" -client-id "$CLIENT_ID" -key "$KEY" \
         -link direct -transport "$TRANSPORT" -dns "$DNS" -data data \
         "${EXTRA_ARGS[@]}" "${TRANSPORT_ARGS[@]}"
 
@@ -353,7 +353,7 @@ echo ""
 echo "[+] Server started successfully!"
 echo ""
 echo "Container name: $CONTAINER_NAME"
-echo "Carrier:        $CARRIER"
+echo "Auth:           $CARRIER"
 echo "Transport:      $TRANSPORT"
 echo "Room ID:        $ROOM_ID"
 echo "Client ID:      $CLIENT_ID"
@@ -410,7 +410,7 @@ echo "Stop server:"
 echo "  podman stop $CONTAINER_NAME"
 echo ""
 echo "Client command:"
-echo -n "  ./olcrtc -mode cnc -carrier \"$CARRIER\" -id \"$ROOM_ID\" -client-id \"$CLIENT_ID\" -key \"$KEY\" \\"
+echo -n "  ./olcrtc -mode cnc -auth \"$CARRIER\" -id \"$ROOM_ID\" -client-id \"$CLIENT_ID\" -key \"$KEY\" \\"
 echo ""
 echo -n "    -link direct -transport \"$TRANSPORT\" -dns $DNS -data data \\"
 echo ""