<p>Keith Whyte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9269">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Logging: Add value_strings for mncc_names.<br><br>Adds function get_mncc_name() and uses it to output<br>to debug log which MNCC_* message was received.<br><br>Note: get_mncc_name() was already defined in mncc_protocol.h<br><br>Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac<br>---<br>M src/mncc.c<br>M src/mncc_protocol.h<br>2 files changed, 65 insertions(+), 1 deletion(-)<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/69/9269/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 c0c082b..0feb12e 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -820,6 +820,9 @@</span><br><span> }</span><br><span> </span><br><span> memcpy(&msg_type, buf, 4);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_DEBUG, "MNCC rcvd message type: %s\n", get_mncc_name(msg_type));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (msg_type) {</span><br><span> case MNCC_SOCKET_HELLO:</span><br><span> check_hello(conn, buf, rc);</span><br><span>@@ -900,3 +903,64 @@</span><br><span> { MNCC_READY, "READY" },</span><br><span> { 0, NULL },</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct value_string mncc_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_SETUP_REQ, "MNCC_SETUP_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_SETUP_IND, "MNCC_SETUP_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_SETUP_RSP, "MNCC_SETUP_RSP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_SETUP_CNF, "MNCC_SETUP_CNF" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_SETUP_COMPL_REQ, "MNCC_SETUP_COMPL_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_SETUP_COMPL_IND, "MNCC_SETUP_COMPL_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_CALL_CONF_IND, "MNCC_CALL_CONF_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_CALL_PROC_REQ, "MNCC_CALL_PROC_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_PROGRESS_REQ, "MNCC_PROGRESS_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_ALERT_REQ, "MNCC_ALERT_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_ALERT_IND, "MNCC_ALERT_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_NOTIFY_REQ, "MNCC_NOTIFY_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_NOTIFY_IND, "MNCC_NOTIFY_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_DISC_REQ, "MNCC_DISC_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_DISC_IND, "MNCC_DISC_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_REL_REQ, "MNCC_REL_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_REL_IND, "MNCC_REL_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_REL_CNF, "MNCC_REL_CNF" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_FACILITY_REQ, "MNCC_FACILITY_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_FACILITY_IND, "MNCC_FACILITY_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_START_DTMF_IND, "MNCC_START_DTMF_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_START_DTMF_RSP, "MNCC_START_DTMF_RSP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_START_DTMF_REJ, "MNCC_START_DTMF_REJ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_STOP_DTMF_IND, "MNCC_STOP_DTMF_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_STOP_DTMF_RSP, "MNCC_STOP_DTMF_RSP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_MODIFY_REQ, "MNCC_MODIFY_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_MODIFY_IND, "MNCC_MODIFY_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_MODIFY_RSP, "MNCC_MODIFY_RSP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_MODIFY_CNF, "MNCC_MODIFY_CNF" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_MODIFY_REJ, "MNCC_MODIFY_REJ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_HOLD_IND, "MNCC_HOLD_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_HOLD_CNF, "MNCC_HOLD_CNF" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_HOLD_REJ, "MNCC_HOLD_REJ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_RETRIEVE_IND, "MNCC_RETRIEVE_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_RETRIEVE_CNF, "MNCC_RETRIEVE_CNF" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_RETRIEVE_REJ, "MNCC_RETRIEVE_REJ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_USERINFO_REQ, "MNCC_USERINFO_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_USERINFO_IND, "MNCC_USERINFO_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_REJ_REQ, "MNCC_REJ_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_REJ_IND, "MNCC_REJ_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_BRIDGE, "MNCC_BRIDGE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_FRAME_RECV, "MNCC_FRAME_RECV" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_FRAME_DROP, "MNCC_FRAME_DROP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_LCHAN_MODIFY, "MNCC_LCHAN_MODIFY" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_RTP_CREATE, "MNCC_RTP_CREATE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_RTP_CONNECT, "MNCC_RTP_CONNECT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { MNCC_RTP_FREE, "MNCC_RTP_FREE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM_TCHF_FRAME, "GSM_TCHF_FRAME" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM_TCHF_FRAME_EFR, "GSM_TCHF_FRAME_EFR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM_TCHH_FRAME, "GSM_TCHH_FRAME" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM_TCH_FRAME_AMR, "GSM_TCH_FRAME_AMR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM_BAD_FRAME, "GSM_BAD_FRAME" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const char *get_mncc_name(const uint32_t value)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return get_value_string(mncc_names, value);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h</span><br><span>index 49f0c8b..705b3c5 100644</span><br><span>--- a/src/mncc_protocol.h</span><br><span>+++ b/src/mncc_protocol.h</span><br><span>@@ -196,7 +196,7 @@</span><br><span> uint32_t callref[2];</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const char *get_mncc_name(int value);</span><br><span style="color: hsl(120, 100%, 40%);">+const char *get_mncc_name(const uint32_t value);</span><br><span> void mncc_set_cause(struct gsm_mncc *data, int loc, int val);</span><br><span> void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9269">change 9269</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/9269"/><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: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac </div>
<div style="display:none"> Gerrit-Change-Number: 9269 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Keith Whyte <keith@rhizomatica.org> </div>