<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: Fix wrong mgcp conn expected in several places<br><br>Change-Id: I0bb15881e640fe49552108679894d5df15339fc8<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>1 file changed, 10 insertions(+), 10 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/75/19975/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index 053a5f6..b24cb8d 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -857,7 +857,7 @@</span><br><span> },</span><br><span> mgw_conn_2 := {</span><br><span> resp := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- mgw_rtp_ip := "1.1.1.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_rtp_ip := "2.2.2.2",</span><br><span> mgw_rtp_port := 11000,</span><br><span> mgcp_connection_id := '22222'H</span><br><span> },</span><br><span>@@ -988,9 +988,9 @@</span><br><span> /* MDCX setting up the RAN side remote RTP address received from Assignment Complete */</span><br><span> [] MGCP.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span> log("f_mt_call_complete 8");</span><br><span style="color: hsl(0, 100%, 40%);">- var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_1.mgw_rtp_ip, cpars.mgw_conn_1.mgw_rtp_ip,</span><br><span> hex2str(cpars.mgcp_call_id), "42",</span><br><span style="color: hsl(0, 100%, 40%);">- cpars.mgw_conn_2.mgw_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ cpars.mgw_conn_1.mgw_rtp_port,</span><br><span> { int2str(cpars.rtp_payload_type) },</span><br><span> { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type,</span><br><span> cpars.rtp_sdp_format)),</span><br><span>@@ -1003,7 +1003,7 @@</span><br><span> }</span><br><span> mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, osmux_cid, sdp);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, sdp);</span><br><span> }</span><br><span> MGCP.send(mgcp_resp);</span><br><span> }</span><br><span>@@ -1073,9 +1073,9 @@</span><br><span> /* MDCX setting up the RAN side remote RTP address received from Assignment Complete */</span><br><span> [] MGCP.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span> log("f_mt_call_complete 8.iu");</span><br><span style="color: hsl(0, 100%, 40%);">- var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_1.mgw_rtp_ip, cpars.mgw_conn_1.mgw_rtp_ip,</span><br><span> hex2str(cpars.mgcp_call_id), "42",</span><br><span style="color: hsl(0, 100%, 40%);">- cpars.mgw_conn_2.mgw_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ cpars.mgw_conn_1.mgw_rtp_port,</span><br><span> { int2str(cpars.rtp_payload_type) },</span><br><span> { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type,</span><br><span> cpars.rtp_sdp_format)),</span><br><span>@@ -1088,7 +1088,7 @@</span><br><span> }</span><br><span> mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, osmux_cid, sdp);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, sdp);</span><br><span> }</span><br><span> MGCP.send(mgcp_resp);</span><br><span> }</span><br><span>@@ -1423,9 +1423,9 @@</span><br><span> /* MDCX setting up the RAN side remote RTP address received from Assignment Complete */</span><br><span> [] MGCP.receive(tr_MDCX) -> value mgcp_cmd {</span><br><span> log("f_mo_call_establish 5: rx MDCX for the RAN side");</span><br><span style="color: hsl(0, 100%, 40%);">- var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_conn_1.mgw_rtp_ip, cpars.mgw_conn_1.mgw_rtp_ip,</span><br><span> hex2str(cpars.mgcp_call_id), "42",</span><br><span style="color: hsl(0, 100%, 40%);">- cpars.mgw_conn_2.mgw_rtp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ cpars.mgw_conn_1.mgw_rtp_port,</span><br><span> { int2str(cpars.rtp_payload_type) },</span><br><span> { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type,</span><br><span> cpars.rtp_sdp_format)),</span><br><span>@@ -1439,7 +1439,7 @@</span><br><span> }</span><br><span> mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, osmux_cid, sdp);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_2.mgcp_connection_id, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgw_conn_1.mgcp_connection_id, sdp);</span><br><span> }</span><br><span> MGCP.send(mgcp_resp);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19975">change 19975</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/+/19975"/><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: I0bb15881e640fe49552108679894d5df15339fc8 </div>
<div style="display:none"> Gerrit-Change-Number: 19975 </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>