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

Fix non forwarded IVIMs, ad default service duration

This commit is contained in:
emanuel 2020-11-25 14:29:49 +00:00
parent 67d13542fa
commit 8a9aed7fcd
4 changed files with 92 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.c
View File

@ -162,6 +162,10 @@ int itss_config(void* facilities_s, char* config_file) {
rv += extract_val_int(&replay_interval, ivim, "replay-interval"); rv += extract_val_int(&replay_interval, ivim, "replay-interval");
facilities->infrastructure->replay_interval = replay_interval; facilities->infrastructure->replay_interval = replay_interval;
int64_t default_service_duration;
rv += extract_val_int(&default_service_duration, ivim, "default-service-duration");
facilities->infrastructure->default_service_duration = default_service_duration * 60000;
// Replay // Replay
int replay_active = 1; int replay_active = 1;
rv += extract_val_bool(&replay_active, replay, "activate"); rv += extract_val_bool(&replay_active, replay, "activate");

44
src/facilities.c
View File

@ -224,13 +224,15 @@ static int facilities_request(facilities_t *facilities, void* responder, uint8_t
is_update = true; is_update = true;
} }
if ( ((DENM_t*)its_msg)->denm.management.transmissionInterval ) { if (fwd) {
transmission_interval = *( (uint32_t*) ((DENM_t*)its_msg)->denm.management.transmissionInterval ); if ( ((DENM_t*)its_msg)->denm.management.transmissionInterval ) {
transmission_interval = *( (uint32_t*) ((DENM_t*)its_msg)->denm.management.transmissionInterval );
if ( ((DENM_t*)its_msg)->denm.management.validityDuration ) {
transmission_duration = *( (uint32_t*) ((DENM_t*)its_msg)->denm.management.validityDuration ) * 1000; if ( ((DENM_t*)its_msg)->denm.management.validityDuration ) {
} else { transmission_duration = *( (uint32_t*) ((DENM_t*)its_msg)->denm.management.validityDuration ) * 1000;
transmission_duration = facilities->den->default_event_duration * 1000; } else {
transmission_duration = facilities->den->default_event_duration * 1000;
}
} }
} }
} else if (fdreq->choice.singleMessage.itssMessageType == ItssMessageType_ivim) { } else if (fdreq->choice.singleMessage.itssMessageType == ItssMessageType_ivim) {
@ -253,13 +255,29 @@ static int facilities_request(facilities_t *facilities, void* responder, uint8_t
is_update = true; is_update = true;
} }
uint64_t valid_to, valid_from; if (fwd) {
asn_INTEGER2ulong((INTEGER_t*) ((IVIM_t*) its_msg)->ivi.mandatory.validTo, &valid_to); uint64_t valid_to, valid_from;
asn_INTEGER2ulong((INTEGER_t*) ((IVIM_t*) its_msg)->ivi.mandatory.validFrom, &valid_from);
transmission_start = valid_from; if (!((IVIM_t*) its_msg)->ivi.mandatory.validFrom) {
transmission_interval = facilities->infrastructure->replay_interval; struct timespec systemtime;
transmission_duration = valid_to - valid_from; clock_gettime(CLOCK_REALTIME, &systemtime);
long now = (long) (systemtime.tv_sec * 1000 + systemtime.tv_nsec / 1E6);
now = now - 1072915200000; // Convert EPOCH to 2004/01/01 00:00:000
valid_from = now;
} else {
asn_INTEGER2ulong((INTEGER_t*) ((IVIM_t*) its_msg)->ivi.mandatory.validFrom, &valid_from);
}
if (!((IVIM_t*) its_msg)->ivi.mandatory.validTo) {
valid_to = valid_from + facilities->infrastructure->default_service_duration;
} else {
asn_INTEGER2ulong((INTEGER_t*) ((IVIM_t*) its_msg)->ivi.mandatory.validTo, &valid_to);
}
transmission_start = valid_from;
transmission_interval = facilities->infrastructure->replay_interval;
transmission_duration = valid_to - valid_from;
}
} }
if (!facilities->replay) { if (!facilities->replay) {

70
src/infrastructure.c
View File

@ -17,6 +17,11 @@
static enum SERVICE_EVAL_RESULT service_check(infrastructure_t* infrastructure, enum SERVICE_TYPE type, void* its_msg) { static enum SERVICE_EVAL_RESULT service_check(infrastructure_t* infrastructure, enum SERVICE_TYPE type, void* its_msg) {
int rv = 0; int rv = 0;
struct timespec systemtime;
clock_gettime(CLOCK_REALTIME, &systemtime);
long now = (long) (systemtime.tv_sec * 1000 + systemtime.tv_nsec / 1E6);
now = now - 1072915200000; // Convert EPOCH to 2004/01/01 00:00:000
switch (type) { switch (type) {
case SERVICE_IVI: case SERVICE_IVI:
break; break;
@ -27,16 +32,25 @@ static enum SERVICE_EVAL_RESULT service_check(infrastructure_t* infrastructure,
IVIM_t* ivim = (IVIM_t*) its_msg; IVIM_t* ivim = (IVIM_t*) its_msg;
uint64_t timestamp, valid_to, valid_from; uint64_t timestamp, valid_to, valid_from;
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, &timestamp); if (!ivim->ivi.mandatory.timeStamp) {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to); timestamp = now;
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from); } else {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, &timestamp);
}
struct timespec systemtime; if (!ivim->ivi.mandatory.validFrom) {
clock_gettime(CLOCK_REALTIME, &systemtime); valid_from = now;
long now = (long) (systemtime.tv_sec * 1000 + systemtime.tv_nsec / 1E6); } else {
now = now - 1072915200000; // Convert EPOCH to 2004/01/01 00:00:000 asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from);
}
if (now > valid_to) { if (!ivim->ivi.mandatory.validTo) {
valid_to = valid_from + infrastructure->default_service_duration;
} else {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to);
}
if (now >= valid_to) {
return SERVICE_PASSED; return SERVICE_PASSED;
} }
@ -116,9 +130,23 @@ static int service_add(infrastructure_t* infrastructure, enum SERVICE_TYPE type,
now = now - 1072915200000; // Convert EPOCH to 2004/01/01 00:00:000 now = now - 1072915200000; // Convert EPOCH to 2004/01/01 00:00:000
uint64_t timestamp, valid_to, valid_from; uint64_t timestamp, valid_to, valid_from;
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, &timestamp); if (!ivim->ivi.mandatory.timeStamp) {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to); timestamp = now;
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from); } else {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, &timestamp);
}
if (!ivim->ivi.mandatory.validFrom) {
valid_from = now;
} else {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from);
}
if (!ivim->ivi.mandatory.validTo) {
valid_to = valid_from + infrastructure->default_service_duration;
} else {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to);
}
pthread_mutex_lock(&infrastructure->lock); pthread_mutex_lock(&infrastructure->lock);
@ -191,9 +219,23 @@ static int service_update(infrastructure_t* infrastructure, enum SERVICE_TYPE ty
now = now - 1072915200000; // Convert EPOCH to 2004/01/01 00:00:000 now = now - 1072915200000; // Convert EPOCH to 2004/01/01 00:00:000
uint64_t timestamp, valid_to, valid_from; uint64_t timestamp, valid_to, valid_from;
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, &timestamp); if (!ivim->ivi.mandatory.timeStamp) {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to); timestamp = now;
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from); } else {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, &timestamp);
}
if (!ivim->ivi.mandatory.validFrom) {
valid_from = now;
} else {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from);
}
if (!ivim->ivi.mandatory.validTo) {
valid_to = valid_from + infrastructure->default_service_duration;
} else {
asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to);
}
uint8_t state; uint8_t state;
switch (ivim->ivi.mandatory.iviStatus) { switch (ivim->ivi.mandatory.iviStatus) {

1
src/infrastructure.h
View File

@ -45,6 +45,7 @@ typedef struct infrastructure {
uint16_t n_max_services; uint16_t n_max_services;
uint32_t replay_interval; uint32_t replay_interval;
uint64_t default_service_duration;
pthread_mutex_t lock; pthread_mutex_t lock;
} infrastructure_t; } infrastructure_t;