<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24839">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/RSL_Types: use OCT4 for local/remote address fields<br><br>This way functions like f_inet_addr() and f_inet6_addr() can be<br>used directly without converting between bytes and integers.<br><br>Change-Id: I389a8cb95c025c9dddc751789223621c15d9b48f<br>---<br>M bts/BTS_Tests.ttcn<br>M library/RSL_Types.ttcn<br>2 files changed, 11 insertions(+), 11 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/39/24839/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 06085c6..a7fdf16 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -4611,7 +4611,7 @@</span><br><span> private function f_TC_ipa_crcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr {</span><br><span> f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?),</span><br><span> "IPA CRCX ACK");</span><br><span style="color: hsl(0, 100%, 40%);">- var uint32_t remote_ip := f_rnd_int(c_UINT32_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 remote_ip := f_rnd_octstring(4);</span><br><span> var uint16_t remote_port := f_rnd_int(c_UINT16_MAX);</span><br><span> var uint7_t rtp_pt2 := f_rnd_int(127);</span><br><span> var uint16_t fake_conn_id := 23; /* we're too lazy to read it out from the CRCX ACK above */</span><br><span>@@ -4632,7 +4632,7 @@</span><br><span> private function f_TC_ipa_crcx_mdcx_mdcx_dlcx_not_active(charstring id) runs on ConnHdlr {</span><br><span> f_rsl_transceive(ts_RSL_IPA_CRCX(g_chan_nr), tr_RSL_IPA_CRCX_ACK(g_chan_nr, ?, ?, ?),</span><br><span> "IPA CRCX ACK");</span><br><span style="color: hsl(0, 100%, 40%);">- var uint32_t remote_ip := f_rnd_int(c_UINT32_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 remote_ip := f_rnd_octstring(4);</span><br><span> var uint16_t remote_port := f_rnd_int(c_UINT16_MAX);</span><br><span> var uint7_t rtp_pt2 := f_rnd_int(127);</span><br><span> var uint16_t fake_conn_id := 23; /* we're too lazy to read it out from the CRCX ACK above */</span><br><span>@@ -4640,7 +4640,7 @@</span><br><span> tr_RSL_IPA_MDCX_ACK(g_chan_nr, ?, ?, ?, rtp_pt2),</span><br><span> "IPA MDCX ACK");</span><br><span> /* Second MDCX */</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := f_rnd_int(c_UINT32_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := f_rnd_octstring(4);</span><br><span> remote_port := f_rnd_int(c_UINT16_MAX);</span><br><span> f_rsl_transceive(ts_RSL_IPA_MDCX(g_chan_nr, fake_conn_id, remote_ip, remote_port, rtp_pt2),</span><br><span> tr_RSL_IPA_MDCX_ACK(g_chan_nr, ?, ?, ?, rtp_pt2),</span><br><span>diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn</span><br><span>index 4e25189..aa206a3 100644</span><br><span>--- a/library/RSL_Types.ttcn</span><br><span>+++ b/library/RSL_Types.ttcn</span><br><span>@@ -919,8 +919,8 @@</span><br><span> uint16_t ipa_conn_id,</span><br><span> uint16_t ipa_local_port,</span><br><span> uint16_t ipa_remote_port,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t ipa_local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t ipa_remote_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ OCT4 ipa_local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ OCT4 ipa_remote_ip,</span><br><span> uint8_t ipa_rtp_pt,</span><br><span> uint8_t ipa_rtp_pt2,</span><br><span> RSL_IE_IPA_ConnectionStats ipa_stats,</span><br><span>@@ -2005,7 +2005,7 @@</span><br><span> }</span><br><span> template (value) RSL_Message</span><br><span> ts_RSL_IPA_CRCX(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) uint32_t remote_ip := oct2int('7F000001'O),</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) OCT4 remote_ip := '7F000001'O,</span><br><span> template (value) uint16_t remote_port := 6766) := {</span><br><span> msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false),</span><br><span> msg_type := RSL_MT_IPAC_CRCX,</span><br><span>@@ -2018,7 +2018,7 @@</span><br><span> </span><br><span> </span><br><span> template (value) RSL_Message ts_RSL_IPA_CRCX_ACK(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ipa_conn_id, uint32_t local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t ipa_conn_id, OCT4 local_ip,</span><br><span> uint16_t local_port, uint7_t rtp_pt2) := {</span><br><span> msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false),</span><br><span> msg_type := RSL_MT_IPAC_CRCX_ACK,</span><br><span>@@ -2032,7 +2032,7 @@</span><br><span> }</span><br><span> template RSL_Message tr_RSL_IPA_CRCX_ACK(template RslChannelNr chan_nr,</span><br><span> template uint16_t ipa_conn_id,</span><br><span style="color: hsl(0, 100%, 40%);">- template uint32_t local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ template OCT4 local_ip,</span><br><span> template uint16_t local_port) := {</span><br><span> msg_disc := tr_RSL_MsgDisc(RSL_MDISC_IPACCESS, false),</span><br><span> msg_type := RSL_MT_IPAC_CRCX_ACK,</span><br><span>@@ -2066,7 +2066,7 @@</span><br><span> </span><br><span> template (value) RSL_Message ts_RSL_IPA_MDCX(template (value) RslChannelNr chan_nr,</span><br><span> uint16_t ipa_conn_id,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t remote_ip, uint16_t remote_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ OCT4 remote_ip, uint16_t remote_port,</span><br><span> uint7_t rtp_pt2) := {</span><br><span> msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false),</span><br><span> msg_type := RSL_MT_IPAC_MDCX,</span><br><span>@@ -2092,7 +2092,7 @@</span><br><span> </span><br><span> template (value) RSL_Message ts_RSL_IPA_MDCX_ACK(template (value) RslChannelNr chan_nr,</span><br><span> uint16_t ipa_conn_id,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t local_ip, uint16_t local_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ OCT4 local_ip, uint16_t local_port,</span><br><span> uint7_t rtp_pt2) := {</span><br><span> msg_disc := ts_RSL_MsgDisc(RSL_MDISC_IPACCESS, false),</span><br><span> msg_type := RSL_MT_IPAC_MDCX_ACK,</span><br><span>@@ -2108,7 +2108,7 @@</span><br><span> }</span><br><span> template RSL_Message tr_RSL_IPA_MDCX_ACK(template RslChannelNr chan_nr,</span><br><span> template uint16_t ipa_conn_id,</span><br><span style="color: hsl(0, 100%, 40%);">- template uint32_t local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ template OCT4 local_ip,</span><br><span> template uint16_t local_port,</span><br><span> template uint7_t rtp_pt2) := {</span><br><span> msg_disc := tr_RSL_MsgDisc(RSL_MDISC_IPACCESS, false),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24839">change 24839</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/+/24839"/><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: I389a8cb95c025c9dddc751789223621c15d9b48f </div>
<div style="display:none"> Gerrit-Change-Number: 24839 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>