<p>keith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Logging: Make use of Levels<br><br>Up to now most logging is on LDEBUG, lets make more use of Log Levels.<br>NOTICE reports basic call setup<br>INFO gives a little more<br>DEBUG, well.. it's DEBUG<br><br>Also, a 4XX or 5XX response to INVITE is not an Error<br>so don't log it as such. Also 183 does not necessarily<br>mean "ringing". Change those log messages for clarity.<br><br>Change-Id: Ie0014043d93303a87cbb8bb351e439ff78651cbe<br>---<br>M src/mncc.c<br>M src/sip.c<br>2 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/78/15078/1</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 d8545da..90eddc1 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -422,7 +422,7 @@</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> inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_INFO,</span><br><span> "RTP continue leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n",</span><br><span> leg->callref, ip_addr, leg->base.port,</span><br><span> leg->base.payload_type, leg->base.payload_msg_type);</span><br><span>@@ -515,7 +515,7 @@</span><br><span> memcpy(&leg->calling, &data->calling, sizeof(leg->calling));</span><br><span> memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_NOTICE,</span><br><span> "Created call(%u) with MNCC leg(%u) IMSI(%.16s)\n",</span><br><span> call->id, leg->callref, data->imsi);</span><br><span> </span><br><span>diff --git a/src/sip.c b/src/sip.c</span><br><span>index 327e90f..c1e34d3 100644</span><br><span>--- a/src/sip.c</span><br><span>+++ b/src/sip.c</span><br><span>@@ -76,7 +76,7 @@</span><br><span> if (status == 183)</span><br><span> sdp_extract_sdp(leg, sip, false);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now ringing.\n", leg);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_INFO, "leg(%p) is now progressing.\n", leg);</span><br><span> other->ring_call(other);</span><br><span> }</span><br><span> </span><br><span>@@ -98,7 +98,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now connected(%s).\n", leg, sip->sip_call_id->i_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_INFO, "leg(%p) is now connected(%s).\n", leg, sip->sip_call_id->i_id);</span><br><span> leg->state = SIP_CC_CONNECTED;</span><br><span> other->connect_call(other);</span><br><span> nua_ack(leg->nua_handle, TAG_END());</span><br><span>@@ -112,7 +112,7 @@</span><br><span> const char *from = NULL, *to = NULL;</span><br><span> char ip_addr[INET_ADDRSTRLEN];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_DEBUG, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh);</span><br><span> </span><br><span> if (!sdp_screen_sdp(sip)) {</span><br><span> LOGP(DSIP, LOGL_ERROR, "No supported codec.\n");</span><br><span>@@ -161,7 +161,7 @@</span><br><span> }</span><br><span> struct in_addr net = { .s_addr = leg->base.ip };</span><br><span> inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_DEBUG, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_INFO, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n",</span><br><span> ip_addr,</span><br><span> leg->base.port,</span><br><span> leg->base.payload_type);</span><br><span>@@ -343,13 +343,13 @@</span><br><span> else if (status >= 300) {</span><br><span> struct call_leg *other = call_leg_other(&leg->base);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_ERROR, "leg(%p) unknown SIP status(%d), releasing.\n", leg, status);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "INVITE got status(%d), releasing leg(%p).\n", status, leg);</span><br><span> nua_cancel(leg->nua_handle, TAG_END());</span><br><span> nua_handle_destroy(leg->nua_handle);</span><br><span> call_leg_release(&leg->base);</span><br><span> </span><br><span> if (other) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_DEBUG, "Releasing other leg (%p) with status(%d)\n", other, status);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_INFO, "Releasing MNCC leg (%p) with status(%d)\n", other, status);</span><br><span> other->cause = status2cause(status);</span><br><span> other->release_call(other);</span><br><span> }</span><br><span>@@ -365,7 +365,7 @@</span><br><span> } else if (event == nua_r_bye || event == nua_r_cancel) {</span><br><span> /* our bye or hang up is answered */</span><br><span> struct sip_call_leg *leg = (struct sip_call_leg *) hmagic;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_NOTICE, "leg(%p) got resp to %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_INFO, "leg(%p) got resp to %s\n",</span><br><span> leg, event == nua_r_bye ? "bye" : "cancel");</span><br><span> nua_handle_destroy(leg->nua_handle);</span><br><span> call_leg_release(&leg->base);</span><br><span>@@ -374,7 +374,7 @@</span><br><span> struct sip_call_leg *leg = (struct sip_call_leg *) hmagic;</span><br><span> struct call_leg *other = call_leg_other(&leg->base);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_ERROR, "leg(%p) got bye, releasing.\n", leg);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "leg(%p) got bye, releasing.\n", leg);</span><br><span> nua_handle_destroy(leg->nua_handle);</span><br><span> call_leg_release(&leg->base);</span><br><span> </span><br><span>@@ -395,7 +395,7 @@</span><br><span> struct sip_call_leg *leg;</span><br><span> struct call_leg *other;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_ERROR, "Cancelled on leg(%p)\n", hmagic);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "Cancelled on leg(%p)\n", hmagic);</span><br><span> </span><br><span> leg = (struct sip_call_leg *) hmagic;</span><br><span> other = call_leg_other(&leg->base);</span><br><span>@@ -447,7 +447,7 @@</span><br><span> * to help us here.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_DEBUG, "%s(): Release with MNCC cause(%s)\n", __func__, gsm48_cc_cause_name(_leg->cause));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_INFO, "%s(): Release with MNCC cause(%s)\n", __func__, gsm48_cc_cause_name(_leg->cause));</span><br><span> cause2status(_leg->cause, &sip_cause, &sip_phrase, &reason_text);</span><br><span> snprintf(reason, sizeof reason, "Q.850;cause=%u;text=\"%s\"", _leg->cause, reason_text);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15078">change 15078</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/+/15078"/><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: Ie0014043d93303a87cbb8bb351e439ff78651cbe </div>
<div style="display:none"> Gerrit-Change-Number: 15078 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>