TiagoRG
/
it2s-itss-facilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove default-event-duration

This commit is contained in:
emanuel 2021-05-14 16:50:56 +01:00
parent a07d37a30c
commit 03df1ad7e4
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.c
View File

@ -229,7 +229,6 @@ int facilities_config(void* facilities_s) {
ASN_STRUCT_FREE(asn_DEF_ManagementRequest, mreq_set); ASN_STRUCT_FREE(asn_DEF_ManagementRequest, mreq_set);
// DENM // DENM
facilities->den->default_event_duration = config->facilities.denm.default_event_duration;
facilities->den->n_max_events = config->facilities.denm.nmax_active_events; facilities->den->n_max_events = config->facilities.denm.nmax_active_events;
// CAM // CAM

4
src/denm.c
View File

@ -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) { if (denm->denm.management.validityDuration != NULL) {
e_validity_duration = *(uint32_t *) denm->denm.management.validityDuration * 1000; // validityDuration comes in seconds e_validity_duration = *(uint32_t *) denm->denm.management.validityDuration * 1000; // validityDuration comes in seconds
} else { } else {
e_validity_duration = den->default_event_duration * 1000; e_validity_duration = 600 * 1000;
} }
uint64_t now = it2s_tender_get_clock(epv); 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) { if (denm->denm.management.validityDuration != NULL) {
e_validity_duration = *(uint32_t *) denm->denm.management.validityDuration * 1000; // validityDuration comes in seconds e_validity_duration = *(uint32_t *) denm->denm.management.validityDuration * 1000; // validityDuration comes in seconds
} else { } else {
e_validity_duration = den->default_event_duration * 1000; e_validity_duration = 600 * 1000;
} }
pthread_mutex_lock(&den->lock); pthread_mutex_lock(&den->lock);

1
src/denm.h
View File

@ -36,7 +36,6 @@ typedef struct den {
uint16_t n_cancelled_events; uint16_t n_cancelled_events;
uint16_t n_negated_events; uint16_t n_negated_events;
uint16_t n_max_events; uint16_t n_max_events;
uint32_t default_event_duration;
pthread_mutex_t lock; pthread_mutex_t lock;
} den_t; } den_t;

2
src/requests.c
View File

@ -201,7 +201,7 @@ int facilities_request_single_message(facilities_t* facilities, void* responder,
if ( ((DENM_t*)its_msg)->denm.management.validityDuration ) { if ( ((DENM_t*)its_msg)->denm.management.validityDuration ) {
transmission_duration = *( (uint32_t*) ((DENM_t*)its_msg)->denm.management.validityDuration ) * 1000; transmission_duration = *( (uint32_t*) ((DENM_t*)its_msg)->denm.management.validityDuration ) * 1000;
} else { } else {
transmission_duration = facilities->den->default_event_duration * 1000; transmission_duration = 600 * 1000;
} }
} }
} }