lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38411?usp=email )
Change subject: libvlr: drop msc/debug.h header ......................................................................
libvlr: drop msc/debug.h header
Since logging is done different, remove the MSC specific header. Also drop some reference counting logging by a generic DEBUG handler.
Change-Id: I8fa2f16c07ef54be3a125c19e0990a68c4d5d2cf --- M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_lu_fsm.c M src/libvlr/vlr_sgs.c M src/libvlr/vlr_sgs_fsm.c 6 files changed, 1 insertion(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/38411/1
diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 3aa5a5e..65cbad6 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -34,7 +34,6 @@ #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/vlr/vlr_sgs.h> #include <osmocom/vlr/vlr.h> -#include <osmocom/msc/debug.h> #include <osmocom/msc/gsup_client_mux.h> #include <osmocom/msc/paging.h>
@@ -352,20 +351,13 @@ struct vlr_subscr *vsub = e->use_count->talloc_object; char buf[128]; int32_t total; - int level;
if (!e->use) return -EINVAL;
total = osmo_use_count_total(&vsub->use_count);
- if (total == 0 - || (total == 1 && old_use_count == 0 && e->count == 1)) - level = LOGL_INFO; - else - level = LOGL_DEBUG; - - LOGPSRC(DREF, level, file, line, "VLR subscr %s %s %s: now used by %s\n", + LOGPSRC(g_vlr_log_cat[OSMO_VLR_LOGC_VLR], LOGL_DEBUG, file, line, "VLR subscr %s %s %s: now used by %s\n", vlr_subscr_name(vsub), (e->count - old_use_count) > 0? "+" : "-", e->use, osmo_use_count_name_buf(buf, sizeof(buf), e->use_count));
diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 3b46ddb..dd9a4e9 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -23,7 +23,6 @@ #include <osmocom/gsm/gsup.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/vlr/vlr.h> -#include <osmocom/msc/debug.h>
#include "vlr_core.h" #include "vlr_auth_fsm.h" diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index 3b398dd..07e6e9e 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -24,7 +24,6 @@ #include <osmocom/core/utils.h> #include <osmocom/gsm/gsup.h> #include <osmocom/vlr/vlr.h> -#include <osmocom/msc/debug.h>
#include "vlr_core.h" #include "vlr_auth_fsm.h" diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 1279801..24423fa 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -22,7 +22,6 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/vlr/vlr.h> -#include <osmocom/msc/debug.h>
#include "vlr_core.h" #include "vlr_auth_fsm.h" diff --git a/src/libvlr/vlr_sgs.c b/src/libvlr/vlr_sgs.c index ace2c5d..7333c04 100644 --- a/src/libvlr/vlr_sgs.c +++ b/src/libvlr/vlr_sgs.c @@ -22,7 +22,6 @@
#include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> -#include <osmocom/msc/debug.h> #include <osmocom/vlr/vlr.h> #include <osmocom/vlr/vlr_sgs.h> #include "vlr_sgs_fsm.h" diff --git a/src/libvlr/vlr_sgs_fsm.c b/src/libvlr/vlr_sgs_fsm.c index 4cea056..4fa0483 100644 --- a/src/libvlr/vlr_sgs_fsm.c +++ b/src/libvlr/vlr_sgs_fsm.c @@ -21,7 +21,6 @@ #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsm48.h> -#include <osmocom/msc/debug.h> #include <osmocom/vlr/vlr.h> #include <osmocom/vlr/vlr_sgs.h>
-
lynxis lazus