fixed mon message encoding

diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h
index f982d23034aadc3785aed16b34a808ee816096b0..0c92b8ef2b33695a42259893c5772ac70f6c5919 100644 (file)
--- a/src/messages/MMonCommand.h
+++ b/src/messages/MMonCommand.h
@@ -42,15 +42,15 @@ class MMonCommand : public Message {
   }
   
   void encode_payload() {
-    ::_encode(fsid, payload);
-    ::_encode(inst, payload);
-    ::_encode(cmd, payload);
+    ::encode(fsid, payload);
+    ::encode(inst, payload);
+    ::encode(cmd, payload);
   }
   void decode_payload() {
-    int off = 0;
-    ::_decode(fsid, payload, off);
-    ::_decode(inst, payload, off);
-    ::_decode(cmd, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(fsid, p);
+    ::decode(inst, p);
+    ::decode(cmd, p);
   }
 };
 

diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h
index 04834079d9c3301f33e058b656c3dce08c4de8ce..5d2199ca6917eb1380bf16633f0d429133c3f1cf 100644 (file)
--- a/src/messages/MMonCommandAck.h
+++ b/src/messages/MMonCommandAck.h
@@ -32,14 +32,13 @@ class MMonCommandAck : public Message {
   }
   
   void encode_payload() {
-    payload.append((char*)&r, sizeof(r));
-    ::_encode(rs, payload);
+    ::encode(r, payload);
+    ::encode(rs, payload);
   }
   void decode_payload() {
-    int off = 0;
-    payload.copy(off, sizeof(r), (char*)&r);
-    off += sizeof(r);
-    ::_decode(rs, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(r, p);
+    ::decode(rs, p);
   }
 };
 

diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h
index 8d5bc41a3e3bc3bb93faa1f61ecfc96c1d065171..cce6bab2cc969b8dcee8b0b985eb8cb7663b8069 100644 (file)
--- a/src/messages/MMonElection.h
+++ b/src/messages/MMonElection.h
@@ -52,15 +52,15 @@ public:
   }
   
   void encode_payload() {
-    ::_encode(op, payload);
-    ::_encode(epoch, payload);
-    ::_encode(monmap_bl, payload);
+    ::encode(op, payload);
+    ::encode(epoch, payload);
+    ::encode(monmap_bl, payload);
   }
   void decode_payload() {
-    int off = 0;
-    ::_decode(op, payload, off);
-    ::_decode(epoch, payload, off);
-    ::_decode(monmap_bl, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(op, p);
+    ::decode(epoch, p);
+    ::decode(monmap_bl, p);
   }
   
 };

diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h
index 199f650fc4280e4fa21a11419a2c4f47068b748a..f2d04ab286e55772ab74f5e9aef5c4e5c79fbfe5 100644 (file)
--- a/src/messages/MMonPaxos.h
+++ b/src/messages/MMonPaxos.h
@@ -71,27 +71,27 @@ class MMonPaxos : public Message {
   }
 
   void encode_payload() {
-    ::_encode(epoch, payload);
-    ::_encode(op, payload);
-    ::_encode(machine_id, payload);
-    ::_encode(last_committed, payload);
-    ::_encode(pn_from, payload);
-    ::_encode(pn, payload);
-    ::_encode(uncommitted_pn, payload);
-    ::_encode(lease_expire, payload);
-    ::_encode(values, payload);
+    ::encode(epoch, payload);
+    ::encode(op, payload);
+    ::encode(machine_id, payload);
+    ::encode(last_committed, payload);
+    ::encode(pn_from, payload);
+    ::encode(pn, payload);
+    ::encode(uncommitted_pn, payload);
+    ::encode(lease_expire, payload);
+    ::encode(values, payload);
   }
   void decode_payload() {
-    int off = 0;
-    ::_decode(epoch, payload, off);
-    ::_decode(op, payload, off);
-    ::_decode(machine_id, payload, off);
-    ::_decode(last_committed, payload, off);
-    ::_decode(pn_from, payload, off);   
-    ::_decode(pn, payload, off);   
-    ::_decode(uncommitted_pn, payload, off);
-    ::_decode(lease_expire, payload, off);
-    ::_decode(values, payload, off);
+    bufferlist::iterator p = payload.begin();
+    ::decode(epoch, p);
+    ::decode(op, p);
+    ::decode(machine_id, p);
+    ::decode(last_committed, p);
+    ::decode(pn_from, p);   
+    ::decode(pn, p);   
+    ::decode(uncommitted_pn, p);
+    ::decode(lease_expire, p);
+    ::decode(values, p);
   }
 };