More commands

Author: rjtokenring

src/cbor/MessageDecoder.cpp

@@ -93,6 +93,9 @@ bool copyCBORStringToArray(CborValue * param, char * dest, size_t dest_size) {
       char * val      = 0;
       size_t val_size = 0;
       if (cbor_value_dup_text_string(param, &val, &val_size, NULL) == CborNoError) {
+        if (val_size > dest_size) {
+          val_size = dest_size;
+        }
         strncpy(dest, val, dest_size);
         free(val);
         return true;
@@ -101,6 +104,22 @@ bool copyCBORStringToArray(CborValue * param, char * dest, size_t dest_size) {
     return false;
 }
 
+bool copyCBORByteToArray(CborValue * param, uint8_t * dest, size_t dest_size) {
+    if (cbor_value_is_byte_string(param)) {
+      uint8_t * val      = 0;
+      size_t    val_size = 0;
+      if (cbor_value_dup_byte_string(param, &val, &val_size, NULL) == CborNoError) {
+        if (val_size > dest_size) {
+          val_size = dest_size;
+        }
+        std::copy(val, val + dest_size, dest);
+        free(val);
+        return true;
+      }
+    }
+    return false;
+}
+
 MessageDecoder::ArrayParserState MessageDecoder::decodeGetThingIdCommand(CborValue * param, Message * message) {
   GetThingIdCommand * thingCommand = (GetThingIdCommand *) message;
 
@@ -169,6 +188,26 @@ MessageDecoder::ArrayParserState MessageDecoder::decodeOTAAvailableCommand(CborV
     return ArrayParserState::Error;
   }
 
+  if (cbor_value_advance(param) != CborNoError) {
+    return ArrayParserState::Error;
+  }
+
+  if (copyCBORByteToArray(param, ota->fields.params.initialSha256, sizeof(ota->fields.params.initialSha256))) {
+    return ArrayParserState::LeaveArray;
+  } else {
+    return ArrayParserState::Error;
+  }
+
+  if (cbor_value_advance(param) != CborNoError) {
+    return ArrayParserState::Error;
+  }
+
+  if (copyCBORByteToArray(param, ota->fields.params.finalSha256, sizeof(ota->fields.params.finalSha256))) {
+    return ArrayParserState::LeaveArray;
+  } else {
+    return ArrayParserState::Error;
+  }
+
   return ArrayParserState::LeaveArray;
 }