lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15399
Change subject: sgsn: replace variable bssgp with gb_idx
......................................................................
sgsn: replace variable bssgp with gb_idx
gb_idx is common used as variable for the index of the bssgb array.
Be consistent and use the same variable name everywhere.
Change-Id: Ib278410bc49f07387873740ed8b411a815d940a8
---
M sgsn/SGSN_Tests.ttcn
M sgsn/SGSN_Tests_Iu.ttcn
2 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/99/15399/1
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index e4a5cbf..c486be1 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -2365,7 +2365,7 @@
f_cleanup();
}
-friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer
bssgp := 0, boolean send_ptmsi := false) runs on BSSGP_ConnHdlr {
+friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer
gb_idx := 0, boolean send_ptmsi := false) runs on BSSGP_ConnHdlr {
var PDU_L3_SGSN_MS l3_mt;
var PDU_DTAP_PS_MT mt;
var template OCT4 p_tmsi := omit;
@@ -2375,29 +2375,29 @@
p_tmsi := g_pars.p_tmsi;
}
/* then send RAU */
- f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra,
false, omit, omit, p_tmsi), bssgp, initial := true);
+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra,
false, omit, omit, p_tmsi), gb_idx, initial := true);
alt {
- [is_gb(bssgp)] BSSGP[bssgp].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt {
-
f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp);
- f_send_l3(ts_GMM_RAU_COMPL, bssgp);
+ [is_gb(gb_idx)] BSSGP[gb_idx].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt
{
+
f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, gb_idx);
+ f_send_l3(ts_GMM_RAU_COMPL, gb_idx);
setverdict(pass);
}
- [is_iu(bssgp)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT)) ->
value mt {
-
f_process_rau_accept(mt.dtap.msgs.gprs_mm.routingAreaUpdateAccept, bssgp);
- f_send_l3(ts_GMM_RAU_COMPL, bssgp);
+ [is_iu(gb_idx)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT)) ->
value mt {
+
f_process_rau_accept(mt.dtap.msgs.gprs_mm.routingAreaUpdateAccept, gb_idx);
+ f_send_l3(ts_GMM_RAU_COMPL, gb_idx);
setverdict(pass);
}
- [is_gb(bssgp)] BSSGP[bssgp].receive(tr_GMM_RAU_REJECT) {
+ [is_gb(gb_idx)] BSSGP[gb_idx].receive(tr_GMM_RAU_REJECT) {
setverdict(fail, "Unexpected RAU Reject");
mtc.stop;
}
- [is_iu(bssgp)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {
+ [is_iu(gb_idx)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {
setverdict(fail, "Unexpected RAU Reject");
mtc.stop;
}
- [is_iu(bssgp)] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?,
uia_key := oct2bit(g_pars.vec.ik),
+ [is_iu(gb_idx)] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?,
uia_key := oct2bit(g_pars.vec.ik),
key_sts := ?)) {
var IntegrityProtectionAlgorithm uia_chosen := 0;
/*standard_UMTS_integrity_algorithm_UIA1;*/
BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));
@@ -2405,8 +2405,8 @@
/* allow to common id to be received */
f_sleep(1.0);
}
- [is_gb(bssgp)] BSSGP[bssgp].receive { repeat; }
- [is_iu(bssgp)] BSSAP.receive { repeat; }
+ [is_gb(gb_idx)] BSSGP[gb_idx].receive { repeat; }
+ [is_iu(gb_idx)] BSSAP.receive { repeat; }
}
deactivate(commonid);
diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn
index 50118c7..c0830ee 100644
--- a/sgsn/SGSN_Tests_Iu.ttcn
+++ b/sgsn/SGSN_Tests_Iu.ttcn
@@ -61,7 +61,7 @@
f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false,
gb_idx := 0);
/* do a routing area update */
- f_routing_area_update(g_pars.ra, bssgp := 3, send_ptmsi := true);
+ f_routing_area_update(g_pars.ra, gb_idx := 3, send_ptmsi := true);
setverdict(pass);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15399
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ib278410bc49f07387873740ed8b411a815d940a8
Gerrit-Change-Number: 15399
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <[email protected]>
Gerrit-MessageType: newchange
