acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fix the compile error [#499]

This commit is contained in:
Sukchan Lee 2020-07-10 14:59:29 -04:00
parent f78ca3c483
commit fdfce08b68
8 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/README.md
View File

@ -68,6 +68,7 @@ export DEBEMAIL='acetcom@gmail.com'
* Version Change
$ vi meson.build
$ ./misc/git-version-gen . > .tarball-version 2>/dev/null
* Upload OpenBuildService
$ dch -i

2
lib/core/ogs-time.h
View File

@ -34,7 +34,7 @@ typedef int64_t ogs_time_t;
#define OGS_NO_WAIT_TIME (0)
/** number of microseconds per second */
#define OGS_USEC_PER_SEC (1000000L)
#define OGS_USEC_PER_SEC (1000000LL)
/** @return ogs_time_t as a second */
#define ogs_time_sec(time) ((time) / OGS_USEC_PER_SEC)

8
src/amf/nnrf-handler.c
View File

@ -68,16 +68,16 @@ void amf_nnrf_handle_nf_status_subscribe(
subscription, SubscriptionData->subscription_id);
if (SubscriptionData->validity_time) {
#define VALIDITY_MARGIN (5 * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600 * OGS_USEC_PER_SEC) /* 3600 seconds */
#define VALIDITY_MARGIN (5LL * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600LL * OGS_USEC_PER_SEC) /* 3600 seconds */
ogs_time_t time, duration;
if (ogs_sbi_time_from_string(
&time, SubscriptionData->validity_time) == true) {
duration = time - ogs_time_now() - VALIDITY_MARGIN;
if (duration < VALIDITY_MINIMUM) {
duration = VALIDITY_MINIMUM;
ogs_warn("[%s] Forced to %d seconds",
subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM));
ogs_warn("[%s] Forced to %lld seconds", subscription->id,
(long long)ogs_time_sec(VALIDITY_MINIMUM));
}
subscription->t_validity = ogs_timer_add(amf_self()->timer_mgr,
amf_timer_subscription_validity, subscription);

8
src/ausf/nnrf-handler.c
View File

@ -66,16 +66,16 @@ void ausf_nnrf_handle_nf_status_subscribe(
subscription, SubscriptionData->subscription_id);
if (SubscriptionData->validity_time) {
#define VALIDITY_MARGIN (5 * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600 * OGS_USEC_PER_SEC) /* 3600 seconds */
#define VALIDITY_MARGIN (5LL * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600LL * OGS_USEC_PER_SEC) /* 3600 seconds */
ogs_time_t time, duration;
if (ogs_sbi_time_from_string(
&time, SubscriptionData->validity_time) == true) {
duration = time - ogs_time_now() - VALIDITY_MARGIN;
if (duration < VALIDITY_MINIMUM) {
duration = VALIDITY_MINIMUM;
ogs_warn("[%s] Forced to %d seconds",
subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM));
ogs_warn("[%s] Forced to %lld seconds", subscription->id,
(long long)ogs_time_sec(VALIDITY_MINIMUM));
}
subscription->t_validity = ogs_timer_add(ausf_self()->timer_mgr,
ausf_timer_subscription_validity, subscription);

8
src/smf/nnrf-handler.c
View File

@ -66,16 +66,16 @@ void smf_nnrf_handle_nf_status_subscribe(
subscription, SubscriptionData->subscription_id);
if (SubscriptionData->validity_time) {
#define VALIDITY_MARGIN (5 * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600 * OGS_USEC_PER_SEC) /* 3600 seconds */
#define VALIDITY_MARGIN (5LL * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600LL * OGS_USEC_PER_SEC) /* 3600 seconds */
ogs_time_t time, duration;
if (ogs_sbi_time_from_string(
&time, SubscriptionData->validity_time) == true) {
duration = time - ogs_time_now() - VALIDITY_MARGIN;
if (duration < VALIDITY_MINIMUM) {
duration = VALIDITY_MINIMUM;
ogs_warn("[%s] Forced to %d seconds",
subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM));
ogs_warn("[%s] Forced to %lld seconds", subscription->id,
(long long)ogs_time_sec(VALIDITY_MINIMUM));
}
subscription->t_validity = ogs_timer_add(smf_self()->timer_mgr,
smf_timer_subscription_validity, subscription);

8
src/udm/nnrf-handler.c
View File

@ -66,16 +66,16 @@ void udm_nnrf_handle_nf_status_subscribe(
subscription, SubscriptionData->subscription_id);
if (SubscriptionData->validity_time) {
#define VALIDITY_MARGIN (5 * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600 * OGS_USEC_PER_SEC) /* 3600 seconds */
#define VALIDITY_MARGIN (5LL * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600LL * OGS_USEC_PER_SEC) /* 3600 seconds */
ogs_time_t time, duration;
if (ogs_sbi_time_from_string(
&time, SubscriptionData->validity_time) == true) {
duration = time - ogs_time_now() - VALIDITY_MARGIN;
if (duration < VALIDITY_MINIMUM) {
duration = VALIDITY_MINIMUM;
ogs_warn("[%s] Forced to %d seconds",
subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM));
ogs_warn("[%s] Forced to %lld seconds", subscription->id,
(long long)ogs_time_sec(VALIDITY_MINIMUM));
}
subscription->t_validity = ogs_timer_add(udm_self()->timer_mgr,
udm_timer_subscription_validity, subscription);

2
src/udm/nudm-handler.c
View File

@ -122,8 +122,6 @@ bool udm_nudm_ueau_handle_get(udm_ue_t *udm_ue, ogs_sbi_message_t *recvmsg)
ogs_log_print(OGS_LOG_ERROR, "[MAC_S] ");
ogs_log_hexdump(OGS_LOG_ERROR, mac_s, OGS_MAC_S_LEN);
ogs_log_hexdump(OGS_LOG_ERROR, auts + OGS_SQN_LEN, OGS_MAC_S_LEN);
ogs_log_print(OGS_LOG_ERROR, "[SQN] UDM 0x%llx UE ",
(long long)udm_ue->sqn);
ogs_log_hexdump(OGS_LOG_ERROR, sqn_ms, OGS_SQN_LEN);
ogs_sbi_server_send_error(session,
OGS_SBI_HTTP_STATUS_UNAUTHORIZED,

8
src/udr/nnrf-handler.c
View File

@ -66,16 +66,16 @@ void udr_nnrf_handle_nf_status_subscribe(
subscription, SubscriptionData->subscription_id);
if (SubscriptionData->validity_time) {
#define VALIDITY_MARGIN (5 * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600 * OGS_USEC_PER_SEC) /* 3600 seconds */
#define VALIDITY_MARGIN (5LL * OGS_USEC_PER_SEC) /* 5 seconds */
#define VALIDITY_MINIMUM (3600LL * OGS_USEC_PER_SEC) /* 3600 seconds */
ogs_time_t time, duration;
if (ogs_sbi_time_from_string(
&time, SubscriptionData->validity_time) == true) {
duration = time - ogs_time_now() - VALIDITY_MARGIN;
if (duration < VALIDITY_MINIMUM) {
duration = VALIDITY_MINIMUM;
ogs_warn("[%s] Forced to %d seconds",
subscription->id, (int)ogs_time_sec(VALIDITY_MINIMUM));
ogs_warn("[%s] Forced to %lld seconds", subscription->id,
(long long)ogs_time_sec(VALIDITY_MINIMUM));
}
subscription->t_validity = ogs_timer_add(udr_self()->timer_mgr,
udr_timer_subscription_validity, subscription);