sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix SMF crash [#512]

This commit is contained in:
Sukchan Lee 2020-07-26 23:10:53 -04:00
parent 0cabf9de11
commit 24a4df3691
8 changed files with 94 additions and 29 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 : 2000ms = 2 seconds)
# o Message Wait Duration (Default : 1000ms = 1 second)
#
# o Message Wait Duration (3 seconds)
# o Message Wait Duration (1200 ms)
# message:
# duration: 3000
# duration: 1200
time:

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

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

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

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

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

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

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

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

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

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

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

@ -266,8 +266,8 @@ static int config_prepare(void)
/* 86400 seconds = 1 day */
self.time.subscription.validity_duration = 86400;
/* Message Wait Duration : 2 seconds */
self.time.message.duration = ogs_time_from_sec(2);
/* Message Wait Duration : 1 seconds */
self.time.message.duration = ogs_time_from_sec(1);
regenerate_all_timer_duration();

83
src/smf/pfcp-path.c
View File

@ -17,8 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "context.h"
#include "sbi-path.h"
#include "pfcp-path.h"
#include "n4-build.h"
@ -197,6 +196,73 @@ static void timeout(ogs_pfcp_xact_t *xact, void *data)
}
break;
default:
ogs_error("Not implemented [type:%d]", type);
break;
}
}
static void sess_5gc_timeout(ogs_pfcp_xact_t *xact, void *data)
{
smf_ue_t *smf_ue = NULL;
smf_sess_t *sess = NULL;
ogs_sbi_session_t *session = NULL;
uint8_t type;
char *strerror = NULL;
ogs_assert(xact);
ogs_assert(data);
sess = data;
ogs_assert(sess);
session = sess->sbi.session;
ogs_assert(session);
smf_ue = sess->smf_ue;
ogs_assert(smf_ue);
type = xact->seq[0].type;
switch (type) {
case OGS_PFCP_SESSION_ESTABLISHMENT_REQUEST_TYPE:
ogs_error("No PFCP session establishment response");
break;
case OGS_PFCP_SESSION_MODIFICATION_REQUEST_TYPE:
strerror = ogs_msprintf("[%s:%d] No PFCP session modification response",
smf_ue->supi, sess->psi);
smf_sbi_send_sm_context_update_error(session,
OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT,
strerror, NULL, NULL, NULL);
break;
case OGS_PFCP_SESSION_DELETION_REQUEST_TYPE:
strerror = ogs_msprintf("[%s:%d] No PFCP session deletion response",
smf_ue->supi, sess->psi);
ogs_sbi_server_send_error(session,
OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, strerror, NULL);
ogs_free(strerror);
break;
default:
ogs_error("Not implemented [type:%d]", type);
break;
}
}
static void sess_epc_timeout(ogs_pfcp_xact_t *xact, void *data)
{
uint8_t type;
ogs_assert(xact);
type = xact->seq[0].type;
switch (type) {
case OGS_PFCP_SESSION_ESTABLISHMENT_REQUEST_TYPE:
ogs_error("No PFCP session establishment response");
break;
case OGS_PFCP_SESSION_MODIFICATION_REQUEST_TYPE:
ogs_error("No PFCP session modification response");
break;
case OGS_PFCP_SESSION_DELETION_REQUEST_TYPE:
ogs_error("No PFCP session deletion response");
break;
default:
ogs_error("Not implemented [type:%d]", type);
break;
}
}
@ -287,7 +353,7 @@ void smf_5gc_pfcp_send_session_establishment_request(smf_sess_t *sess)
ogs_expect_or_return(n4buf);
xact = ogs_pfcp_xact_local_create(
sess->pfcp_node, &h, n4buf, timeout, sess);
sess->pfcp_node, &h, n4buf, sess_5gc_timeout, sess);
ogs_expect_or_return(xact);
rv = ogs_pfcp_xact_commit(xact);
@ -300,7 +366,6 @@ void smf_5gc_pfcp_send_session_modification_request(smf_sess_t *sess)
ogs_pkbuf_t *n4buf = NULL;
ogs_pfcp_header_t h;
ogs_pfcp_xact_t *xact = NULL;
smf_bearer_t *bearer = NULL;
ogs_assert(sess);
@ -312,7 +377,7 @@ void smf_5gc_pfcp_send_session_modification_request(smf_sess_t *sess)
ogs_expect_or_return(n4buf);
xact = ogs_pfcp_xact_local_create(
sess->pfcp_node, &h, n4buf, timeout, bearer);
sess->pfcp_node, &h, n4buf, sess_5gc_timeout, sess);
ogs_expect_or_return(xact);
xact->assoc_session = sess->sbi.session;
@ -338,7 +403,7 @@ void smf_5gc_pfcp_send_session_deletion_request(smf_sess_t *sess, int trigger)
ogs_expect_or_return(n4buf);
xact = ogs_pfcp_xact_local_create(
sess->pfcp_node, &h, n4buf, timeout, sess);
sess->pfcp_node, &h, n4buf, sess_5gc_timeout, sess);
ogs_expect_or_return(xact);
xact->assoc_session = sess->sbi.session;
xact->trigger = trigger;
@ -365,7 +430,7 @@ void smf_epc_pfcp_send_session_establishment_request(
ogs_expect_or_return(n4buf);
xact = ogs_pfcp_xact_local_create(
sess->pfcp_node, &h, n4buf, timeout, sess);
sess->pfcp_node, &h, n4buf, sess_epc_timeout, sess);
ogs_expect_or_return(xact);
xact->assoc_xact = gtp_xact;
@ -393,7 +458,7 @@ void smf_epc_pfcp_send_session_modification_request(smf_bearer_t *bearer)
ogs_expect_or_return(n4buf);
xact = ogs_pfcp_xact_local_create(
sess->pfcp_node, &h, n4buf, timeout, bearer);
sess->pfcp_node, &h, n4buf, sess_epc_timeout, bearer);
ogs_expect_or_return(xact);
rv = ogs_pfcp_xact_commit(xact);
@ -418,7 +483,7 @@ void smf_epc_pfcp_send_session_deletion_request(
ogs_expect_or_return(n4buf);
xact = ogs_pfcp_xact_local_create(
sess->pfcp_node, &h, n4buf, timeout, sess);
sess->pfcp_node, &h, n4buf, sess_epc_timeout, sess);
ogs_expect_or_return(xact);
xact->assoc_xact = gtp_xact;