<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24837">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rsl: use tlvp_val16be() in rsl_rx_ipac_XXcx()<br><br>Instead of using tlvp_val16_unal() and then doing ntohs() here<br>and there, convert the remote port to the host byte order once.<br><br>Change-Id: Id883a976a03fd3022ed9d66f703b01244df2d9db<br>---<br>M src/common/rsl.c<br>1 file changed, 4 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/37/24837/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 010b9d3..29388a1 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -2615,9 +2615,8 @@</span><br><span>   }</span><br><span> </span><br><span>        if (TLVP_PRES_LEN(&tp, RSL_IE_IPAC_REMOTE_PORT, 2)) {</span><br><span style="color: hsl(0, 100%, 40%);">-               connect_port = tlvp_val16_unal(&tp, RSL_IE_IPAC_REMOTE_PORT);</span><br><span style="color: hsl(0, 100%, 40%);">-               LOGPC(DRSL, LOGL_DEBUG, "connect_port=%u ",</span><br><span style="color: hsl(0, 100%, 40%);">-                 ntohs(connect_port));</span><br><span style="color: hsl(120, 100%, 40%);">+           connect_port = tlvp_val16be(&tp, RSL_IE_IPAC_REMOTE_PORT);</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGPC(DRSL, LOGL_DEBUG, "connect_port=%u ", connect_port);</span><br><span>         }</span><br><span> </span><br><span>        speech_mode = TLVP_VAL(&tp, RSL_IE_IPAC_SPEECH_MODE);</span><br><span>@@ -2733,7 +2732,7 @@</span><br><span>    } else</span><br><span>               ia.s_addr = connect_ip;</span><br><span>      rc = osmo_rtp_socket_connect(lchan->abis_ip.rtp_socket,</span><br><span style="color: hsl(0, 100%, 40%);">-                                   inet_ntoa(ia), ntohs(connect_port));</span><br><span style="color: hsl(120, 100%, 40%);">+                                  inet_ntoa(ia), connect_port);</span><br><span>   if (rc < 0) {</span><br><span>             LOGPLCHAN(lchan, DRTP, LOGL_ERROR, "Failed to connect RTP/RTCP sockets\n");</span><br><span>                osmo_rtp_socket_free(lchan->abis_ip.rtp_socket);</span><br><span>@@ -2744,7 +2743,7 @@</span><br><span>  }</span><br><span>    /* save IP address and port number */</span><br><span>        lchan->abis_ip.connect_ip = ntohl(ia.s_addr);</span><br><span style="color: hsl(0, 100%, 40%);">-        lchan->abis_ip.connect_port = ntohs(connect_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->abis_ip.connect_port = connect_port;</span><br><span> </span><br><span>   rc = osmo_rtp_get_bound_ip_port(lchan->abis_ip.rtp_socket,</span><br><span>                                        &lchan->abis_ip.bound_ip,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24837">change 24837</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-bts/+/24837"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id883a976a03fd3022ed9d66f703b01244df2d9db </div>
<div style="display:none"> Gerrit-Change-Number: 24837 </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>