Sync OpenBSD patchset 181:

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.

1 files changed, 1 insertions, 26 deletions

diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index c26c741f..d48c950c 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-switch-client.c,v 1.16 2009-07-14 06:43:33 nicm Exp $ */
+/* $Id: cmd-switch-client.c,v 1.17 2009-07-28 22:12:16 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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;