diff --git a/ipk-source/socat-at-bridge/CONTROL/control b/ipk-source/socat-at-bridge/CONTROL/control index 005425c..fe0ecbe 100755 --- a/ipk-source/socat-at-bridge/CONTROL/control +++ b/ipk-source/socat-at-bridge/CONTROL/control @@ -1,5 +1,5 @@ Package: socat-at-bridge -Version: 1.1.0 +Version: 1.1.1 Depends: libc socat Source: github/iamromulan/quectel-rgmii-toolkit Section: utils diff --git a/ipk-source/socat-at-bridge/CONTROL/prerm b/ipk-source/socat-at-bridge/CONTROL/prerm index 1d2b03b..0b1e05e 100755 --- a/ipk-source/socat-at-bridge/CONTROL/prerm +++ b/ipk-source/socat-at-bridge/CONTROL/prerm @@ -2,6 +2,7 @@ echo "Disabling socat-at-bridge at startup" service socat-at-bridge disable +service socat-at-bridge-smd7 disable echo "Stopping socat-at-bridge" service socat-at-bridge stop service socat-at-bridge-smd7 stop diff --git a/ipk-source/socat-at-bridge/root/etc/init.d/socat-at-bridge b/ipk-source/socat-at-bridge/root/etc/init.d/socat-at-bridge index 5ee71e9..7569dd8 100755 --- a/ipk-source/socat-at-bridge/root/etc/init.d/socat-at-bridge +++ b/ipk-source/socat-at-bridge/root/etc/init.d/socat-at-bridge @@ -1,33 +1,13 @@ #!/bin/sh /etc/rc.common -START=30 +START=05 STOP=10 USE_PROCD=1 start_service() { procd_open_instance - - # Start socat to create /dev/ttySMD11IN and /dev/ttySMD11 - procd_set_param command \ - socat -d -d pty,link=/dev/ttySMD11IN,raw,echo=0,group=20,perm=660 \ - pty,link=/dev/ttySMD11,raw,echo=1,group=20,perm=660 - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance - - # Start cat process for /dev/smd11 to /dev/ttySMD11IN - procd_open_instance - procd_set_param command sh -c "cat /dev/smd11 > /dev/ttySMD11IN" - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance - - # Start cat process for /dev/ttySMD11IN to /dev/smd11 - procd_open_instance - procd_set_param command sh -c "cat /dev/ttySMD11IN > /dev/smd11" + procd_set_param command /usr/sbin/socat-at-bridge.sh procd_set_param respawn procd_set_param stdout 1 procd_set_param stderr 1 diff --git a/ipk-source/socat-at-bridge/root/etc/init.d/socat-at-bridge-smd7 b/ipk-source/socat-at-bridge/root/etc/init.d/socat-at-bridge-smd7 index 708f3dc..742f4fc 100755 --- a/ipk-source/socat-at-bridge/root/etc/init.d/socat-at-bridge-smd7 +++ b/ipk-source/socat-at-bridge/root/etc/init.d/socat-at-bridge-smd7 @@ -1,33 +1,13 @@ #!/bin/sh /etc/rc.common -START=30 +START=05 STOP=10 USE_PROCD=1 start_service() { procd_open_instance - - # Start socat to create /dev/ttySMD7IN and /dev/ttySMD7 - procd_set_param command \ - socat -d -d pty,link=/dev/ttySMD7IN,raw,echo=0,group=20,perm=660 \ - pty,link=/dev/ttySMD7,raw,echo=1,group=20,perm=660 - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance - - # Start cat process for /dev/smd11 to /dev/ttySMD11IN - procd_open_instance - procd_set_param command sh -c "cat /dev/smd7 > /dev/ttySMD7IN" - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance - - # Start cat process for /dev/ttySMD7IN to /dev/smd7 - procd_open_instance - procd_set_param command sh -c "cat /dev/ttySMD7IN > /dev/smd7" + procd_set_param command /usr/sbin/socat-at-bridge-smd7.sh procd_set_param respawn procd_set_param stdout 1 procd_set_param stderr 1 diff --git a/ipk-source/socat-at-bridge/root/usr/sbin/socat-at-bridge-smd7.sh b/ipk-source/socat-at-bridge/root/usr/sbin/socat-at-bridge-smd7.sh new file mode 100755 index 0000000..ffb0da7 --- /dev/null +++ b/ipk-source/socat-at-bridge/root/usr/sbin/socat-at-bridge-smd7.sh @@ -0,0 +1,37 @@ +#!/bin/ash + +# Optional logging for debugging +LOGFILE="/var/log/socat-bridge-smd7.log" + +# Start socat to create virtual TTY devices +echo "$(date): Starting socat..." >> "$LOGFILE" +socat -d -d pty,link=/dev/ttySMD7IN,raw,echo=0,group=20,perm=660 \ + pty,link=/dev/ttySMD7,raw,echo=1,group=20,perm=660 & +SOCAT_PID=$! + +# Allow socat to initialize +sleep 1 + +# Start forwarding data from /dev/smd7 to /dev/ttySMD7IN +echo "$(date): Starting forward from /dev/smd7 to /dev/ttySMD7IN..." >> "$LOGFILE" +cat /dev/smd7 > /dev/ttySMD7IN & +CAT1_PID=$! + +# Start forwarding data from /dev/ttySMD7IN to /dev/smd7 +echo "$(date): Starting forward from /dev/ttySMD7IN to /dev/smd7..." >> "$LOGFILE" +cat /dev/ttySMD7IN > /dev/smd7 & +CAT2_PID=$! + +# Handle script termination and cleanup +cleanup() { + echo "$(date): Cleaning up processes..." >> "$LOGFILE" + kill "$SOCAT_PID" "$CAT1_PID" "$CAT2_PID" 2>/dev/null + wait + echo "$(date): All processes stopped." >> "$LOGFILE" +} + +# Trap termination signals to run cleanup +trap cleanup INT TERM EXIT + +# Wait for all background processes to finish +wait diff --git a/ipk-source/socat-at-bridge/root/usr/sbin/socat-at-bridge.sh b/ipk-source/socat-at-bridge/root/usr/sbin/socat-at-bridge.sh new file mode 100755 index 0000000..67d4663 --- /dev/null +++ b/ipk-source/socat-at-bridge/root/usr/sbin/socat-at-bridge.sh @@ -0,0 +1,37 @@ +#!/bin/ash + +# Optional logging for debugging +LOGFILE="/var/log/socat-bridge.log" + +# Start socat to create virtual TTY devices +echo "$(date): Starting socat..." >> "$LOGFILE" +socat -d -d pty,link=/dev/ttySMD11IN,raw,echo=0,group=20,perm=660 \ + pty,link=/dev/ttySMD11,raw,echo=1,group=20,perm=660 & +SOCAT_PID=$! + +# Allow socat to initialize +sleep 1 + +# Start forwarding data from /dev/smd11 to /dev/ttySMD11IN +echo "$(date): Starting forward from /dev/smd11 to /dev/ttySMD11IN..." >> "$LOGFILE" +cat /dev/smd11 > /dev/ttySMD11IN & +CAT1_PID=$! + +# Start forwarding data from /dev/ttySMD11IN to /dev/smd11 +echo "$(date): Starting forward from /dev/ttySMD11IN to /dev/smd11..." >> "$LOGFILE" +cat /dev/ttySMD11IN > /dev/smd11 & +CAT2_PID=$! + +# Handle script termination and cleanup +cleanup() { + echo "$(date): Cleaning up processes..." >> "$LOGFILE" + kill "$SOCAT_PID" "$CAT1_PID" "$CAT2_PID" 2>/dev/null + wait + echo "$(date): All processes stopped." >> "$LOGFILE" +} + +# Trap termination signals to run cleanup +trap cleanup INT TERM EXIT + +# Wait for all background processes to finish +wait diff --git a/opkg-feed/Packages b/opkg-feed/Packages index dd316b3..811ff2f 100644 --- a/opkg-feed/Packages +++ b/opkg-feed/Packages @@ -139,14 +139,14 @@ Description: SMS Tool for 3G/4G/5G modem Package: socat-at-bridge -Version: 1.1.0 +Version: 1.1.1 Depends: libc, socat Section: utils Architecture: aarch64_cortex-a53 Maintainer: iamromulan -MD5Sum: 8192ace5fa449a8989eecdec09138dc8 -Size: 1392 -Filename: socat-at-bridge_1.1.0_aarch64_cortex-a53.ipk +MD5Sum: 2f44c96722059294c162c845a3f628b9 +Size: 1828 +Filename: socat-at-bridge_1.1.1_aarch64_cortex-a53.ipk Source: https://github.com/iamromulan/quectel-rgmii-toolkit Description: Sets up a tty from SMD11 diff --git a/opkg-feed/Packages.gz b/opkg-feed/Packages.gz index 11e326c..9deea14 100644 Binary files a/opkg-feed/Packages.gz and b/opkg-feed/Packages.gz differ diff --git a/opkg-feed/Packages.log b/opkg-feed/Packages.log index fad1d8a..d0e1664 100644 --- a/opkg-feed/Packages.log +++ b/opkg-feed/Packages.log @@ -1,15 +1,15 @@ -Starting package analysis - Wed Jan 15 03:47:11 PM EST 2025 +Starting package analysis - Thu Jan 16 12:57:32 AM EST 2025 No update needed for atinout (version 0.9.1, MD5: 6c8d3c910477e31940ee7740111a7fdf, size: 4226) No update needed for luci-app-atinout-mod (version 1.3.4-20241006, MD5: 2dac55de763333c37dd1728957fc8294, size: 4827) No update needed for ookla-speedtest (version 1.2.0, MD5: 2183f2df42a00380e761cace096e17c3, size: 1075762) No update needed for sdxpinn-console-menu (version 0.0.2, MD5: 42d2fd4c85b36a9c29e66092899080a4, size: 7365) No update needed for sdxpinn-mount-fix (version 1.2.0, MD5: 3f1279109adfba02bb7ca31026ec1c51, size: 55275) No update needed for sdxpinn-quecmanager (version 1.0.1, MD5: 142068c54af185e673b9e0ba0686b0f4, size: 715428) -Updating package info for sdxpinn-quecmanager-beta... -Updated sdxpinn-quecmanager-beta to version 1.1.0-5 with MD5: 068e1cb05640a17146e07fad6d37725f and size: 844008 +No update needed for sdxpinn-quecmanager-beta (version 1.1.0-5, MD5: 068e1cb05640a17146e07fad6d37725f, size: 844008) No update needed for sms-tool (version 2025.1.12-APmod-iamromulan, MD5: 24ad9e7380b8390764e8e55cbf2b658a, size: 13590) -No update needed for socat-at-bridge (version 1.1.0, MD5: 8192ace5fa449a8989eecdec09138dc8, size: 1392) +Updating package info for socat-at-bridge... +Updated socat-at-bridge to version 1.1.1 with MD5: 2f44c96722059294c162c845a3f628b9 and size: 1828 No update needed for tailscale (version 1.78.1-1, MD5: f909644bc5a7bd23fa1827e3276cc2c3, size: 9906361) No update needed for tailscaled (version 1.78.1-1, MD5: 950b788a00dccf5349e6bac1ec0cca6e, size: 18014482) Package file and signature updated successfully. -Package analysis completed - Wed Jan 15 03:47:11 PM EST 2025 +Package analysis completed - Thu Jan 16 12:57:33 AM EST 2025 diff --git a/opkg-feed/Packages.sig b/opkg-feed/Packages.sig index f5cfd95..7f7dd21 100644 --- a/opkg-feed/Packages.sig +++ b/opkg-feed/Packages.sig @@ -1,2 +1,2 @@ untrusted comment: signed by key 6262698f038d1226 -RWRiYmmPA40SJtKxv8Db34+wdWgvWvsHtsOJFCXd/8TN2RHA/0rMH7urrBJDBTVpnQWoQluo8+eLzzhGkuzrwhX0ouIK/JwYtg0= +RWRiYmmPA40SJorUAk7+p1GORPaOtslU8YGA5cSAubOXkQx3H3Oult9jDOQK/JnTM2VyqO5FdGXEyuImGVDm6vh/dIqPzhc8pQA= diff --git a/opkg-feed/socat-at-bridge_1.1.0_aarch64_cortex-a53.ipk b/opkg-feed/socat-at-bridge_1.1.0_aarch64_cortex-a53.ipk deleted file mode 100644 index 620fcb4..0000000 Binary files a/opkg-feed/socat-at-bridge_1.1.0_aarch64_cortex-a53.ipk and /dev/null differ diff --git a/opkg-feed/socat-at-bridge_1.1.1_aarch64_cortex-a53.ipk b/opkg-feed/socat-at-bridge_1.1.1_aarch64_cortex-a53.ipk new file mode 100644 index 0000000..3ec10f2 Binary files /dev/null and b/opkg-feed/socat-at-bridge_1.1.1_aarch64_cortex-a53.ipk differ