From 91bddbc02f2de5e49d0c3a9d170da5432c4acc9e Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 7 Sep 2023 09:15:29 -0400 Subject: [PATCH] Fix #248, change blocktype value used for custody Change the custody signal blocktype from 13 to 73 --- v7/inc/v7_types.h | 3 +-- v7/src/v7_bp_canonical_block.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/v7/inc/v7_types.h b/v7/inc/v7_types.h index 234cb0ad..d19fda87 100644 --- a/v7/inc/v7_types.h +++ b/v7/inc/v7_types.h @@ -59,8 +59,7 @@ typedef enum bp_blocktype bp_blocktype_hopCount = 10, bp_blocktype_bpsec_bib = 11, bp_blocktype_bpsec_bcb = 12, - bp_blocktype_custodyTrackingBlock = 13, - bp_blocktype_MAX_NORMAL = 14, + bp_blocktype_custodyTrackingBlock = 73, /* * These are internal block types - they exist only locally in this implementation diff --git a/v7/src/v7_bp_canonical_block.c b/v7/src/v7_bp_canonical_block.c index fb66ab7e..40dffc09 100644 --- a/v7/src/v7_bp_canonical_block.c +++ b/v7/src/v7_bp_canonical_block.c @@ -69,7 +69,7 @@ void v7_encode_bp_canonical_bundle_block(v7_encode_state_t *enc, const bp_canoni break; } - if (encode_blocktype < bp_blocktype_MAX_NORMAL) + if (encode_blocktype < bp_blocktype_SPECIAL_BLOCKS_START) { v7_encode_bp_blocktype(enc, &encode_blocktype); v7_encode_bp_blocknum(enc, &v->blockNum);