From 64453527da1cdc95a394fa718eefed451108e62a Mon Sep 17 00:00:00 2001 From: emanuel Date: Mon, 21 Nov 2022 17:34:04 +0000 Subject: [PATCH] VCM: [coordination]->[vc] logs --- src/vcm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vcm.c b/src/vcm.c index 51bfe4b..6acbd0a 100644 --- a/src/vcm.c +++ b/src/vcm.c @@ -18,7 +18,6 @@ static int do_paths_intersect( int* index ) { - // TODO check first time intersection, then the spacial trajectory double A1[2], A2[2], B1[2], B2[2]; uint64_t tsA, tsB; for (int a = 0; a < tA_len-1; ++a) { @@ -278,7 +277,7 @@ static int vcm_check_handle_reply(VCM_t* vcm, mc_neighbour_s* neighbour) { coordination_t* coordination = &facilities.coordination; if (!coordination->session.req) { - log_debug("[coordination] unknown reply context - session expired or another ITS-S rejected"); + log_debug("[vc] unknown reply context - session expired or another ITS-S rejected"); return 1; } @@ -291,7 +290,7 @@ static int vcm_check_handle_reply(VCM_t* vcm, mc_neighbour_s* neighbour) { if (neighbour->intersecting) { if (reply->acceptedTrajectoriesIds.list.count == 0) { - log_debug("[coordination] maneuver %lld rejected by %d", reply->requesterId, vcm->header.stationID); + log_debug("[vc] maneuver %lld rejected by %d", reply->requesterId, vcm->header.stationID); ASN_STRUCT_FREE(asn_DEF_VCM, coordination->session.req); coordination->session.req = NULL; coordination->session.ts = itss_time_get(); @@ -828,7 +827,7 @@ int vcm_check(VCM_t* vcm) { switch (mvc->negotiation->present) { case CoordinationNegotiation_PR_request: if (coordination->session.req && now < coordination->session.ts + MC_RESOLUTION_TIMEOUT) { /* in maneuver */ - log_debug("[coordination] rejecting VCM from %d - currently in maneuver", vcm->header.stationID); + log_debug("[vc] rejecting VCM from %d - currently in maneuver", vcm->header.stationID); vcm_reject(vcm, neighbour); } else { vcm_check_handle_request(vcm, neighbour); @@ -847,7 +846,7 @@ int vcm_check(VCM_t* vcm) { (coordination->session.req && now < coordination->session.ts + MC_RESOLUTION_TIMEOUT) || /* issued request */ now < neighbour->t_proposal + MC_RESOLUTION_TIMEOUT /* issued reply */ ) { /* in maneuver */ - log_debug("[coordination] ignoring VCM from %d - currently in maneuver", vcm->header.stationID); + log_debug("[vc] ignoring VCM from %d - currently in maneuver", vcm->header.stationID); } else { /* not in maneuver OR timeout reached */ if (coordination->session.req) { /* clear previous request if exists */ ASN_STRUCT_FREE(asn_DEF_VCM, coordination->session.req);