diff options
author | Harald Welte <laforge@gnumonks.org> | 2015-01-05 14:15:16 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2015-01-05 14:15:16 +0100 |
commit | a67704753a6328f725d38d61af8bfbe29012fcbc (patch) | |
tree | 2065c84299436fd73adc57c7ce8812917dfb5965 /openbsc/src/libcommon | |
parent | 0c4e400d2fdd6445da4dc24851945119517d8083 (diff) |
Revert "debug.c: use new libosmocore features to print and save log filter"
This reverts commit c598e6e0a6d00827c2c974010d582815d66d0f14.
It introduced a dependency from libcommon to libosmovty, which we don't
want
Diffstat (limited to 'openbsc/src/libcommon')
-rw-r--r-- | openbsc/src/libcommon/debug.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/openbsc/src/libcommon/debug.c b/openbsc/src/libcommon/debug.c index cfaaa1756..ca7ff5da6 100644 --- a/openbsc/src/libcommon/debug.c +++ b/openbsc/src/libcommon/debug.c @@ -30,7 +30,6 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> -#include <osmocom/vty/vty.h> #include <osmocom/gprs/gprs_msgb.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> @@ -194,53 +193,8 @@ static int filter_fn(const struct log_context *ctx, return 0; } -static void filter_print(struct vty *vty, - const struct log_info *info, - const struct log_target *tar) -{ - if ((tar->filter_map & (1 << FLT_IMSI)) != 0) - vty_out(vty, " Log Filter 'IMSI': %s%s", - tar->filter_data[FLT_IMSI], VTY_NEWLINE); - else - vty_out(vty, " Log Filter 'IMSI': Disabled%s", VTY_NEWLINE); - - if ((tar->filter_map & (1 << FLT_NSVC)) != 0) - vty_out(vty, " Log Filter 'NSVC': %u%s", - tar->filter_data[FLT_NSVC], VTY_NEWLINE); - else - vty_out(vty, " Log Filter 'NSVC': Disabled%s", VTY_NEWLINE); - - /* Filter on the NS Virtual Connection */ - if ((tar->filter_map & (1 << FLT_BVC)) != 0) - vty_out(vty, " Log Filter 'BVC': %u%s", - tar->filter_data[FLT_BVC], VTY_NEWLINE); - else - vty_out(vty, " Log Filter 'BVC': Disabled%s", VTY_NEWLINE); -} - -static void filter_save(struct vty *vty, - const struct log_info *info, - const struct log_target *tar) -{ - if ((tar->filter_map & (1 << FLT_IMSI)) != 0) - vty_out(vty, " logging filter imsi %s%s", - tar->filter_data[FLT_IMSI], VTY_NEWLINE); - - if ((tar->filter_map & (1 << FLT_NSVC)) != 0) - vty_out(vty, " logging filter nsvc %u%s", - tar->filter_data[FLT_NSVC], VTY_NEWLINE); - - if ((tar->filter_map & (1 << FLT_BVC)) != 0) - vty_out(vty, " logging filter bvc %u%s", - tar->filter_data[FLT_BVC], VTY_NEWLINE); -} - - - const struct log_info log_info = { .filter_fn = filter_fn, - .save_fn = filter_save, - .print_fn = filter_print, .cat = default_categories, .num_cat = ARRAY_SIZE(default_categories), }; |