From 5e3b5d9ab3a59e319050ec6c427657a8cc7d05e9 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 28 Nov 2019 20:34:57 +0100 Subject: [PATCH] introduce MNCC_Emulation mp_mncc_version Default the MNCC version to the current osmo-sip-connector's master branch MNCC version. As soon as the new version (6) is merged, we can bump it here to make tests for master work again. For 'latest' builds, we can adjust osmo-ttcn3-hacks to use version 5, and also see those tests still passing. Change-Id: I3eb6e0132dc99ebe41a98cc5c329ed4864b770d6 --- library/MNCC_Emulation.ttcn | 6 +++++- sip/SIP_Tests.default | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/library/MNCC_Emulation.ttcn b/library/MNCC_Emulation.ttcn index ee9b58eb5..9522e72ae 100644 --- a/library/MNCC_Emulation.ttcn +++ b/library/MNCC_Emulation.ttcn @@ -37,6 +37,10 @@ import from MNCC_CodecPort all; import from MNCC_Types all; import from UD_Types all; +modulepar { + int mp_mncc_version := 5; +} + /* General "base class" component definition, of which specific implementations * derive themselves by means of the "extends" feature */ type component MNCC_ConnHdlr { @@ -264,7 +268,7 @@ runs on MNCC_Emulation_CT { if (role_server) { f_listen(sock); - MNCC.send(t_SD_MNCC(g_mncc_ud_id, ts_MNCC_HELLO)); + MNCC.send(t_SD_MNCC(g_mncc_ud_id, ts_MNCC_HELLO(version := mp_mncc_version))); } else { f_connect(sock); } diff --git a/sip/SIP_Tests.default b/sip/SIP_Tests.default index 4434a1a5e..9fcd3879f 100644 --- a/sip/SIP_Tests.default +++ b/sip/SIP_Tests.default @@ -25,6 +25,7 @@ mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSIPcon"; +MNCC_Emulation.mp_mncc_version := 5; [MAIN_CONTROLLER]