diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-14 21:04:04 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-14 21:04:04 +0000 |
| commit | a9b6bfdddd570753e52dca73169f70864502c38c (patch) | |
| tree | bc259ba79ba2ddddd5579857ccaad69eef5d55d4 /server-fn.c | |
| parent | a604dfbb979c994ee7fb068416e0b60c95ce2198 (diff) | |
| download | rtmux-a9b6bfdddd570753e52dca73169f70864502c38c.tar.gz rtmux-a9b6bfdddd570753e52dca73169f70864502c38c.tar.bz2 rtmux-a9b6bfdddd570753e52dca73169f70864502c38c.zip | |
Sync OpenBSD patchset 243:
Switch tmux to use imsg. This is the last major change to make the
client-server protocol more resilient and make the protocol versioning work
properly. In future, the only things requiring a protocol version bump will be
changes in the message structs, and (when both client and server have this
change) mixing different versions should nicely report an error message.
As a side effect this also makes the code tidier, fixes a problem with the way
errors reported during server startup were handled, and supports fd passing
(which will be used in future).
Looked over by eric@, thanks.
Please note that mixing a client with this change with an older server or vice
versa may cause tmux to crash or hang - tmux should be completely exited before
upgrading.
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/server-fn.c b/server-fn.c index 35162c93..d01c8ab4 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.80 2009-08-09 17:48:55 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.81 2009-08-14 21:04:04 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -55,18 +55,12 @@ void server_write_client( struct client *c, enum msgtype type, const void *buf, size_t len) { - struct hdr hdr; + struct imsgbuf *ibuf = &c->ibuf; if (c->flags & CLIENT_BAD) return; - log_debug("writing %d to client %d", type, c->fd); - - hdr.type = type; - hdr.size = len; - - buffer_write(c->out, &hdr, sizeof hdr); - if (buf != NULL && len > 0) - buffer_write(c->out, buf, len); + log_debug("writing %d to client %d", type, c->ibuf.fd); + imsg_compose(ibuf, type, PROTOCOL_VERSION, -1, -1, (void *) buf, len); } void |