Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/9269 )
Change subject: Logging: Log mncc_names in mncc_data()
......................................................................
Logging: Log mncc_names in mncc_data()
Links libosmocore (libosmogsm) for access to osmo_mncc_name()
Remove reference to get_mncc_name() in src/mncc_protocol.h
Uses osmo_mncc_name() to output to debug log
which MNCC_* message was received.
Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac
---
M configure.ac
M src/Makefile.am
M src/mncc.c
M src/mncc_protocol.h
4 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/configure.ac b/configure.ac
index 20b682e..e84cb83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@
AC_PROG_CC
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0)
PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0)
diff --git a/src/Makefile.am b/src/Makefile.am
index b90e38c..7a955fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = osmo-sip-connector
-AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(SOFIASIP_CFLAGS)
+AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
$(LIBOSMOGSM_CFLAGS) $(SOFIASIP_CFLAGS)
noinst_HEADERS = \
evpoll.h vty.h mncc_protocol.h app.h mncc.h sip.h call.h sdp.h logging.h
@@ -17,4 +17,5 @@
osmo_sip_connector_LDADD = \
$(SOFIASIP_LIBS) \
$(LIBOSMOCORE_LIBS) \
- $(LIBOSMOVTY_LIBS)
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOGSM_LIBS)
diff --git a/src/mncc.c b/src/mncc.c
index c0c082b..3b9f0f4 100644
--- a/src/mncc.c
+++ b/src/mncc.c
@@ -820,6 +820,9 @@
}
memcpy(&msg_type, buf, 4);
+
+ LOGP(DMNCC, LOGL_DEBUG, "MNCC rcvd message type: %s\n",
osmo_mncc_name(msg_type));
+
switch (msg_type) {
case MNCC_SOCKET_HELLO:
check_hello(conn, buf, rc);
diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h
index 49f0c8b..4950a77 100644
--- a/src/mncc_protocol.h
+++ b/src/mncc_protocol.h
@@ -196,7 +196,6 @@
uint32_t callref[2];
};
-const char *get_mncc_name(int value);
void mncc_set_cause(struct gsm_mncc *data, int loc, int val);
void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg);
--
To view, visit https://gerrit.osmocom.org/9269
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac
Gerrit-Change-Number: 9269
Gerrit-PatchSet: 3
Gerrit-Owner: Keith Whyte <ke...@rhizomatica.org>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Keith Whyte <ke...@rhizomatica.org>
Gerrit-Reviewer: Pau Espin Pedrol <pes...@sysmocom.de>
