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

Message Wait Timer default set to 2 seconds [#512]

This commit is contained in:
Sukchan Lee 2020-07-27 00:20:01 -04:00
parent 24a4df3691
commit 7071d32518
10 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/open5gs/amf.yaml.in
View File

@ -301,9 +301,9 @@ pool:
# nf_instance:
# heartbeat: 10
#
# o Message Wait Duration (Default : 1000ms = 1 second)
# o Message Wait Duration (Default : 2000ms = 2 seconds)
#
# o Message Wait Duration (1200 ms)
# o Message Wait Duration (3000 ms)
# message:
# duration: 1200
# duration: 3000
time:

6
configs/open5gs/ausf.yaml.in
View File

@ -177,9 +177,9 @@ pool:
# nf_instance:
# heartbeat: 10
#
# o Message Wait Duration (Default : 1000ms = 1 second)
# o Message Wait Duration (Default : 2000ms = 2 seconds)
#
# o Message Wait Duration (1200 ms)
# o Message Wait Duration (3000 ms)
# message:
# duration: 1200
# duration: 3000
time:

6
configs/open5gs/nrf.yaml.in
View File

@ -153,9 +153,9 @@ pool:
# subscription:
# validity: 3600
#
# o Message Wait Duration (Default : 1000ms = 1 second)
# o Message Wait Duration (Default : 2000ms = 2 seconds)
#
# o Message Wait Duration (1200 ms)
# o Message Wait Duration (3000 ms)
# message:
# duration: 1200
# duration: 3000
time:

6
configs/open5gs/smf.yaml.in
View File

@ -361,9 +361,9 @@ pool:
# nf_instance:
# heartbeat: 10
#
# o Message Wait Duration (Default : 1000ms = 1 second)
# o Message Wait Duration (Default : 2000ms = 2 seconds)
#
# o Message Wait Duration (1200 ms)
# o Message Wait Duration (3000 ms)
# message:
# duration: 1200
# duration: 3000
time:

6
configs/open5gs/udm.yaml.in
View File

@ -177,9 +177,9 @@ pool:
# nf_instance:
# heartbeat: 10
#
# o Message Wait Duration (Default : 1000ms = 1 second)
# o Message Wait Duration (Default : 2000ms = 2 seconds)
#
# o Message Wait Duration (1200 ms)
# o Message Wait Duration (3000 ms)
# message:
# duration: 1200
# duration: 3000
time:

6
configs/open5gs/udr.yaml.in
View File

@ -179,9 +179,9 @@ pool:
# nf_instance:
# heartbeat: 10
#
# o Message Wait Duration (Default : 1000ms = 1 second)
# o Message Wait Duration (Default : 2000ms = 2 seconds)
#
# o Message Wait Duration (1200 ms)
# o Message Wait Duration (3000 ms)
# message:
# duration: 1200
# duration: 3000
time:

8
lib/app/ogs-config.c
View File

@ -159,7 +159,7 @@ static void regenerate_all_timer_duration(void)
ogs_assert(self.time.message.duration);
self.time.message.sbi.client_wait_duration = self.time.message.duration;
self.time.message.sbi.server_response_deadline =
self.time.message.sbi.connection_deadline =
self.time.message.sbi.client_wait_duration + ogs_time_from_sec(1);
self.time.message.sbi.nf_register_interval =
ogs_max(ogs_time_from_sec(3),
@ -207,7 +207,7 @@ static void regenerate_all_timer_duration(void)
ogs_trace("%lld, %lld, %lld, %d, %lld, %d %lld, %d, %lld, %d, %lld",
(long long)self.time.message.duration,
(long long)self.time.message.sbi.client_wait_duration,
(long long)self.time.message.sbi.server_response_deadline,
(long long)self.time.message.sbi.connection_deadline,
self.time.message.pfcp.n1_response_rcount,
(long long)self.time.message.pfcp.t1_response_duration,
self.time.message.pfcp.n1_holding_rcount,
@ -266,8 +266,8 @@ static int config_prepare(void)
/* 86400 seconds = 1 day */
self.time.subscription.validity_duration = 86400;
/* Message Wait Duration : 1 seconds */
self.time.message.duration = ogs_time_from_sec(1);
/* Message Wait Duration : 2 seconds */
self.time.message.duration = ogs_time_from_sec(2);
regenerate_all_timer_duration();

2
lib/app/ogs-config.h
View File

@ -112,7 +112,7 @@ typedef struct ogs_config_s {
ogs_time_t duration;
struct {
ogs_time_t client_wait_duration;
ogs_time_t server_response_deadline;
ogs_time_t connection_deadline;
ogs_time_t nf_register_interval;
ogs_time_t nf_register_interval_in_exception;
} sbi;

7
lib/sbi/client.c
View File

@ -274,9 +274,10 @@ static connection_t *connection_add(
ogs_list_add(&client->connection_list, conn);
/* If http response is not received within 1 second,
* we will discard this request. */
ogs_timer_start(conn->timer, ogs_time_from_sec(1));
/* If http response is not received within deadline,
* Open5GS will discard this request. */
ogs_timer_start(conn->timer,
ogs_config()->time.message.sbi.connection_deadline);
conn->easy = curl_easy_init();
ogs_assert(conn->easy);

2
lib/sbi/server.c
View File

@ -118,7 +118,7 @@ static ogs_sbi_session_t *session_add(ogs_sbi_server_t *server,
/* If User does not send http response within deadline,
* Open5GS will assert this program. */
ogs_timer_start(session->timer,
ogs_config()->time.message.sbi.server_response_deadline);
ogs_config()->time.message.sbi.connection_deadline);
ogs_list_add(&server->suspended_session_list, session);