summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/cmd-new-session.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-07-26 12:58:45 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-07-26 12:58:45 +0000
commit9d7adcc68d696be005aa775aefe71538f3e82a63 (patch)
treeb71f925bb054ef9ce5cef706aea3729f79c7f0f7 /usr.bin/tmux/cmd-new-session.c
parent040c8a0a2f1ccc88349164fc8bb816cde4d204c7 (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 'usr.bin/tmux/cmd-new-session.c')
-rw-r--r--usr.bin/tmux/cmd-new-session.c29
1 files changed, 1 insertions, 28 deletions
diff --git a/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c
index e1c83315222..a5ea55a3329 100644
--- a/usr.bin/tmux/cmd-new-session.c
+++ b/usr.bin/tmux/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-session.c,v 1.7 2009/07/23 15:47:56 nicm Exp $ */
+/* $OpenBSD: cmd-new-session.c,v 1.8 2009/07/26 12:58:44 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -26,8 +26,6 @@
int cmd_new_session_parse(struct cmd *, int, char **, char **);
int cmd_new_session_exec(struct cmd *, struct cmd_ctx *);
-void cmd_new_session_send(struct cmd *, struct buffer *);
-void cmd_new_session_recv(struct cmd *, struct buffer *);
void cmd_new_session_free(struct cmd *);
void cmd_new_session_init(struct cmd *, int);
size_t cmd_new_session_print(struct cmd *, char *, size_t);
@@ -46,8 +44,6 @@ const struct cmd_entry cmd_new_session_entry = {
cmd_new_session_init,
cmd_new_session_parse,
cmd_new_session_exec,
- cmd_new_session_send,
- cmd_new_session_recv,
cmd_new_session_free,
cmd_new_session_print
};
@@ -229,29 +225,6 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
}
void
-cmd_new_session_send(struct cmd *self, struct buffer *b)
-{
- struct cmd_new_session_data *data = self->data;
-
- buffer_write(b, data, sizeof *data);
- cmd_send_string(b, data->newname);
- cmd_send_string(b, data->winname);
- cmd_send_string(b, data->cmd);
-}
-
-void
-cmd_new_session_recv(struct cmd *self, struct buffer *b)
-{
- struct cmd_new_session_data *data;
-
- self->data = data = xmalloc(sizeof *data);
- buffer_read(b, data, sizeof *data);
- data->newname = cmd_recv_string(b);
- data->winname = cmd_recv_string(b);
- data->cmd = cmd_recv_string(b);
-}
-
-void
cmd_new_session_free(struct cmd *self)
{
struct cmd_new_session_data *data = self->data;