lynxis lazus has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40649?usp=email )
Change subject: SGSN: Iu: use correct service request type
......................................................................
SGSN: Iu: use correct service request type
When the UE wants to transfer data, the Service Request
must have the type data.
Remove the default of f_service_request() to force
explicit defining it.
Change-Id: Ia47edd8ca916cf377da875583a3c4eb6ff5f1f52
---
M sgsn/BSSGP_ConnHdlr.ttcn
M sgsn/SGSN_Tests_Iu.ttcn
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
daniel: Looks good to me, approved
diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn
index 2b95ec0..6e2e611 100644
--- a/sgsn/BSSGP_ConnHdlr.ttcn
+++ b/sgsn/BSSGP_ConnHdlr.ttcn
@@ -753,7 +753,7 @@
}
function f_service_request(inout PdpActPars apars,
- ServiceType service_type := SERVICE_TYPE_Signalling,
+ ServiceType service_type,
template (value) OCT2 pdp_status := '0000'O,
boolean exp_ggsn_pdp_del := false,
boolean expect_auth := false,
diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn
index 3de89b6..776c333 100644
--- a/sgsn/SGSN_Tests_Iu.ttcn
+++ b/sgsn/SGSN_Tests_Iu.ttcn
@@ -137,7 +137,7 @@
/* first perform regular attach */
f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false,
ran_index := 3);
- f_service_request(apars, ran_index := 3);
+ f_service_request(apars, service_type := SERVICE_TYPE_Signalling,
ran_index := 3);
f_pdp_ctx_act(apars, ran_index := 3);
@@ -210,7 +210,7 @@
/* first perform regular attach */
f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false,
ran_index := ran_index);
- f_service_request(apars, ran_index := ran_index);
+ f_service_request(apars, service_type := SERVICE_TYPE_Signalling,
ran_index := ran_index);
f_pdp_tx_ctx_act(apars, ran_index := ran_index);
as_ggsn_gtp_ctx_act_req(apars, send_recovery := false);
T.start;
@@ -247,7 +247,7 @@
/* first perform regular attach */
f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false,
ran_index := 3);
- f_service_request(apars, ran_index := 3);
+ f_service_request(apars, service_type := SERVICE_TYPE_Signalling,
ran_index := 3);
f_pdp_ctx_act(apars, ran_index := 3);
@@ -283,7 +283,7 @@
/* first perform regular attach */
f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false,
ran_index := 3);
- f_service_request(apars, ran_index := 3);
+ f_service_request(apars, service_type := SERVICE_TYPE_Signalling,
ran_index := 3);
f_pdp_ctx_act(apars, ran_index := 3);
@@ -295,7 +295,7 @@
/* Now UE tries to send new data after a while of being IDLE.
* It forgot its previous pdp status, hence := 0000.
* SGSN will delete previous PDP ctx at the GGSN. */
- f_service_request(apars, pdp_status := '0000'O /*NSAPI=5*/,
exp_ggsn_pdp_del := true, ran_index := 3);
+ f_service_request(apars, service_type := SERVICE_TYPE_Data, pdp_status
:= '0000'O /*NSAPI=5*/, exp_ggsn_pdp_del := true, ran_index := 3);
f_pdp_ctx_act(apars, ran_index := 3);
/* Now UE is in PMM ENABLED state, tear it down to clean up: */
@@ -319,7 +319,7 @@
/* first perform regular attach */
f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false,
ran_index := 3);
- f_service_request(apars, ran_index := 3);
+ f_service_request(apars, service_type := SERVICE_TYPE_Signalling,
ran_index := 3);
f_pdp_ctx_act(apars, ran_index := 3);
@@ -338,7 +338,7 @@
/* Ue comes back, answering the paging:
* SGSN recreates the Iu ctx and recovers the Direct Tunnel RNC<->GGSN:
*/
- f_service_request(apars, pdp_status := '2000'O /*NSAPI=5*/, ran_index
:= 3);
+ f_service_request(apars, service_type := SERVICE_TYPE_Data, pdp_status
:= '2000'O /*NSAPI=5*/, ran_index := 3);
as_ranap_rab_ass_req(apars);
as_ggsn_gtp_ctx_upd_req(apars, exp_dir_tun := true, ran_index := 3);
@@ -367,7 +367,7 @@
/* first perform regular attach */
f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false,
ran_index := ran_index);
- f_service_request(apars, ran_index := ran_index);
+ f_service_request(apars, service_type := SERVICE_TYPE_Signalling,
ran_index := ran_index);
f_pdp_ctx_act(apars, ran_index := ran_index);
@@ -399,7 +399,7 @@
/* Ue comes back, answering the paging:
* SGSN recreates the Iu ctx and recovers the Direct Tunnel RNC<->GGSN:
*/
- f_service_request(apars, pdp_status := '2000'O /*NSAPI=5*/, ran_index
:= ran_index);
+ f_service_request(apars, service_type := SERVICE_TYPE_Data, pdp_status
:= '2000'O /*NSAPI=5*/, ran_index := ran_index);
as_ranap_rab_ass_req(apars);
as_ggsn_gtp_ctx_upd_req(apars, exp_dir_tun := true, ran_index :=
ran_index);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40649?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ia47edd8ca916cf377da875583a3c4eb6ff5f1f52
Gerrit-Change-Number: 40649
Gerrit-PatchSet: 4
Gerrit-Owner: lynxis lazus <lyn...@fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillm...@sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lyn...@fe80.eu>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
