<p>keith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">inet_ntoa() is deprecated, use inet_ntop() instead<br><br>Change-Id: If6a96ede7d5e73884c32fbfdb03052e2bda50a77<br>---<br>M src/mncc.c<br>M src/sdp.c<br>M src/sip.c<br>3 files changed, 17 insertions(+), 6 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 7bffbd1..8f512d9 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -174,6 +174,7 @@</span><br><span> {</span><br><span> struct gsm_mncc_rtp mncc = { 0, };</span><br><span> int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ char ip_addr[INET_ADDRSTRLEN];</span><br><span> </span><br><span> /*</span><br><span> * Send RTP CONNECT and we handle the general failure of it by</span><br><span>@@ -189,7 +190,8 @@</span><br><span> * payload_type should be different..</span><br><span> */</span><br><span> struct in_addr net = { .s_addr = other->ip };</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", inet_ntoa(net), mncc.port);</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", ip_addr, mncc.port);</span><br><span> rc = write(leg->conn->fd.fd, &mncc, sizeof(mncc));</span><br><span> if (rc != sizeof(mncc)) {</span><br><span> LOGP(DMNCC, LOGL_ERROR, "Failed to send message leg(%u)\n",</span><br><span>@@ -395,6 +397,7 @@</span><br><span> {</span><br><span> const struct gsm_mncc_rtp *rtp;</span><br><span> struct mncc_call_leg *leg;</span><br><span style="color: hsl(120, 100%, 40%);">+ char ip_addr[INET_ADDRSTRLEN];</span><br><span> </span><br><span> if (rc < sizeof(*rtp)) {</span><br><span> LOGP(DMNCC, LOGL_ERROR, "gsm_mncc_rtp of wrong size %d < %zu\n",</span><br><span>@@ -417,9 +420,10 @@</span><br><span> </span><br><span> /* TODO.. now we can continue with the call */</span><br><span> struct in_addr net = { .s_addr = leg->base.ip };</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));</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 style="color: hsl(0, 100%, 40%);">- leg->callref, inet_ntoa(net), leg->base.port,</span><br><span style="color: hsl(120, 100%, 40%);">+ leg->callref, ip_addr, leg->base.port,</span><br><span> leg->base.payload_type, leg->base.payload_msg_type);</span><br><span> stop_cmd_timer(leg, MNCC_RTP_CREATE);</span><br><span> continue_call(leg);</span><br><span>diff --git a/src/sdp.c b/src/sdp.c</span><br><span>index e2ed25e..56a41f7 100644</span><br><span>--- a/src/sdp.c</span><br><span>+++ b/src/sdp.c</span><br><span>@@ -207,7 +207,9 @@</span><br><span> struct in_addr net = { .s_addr = other->ip };</span><br><span> char *fmtp_str = NULL, *sdp;</span><br><span> char *mode_attribute;</span><br><span style="color: hsl(120, 100%, 40%);">+ char ip_addr[INET_ADDRSTRLEN];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));</span><br><span> leg->wanted_codec = app_media_name(other->payload_msg_type);</span><br><span> </span><br><span> if (strcmp(leg->wanted_codec, "AMR") == 0)</span><br><span>@@ -241,7 +243,7 @@</span><br><span> "%s"</span><br><span> "a=rtpmap:%d %s/8000\r\n"</span><br><span> "%s",</span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntoa(net), inet_ntoa(net), /* never use diff. addr! */</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_addr, ip_addr, /* never use diff. addr! */</span><br><span> other->port, other->payload_type,</span><br><span> fmtp_str ? fmtp_str : "",</span><br><span> other->payload_type,</span><br><span>diff --git a/src/sip.c b/src/sip.c</span><br><span>index 0179226..b652b4b 100644</span><br><span>--- a/src/sip.c</span><br><span>+++ b/src/sip.c</span><br><span>@@ -110,6 +110,7 @@</span><br><span> struct call *call;</span><br><span> struct sip_call_leg *leg;</span><br><span> const char *from = NULL, *to = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ char ip_addr[INET_ADDRSTRLEN];</span><br><span> </span><br><span> LOGP(DSIP, LOGL_DEBUG, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh);</span><br><span> </span><br><span>@@ -159,8 +160,9 @@</span><br><span> return;</span><br><span> }</span><br><span> struct in_addr net = { .s_addr = leg->base.ip };</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));</span><br><span> LOGP(DSIP, LOGL_DEBUG, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n",</span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntoa(net),</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_addr,</span><br><span> leg->base.port,</span><br><span> leg->base.payload_type);</span><br><span> </span><br><span>@@ -186,6 +188,7 @@</span><br><span> sdp_mode_t mode = sdp_sendrecv;</span><br><span> uint32_t ip = leg->base.ip;</span><br><span> uint16_t port = leg->base.port;</span><br><span style="color: hsl(120, 100%, 40%);">+ char ip_addr[INET_ADDRSTRLEN];</span><br><span> </span><br><span> LOGP(DSIP, LOGL_NOTICE, "re-INVITE for call %s\n", sip->sip_call_id->i_id);</span><br><span> </span><br><span>@@ -205,7 +208,8 @@</span><br><span> }</span><br><span> </span><br><span> struct in_addr net = { .s_addr = leg->base.ip };</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_NOTICE, "pre re-INVITE have IP:port (%s:%u)\n", inet_ntoa(net), leg->base.port);</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "pre re-INVITE have IP:port (%s:%u)\n", ip_addr, leg->base.port);</span><br><span> </span><br><span> if (mode == sdp_sendonly) {</span><br><span> /* SIP side places call on HOLD */</span><br><span>@@ -221,7 +225,8 @@</span><br><span> return;</span><br><span> }</span><br><span> struct in_addr net = { .s_addr = leg->base.ip };</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", inet_ntoa(net), leg->base.port);</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", ip_addr, leg->base.port);</span><br><span> if (ip != leg->base.ip || port != leg->base.port) {</span><br><span> LOGP(DSIP, LOGL_NOTICE, "re-INVITE changes media connection.\n");</span><br><span> if (other->update_rtp)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15065">change 15065</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/+/15065"/><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: If6a96ede7d5e73884c32fbfdb03052e2bda50a77 </div>
<div style="display:none"> Gerrit-Change-Number: 15065 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>