misc: Update code to compil with libosmocore 0.3.2
The DSCCP/DM2UA code still needs to be updated to deal with the
new way to handle these regions in libraries.
diff --git a/configure.ac b/configure.ac
index 1b2e535..de0b1ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,10 @@
AC_CHECK_HEADERS([net-snmp/net-snmp-config.h])
dnl Checks for typedefs, structures and compiler characteristics
-PKG_CHECK_MODULES([LIBOSMOCORE], [libosmocore])
-PKG_CHECK_MODULES([LIBOSMOGSM], [libosmogsm])
+PKG_CHECK_MODULES([LIBOSMOCORE], [libosmocore >= 0.3.2])
+PKG_CHECK_MODULES([LIBOSMOGSM], [libosmogsm >= 0.3.2])
PKG_CHECK_MODULES([LIBOSMOSCCP], [libosmo-sccp])
-PKG_CHECK_MODULES([LIBOSMOVTY], [libosmovty])
+PKG_CHECK_MODULES([LIBOSMOVTY], [libosmovty >= 0.3.2])
#PKG_CHECK_MODULES([NEXUSWARE_C7], [nexusware-c7])
old_libs=$LIBS
diff --git a/src/main.c b/src/main.c
index 4da6294..70a2f85 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,6 +30,7 @@
#include <bsc_sccp.h>
#include <ss7_application.h>
+#include <osmocom/core/application.h>
#include <osmocom/core/talloc.h>
#include <osmocom/vty/vty.h>
@@ -38,8 +39,6 @@
#include <sys/stat.h>
#include <sys/types.h>
-static struct log_target *stderr_target;
-
char *config = "cellmgr_ng.cfg";
struct bsc_data *bsc;
@@ -63,18 +62,15 @@
thread_init();
- log_init(&log_info);
- stderr_target = log_target_create_stderr();
- log_add_target(stderr_target);
+ osmo_init_logging(&log_info);
/* enable filters */
- log_set_all_filter(stderr_target, 1);
- log_set_category_filter(stderr_target, DINP, 1, LOGL_INFO);
- log_set_category_filter(stderr_target, DSCCP, 1, LOGL_INFO);
- log_set_category_filter(stderr_target, DMSC, 1, LOGL_INFO);
- log_set_category_filter(stderr_target, DMGCP, 1, LOGL_INFO);
- log_set_print_timestamp(stderr_target, 1);
- log_set_use_color(stderr_target, 0);
+ log_set_category_filter(osmo_stderr_target, DINP, 1, LOGL_INFO);
+ log_set_category_filter(osmo_stderr_target, DSCCP, 1, LOGL_INFO);
+ log_set_category_filter(osmo_stderr_target, DMSC, 1, LOGL_INFO);
+ log_set_category_filter(osmo_stderr_target, DMGCP, 1, LOGL_INFO);
+ log_set_print_timestamp(osmo_stderr_target, 1);
+ log_set_use_color(osmo_stderr_target, 0);
sccp_set_log_area(DSCCP);
diff --git a/src/main_stp.c b/src/main_stp.c
index 2451d35..afb5a6a 100644
--- a/src/main_stp.c
+++ b/src/main_stp.c
@@ -32,6 +32,7 @@
#include <osmocom/m2ua/m2ua_msg.h>
+#include <osmocom/core/application.h>
#include <osmocom/core/talloc.h>
#include <osmocom/sccp/sccp.h>
@@ -62,8 +63,6 @@
#undef PACKAGE_STRING
#include <cellmgr_config.h>
-static struct log_target *stderr_target;
-
char *config = "osmo_stp.cfg";
struct bsc_data *bsc;
@@ -200,18 +199,15 @@
thread_init();
- log_init(&log_info);
- stderr_target = log_target_create_stderr();
- log_add_target(stderr_target);
+ osmo_init_logging(&log_info);
/* enable filters */
- log_set_all_filter(stderr_target, 1);
- log_set_category_filter(stderr_target, DINP, 1, LOGL_INFO);
- log_set_category_filter(stderr_target, DSCCP, 1, LOGL_INFO);
- log_set_category_filter(stderr_target, DMSC, 1, LOGL_INFO);
- log_set_category_filter(stderr_target, DMGCP, 1, LOGL_INFO);
- log_set_print_timestamp(stderr_target, 1);
- log_set_use_color(stderr_target, 0);
+ log_set_category_filter(osmo_stderr_target, DINP, 1, LOGL_INFO);
+ log_set_category_filter(osmo_stderr_target, DSCCP, 1, LOGL_INFO);
+ log_set_category_filter(osmo_stderr_target, DMSC, 1, LOGL_INFO);
+ log_set_category_filter(osmo_stderr_target, DMGCP, 1, LOGL_INFO);
+ log_set_print_timestamp(osmo_stderr_target, 1);
+ log_set_use_color(osmo_stderr_target, 0);
sccp_set_log_area(DSCCP);
m2ua_set_log_area(DM2UA);
diff --git a/src/mgcp_ss7.c b/src/mgcp_ss7.c
index bd82bbf..22e1db3 100644
--- a/src/mgcp_ss7.c
+++ b/src/mgcp_ss7.c
@@ -25,6 +25,7 @@
#include <cellmgr_debug.h>
+#include <osmocom/core/application.h>
#include <osmocom/core/select.h>
#include <osmocom/core/talloc.h>
#include <osmocom/core/timer.h>
@@ -52,7 +53,6 @@
#endif
#include <getopt.h>
-static struct log_target *stderr_target;
static char *config_file = "mgcp_mgw.cfg";
static int exit_on_failure = 0;
@@ -848,18 +848,14 @@
struct mgcp_ss7 *mgcp;
int rc;
- log_init(&log_info);
- stderr_target = log_target_create_stderr();
- log_add_target(stderr_target);
+ osmo_init_logging(&log_info);
/* enable filters */
- log_set_all_filter(stderr_target, 1);
- log_set_category_filter(stderr_target, DINP, 1, LOGL_INFO);
- log_set_category_filter(stderr_target, DSCCP, 1, LOGL_INFO);
- log_set_category_filter(stderr_target, DMSC, 1, LOGL_INFO);
- log_set_category_filter(stderr_target, DMGCP, 1, LOGL_INFO);
- log_set_print_timestamp(stderr_target, 1);
- log_set_use_color(stderr_target, 0);
+ log_set_category_filter(osmo_stderr_target, DSCCP, 1, LOGL_INFO);
+ log_set_category_filter(osmo_stderr_target, DMSC, 1, LOGL_INFO);
+ log_set_category_filter(osmo_stderr_target, DMGCP, 1, LOGL_INFO);
+ log_set_print_timestamp(osmo_stderr_target, 1);
+ log_set_use_color(osmo_stderr_target, 0);
handle_options(argc, argv);