msc: Introduce f_cl3_or_initial_ue as replacement for f_bssap_compl_l3()
The new function will check the RAN type and dispath to
f_bssap_compl_l3() in case of 2G/GERAN and to f_ranap_initial_ue()
on case of 3G/UTRAN.
Change-Id: Ia27afa265d441d1a0cbb40cc2d938aff46fa25f9
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index e603035..1fd02aa 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -311,6 +311,16 @@
}
}
+/* Send BSSMAP Complete L3 or RANAP Initial UE depending on 2G/3G RAN type */
+function f_cl3_or_initial_ue(PDU_ML3_MS_NW l3)
+runs on BSC_ConnHdlr {
+ if (g_pars.ran_is_geran) {
+ f_bssap_compl_l3(l3);
+ } else {
+ f_ranap_initial_ue(l3);
+ }
+}
+
type enumerated EstablishType {
EST_TYPE_MO_CALL,
EST_TYPE_EMERG_CALL,
@@ -351,11 +361,7 @@
}
/* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */
- if (g_pars.ran_is_geran) {
- f_bssap_compl_l3(l3_info);
- } else {
- f_ranap_initial_ue(l3_info);
- }
+ f_cl3_or_initial_ue(l3_info);
f_mm_common();
if (g_pars.net.expect_ciph) {