<p>Keith Whyte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10733">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Log using GSM48 Cause Value strings<br><br>Use gsm48_cc_cause_name() in logging messages<br><br>Depends-On: I296f208581ce2550805f9d96e20f7319e1199023<br>Change-Id: I6e3541b66cb3407f0cb23fb6e00a04685fe90757<br>---<br>M src/mncc.c<br>M src/sip.c<br>2 files changed, 9 insertions(+), 8 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/33/10733/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 2de0482..25b6702 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span> #include "call.h"</span><br><span> </span><br><span> #include <osmocom/gsm/protocol/gsm_03_40.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span> </span><br><span> #include <osmocom/core/socket.h></span><br><span> #include <osmocom/core/utils.h></span><br><span>@@ -264,7 +265,7 @@</span><br><span>   case MNCC_CC_PROCEEDING:</span><br><span>     case MNCC_CC_CONNECTED:</span><br><span>              LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">-                 "Releasing call in non-initial leg(%u) cause(%d)\n", leg->callref, leg->base.cause);</span><br><span style="color: hsl(120, 100%, 40%);">+                  "Releasing call in non-initial leg(%u) cause(%s)\n", leg->callref, gsm48_cc_cause_name(leg->base.cause));</span><br><span>            leg->base.in_release = true;</span><br><span>              start_cmd_timer(leg, MNCC_REL_IND);</span><br><span>          mncc_send(leg->conn, MNCC_DISC_REQ, leg->callref);</span><br><span>@@ -508,7 +509,7 @@</span><br><span>               return;</span><br><span> </span><br><span>  LOGP(DMNCC,</span><br><span style="color: hsl(0, 100%, 40%);">-             LOGL_DEBUG, "Rcvd MNCC_DISC_IND, Cause: %d\n", data->cause.value);</span><br><span style="color: hsl(120, 100%, 40%);">+               LOGL_DEBUG, "Rcvd MNCC_DISC_IND, Cause: %s\n", gsm48_cc_cause_name(data->cause.value));</span><br><span>         LOGP(DMNCC,</span><br><span>          LOGL_DEBUG, "leg(%u) was disconnected. Releasing\n", data->callref);</span><br><span>    leg->base.in_release = true;</span><br><span>@@ -530,7 +531,7 @@</span><br><span>        if (!leg)</span><br><span>            return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_REL_IND, Cause: %d\n", data->cause.value);</span><br><span style="color: hsl(120, 100%, 40%);">+    LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_REL_IND, Cause: %s\n", gsm48_cc_cause_name(data->cause.value));</span><br><span> </span><br><span>  if (leg->base.in_release)</span><br><span>                 stop_cmd_timer(leg, MNCC_REL_IND);</span><br><span>@@ -588,7 +589,7 @@</span><br><span>     if (other_leg)</span><br><span>               other_leg->cause = data->cause.value;</span><br><span>          other_leg->release_call(other_leg);</span><br><span style="color: hsl(0, 100%, 40%);">-  LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was rejected with cause(%d).\n", data->callref, leg->cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was rejected with cause(%s).\n", data->callref, gsm48_cc_cause_name(leg->cause));</span><br><span>   mncc_leg_release(leg);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/sip.c b/src/sip.c</span><br><span>index cf457ad..adf20d8 100644</span><br><span>--- a/src/sip.c</span><br><span>+++ b/src/sip.c</span><br><span>@@ -298,12 +298,12 @@</span><br><span>                     *sip_status = cause_map[i].sip_status;</span><br><span>                       *sip_phrase = cause_map[i].sip_phrase;</span><br><span>                       *reason_text = cause_map[i].q850_reason;</span><br><span style="color: hsl(0, 100%, 40%);">-                        LOGP(DSIP, LOGL_DEBUG, "%s(): Mapping cause(%d) to status(%d)\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                             __func__, cause, *sip_status);</span><br><span style="color: hsl(120, 100%, 40%);">+                        LOGP(DSIP, LOGL_DEBUG, "%s(): Mapping cause(%s) to status(%d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                           __func__, gsm48_cc_cause_name(cause), *sip_status);</span><br><span>                  return;</span><br><span>              }</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       LOGP(DSIP, LOGL_ERROR, "%s(): Cause(%d) not found in map.\n", __func__, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+     LOGP(DSIP, LOGL_ERROR, "%s(): Cause(%s) not found in map.\n", __func__, gsm48_cc_cause_name(cause));</span><br><span>       *sip_status = cause_map[i].sip_status;</span><br><span>       *sip_phrase = cause_map[i].sip_phrase;</span><br><span>       *reason_text = cause_map[i].q850_reason;</span><br><span>@@ -327,7 +327,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(%d)\n", __func__, _leg->cause);</span><br><span style="color: hsl(120, 100%, 40%);">+    LOGP(DSIP, LOGL_DEBUG, "%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/10733">change 10733</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/10733"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I6e3541b66cb3407f0cb23fb6e00a04685fe90757 </div>
<div style="display:none"> Gerrit-Change-Number: 10733 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Keith Whyte <keith@rhizomatica.org> </div>