This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/36/head
in repository terminology.
View the commit online.
commit 1c733f5dddfdb613198b06e3829aee2677479106
Author: [email protected] <[email protected]>
AuthorDate: Thu May 14 19:08:42 2026 -0600
fix(tymux): sync CLI proxy ATTACHED parser with shell_pid field
The standalone tymux CLI proxy maintains its own hand-rolled copy of
protocol structs. The recent 4-commit chain added int32_t shell_pid to
the ATTACHED message, but src/bin/tymux.c was missed. Without this fix,
the proxy's strict-equality size check rejects every ATTACHED message
from a daemon built from this branch, breaking tymux attach.
This fix mirrors the shell_pid field into _TsrvMsgAttached and switches
the size check from strict equality to forward-compatible <, matching
termsrv_recv_attached and the NOTIFY v2 pattern. The proxy does not
consume shell_pid — the field is decoded and discarded — the goal is
only struct compatibility and forward-compatible size checking.
---
src/bin/tymux.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/tymux.c b/src/bin/tymux.c
index ba4a9b0d..847e9be8 100644
--- a/src/bin/tymux.c
+++ b/src/bin/tymux.c
@@ -117,6 +117,7 @@ typedef struct {
uint32_t backlog_buf_count;
uint32_t backlog_max_lines;
uint32_t oldest_buf_id;
+ int32_t shell_pid; /* daemon-side shell pid, or -1 */
} _TsrvMsgAttached;
typedef struct {
@@ -333,7 +334,7 @@ _proto_recv_attached(int sock_fd, int *shm_fd_out,
if (n < (ssize_t)(sizeof(hdr) + sizeof(pl))) return -1;
if (msg.msg_flags & MSG_CTRUNC) return -1;
if (hdr.type != _TSRV_MSG_ATTACHED) return -1;
- if (hdr.size != sizeof(pl)) return -1;
+ if (hdr.size < sizeof(pl)) return -1;
struct cmsghdr *cm = CMSG_FIRSTHDR(&msg);
if (!cm || cm->cmsg_type != SCM_RIGHTS ||
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
