[mynewt-mcumgr] branch master updated: log_mgmt: Restore old `log show` response format

[cc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-mcumgr.git


The following commit(s) were added to refs/heads/master by this push:
     new e25110f  log_mgmt: Restore old `log show` response format
e25110f is described below

commit e25110fd6cbc0b8ddd49ef483f5719a0ee9e784a
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Thu Oct 24 11:42:50 2019 -0700

    log_mgmt: Restore old `log show` response format
    
    The change to the format of this response causes parsing issues for some
    clients.  To resolve these issues, restore the old format as follows:
    
    1. Re-add the top-level `next_index` field.  It will always have a
    value of 0 (a single "next index" no longer exists).  This field will
    be considered deprecated with plans to remove it in the future.
    
    2. Remove the per-log `next_index` field.
---
 cmd/log_mgmt/src/log_mgmt.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/cmd/log_mgmt/src/log_mgmt.c b/cmd/log_mgmt/src/log_mgmt.c
index dab534f..0cd94a9 100644
--- a/cmd/log_mgmt/src/log_mgmt.c
+++ b/cmd/log_mgmt/src/log_mgmt.c
@@ -328,10 +328,6 @@ log_encode(const struct log_mgmt_log *log, CborEncoder *ctxt,
     err |= cbor_encode_text_stringz(&logs, log->name);
     err |= cbor_encode_text_stringz(&logs, "type");
     err |= cbor_encode_uint(&logs, log->type);
-#if !LOG_MGMT_GLOBAL_IDX
-    err |= cbor_encode_text_stringz(&logs, "next_index");
-    err |= cbor_encode_int(&logs, log->index);
-#endif
 
     rc = log_encode_entries(log, &logs, timestamp, index);
     if (rc != 0) {
@@ -359,13 +355,11 @@ log_mgmt_show(struct mgmt_ctxt *ctxt)
     CborEncoder logs;
     CborError err;
     uint64_t index;
+    uint32_t next_idx;
     int64_t timestamp;
     int name_len;
     int log_idx;
     int rc;
-#if LOG_MGMT_GLOBAL_IDX
-    uint32_t next_idx;
-#endif
 
     const struct cbor_attr_t attr[] = {
         {
@@ -403,10 +397,13 @@ log_mgmt_show(struct mgmt_ctxt *ctxt)
     if (rc != 0) {
         return LOG_MGMT_ERR_EUNKNOWN;
     }
+#else
+    /* This field is deprecated.  Set it to 0 until it gets removed. */
+    next_idx = 0;
+#endif
 
     err |= cbor_encode_text_stringz(&ctxt->encoder, "next_index");
     err |= cbor_encode_uint(&ctxt->encoder, next_idx);
-#endif
 
     err |= cbor_encode_text_stringz(&ctxt->encoder, "logs");
     err |= cbor_encoder_create_array(&ctxt->encoder, &logs,