From d697bfcc2234dbc66c377a8ba0672679a64ca6b8 Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Fri, 16 Nov 2007 05:43:33 +0000
Subject: [PATCH] fixed header encoding/decoding

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2072 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/kernel/messenger.c | 14 +++++++--
 trunk/ceph/kernel/messenger.h | 56 ++++++++++++++++++++++++++++++++---
 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/trunk/ceph/kernel/messenger.c b/trunk/ceph/kernel/messenger.c
index a922e13cc8b14..8ffba6815fda8 100644
--- a/trunk/ceph/kernel/messenger.c
+++ b/trunk/ceph/kernel/messenger.c
@@ -292,14 +292,17 @@ static void prepare_write_message(struct ceph_connection *con)
 	list_add(&m->list_head, &con->out_sent);
 	con->out_msg = m;
 
+	/* encode header */
+	ceph_encode_header(&con->out_hdr, &m->hdr);
+
 	/* tag + hdr + front */
 	con->out_kvec[0].iov_base = &tag_msg;
 	con->out_kvec[0].iov_len = 1;
-	con->out_kvec[1].iov_base = &m->hdr;
-	con->out_kvec[1].iov_len = sizeof(m->hdr);
+	con->out_kvec[1].iov_base = &con->out_hdr;
+	con->out_kvec[1].iov_len = sizeof(con->out_hdr);
 	con->out_kvec[2] = m->front;
 	con->out_kvec_left = 3;
-	con->out_kvec_bytes = 1 + sizeof(m->hdr) + m->front.iov_len;
+	con->out_kvec_bytes = 1 + sizeof(con->out_hdr) + m->front.iov_len;
 	con->out_kvec_cur = con->out_kvec;
 
 	/* pages */
@@ -440,6 +443,11 @@ static int read_message_partial(struct ceph_connection *con)
 		ret = _krecvmsg(con->sock, &m->hdr + con->in_base_pos, left, 0);
 		if (ret <= 0) return ret;
 		con->in_base_pos += ret;
+		if (con->in_base_pos == sizeof(struct ceph_msg_header)) {
+			/* decode/swab */
+			ceph_decode_header(&m->hdr);
+			break;
+		}
 	}
 
 	/* front */
diff --git a/trunk/ceph/kernel/messenger.h b/trunk/ceph/kernel/messenger.h
index d2acc4135feb0..14f8decea643d 100644
--- a/trunk/ceph/kernel/messenger.h
+++ b/trunk/ceph/kernel/messenger.h
@@ -81,7 +81,7 @@ struct ceph_connection {
 
 	/* out queue */
 	struct list_head out_queue;
-
+	struct ceph_msg_header out_hdr;
 	struct kvec out_kvec[4],
 		*out_kvec_cur;
 	int out_kvec_left;   /* kvec's left */
@@ -114,22 +114,23 @@ extern void ceph_msg_put(struct ceph_msg *msg);
 extern int ceph_msg_send(struct ceph_messenger *msgr, struct ceph_msg *msg);
 
 
+/* encoding/decoding helpers */
 static __inline__ int ceph_decode_64(void **p, void *end, __u64 *v) {
-	if (*p + sizeof(v) > end)
+	if (*p + sizeof(*v) > end)
 		return -EINVAL;
 	*v = le64_to_cpu(*(__u64*)p);
 	p += sizeof(*v);
 	return 0;
 }
 static __inline__ int ceph_decode_32(void **p, void *end, __u32 *v) {
-	if (*p + sizeof(v) > end)
+	if (*p + sizeof(*v) > end)
 		return -EINVAL;
 	*v = le32_to_cpu(*(__u32*)p);
 	p += sizeof(*v);
 	return 0;
 }
 static __inline__ int ceph_decode_16(void **p, void *end, __u16 *v) {
-	if (*p + sizeof(v) > end)
+	if (*p + sizeof(*v) > end)
 		return -EINVAL;
 	*v = le16_to_cpu(*(__u16*)p);
 	p += sizeof(*v);
@@ -155,6 +156,53 @@ static __inline__ int ceph_decode_addr(void **p, void *end, struct ceph_entity_a
 	return 0;
 }
 
+static __inline__ int ceph_decode_name(void **p, void *end, struct ceph_entity_name *v) {
+	if (*p + sizeof(*v) > end)
+		return -EINVAL;
+	v->type = le32_to_cpu(*(__u32*)p);
+	p += sizeof(__u32);
+	v->num = le32_to_cpu(*(__u32*)p);
+	p += sizeof(__u32);
+	return 0;
+}
+
+/* hmm, these are actually identical, yeah? */
+static __inline__ void ceph_decode_inst(struct ceph_entity_inst *to)
+{
+	to->name.type = le32_to_cpu(to->name.type);
+	to->name.num = le32_to_cpu(to->name.num);
+	to->addr.erank = le32_to_cpu(to->addr.erank);
+	to->addr.nonce = le32_to_cpu(to->addr.nonce);
+}
+static __inline__ void ceph_encode_inst(struct ceph_entity_inst *to, struct ceph_entity_inst *from)
+{
+	to->name.type = cpu_to_le32(from->name.type);
+	to->name.num = cpu_to_le32(from->name.num);
+	to->addr.erank = cpu_to_le32(from->addr.erank);
+	to->addr.nonce = cpu_to_le32(from->addr.nonce);
+	to->addr.ipaddr = from->addr.ipaddr;
+}
+
+static __inline__ void ceph_encode_header(struct ceph_msg_header *to, struct ceph_msg_header *from)
+{
+	to->seq = cpu_to_le32(from->seq);
+	to->type = cpu_to_le32(from->type);
+	ceph_encode_inst(&to->src, &from->src);
+	ceph_encode_inst(&to->dst, &from->dst);
+	to->front_len = cpu_to_le16(from->front_len);
+	to->data_off = cpu_to_le16(from->data_off);
+	to->data_len = cpu_to_le16(from->data_len);
+}
+static __inline__ void ceph_decode_header(struct ceph_msg_header *to)
+{
+	to->seq = cpu_to_le32(to->seq);
+	to->type = cpu_to_le32(to->type);
+	ceph_decode_inst(&to->src);
+	ceph_decode_inst(&to->dst);
+	to->front_len = cpu_to_le16(to->front_len);
+	to->data_off = cpu_to_le16(to->data_off);
+	to->data_len = cpu_to_le16(to->data_len);
+}
 
 
 #endif
-- 
2.39.5