Use TLV parser for generic parser array

Author: fbeutin-ledger

src_features/generic_tx_parser/gtp_data_path.c

@@ -45,8 +45,9 @@ static bool handle_array(const s_tlv_data *data, s_data_path_context *context) {
 
     ctx.args = &context->data_path->elements[context->data_path->size].array;
     explicit_bzero(ctx.args, sizeof(*ctx.args));
-    if (!tlv_parse(data->value, data->length, (f_tlv_data_handler) &handle_array_struct, &ctx))
+    if (!handle_array_struct(data, &ctx)) {
         return false;
+    }
     context->data_path->elements[context->data_path->size].type = ELEMENT_TYPE_ARRAY;
     context->data_path->size += 1;
     return true;
@@ -78,7 +79,7 @@ static bool handle_slice(const s_tlv_data *data, s_data_path_context *context) {
 
     ctx.args = &context->data_path->elements[context->data_path->size].slice;
     explicit_bzero(ctx.args, sizeof(*ctx.args));
-    if (!handle_slice_struct(data, &ctx)){
+    if (!handle_slice_struct(data, &ctx)) {
         return false;
     }
     context->data_path->elements[context->data_path->size].type = ELEMENT_TYPE_SLICE;

src_features/generic_tx_parser/gtp_path_array.c

@@ -4,24 +4,16 @@
 #include <string.h>
 #include "gtp_path_array.h"
 #include "read.h"
+#include "tlv_library.h"
+#include "buffer.h"
 #include "os_print.h"
 #include "utils.h"
 
-enum {
-    TAG_WEIGHT = 0x01,
-    TAG_START = 0x02,
-    TAG_END = 0x03,
-};
-
-static bool handle_weight(const s_tlv_data *data, s_path_array_context *context) {
-    if (data->length != sizeof(context->args->weight)) {
-        return false;
-    }
-    context->args->weight = data->value[0];
-    return true;
+static bool handle_weight(const tlv_data_t *data, s_path_array_context *context) {
+    return get_uint8_t_from_tlv_data(data, &context->args->weight);
 }
 
-static bool handle_start(const s_tlv_data *data, s_path_array_context *context) {
+static bool handle_start(const tlv_data_t *data, s_path_array_context *context) {
     if (data->length != sizeof(context->args->start)) {
         return false;
     }
@@ -30,7 +22,7 @@ static bool handle_start(const s_tlv_data *data, s_path_array_context *context)
     return true;
 }
 
-static bool handle_end(const s_tlv_data *data, s_path_array_context *context) {
+static bool handle_end(const tlv_data_t *data, s_path_array_context *context) {
     if (data->length != sizeof(context->args->end)) {
         return false;
     }
@@ -39,24 +31,17 @@ static bool handle_end(const s_tlv_data *data, s_path_array_context *context) {
     return true;
 }
 
+// clang-format off
+#define TLV_TAGS(X)                                        \
+    X(0x01, TAG_WEIGHT, handle_weight, ALLOW_MULTIPLE_TAG) \
+    X(0x02, TAG_START,  handle_start,  ENFORCE_UNIQUE_TAG) \
+    X(0x03, TAG_END,    handle_end,    ENFORCE_UNIQUE_TAG)
+
+DEFINE_TLV_PARSER(TLV_TAGS, parse_tlv_array)
+
 bool handle_array_struct(const s_tlv_data *data, s_path_array_context *context) {
-    bool ret;
-
-    switch (data->tag) {
-        case TAG_WEIGHT:
-            ret = handle_weight(data, context);
-            break;
-        case TAG_START:
-            ret = handle_start(data, context);
-            break;
-        case TAG_END:
-            ret = handle_end(data, context);
-            break;
-        default:
-            PRINTF(TLV_TAG_ERROR_MSG, data->tag);
-            ret = false;
-    }
-    return ret;
+    buffer_t payload_buffer = {.ptr = data->value, .size = data->length};
+    return parse_tlv_array(&payload_buffer, context, NULL);
 }
 
 #endif  // HAVE_GENERIC_TX_PARSER

src_features/generic_tx_parser/gtp_path_slice.c

@@ -28,11 +28,11 @@ static bool handle_end(const s_tlv_data *data, s_path_slice_context *context) {
     X(0x01, TAG_START, handle_start, ENFORCE_UNIQUE_TAG) \
     X(0x02, TAG_END,   handle_end,   ENFORCE_UNIQUE_TAG)
 
-DEFINE_TLV_PARSER(TLV_TAGS, parse_tlv_slice_struct)
+DEFINE_TLV_PARSER(TLV_TAGS, parse_tlv_slice)
 
 bool handle_slice_struct(const s_tlv_data *data, s_path_slice_context *context) {
     buffer_t payload_buffer = {.ptr = data->value, .size = data->length};
-    return parse_tlv_slice_struct(&payload_buffer, context, NULL);
+    return parse_tlv_slice(&payload_buffer, context, NULL);
 }
 
 #endif  // HAVE_GENERIC_TX_PARSER