[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: make sure g_uecups_conn_id is populated.
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34265?usp=email ) Change subject: GTPv2_Emulation: make sure g_uecups_conn_id is populated. ...................................................................... GTPv2_Emulation: make sure g_uecups_conn_id is populated. In function f_init, we activate altstep as_uecups_ind at the end of the function. In as_uecups we use the template generator function tr_UECUPS_RecvFrom_R(). In this function we use g_uecups_conn_id, which is only populated when use_gtpu_daemon is set to true. When use_gtpu_daemon is false g_uecups_conn_id will be <unbound>, which leads into an error. Related: OS#5760 Change-Id: Ifc2e8d9de13d5d183d6f052b2092c356ab4973d1 --- M library/GTPv2_Emulation.ttcn 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index 5bb3b1e..ff6a60a 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -389,6 +389,8 @@ remPort := g_gtp2_cfg.gtpc_remote_port } + g_uecups_conn_id := res.connId; + if (g_gtp2_cfg.use_gtpu_daemon) { map(self:UECUPS, system:UECUPS); res := UECUPS_CodecPort_CtrlFunct.f_IPL4_connect(UECUPS, mp_uecups_host, mp_uecups_port, "", -1, -1, { sctp := valueof(ts_SCTP) }); @@ -396,7 +398,6 @@ setverdict(fail, "Could not connect UECUPS socket, check your configuration"); testcase.stop; } - g_uecups_conn_id := res.connId; /* clear all tunnel state in the daemon at start */ f_uecups_xceive({reset_all_state := {}}, {reset_all_state_res:=?}, 30.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34265?usp=email 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: Ifc2e8d9de13d5d183d6f052b2092c356ab4973d1 Gerrit-Change-Number: 34265 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged
participants (1)
-
laforge