From 74a4ae57457b6e0abca429043548683fc0637e27 Mon Sep 17 00:00:00 2001
From: gardners <paul@servalproject.org>
Date: Thu, 9 May 2013 21:44:05 +0930
Subject: [PATCH] add numbers to messages in meshms list messages output.

---
 meshms.c               | 10 +++++-----
 rhizome.h              |  4 +++-
 serialization_meshms.c |  5 ++++-
 tests/meshms           |  1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/meshms.c b/meshms.c
index 427a6f40..da414fc2 100644
--- a/meshms.c
+++ b/meshms.c
@@ -286,10 +286,8 @@ int app_meshms_read_messagelog(const struct cli_parsed *parsed, void *context)
   ret = meshms_read_message(m,buffer_file);
   //hex_dump(buffer_file,buffer_length);
   int offset_buffer = 0;
-  ret = deserialize_meshms(buffer_file,&offset_buffer,buffer_length,"unknown");
+  ret = deserialize_meshms(0,buffer_file,&offset_buffer,buffer_length,"unknown");
   
-
-
   free(buffer_file);
   return ret;
   
@@ -434,6 +432,7 @@ int app_meshms_list_messages(const struct cli_parsed *parsed, void *context)
  
  // Display list of messages in reverse order
   const char *names[]={
+    "number",
     "offset",
     "length",
     "sender",
@@ -443,7 +442,7 @@ int app_meshms_list_messages(const struct cli_parsed *parsed, void *context)
     "type",
     "message"
   };
-  cli_columns(8, names);
+  cli_columns(9, names);
 
  int i;
  for(i=message_count-1;i>=0;i--) 
@@ -452,7 +451,8 @@ int app_meshms_list_messages(const struct cli_parsed *parsed, void *context)
        =sides[i]?"received":
        ((offsets[i]<right_ack_limit)?"delivered":"unacknowledged");
      int boffset=offsets[i];
-     deserialize_meshms(sides[i]?right_messages:left_messages,&boffset,
+     deserialize_meshms(message_count-1-i,
+			sides[i]?right_messages:left_messages,&boffset,
 			sides[i]?right_len:left_len,delivery_status);
    }
 
diff --git a/rhizome.h b/rhizome.h
index 06771c00..e4439422 100644
--- a/rhizome.h
+++ b/rhizome.h
@@ -698,7 +698,9 @@ int rhizome_dump_file(const char *id, const char *filepath, int64_t *length);
 int rhizome_database_filehash_from_id(const char *id, uint64_t version, char hash[SHA512_DIGEST_STRING_LENGTH]);
 
 int serialize_meshms(unsigned char *buffer,int *offset,unsigned int length,const char *sender_did,const char *recipient_did, unsigned long long time, const char *payload, int payload_length);
-int deserialize_meshms(unsigned char *buffer,int *offset, int buffer_size,char *delivery_status);
+int deserialize_meshms(int message_number,
+		       unsigned char *buffer,int *offset, int buffer_size,
+		       char *delivery_status);
 int rhizome_meshms_find_conversation(const char *sender_sid, 
 				     const char *recipient_sid, 
 				     char *manifest_id, int offset);
diff --git a/serialization_meshms.c b/serialization_meshms.c
index d6e81afa..92407e06 100644
--- a/serialization_meshms.c
+++ b/serialization_meshms.c
@@ -263,7 +263,8 @@ int deserialize_ack(unsigned char *buffer,int *offset, int buffer_size,
   return 0;
 }
 
-int deserialize_meshms(unsigned char *buffer,int *offset, int buffer_size,
+int deserialize_meshms(int message_number,
+		       unsigned char *buffer,int *offset, int buffer_size,
 		       char *delivery_status)
 {
   int ret = 0;
@@ -272,6 +273,8 @@ int deserialize_meshms(unsigned char *buffer,int *offset, int buffer_size,
   unsigned int length =0;
 
   unsigned int start_offset=*offset;
+
+  cli_printf("%d",message_number); cli_delim(":");
   
   cli_printf("%d",*offset); cli_delim(":");
   
diff --git a/tests/meshms b/tests/meshms
index 4c3dcddf..f3f8f65c 100755
--- a/tests/meshms
+++ b/tests/meshms
@@ -45,6 +45,7 @@ test_createPly() {
    executeOk_servald rhizome list
    assert_rhizome_list --fromhere=1 --author=$SIDA1 ''
    executeOk_servald meshms list messages $SIDA1 $SIDA2
+   tfw_cat --stderr --stdout
 }
 
 runTests "$@"