From 37a8c1c124204056e122ffc2d98aaf71e1e33d9a Mon Sep 17 00:00:00 2001
From: Scott Lystig Fritchie <slfritchie@snookles.com>
Date: Thu, 18 Jun 2015 16:16:23 +0900
Subject: [PATCH] WIP: PB wrestling

---
 src/machi.proto           | 18 ++++++++++--------
 src/machi_pb_messages.csv |  7 +++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/machi.proto b/src/machi.proto
index 09e0061..98abbb4 100644
--- a/src/machi.proto
+++ b/src/machi.proto
@@ -48,12 +48,6 @@ enum MpbCSumType {
      CSUM_TAG_SERVER_REGEN = 3;
 }
 
-// Error response - may be generated for any Req
-message MpbErrorResp {
-    required bytes errmsg = 1;
-    required uint32 errcode = 2;
-}
-
 // chunk_pos() type
 message MpbChunkPos {
     required uint32 offset = 1;
@@ -68,14 +62,20 @@ message MpbChunkCSum {
 }
 
 // epoch_id() type
-message MbpEpochId {
+message MpbEpochId {
     required uint32 epoch_num = 1;
     required MpbChunkCSum epoch_csum = 2;
 }
 
+// Error response - may be generated for any Req
+message MpbErrorResp {
+    required bytes errmsg = 1;
+    required uint32 errcode = 2;
+}
+
 // append_chunk() request
 message MpbAppendChunkReq {
-    required bytes prefix = 1;
+    required string prefix = 1;
     optional bytes placement_key = 2;
     required bytes chunk = 3;
     optional uint32 chunk_extra = 4;
@@ -93,3 +93,5 @@ message MpbAuthReq {
     required bytes user = 1;
     required bytes password = 2;
 }
+
+
diff --git a/src/machi_pb_messages.csv b/src/machi_pb_messages.csv
index 5d7b239..2b1fdcd 100644
--- a/src/machi_pb_messages.csv
+++ b/src/machi_pb_messages.csv
@@ -1,4 +1,7 @@
 0,MpbErrorResp,machi_pbundefined
 1,MpbPingReq,machi_pbundefined
-2,MpbAppendChunkReq,machi_pbundefined
-3,MpbAppendChunkResp,machi_pbundefined
+2,MpbAuthReq,machi_pbundefined
+3,MpbAuthResp,machi_pbundefined
+4,MpbPingResp,machi_pbundefined
+5,MpbAppendChunkReq,machi_pbundefined
+6,MpbAppendChunkResp,machi_pbundefined