<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9269">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Logging: Log mncc_names in mncc_data()<br><br>Links libosmocore (libosmogsm) for access to osmo_mncc_name()<br><br>Remove reference to get_mncc_name() in src/mncc_protocol.h<br>Uses osmo_mncc_name() to output to debug log<br>which MNCC_* message was received.<br><br>Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac<br>---<br>M configure.ac<br>M src/Makefile.am<br>M src/mncc.c<br>M src/mncc_protocol.h<br>4 files changed, 7 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 20b682e..e84cb83 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -23,6 +23,7 @@</span><br><span> AC_PROG_CC</span><br><span> </span><br><span> PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0)</span><br><span> PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0)</span><br><span> PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0)</span><br><span> </span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index b90e38c..7a955fa 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -1,6 +1,6 @@</span><br><span> bin_PROGRAMS = osmo-sip-connector</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(SOFIASIP_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(SOFIASIP_CFLAGS)</span><br><span> </span><br><span> noinst_HEADERS = \</span><br><span> evpoll.h vty.h mncc_protocol.h app.h mncc.h sip.h call.h sdp.h logging.h</span><br><span>@@ -17,4 +17,5 @@</span><br><span> osmo_sip_connector_LDADD = \</span><br><span> $(SOFIASIP_LIBS) \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOVTY_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOVTY_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_LIBS)</span><br><span>diff --git a/src/mncc.c b/src/mncc.c</span><br><span>index c0c082b..3b9f0f4 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", osmo_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>diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h</span><br><span>index 49f0c8b..4950a77 100644</span><br><span>--- a/src/mncc_protocol.h</span><br><span>+++ b/src/mncc_protocol.h</span><br><span>@@ -196,7 +196,6 @@</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> 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: merged </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: 3 </div>
<div style="display:none"> Gerrit-Owner: Keith Whyte <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Keith Whyte <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>