<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgw: Rename IP address module parameter specifying IP version<br><br>Change-Id: Ia393d7175de277ec8fa524ba74bf3b150b74c766<br>---<br>M mgw/MGCP_Test.default<br>M mgw/MGCP_Test.ttcn<br>2 files changed, 33 insertions(+), 33 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/20037/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/mgw/MGCP_Test.default b/mgw/MGCP_Test.default</span><br><span>index 4336033..35f7ed0 100644</span><br><span>--- a/mgw/MGCP_Test.default</span><br><span>+++ b/mgw/MGCP_Test.default</span><br><span>@@ -14,9 +14,9 @@</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span> mp_local_udp_port := 2727;</span><br><span style="color: hsl(0, 100%, 40%);">-mp_local_ip:= "127.0.0.1";</span><br><span style="color: hsl(120, 100%, 40%);">+mp_local_ipv4:= "127.0.0.1";</span><br><span> mp_remote_udp_port := 2427;</span><br><span style="color: hsl(0, 100%, 40%);">-mp_remote_ip:= "127.0.0.1";</span><br><span style="color: hsl(120, 100%, 40%);">+mp_remote_ipv4:= "127.0.0.1";</span><br><span> Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoMGW";</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span>diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn</span><br><span>index 47a7690..c41466a 100644</span><br><span>--- a/mgw/MGCP_Test.ttcn</span><br><span>+++ b/mgw/MGCP_Test.ttcn</span><br><span>@@ -64,9 +64,9 @@</span><br><span> * default values assigned below are used */</span><br><span> modulepar {</span><br><span> PortNumber mp_local_udp_port := 2727;</span><br><span style="color: hsl(0, 100%, 40%);">- charstring mp_local_ip := "127.0.0.1";</span><br><span style="color: hsl(120, 100%, 40%);">+ charstring mp_local_ipv4 := "127.0.0.1";</span><br><span> PortNumber mp_remote_udp_port := 2427;</span><br><span style="color: hsl(0, 100%, 40%);">- charstring mp_remote_ip := "127.0.0.1";</span><br><span style="color: hsl(120, 100%, 40%);">+ charstring mp_remote_ipv4 := "127.0.0.1";</span><br><span> PortNumber mp_local_rtp_port_base := 10000;</span><br><span> PortNumber mp_local_osmux_port := 1985;</span><br><span> }</span><br><span>@@ -124,7 +124,7 @@</span><br><span> /* connect the MGCP test port using the given</span><br><span> * source/destionation ip/port and store the connection id in g_mgcp_conn_id</span><br><span> * */</span><br><span style="color: hsl(0, 100%, 40%);">- res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {} });</span><br><span style="color: hsl(120, 100%, 40%);">+ res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, mp_remote_ipv4, mp_remote_udp_port, mp_local_ipv4, mp_local_udp_port, 0, { udp := {} });</span><br><span> if (not ispresent(res.connId)) {</span><br><span> setverdict(fail, "Could not connect MGCP, check your configuration");</span><br><span> mtc.stop;</span><br><span>@@ -224,9 +224,9 @@</span><br><span> function tr_MGCP_RecvFrom_R(template MgcpResponse resp) runs on dummy_CT return template MGCP_RecvFrom {</span><br><span> var template MGCP_RecvFrom mrf := {</span><br><span> connId := g_mgcp_conn_id,</span><br><span style="color: hsl(0, 100%, 40%);">- remName := mp_remote_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ remName := mp_remote_ipv4,</span><br><span> remPort := mp_remote_udp_port,</span><br><span style="color: hsl(0, 100%, 40%);">- locName := mp_local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ locName := mp_local_ipv4,</span><br><span> locPort := mp_local_udp_port,</span><br><span> msg := { response := resp }</span><br><span> }</span><br><span>@@ -1080,7 +1080,7 @@</span><br><span> var OsmuxTxHandle tx_hdl;</span><br><span> </span><br><span> f_init(ep, true);</span><br><span style="color: hsl(0, 100%, 40%);">- flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000/1"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000/1"));</span><br><span> flow.em.portnr := mp_local_osmux_port;</span><br><span> flow.osmux_cid := -1;</span><br><span> f_flow_create_osmux(OsmuxEM, ep, call_id, "recvonly", flow, false);</span><br><span>@@ -1117,7 +1117,7 @@</span><br><span> var OsmuxTxHandle tx_hdl;</span><br><span> </span><br><span> f_init(ep, true);</span><br><span style="color: hsl(0, 100%, 40%);">- flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1"));</span><br><span> flow.em.portnr := mp_local_osmux_port;</span><br><span> flow.osmux_cid := 2;</span><br><span> f_flow_create_osmux(OsmuxEM, ep, call_id, "loopback", flow);</span><br><span>@@ -1198,7 +1198,7 @@</span><br><span> f_init(ep, true);</span><br><span> </span><br><span> /* from us to MGW */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000"));</span><br><span> flow[0].rtp_cfg := c_RtpemDefaultCfg</span><br><span> flow[0].rtp_cfg.tx_payload_type := flow[0].pt;</span><br><span> /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */</span><br><span>@@ -1209,7 +1209,7 @@</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]);</span><br><span> </span><br><span> /* from MGW back to us */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "AMR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000"));</span><br><span> flow[1].em.portnr := mp_local_osmux_port;</span><br><span> flow[1].osmux_cid := 2;</span><br><span> flow[1].osmux_cfg := c_OsmuxemDefaultCfg;</span><br><span>@@ -1277,7 +1277,7 @@</span><br><span> f_init(ep, true);</span><br><span> </span><br><span> /* Create the first connection in receive only mode */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000"));</span><br><span> flow[0].rtp_cfg := c_RtpemDefaultCfg</span><br><span> flow[0].rtp_cfg.tx_payload_type := flow[0].pt;</span><br><span> /* 0014 is the ToC (CMR=AMR4.75) in front of AMR Payload in RTP Payload */</span><br><span>@@ -1290,7 +1290,7 @@</span><br><span> </span><br><span> /* Create the second connection. This connection will be also</span><br><span> * in receive only mode */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "AMR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "AMR/8000"));</span><br><span> flow[1].em.portnr := mp_local_osmux_port;</span><br><span> if (crcx_osmux_wildcard) {</span><br><span> flow[1].osmux_cid := -1;</span><br><span>@@ -1591,7 +1591,7 @@</span><br><span> var RtpemStats stats;</span><br><span> </span><br><span> f_init(ep);</span><br><span style="color: hsl(0, 100%, 40%);">- flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000/1"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000/1"));</span><br><span> flow.em.portnr := 10000;</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow, true);</span><br><span> </span><br><span>@@ -1629,7 +1629,7 @@</span><br><span> var RtpemStats stats;</span><br><span> </span><br><span> f_init(ep);</span><br><span style="color: hsl(0, 100%, 40%);">- flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1"));</span><br><span> flow.em.portnr := 10000;</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "loopback", flow);</span><br><span> </span><br><span>@@ -1663,13 +1663,13 @@</span><br><span> f_init(ep);</span><br><span> </span><br><span> /* from us to MGW */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, pt_a, codec_name_a));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, pt_a, codec_name_a));</span><br><span> /* bind local RTP emulation sockets */</span><br><span> flow[0].em.portnr := 10000;</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]);</span><br><span> </span><br><span> /* from MGW back to us */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, pt_b, codec_name_b));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, pt_b, codec_name_b));</span><br><span> flow[1].em.portnr := 20000;</span><br><span> f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]);</span><br><span> </span><br><span>@@ -1739,13 +1739,13 @@</span><br><span> f_init(ep);</span><br><span> </span><br><span> /* Create the first connection in receive only mode */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 3, "GSM/8000/1"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1"));</span><br><span> flow[0].em.portnr := 10000;</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], false);</span><br><span> </span><br><span> /* Create the second connection. This connection will be also</span><br><span> * in receive only mode */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 3, "GSM/8000/1"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 3, "GSM/8000/1"));</span><br><span> flow[1].em.portnr := 20000;</span><br><span> f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], false);</span><br><span> </span><br><span>@@ -1841,13 +1841,13 @@</span><br><span> f_init(ep);</span><br><span> </span><br><span> /* from us to MGW */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 98, "AMR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 98, "AMR/8000"));</span><br><span> /* bind local RTP emulation sockets */</span><br><span> flow[0].em.portnr := 10000;</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]);</span><br><span> </span><br><span> /* from MGW back to us */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 98, "AMR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 98, "AMR/8000"));</span><br><span> flow[1].em.portnr := 20000;</span><br><span> f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]);</span><br><span> </span><br><span>@@ -1857,8 +1857,8 @@</span><br><span> f_sleep(0.5);</span><br><span> </span><br><span> /* Start inserting unsolicited RTP packets */</span><br><span style="color: hsl(0, 100%, 40%);">- f_rtpem_bind(RTPEM[2], mp_local_ip, unsolicited_port);</span><br><span style="color: hsl(0, 100%, 40%);">- f_rtpem_connect(RTPEM[2], mp_remote_ip, flow[0].mgw.portnr);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_bind(RTPEM[2], mp_local_ipv4, unsolicited_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_connect(RTPEM[2], mp_remote_ipv4, flow[0].mgw.portnr);</span><br><span> f_rtpem_mode(RTPEM[2], RTPEM_MODE_TXONLY);</span><br><span> </span><br><span> f_sleep(0.5);</span><br><span>@@ -1894,13 +1894,13 @@</span><br><span> f_init(ep);</span><br><span> </span><br><span> /* First connection (BTS) */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "GSM-EFR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "GSM-EFR/8000"));</span><br><span> /* bind local RTP emulation sockets */</span><br><span> flow[0].em.portnr := 10000;</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]);</span><br><span> </span><br><span> /* Second connection (PBX) */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 110, "GSM-EFR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 110, "GSM-EFR/8000"));</span><br><span> flow[1].em.portnr := 20000;</span><br><span> f_flow_create(RTPEM[1], ep, call_id, "sendrecv", flow[1]);</span><br><span> </span><br><span>@@ -1920,8 +1920,8 @@</span><br><span> * transmitting for a while. We simulate this by injecting</span><br><span> * some unsolicited packets on the behalf of the old source,</span><br><span> * (old remote port) */</span><br><span style="color: hsl(0, 100%, 40%);">- f_rtpem_bind(RTPEM[2], mp_local_ip, port_old);</span><br><span style="color: hsl(0, 100%, 40%);">- f_rtpem_connect(RTPEM[2], mp_remote_ip, flow[0].mgw.portnr);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_bind(RTPEM[2], mp_local_ipv4, port_old);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rtpem_connect(RTPEM[2], mp_remote_ipv4, flow[0].mgw.portnr);</span><br><span> f_rtpem_mode(RTPEM[2], RTPEM_MODE_TXONLY);</span><br><span> f_sleep(1.0);</span><br><span> f_rtpem_mode(RTPEM[2], RTPEM_MODE_NONE);</span><br><span>@@ -1968,7 +1968,7 @@</span><br><span> f_vty_transceive(MGWVTY, "rtp-patch rfc5993hr");</span><br><span> </span><br><span> /* Connection #0 (Bidirectional) */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000"));</span><br><span> /* bind local RTP emulation sockets */</span><br><span> flow[0].em.portnr := 10000;</span><br><span> flow[0].rtp_cfg := c_RtpemDefaultCfg;</span><br><span>@@ -1978,7 +1978,7 @@</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]);</span><br><span> </span><br><span> /* Connection #1 (Bidirectional) */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000"));</span><br><span> flow[1].em.portnr := 20000;</span><br><span> flow[1].rtp_cfg := c_RtpemDefaultCfg;</span><br><span> flow[1].rtp_cfg.tx_payload_type := flow[1].pt;</span><br><span>@@ -2033,7 +2033,7 @@</span><br><span> f_init(ep);</span><br><span> </span><br><span> /* Connection #0 (Bidirectional) */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[0] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000"));</span><br><span> /* bind local RTP emulation sockets */</span><br><span> flow[0].em.portnr := 10000;</span><br><span> flow[0].rtp_cfg := c_RtpemDefaultCfg;</span><br><span>@@ -2044,7 +2044,7 @@</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "sendrecv", flow[0]);</span><br><span> </span><br><span> /* Connection #1 (Bidirectional) */</span><br><span style="color: hsl(0, 100%, 40%);">- flow[1] := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 112, "AMR/8000"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "AMR/8000"));</span><br><span> flow[1].em.portnr := 20000;</span><br><span> flow[1].rtp_cfg := c_RtpemDefaultCfg;</span><br><span> flow[1].rtp_cfg.tx_payload_type := flow[1].pt;</span><br><span>@@ -2123,7 +2123,7 @@</span><br><span> f_vty_config(MGWVTY, "mgcp", "conn-timeout 1"); /* reset in f_init_vty() */</span><br><span> </span><br><span> log("Sending RTP data for 1.5s");</span><br><span style="color: hsl(0, 100%, 40%);">- flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1"));</span><br><span> flow.em.portnr := 10000;</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "loopback", flow);</span><br><span> f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR);</span><br><span>@@ -2208,7 +2208,7 @@</span><br><span> var RtpemStats stats;</span><br><span> </span><br><span> f_init(ep);</span><br><span style="color: hsl(0, 100%, 40%);">- flow := valueof(t_RtpFlow(mp_local_ip, mp_remote_ip, 111, "GSM-HR-08/8000/1"));</span><br><span style="color: hsl(120, 100%, 40%);">+ flow := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 111, "GSM-HR-08/8000/1"));</span><br><span> flow.em.portnr := 10000;</span><br><span> f_flow_create(RTPEM[0], ep, call_id, "loopback", flow);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20037">change 20037</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/+/20037"/><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: Ia393d7175de277ec8fa524ba74bf3b150b74c766 </div>
<div style="display:none"> Gerrit-Change-Number: 20037 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>