<p>neels <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  neels: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">IPs stored in the call struct are NETWORK byte order<br><br>As far as I can make out, the intention is to always store ip address in the call struct<br>in network byte order, whereas the ip address sent on MNCC are in host byte order.<br><br>Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814<br>---<br>M src/mncc.c<br>1 file changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mncc.c b/src/mncc.c</span><br><span>index 81fe30f..7bffbd1 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -181,7 +181,7 @@</span><br><span>          */</span><br><span>  mncc.msg_type = MNCC_RTP_CONNECT;</span><br><span>    mncc.callref = leg->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- mncc.ip = htonl(other->ip);</span><br><span style="color: hsl(120, 100%, 40%);">+        mncc.ip = ntohl(other->ip);</span><br><span>       mncc.port = other->port;</span><br><span>  mncc.payload_type = other->payload_type;</span><br><span>  /*</span><br><span>@@ -410,13 +410,13 @@</span><br><span>   }</span><br><span> </span><br><span>        /* extract information about where the RTP is */</span><br><span style="color: hsl(0, 100%, 40%);">-        leg->base.ip = rtp->ip;</span><br><span style="color: hsl(120, 100%, 40%);">+ leg->base.ip = htonl(rtp->ip);</span><br><span>         leg->base.port = rtp->port;</span><br><span>    leg->base.payload_type = rtp->payload_type;</span><br><span>    leg->base.payload_msg_type = rtp->payload_msg_type;</span><br><span> </span><br><span>        /* TODO.. now we can continue with the call */</span><br><span style="color: hsl(0, 100%, 40%);">-  struct in_addr net = { .s_addr = htonl(leg->base.ip) };</span><br><span style="color: hsl(120, 100%, 40%);">+    struct in_addr net = { .s_addr = leg->base.ip };</span><br><span>  LOGP(DMNCC, LOGL_DEBUG,</span><br><span>              "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n",</span><br><span>               leg->callref, inet_ntoa(net), leg->base.port,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15063">change 15063</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-sip-connector/+/15063"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sip-connector </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I89ef26aa32a672f394699251cf560b53ae01a814 </div>
<div style="display:none"> Gerrit-Change-Number: 15063 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>