diff options
| author | Keith <keith@rhizomatica.org> | 2018-05-23 23:23:19 +0200 |
|---|---|---|
| committer | Keith <keith@rhizomatica.org> | 2018-05-24 16:56:41 +0200 |
| commit | 911d4d5e15c244dfd5bda1973871b14c4cb674bc (patch) | |
| tree | bc27693e5c13fe7bc1e88b9d9ea6063d5f15d0c9 | |
| parent | 55faf3867540f5d42a69e17cdc02f0e522f42478 (diff) | |
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
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/mncc.c | 3 | ||||
| -rw-r--r-- | src/mncc_protocol.h | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 20b682e..e84cb83 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 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_SOURCES = \ osmo_sip_connector_LDADD = \ $(SOFIASIP_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOVTY_LIBS) + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOGSM_LIBS) @@ -820,6 +820,9 @@ static int mncc_data(struct osmo_fd *fd, unsigned int what) } 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 @@ struct gsm_mncc_bridge { 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); |