<p>dexter <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC_ConnectionHandler: allow to use IPV4 as default<br><br>When the BSC sends a CRCX without an IP address in it, the testcase will<br>automatically assign an IPV6 address in the response. However, this<br>breaks compatibility with older versions of osmo-bsc that do not have<br>IPV6 support. Lets add a module parameter in order to be able to use<br>IPV4 as default if required.<br><br>Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>2 files changed, 15 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 7f670d2..34ee429 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -611,6 +611,8 @@</span><br><span> boolean mp_enable_osmux_test := true;</span><br><span> /* Value set in osmo-bsc.cfg "ms max power" */</span><br><span> uint8_t mp_exp_ms_power_level := 7;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean mp_media_mgw_offer_ipv6 := true;</span><br><span> }</span><br><span> </span><br><span> private function f_gen_test_hdlr_pars(integer bssap_idx := 0) return TestHdlrParams {</span><br><span>@@ -623,6 +625,7 @@</span><br><span> }</span><br><span> pars.exp_ms_power_level := mp_exp_ms_power_level;</span><br><span> pars.mscpool.bssap_idx := bssap_idx;</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.media_mgw_offer_ipv6 := mp_media_mgw_offer_ipv6;</span><br><span> </span><br><span> return pars;</span><br><span> }</span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index c372709..3d6538a 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -279,7 +279,14 @@</span><br><span> var MgcpOsmuxCID osmux_cid;</span><br><span> var SDP_Message sdp;</span><br><span> var integer cid := f_get_free_mgcp_conn();</span><br><span style="color: hsl(0, 100%, 40%);">- var charstring local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */</span><br><span style="color: hsl(120, 100%, 40%);">+ var charstring local_rtp_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_pars.media_mgw_offer_ipv6 == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ local_rtp_addr := host_mgw_rtp_v4; /* Use IPv4 by default if no remote addr is provided by client */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (match(mgcp_cmd.line.ep, t_MGCP_EP_wildcard)) {</span><br><span> if (cid != 0) {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP wildcard EP only works in first CRCX");</span><br><span>@@ -553,7 +560,8 @@</span><br><span> boolean aoip,</span><br><span> boolean use_osmux,</span><br><span> charstring host_aoip_tla,</span><br><span style="color: hsl(0, 100%, 40%);">- TestHdlrParamsMSCPool mscpool</span><br><span style="color: hsl(120, 100%, 40%);">+ TestHdlrParamsMSCPool mscpool,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean media_mgw_offer_ipv6</span><br><span> };</span><br><span> </span><br><span> /* Note: Do not use valueof() to get a value of this template, use</span><br><span>@@ -587,7 +595,8 @@</span><br><span> bssap_idx := 0,</span><br><span> rsl_idx := 0,</span><br><span> l3_info := omit</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ media_mgw_offer_ipv6 := true</span><br><span> }</span><br><span> </span><br><span> function f_create_chan_and_exp() runs on MSC_ConnHdlr {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232">change 20232</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c </div>
<div style="display:none"> Gerrit-Change-Number: 20232 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>