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
changes/69/9269/3
Keith Whyte 4 years ago
parent 55faf38675
commit 911d4d5e15
  1. 1
      configure.ac
  2. 5
      src/Makefile.am
  3. 3
      src/mncc.c
  4. 1
      src/mncc_protocol.h

@ -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)

@ -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);

@ -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);

Loading…
Cancel
Save