diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2009-07-26 12:58:44 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2009-07-26 12:58:44 +0000 |
commit | 34a82e7629073b8a6bb3474862d5f36b670338a3 (patch) | |
tree | 7b997970d436b81cd73370dd75ba0096756a903c /cmd-list.c | |
parent | 2bb89bc5bce2f5ab59c4bec760f1151c4fb8b0a3 (diff) | |
download | rtmux-34a82e7629073b8a6bb3474862d5f36b670338a3.tar.gz rtmux-34a82e7629073b8a6bb3474862d5f36b670338a3.tar.bz2 rtmux-34a82e7629073b8a6bb3474862d5f36b670338a3.zip |
Make all messages sent between the client and server fixed size.
This is the first of two changes to make the protocol more resilient and less
sensitive to other changes in the code, particularly with commands. The client
now packs argv into a buffer and sends it to the server for parsing, rather
than doing it itself and sending the parsed command data.
As a side-effect this also removes a lot of now-unused command marshalling
code.
Mixing a server without this change and a client with or vice versa will cause
tmux to hang or crash, please ensure that tmux is entirely killed before
upgrading.
Diffstat (limited to 'cmd-list.c')
-rw-r--r-- | cmd-list.c | 35 |
1 files changed, 0 insertions, 35 deletions
@@ -87,41 +87,6 @@ cmd_list_exec(struct cmd_list *cmdlist, struct cmd_ctx *ctx) } void -cmd_list_send(struct cmd_list *cmdlist, struct buffer *b) -{ - struct cmd *cmd; - u_int n; - - n = 0; - TAILQ_FOREACH(cmd, cmdlist, qentry) - n++; - - buffer_write(b, &n, sizeof n); - TAILQ_FOREACH(cmd, cmdlist, qentry) - cmd_send(cmd, b); -} - -struct cmd_list * -cmd_list_recv(struct buffer *b) -{ - struct cmd_list *cmdlist; - struct cmd *cmd; - u_int n; - - buffer_read(b, &n, sizeof n); - - cmdlist = xmalloc(sizeof *cmdlist); - TAILQ_INIT(cmdlist); - - while (n-- > 0) { - cmd = cmd_recv(b); - TAILQ_INSERT_TAIL(cmdlist, cmd, qentry); - } - - return (cmdlist); -} - -void cmd_list_free(struct cmd_list *cmdlist) { struct cmd *cmd; |