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 /server-fn.c | |
parent | 2bb89bc5bce2f5ab59c4bec760f1151c4fb8b0a3 (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 'server-fn.c')
-rw-r--r-- | server-fn.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/server-fn.c b/server-fn.c index 409f65bc..05f4168e 100644 --- a/server-fn.c +++ b/server-fn.c @@ -48,6 +48,15 @@ server_fill_environ(struct session *s) } void +server_write_error(struct client *c, const char *msg) +{ + struct msg_print_data printdata; + + strlcpy(printdata.msg, msg, sizeof printdata.msg); + server_write_client(c, MSG_ERROR, &printdata, sizeof printdata); +} + +void server_write_client( struct client *c, enum hdrtype type, const void *buf, size_t len) { @@ -220,7 +229,7 @@ wrong: password_failures++; for (i = 0; i < ARRAY_LENGTH(&clients); i++) { c = ARRAY_ITEM(&clients, i); - if (c == NULL || c->prompt_buffer == NULL) + if (c == NULL || c->prompt_buffer == NULL) continue; *c->prompt_buffer = '\0'; |