From 19a08e79ea4761b848a761e3295ab3dc9b4c99eb Mon Sep 17 00:00:00 2001
From: zarazaex69 <zarazaex@tuta.io>
Date: Wed, 6 May 2026 18:32:16 +0300
Subject: [PATCH] feat(sh): sync script with client-id key

---
 script/cnc.sh                      | 7 ++++++-
 script/docker/olcrtc-entrypoint.sh | 3 +++
 script/srv.sh                      | 9 +++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/script/cnc.sh b/script/cnc.sh
index c0044ce..987745f 100755
--- a/script/cnc.sh
+++ b/script/cnc.sh
@@ -123,6 +123,10 @@ if [ -z "$ROOM_ID" ]; then
     exit 1
 fi
 
+echo ""
+read -p "Enter Client ID [default: default]: " CLIENT_ID_INPUT
+CLIENT_ID=${CLIENT_ID_INPUT:-default}
+
 echo ""
 read -p "Enter Encryption Key (hex): " KEY
 
@@ -253,7 +257,7 @@ podman run -d \
     -v $WORK_DIR:/app:Z \
     -w /app \
     $IMAGE_NAME \
-    ./olcrtc -mode cnc -carrier "$CARRIER" -id "$ROOM_ID" -key "$KEY" \
+    ./olcrtc -mode cnc -carrier "$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[@]}"
 
@@ -266,6 +270,7 @@ echo "Container name: $CONTAINER_NAME"
 echo "Carrier:        $CARRIER"
 echo "Transport:      $TRANSPORT"
 echo "Room ID:        $ROOM_ID"
+echo "Client ID:      $CLIENT_ID"
 echo "SOCKS5 proxy:   $SOCKS_IP:$SOCKS_PORT"
 echo ""
 echo "View logs:"
diff --git a/script/docker/olcrtc-entrypoint.sh b/script/docker/olcrtc-entrypoint.sh
index 0473f93..f8c971e 100644
--- a/script/docker/olcrtc-entrypoint.sh
+++ b/script/docker/olcrtc-entrypoint.sh
@@ -37,6 +37,7 @@ link="${OLCRTC_LINK:-direct}"
 data_dir="${OLCRTC_DATA_DIR:-/usr/share/olcrtc}"
 dns_server="${OLCRTC_DNS:-1.1.1.1:53}"
 key="${OLCRTC_KEY:-${KEY:-}}"
+client_id="${OLCRTC_CLIENT_ID:-${CLIENT_ID:-}}"
 key_file="${OLCRTC_KEY_FILE:-/var/lib/olcrtc/key.hex}"
 socks_proxy="${OLCRTC_SOCKS_PROXY:-}"
 socks_proxy_port="${OLCRTC_SOCKS_PROXY_PORT:-1080}"
@@ -59,6 +60,7 @@ vp8_batch="${OLCRTC_VP8_BATCH:-0}"
 [ -n "$carrier" ] || die "set OLCRTC_CARRIER (e.g. telemost, jazz, wbstream)"
 [ -n "$transport" ] || die "set OLCRTC_TRANSPORT (e.g. datachannel, videochannel, seichannel, vp8channel)"
 [ -n "$room_id" ] || die "set OLCRTC_ROOM_ID to the room identifier"
+[ -n "$client_id" ] || die "set OLCRTC_CLIENT_ID to bind the expected client"
 
 if [ -z "$key" ]; then
     if [ -s "$key_file" ]; then
@@ -84,6 +86,7 @@ set -- /usr/local/bin/olcrtc \
     -mode "$mode" \
     -carrier "$carrier" \
     -id "$room_id" \
+    -client-id "$client_id" \
     -key "$key" \
     -link "$link" \
     -transport "$transport" \
diff --git a/script/srv.sh b/script/srv.sh
index 6dabcd3..f992aaf 100755
--- a/script/srv.sh
+++ b/script/srv.sh
@@ -149,6 +149,10 @@ else
     fi
 fi
 
+echo ""
+read -p "Enter Client ID [default: default]: " CLIENT_ID_INPUT
+CLIENT_ID=${CLIENT_ID_INPUT:-default}
+
 echo ""
 read -p "DNS server [default: 1.1.1.1:53]: " DNS_INPUT
 DNS=${DNS_INPUT:-1.1.1.1:53}
@@ -296,7 +300,7 @@ podman run -d \
     -v $WORK_DIR:/app:Z \
     -w /app \
     $IMAGE_NAME \
-    ./olcrtc -mode srv -carrier "$CARRIER" -id "$ROOM_ID" -key "$KEY" \
+    ./olcrtc -mode srv -carrier "$CARRIER" -id "$ROOM_ID" -client-id "$CLIENT_ID" -key "$KEY" \
         -link direct -transport "$TRANSPORT" -dns "$DNS" -data data \
         "${EXTRA_ARGS[@]}" "${TRANSPORT_ARGS[@]}"
 
@@ -341,6 +345,7 @@ echo "Container name: $CONTAINER_NAME"
 echo "Carrier:        $CARRIER"
 echo "Transport:      $TRANSPORT"
 echo "Room ID:        $ACTUAL_ROOM_ID"
+echo "Client ID:      $CLIENT_ID"
 echo "Encryption key: $KEY"
 
 if [ ${#EXTRA_ARGS[@]} -gt 0 ]; then
@@ -355,7 +360,7 @@ echo "Stop server:"
 echo "  podman stop $CONTAINER_NAME"
 echo ""
 echo "Client command:"
-echo -n "  ./olcrtc -mode cnc -carrier \"$CARRIER\" -id \"$ACTUAL_ROOM_ID\" -key \"$KEY\" \\"
+echo -n "  ./olcrtc -mode cnc -carrier \"$CARRIER\" -id \"$ACTUAL_ROOM_ID\" -client-id \"$CLIENT_ID\" -key \"$KEY\" \\"
 echo ""
 echo -n "    -link direct -transport \"$TRANSPORT\" -dns 1.1.1.1:53 -data data \\"
 echo ""