diff --git a/src/config.c b/src/config.c index d6eb9fc..c530924 100644 --- a/src/config.c +++ b/src/config.c @@ -229,7 +229,6 @@ int facilities_config(void* facilities_s) { ASN_STRUCT_FREE(asn_DEF_ManagementRequest, mreq_set); // DENM - facilities->den->default_event_duration = config->facilities.denm.default_event_duration; facilities->den->n_max_events = config->facilities.denm.nmax_active_events; // CAM diff --git a/src/denm.c b/src/denm.c index 0794e02..36f364b 100644 --- a/src/denm.c +++ b/src/denm.c @@ -101,7 +101,7 @@ static enum EVENT_CHECK_R event_check(den_t *den, DENM_t *denm, it2s_tender_epv_ if (denm->denm.management.validityDuration != NULL) { e_validity_duration = *(uint32_t *) denm->denm.management.validityDuration * 1000; // validityDuration comes in seconds } else { - e_validity_duration = den->default_event_duration * 1000; + e_validity_duration = 600 * 1000; } uint64_t now = it2s_tender_get_clock(epv); @@ -177,7 +177,7 @@ static int event_add(den_t *den, DENM_t *denm, it2s_tender_epv_t* epv, int64_t* if (denm->denm.management.validityDuration != NULL) { e_validity_duration = *(uint32_t *) denm->denm.management.validityDuration * 1000; // validityDuration comes in seconds } else { - e_validity_duration = den->default_event_duration * 1000; + e_validity_duration = 600 * 1000; } pthread_mutex_lock(&den->lock); diff --git a/src/denm.h b/src/denm.h index fb5a59c..69524cb 100644 --- a/src/denm.h +++ b/src/denm.h @@ -36,7 +36,6 @@ typedef struct den { uint16_t n_cancelled_events; uint16_t n_negated_events; uint16_t n_max_events; - uint32_t default_event_duration; pthread_mutex_t lock; } den_t; diff --git a/src/requests.c b/src/requests.c index b240c38..49d9bc5 100644 --- a/src/requests.c +++ b/src/requests.c @@ -201,7 +201,7 @@ int facilities_request_single_message(facilities_t* facilities, void* responder, if ( ((DENM_t*)its_msg)->denm.management.validityDuration ) { transmission_duration = *( (uint32_t*) ((DENM_t*)its_msg)->denm.management.validityDuration ) * 1000; } else { - transmission_duration = facilities->den->default_event_duration * 1000; + transmission_duration = 600 * 1000; } } }