diff --git a/src/vcm.c b/src/vcm.c index 3af0e47..69537de 100644 --- a/src/vcm.c +++ b/src/vcm.c @@ -88,14 +88,14 @@ static void vcm_reject(VCM_t* vcm, mc_neighbour_s* neighbour) { vcm_rep->vcm.chain->link.buf = malloc(32); vcm_rep->vcm.chain->link.size = 32; memcpy(vcm_rep->vcm.chain->link.buf, coordination->chain.links[0], 32); - vcm->vcm.chain->area = calloc(1, sizeof(struct area)); - vcm->vcm.chain->area->list.count = 1; - vcm->vcm.chain->area->list.size = 1 * sizeof(OCTET_STRING_t*); - vcm->vcm.chain->area->list.array = malloc(1 * sizeof(OCTET_STRING_t*)); + vcm->vcm.chain->area = calloc(1, sizeof(ChainInformationArea_t)); + vcm->vcm.chain->area->trees.list.count = 1; + vcm->vcm.chain->area->trees.list.size = 1 * sizeof(OCTET_STRING_t*); + vcm->vcm.chain->area->trees.list.array = malloc(1 * sizeof(OCTET_STRING_t*)); for (int q = 0; q < 1; ++q) { - vcm->vcm.chain->area->list.array[q] = calloc(1, sizeof(OCTET_STRING_t)); - vcm->vcm.chain->area->list.array[q]->buf = malloc(4); - vcm->vcm.chain->area->list.array[q]->size = 4; + vcm->vcm.chain->area->trees.list.array[q] = calloc(1, sizeof(OCTET_STRING_t)); + vcm->vcm.chain->area->trees.list.array[q]->buf = malloc(4); + vcm->vcm.chain->area->trees.list.array[q]->size = 4; } } @@ -340,14 +340,14 @@ static int vcm_check_handle_request(VCM_t* vcm, mc_neighbour_s* neighbour) { } memcpy(vcm_rep->vcm.chain->link.buf, coordination->chain.links[to_link], 32); - vcm->vcm.chain->area = calloc(1, sizeof(struct area)); - vcm->vcm.chain->area->list.count = 1; - vcm->vcm.chain->area->list.size = 1 * sizeof(OCTET_STRING_t*); - vcm->vcm.chain->area->list.array = malloc(1 * sizeof(OCTET_STRING_t*)); + vcm->vcm.chain->area = calloc(1, sizeof(ChainInformationArea_t)); + vcm->vcm.chain->area->trees.list.count = 1; + vcm->vcm.chain->area->trees.list.size = 1 * sizeof(OCTET_STRING_t*); + vcm->vcm.chain->area->trees.list.array = malloc(1 * sizeof(OCTET_STRING_t*)); for (int q = 0; q < 1; ++q) { - vcm->vcm.chain->area->list.array[q] = calloc(1, sizeof(OCTET_STRING_t)); - vcm->vcm.chain->area->list.array[q]->buf = malloc(4); - vcm->vcm.chain->area->list.array[q]->size = 4; + vcm->vcm.chain->area->trees.list.array[q] = calloc(1, sizeof(OCTET_STRING_t)); + vcm->vcm.chain->area->trees.list.array[q]->buf = malloc(4); + vcm->vcm.chain->area->trees.list.array[q]->size = 4; } } @@ -612,14 +612,14 @@ static int intersection_detected(VCM_t* vcm, mc_neighbour_s* neighbour) { vcm_req->vcm.chain->link.buf = malloc(32); vcm_req->vcm.chain->link.size = 32; memcpy(vcm_req->vcm.chain->link.buf, coordination->chain.links[0], 32); - vcm->vcm.chain->area = calloc(1, sizeof(struct area)); - vcm->vcm.chain->area->list.count = 1; - vcm->vcm.chain->area->list.size = 1 * sizeof(OCTET_STRING_t*); - vcm->vcm.chain->area->list.array = malloc(1 * sizeof(OCTET_STRING_t*)); + vcm->vcm.chain->area = calloc(1, sizeof(ChainInformationArea_t)); + vcm->vcm.chain->area->trees.list.count = 1; + vcm->vcm.chain->area->trees.list.size = 1 * sizeof(OCTET_STRING_t*); + vcm->vcm.chain->area->trees.list.array = malloc(1 * sizeof(OCTET_STRING_t*)); for (int q = 0; q < 1; ++q) { - vcm->vcm.chain->area->list.array[q] = calloc(1, sizeof(OCTET_STRING_t)); - vcm->vcm.chain->area->list.array[q]->buf = malloc(4); - vcm->vcm.chain->area->list.array[q]->size = 4; + vcm->vcm.chain->area->trees.list.array[q] = calloc(1, sizeof(OCTET_STRING_t)); + vcm->vcm.chain->area->trees.list.array[q]->buf = malloc(4); + vcm->vcm.chain->area->trees.list.array[q]->size = 4; } } @@ -994,14 +994,14 @@ static int mk_vcm(uint8_t* vcm_uper, uint16_t* vcm_uper_len) { vcm->vcm.chain->link.buf = malloc(32); vcm->vcm.chain->link.size = 32; memcpy(vcm->vcm.chain->link.buf, coordination->chain.links[0], 32); - vcm->vcm.chain->area = calloc(1, sizeof(struct area)); - vcm->vcm.chain->area->list.count = 1; - vcm->vcm.chain->area->list.size = 1 * sizeof(OCTET_STRING_t*); - vcm->vcm.chain->area->list.array = malloc(1 * sizeof(OCTET_STRING_t*)); + vcm->vcm.chain->area = calloc(1, sizeof(ChainInformationArea_t)); + vcm->vcm.chain->area->trees.list.count = 1; + vcm->vcm.chain->area->trees.list.size = 1 * sizeof(OCTET_STRING_t*); + vcm->vcm.chain->area->trees.list.array = malloc(1 * sizeof(OCTET_STRING_t*)); for (int q = 0; q < 1; ++q) { - vcm->vcm.chain->area->list.array[q] = calloc(1, sizeof(OCTET_STRING_t)); - vcm->vcm.chain->area->list.array[q]->buf = malloc(4); - vcm->vcm.chain->area->list.array[q]->size = 4; + vcm->vcm.chain->area->trees.list.array[q] = calloc(1, sizeof(OCTET_STRING_t)); + vcm->vcm.chain->area->trees.list.array[q]->buf = malloc(4); + vcm->vcm.chain->area->trees.list.array[q]->size = 4; } }