Split GTP_CodecPort/GTP_Templates into C and U variants
The Types are already split in the dependent modules in GTPC_Types and
GTPU_Types.
There's no point in keeping them together in the same file since those 2
protocols are mostly independent.
Furthermore, testsuites using GTPv2C + GTPv1U don't need GTPv1C.
Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d
diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn
index 8e95616..e256963 100644
--- a/hnodeb/HNBGW_ConnectionHandler.ttcn
+++ b/hnodeb/HNBGW_ConnectionHandler.ttcn
@@ -35,8 +35,8 @@
import from HNBLLIF_Templates all;
import from GTP_Emulation all;
-import from GTP_Templates all;
-import from GTP_CodecPort all;
+import from GTPv1U_Templates all;
+import from GTPv1U_CodecPort all;
import from GTPU_Types all;
/* this component represents a single Iuh connection at the HNBGW. */
@@ -192,14 +192,14 @@
sac := 4
}
-template (value) GtpPeer ts_GtpPeerU(charstring ip) := {
+template (value) Gtp1uPeer ts_GtpPeerU(charstring ip) := {
connId := 1,
remName := ip,
remPort := GTP1U_PORT
}
function f_gtpu_send(uint32_t tei, octetstring payload) runs on HNBGW_ConnHdlr {
- var GtpPeer peer := valueof(ts_GtpPeerU(g_pars.hnodeb_addr));
+ var Gtp1uPeer peer := valueof(ts_GtpPeerU(g_pars.hnodeb_addr));
GTP.send(ts_GTP1U_GPDU(peer, 0 /*seq*/, int2oct(tei, 4), payload));
}
diff --git a/hnodeb/HNB_Tests.ttcn b/hnodeb/HNB_Tests.ttcn
index df7a04c..1178695 100644
--- a/hnodeb/HNB_Tests.ttcn
+++ b/hnodeb/HNB_Tests.ttcn
@@ -53,7 +53,7 @@
import from HNBLLIF_Templates all;
import from GTPU_Types all;
-import from GTP_Templates all;
+import from GTPv1U_Templates all;
import from GTP_Emulation all;
import from IuUP_Types all;
diff --git a/hnodeb/gen_links.sh b/hnodeb/gen_links.sh
index 84495e9..e4f453e 100755
--- a/hnodeb/gen_links.sh
+++ b/hnodeb/gen_links.sh
@@ -63,7 +63,9 @@
FILES+="Iuh_Types.ttcn Iuh_CodecPort.ttcn Iuh_CodecPort_CtrlFunctDef.cc Iuh_CodecPort_CtrlFunct.ttcn Iuh_Emulation.ttcn DNS_Helpers.ttcn "
FILES+="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn "
FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn "
-FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn GSM_Types.ttcn "
+FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn "
+FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn "
+FILES+="GTP_Emulation.ttcn IPCP_Types.ttcn GSM_Types.ttcn "
gen_links $DIR $FILES
ignore_pp_results
diff --git a/hnodeb/regen_makefile.sh b/hnodeb/regen_makefile.sh
index 10f5c21..cf5fed3 100755
--- a/hnodeb/regen_makefile.sh
+++ b/hnodeb/regen_makefile.sh
@@ -27,7 +27,8 @@
UD_PT.cc
GTPC_EncDec.cc
GTPU_EncDec.cc
- GTP_CodecPort_CtrlFunctDef.cc
+ GTPv1C_CodecPort_CtrlFunctDef.cc
+ GTPv1U_CodecPort_CtrlFunctDef.cc
"
export CPPFLAGS_TTCN3="