Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: allow to use IPV4 as default

[dexter]

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232 )

Change subject: MSC_ConnectionHandler: allow to use IPV4 as default
......................................................................

MSC_ConnectionHandler: allow to use IPV4 as default

When the BSC sends a CRCX without an IP address in it, the testcase will
automatically assign an IPV6 address in the response. However, this
breaks compatibility with older versions of osmo-bsc that do not have
IPV6 support. Lets add a module parameter in order to be able to use
IPV4 as default if required.

Change-Id: I30c77abef63636bb02db12d2f2b2d79ea244b96c
---
M bsc/BSC_Tests.ttcn
M bsc/MSC_ConnectionHandler.ttcn
2 files changed, 15 insertions(+), 3 deletions(-)

Approvals:
  daniel: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 7f670d2..34ee429 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -611,6 +611,8 @@
 	boolean mp_enable_osmux_test := true;
 	/* Value set in osmo-bsc.cfg "ms max power" */
 	uint8_t mp_exp_ms_power_level := 7;
+
+	boolean mp_media_mgw_offer_ipv6 := true;
 }
 
 private function f_gen_test_hdlr_pars(integer bssap_idx := 0) return TestHdlrParams {
@@ -623,6 +625,7 @@
 	}
 	pars.exp_ms_power_level := mp_exp_ms_power_level;
 	pars.mscpool.bssap_idx := bssap_idx;
+	pars.media_mgw_offer_ipv6 := mp_media_mgw_offer_ipv6;
 
 	return pars;
 }
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index c372709..3d6538a 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -279,7 +279,14 @@
 	var MgcpOsmuxCID osmux_cid;
 	var SDP_Message sdp;
 	var integer cid := f_get_free_mgcp_conn();
-	var charstring local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */
+	var charstring local_rtp_addr;
+
+	if (g_pars.media_mgw_offer_ipv6 == true) {
+		local_rtp_addr := host_mgw_rtp_v6; /* Use IPv6 by default if no remote addr is provided by client */
+	} else {
+		local_rtp_addr := host_mgw_rtp_v4; /* Use IPv4 by default if no remote addr is provided by client */
+	}
+
 	if (match(mgcp_cmd.line.ep, t_MGCP_EP_wildcard)) {
 		if (cid != 0) {
 			Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "MGCP wildcard EP only works in first CRCX");
@@ -553,7 +560,8 @@
 	boolean		aoip,
 	boolean		use_osmux,
 	charstring	host_aoip_tla,
-	TestHdlrParamsMSCPool mscpool
+	TestHdlrParamsMSCPool mscpool,
+	boolean		media_mgw_offer_ipv6
 };
 
 /* Note: Do not use valueof() to get a value of this template, use
@@ -587,7 +595,8 @@
 		bssap_idx := 0,
 		rsl_idx := 0,
 		l3_info := omit
-	}
+	},
+	media_mgw_offer_ipv6 := true
 }
 
 function f_create_chan_and_exp() runs on MSC_ConnHdlr {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20232
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: I30c77abef63636bb02db12d2f2b2d79ea244b96c
Gerrit-Change-Number: 20232
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200929/3bbe9eec/attachment.htm>