diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-10-31 13:43:39 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2015-10-31 13:43:39 +0000 |
| commit | 0c2f3fa14b7dba1601821d1e7d9bab203a1b40bd (patch) | |
| tree | 6897c8d74b8a51d3e8a365e85f54926b4acbb1dc | |
| parent | f751bdbad271dd30657b99762bcd6e5a8a7fd9bc (diff) | |
Don't shift version out of peerid, it is needed later.
| -rw-r--r-- | usr.bin/tmux/client.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/proc.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index 75028301486..73a46204f78 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.102 2015/10/31 08:13:58 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.103 2015/10/31 13:43:38 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -596,7 +596,7 @@ client_dispatch_wait(struct imsg *imsg) fprintf(stderr, "protocol version mismatch " "(client %d, server %u)\n", PROTOCOL_VERSION, - imsg->hdr.peerid); + imsg->hdr.peerid & 0xff); client_exitval = 1; proc_exit(client_proc); break; diff --git a/usr.bin/tmux/proc.c b/usr.bin/tmux/proc.c index 496e20794a7..0079d866d65 100644 --- a/usr.bin/tmux/proc.c +++ b/usr.bin/tmux/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.2 2015/10/29 09:35:31 nicm Exp $ */ +/* $OpenBSD: proc.c,v 1.3 2015/10/31 13:43:38 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@users.sourceforge.net> @@ -122,7 +122,6 @@ peer_check_version(struct tmuxpeer *peer, struct imsg *imsg) return (-1); } - imsg->hdr.peerid >>= 8; return (0); } |