diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-07-22 09:00:23 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-07-22 09:00:23 +0200 |
commit | c21c0d699f522ed38958cb9b19043efeaec03828 (patch) | |
tree | 5d3197340c4631245eeaa206d83c0c66e23017d8 /src | |
parent | fcfb05fd5dde73a839a9b3972769ca0a8494ca51 (diff) |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/main.c | 20 | ||||
-rw-r--r-- | src/main_stp.c | 20 | ||||
-rw-r--r-- | src/mgcp_ss7.c | 18 |
3 files changed, 23 insertions, 35 deletions
@@ -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 @@ int main(int argc, char **argv) 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 @@ int main(int argc, char **argv) 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 @@ int main(int argc, char **argv) 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); |