From f8412386c443911c056e597e21951b4fa2290b0e Mon Sep 17 00:00:00 2001
From: Dominic Grimm <dominic@dergrimm.net>
Date: Thu, 6 Feb 2025 13:10:56 +0100
Subject: [PATCH] Update socat script

---
 docker/t38modem/.dockerignore        |  2 --
 docker/t38modem/docker-compose.yml   | 15 ---------------
 docker/t38modem/services/socat.sh    |  6 +++---
 docker/t38modem/services/t38modem.sh |  2 +-
 docker/t38modem/start.sh             | 12 +++++++++---
 5 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 docker/t38modem/.dockerignore
 delete mode 100644 docker/t38modem/docker-compose.yml

diff --git a/docker/t38modem/.dockerignore b/docker/t38modem/.dockerignore
deleted file mode 100644
index 45e1bbd..0000000
--- a/docker/t38modem/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Dockerfile
-docker-compose.yml
diff --git a/docker/t38modem/docker-compose.yml b/docker/t38modem/docker-compose.yml
deleted file mode 100644
index 0c0e2b3..0000000
--- a/docker/t38modem/docker-compose.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
-  epvpn:
-    image: git.dergrimm.net/dergrimm/t38modem:latest
-    restart: always
-    environment:
-      T38MODEM_SIP_USERNAME: ""
-      T38MODEM_SIP_PASSWORD: ""
-      T38MODEM_SIP_SERVER: "hg.eventphone.de"
-      T38MODEM_STUN_SERVER: "stun.l.google.com:19302"
-      T38MODEM_DISABLE_T38: true
-      T38MODEM_CMD_ARGS: "-t"
-      T38MODEM_START_PORT: 3000
-      T38MODEM_MODEM_COUNT: 2
-    ports:
-      - 127.0.0.1:3000-3002:3000-3002
diff --git a/docker/t38modem/services/socat.sh b/docker/t38modem/services/socat.sh
index 2943066..3159a68 100644
--- a/docker/t38modem/services/socat.sh
+++ b/docker/t38modem/services/socat.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# $1: PTTY ID
-# $2: TCP server port
+# $1: PTTY
+# $2: Unix socket
 
-socat -d -d "file:${1},raw,echo=0" "TCP-LISTEN:${2},reuseaddr"
+socat -d -d "file:${1},raw,echo=0" "UNIX-LISTEN:${2},reuseaddr"
diff --git a/docker/t38modem/services/t38modem.sh b/docker/t38modem/services/t38modem.sh
index 28ecd98..558c0c1 100644
--- a/docker/t38modem/services/t38modem.sh
+++ b/docker/t38modem/services/t38modem.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PTTY=$(seq -f "+${1}-%g" -s "," "${T38MODEM_MODEM_COUNT}")
+PTTY=$(seq -f "+${1}%g" -s "," "${T38MODEM_MODEM_COUNT}")
 
 CMD=(
     "t38modem"
diff --git a/docker/t38modem/start.sh b/docker/t38modem/start.sh
index fb86e53..4e1f7b9 100644
--- a/docker/t38modem/start.sh
+++ b/docker/t38modem/start.sh
@@ -1,11 +1,17 @@
 #!/usr/bin/env bash
 
-exec "${PREFIX}/services/t38modem.sh" /dev/ttyT38 &
+set -e
+
+PTTY_PREFIX=/dev/ttyT38-
+SOCKET_DIR=/run/t38modem
+
+exec "${PREFIX}/services/t38modem.sh" "$PTTY_PREFIX" &
 sleep 5
 
 for i in $(seq "${T38MODEM_MODEM_COUNT}"); do
-    PORT="$(("${T38MODEM_START_PORT}" + i - 1))"
-    exec "${PREFIX}/services/socat.sh" "/dev/ttyT38-${i}" "${PORT}" &
+    PTTY="${PTTY_PREFIX}${i}"
+    SOCKET="${SOCKET_DIR}/${i}.sock"
+    exec "${PREFIX}/services/socat.sh" "$PTTY" "$SOCKET" &
 done
 
 wait