From b0a99e85b66c8d74022525908a9584ce1b002da4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 31 Oct 2015 13:43:38 +0000
Subject: [PATCH] Don't shift version out of peerid, it is needed later.

---
 client.c | 2 +-
 proc.c   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client.c b/client.c
index 008bd631..bc934d33 100644
--- a/client.c
+++ b/client.c
@@ -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/proc.c b/proc.c
index 12e50e2c..6b84fc00 100644
--- a/proc.c
+++ b/proc.c
@@ -122,7 +122,6 @@ peer_check_version(struct tmuxpeer *peer, struct imsg *imsg)
 
 		return (-1);
 	}
-	imsg->hdr.peerid >>= 8;
 	return (0);
 }