summaryrefslogtreecommitdiffstats
path: root/cmd-switch-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-07-26 12:58:44 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-07-26 12:58:44 +0000
commit34a82e7629073b8a6bb3474862d5f36b670338a3 (patch)
tree7b997970d436b81cd73370dd75ba0096756a903c /cmd-switch-client.c
parent2bb89bc5bce2f5ab59c4bec760f1151c4fb8b0a3 (diff)
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-switch-client.c')
-rw-r--r--cmd-switch-client.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index 1ad4701f..80c4dc5d 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -29,8 +29,6 @@
int cmd_switch_client_parse(struct cmd *, int, char **, char **);
int cmd_switch_client_exec(struct cmd *, struct cmd_ctx *);
-void cmd_switch_client_send(struct cmd *, struct buffer *);
-void cmd_switch_client_recv(struct cmd *, struct buffer *);
void cmd_switch_client_free(struct cmd *);
size_t cmd_switch_client_print(struct cmd *, char *, size_t);
@@ -46,8 +44,6 @@ const struct cmd_entry cmd_switch_client_entry = {
NULL,
cmd_switch_client_parse,
cmd_switch_client_exec,
- cmd_switch_client_send,
- cmd_switch_client_recv,
cmd_switch_client_free,
cmd_switch_client_print
};
@@ -112,27 +108,6 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_ctx *ctx)
}
void
-cmd_switch_client_send(struct cmd *self, struct buffer *b)
-{
- struct cmd_switch_client_data *data = self->data;
-
- buffer_write(b, data, sizeof *data);
- cmd_send_string(b, data->name);
- cmd_send_string(b, data->target);
-}
-
-void
-cmd_switch_client_recv(struct cmd *self, struct buffer *b)
-{
- struct cmd_switch_client_data *data;
-
- self->data = data = xmalloc(sizeof *data);
- buffer_read(b, data, sizeof *data);
- data->name = cmd_recv_string(b);
- data->target = cmd_recv_string(b);
-}
-
-void
cmd_switch_client_free(struct cmd *self)
{
struct cmd_switch_client_data *data = self->data;