dissolve libcommon: drop debug.c
Apply more concise logging categories in each main scope. The bulk goes to msc_main.c, obviously, while tests and utils get a slimmed down bunch of logging categories. Change-Id: I969a0662ba273f3721b6820d02151b7a5b8014b8
This commit is contained in:
parent
34fd0c69a3
commit
6a8b9c70fc
|
@ -1,9 +1,5 @@
|
|||
#pragma once
|
||||
|
||||
#include <stdio.h>
|
||||
#include <osmocom/core/linuxlist.h>
|
||||
|
||||
#define DEBUG
|
||||
#include <osmocom/core/logging.h>
|
||||
|
||||
/* Debug Areas of the code */
|
||||
|
@ -27,5 +23,3 @@ enum {
|
|||
DBSSAP,
|
||||
Debug_LastEntry,
|
||||
};
|
||||
|
||||
extern const struct log_info log_info;
|
||||
|
|
|
@ -20,7 +20,6 @@ noinst_LIBRARIES = \
|
|||
$(NULL)
|
||||
|
||||
libcommon_a_SOURCES = \
|
||||
debug.c \
|
||||
gsm_data.c \
|
||||
gsup_client.c \
|
||||
oap_client.c \
|
||||
|
|
|
@ -1,148 +0,0 @@
|
|||
/* OpenBSC Debugging/Logging support code */
|
||||
|
||||
/* (C) 2008-2010 by Harald Welte <laforge@gnumonks.org>
|
||||
* (C) 2008 by Holger Hans Peter Freyther <zecke@selfish.org>
|
||||
* All Rights Reserved
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <osmocom/core/talloc.h>
|
||||
#include <osmocom/core/utils.h>
|
||||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/gprs/gprs_msgb.h>
|
||||
#include <osmocom/msc/gsm_data.h>
|
||||
#include <osmocom/msc/debug.h>
|
||||
|
||||
/* default categories */
|
||||
static const struct log_info_cat default_categories[] = {
|
||||
[DRLL] = {
|
||||
.name = "DRLL",
|
||||
.description = "A-bis Radio Link Layer (RLL)",
|
||||
.color = "\033[1;31m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DCC] = {
|
||||
.name = "DCC",
|
||||
.description = "Layer3 Call Control (CC)",
|
||||
.color = "\033[1;32m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DMM] = {
|
||||
.name = "DMM",
|
||||
.description = "Layer3 Mobility Management (MM)",
|
||||
.color = "\033[1;33m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DRR] = {
|
||||
.name = "DRR",
|
||||
.description = "Layer3 Radio Resource (RR)",
|
||||
.color = "\033[1;34m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DMNCC] = {
|
||||
.name = "DMNCC",
|
||||
.description = "MNCC API for Call Control application",
|
||||
.color = "\033[1;39m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DPAG] = {
|
||||
.name = "DPAG",
|
||||
.description = "Paging Subsystem",
|
||||
.color = "\033[1;38m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DMSC] = {
|
||||
.name = "DMSC",
|
||||
.description = "Mobile Switching Center",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DMGCP] = {
|
||||
.name = "DMGCP",
|
||||
.description = "Media Gateway Control Protocol",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DHO] = {
|
||||
.name = "DHO",
|
||||
.description = "Hand-Over",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DDB] = {
|
||||
.name = "DDB",
|
||||
.description = "Database Layer",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DREF] = {
|
||||
.name = "DREF",
|
||||
.description = "Reference Counting",
|
||||
.enabled = 0, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DCTRL] = {
|
||||
.name = "DCTRL",
|
||||
.description = "Control interface",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DSMPP] = {
|
||||
.name = "DSMPP",
|
||||
.description = "SMPP interface for external SMS apps",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
[DRANAP] = {
|
||||
.name = "DRANAP",
|
||||
.description = "Radio Access Network Application Part Protocol",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
[DVLR] = {
|
||||
.name = "DVLR",
|
||||
.description = "Visitor Location Register",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
[DIUCS] = {
|
||||
.name = "DIUCS",
|
||||
.description = "Iu-CS Protocol",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
[DBSSAP] = {
|
||||
.name = "DBSSAP",
|
||||
.description = "BSSAP Protocol (A Interface)",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
static int filter_fn(const struct log_context *ctx, struct log_target *tar)
|
||||
{
|
||||
const struct vlr_subscr *vsub = ctx->ctx[LOG_CTX_VLR_SUBSCR];
|
||||
|
||||
if ((tar->filter_map & (1 << LOG_FLT_VLR_SUBSCR)) != 0
|
||||
&& vsub && vsub == tar->filter_data[LOG_FLT_VLR_SUBSCR])
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
const struct log_info log_info = {
|
||||
.filter_fn = filter_fn,
|
||||
.cat = default_categories,
|
||||
.num_cat = ARRAY_SIZE(default_categories),
|
||||
};
|
|
@ -8,10 +8,10 @@
|
|||
#include <osmocom/core/select.h>
|
||||
#include <osmocom/core/application.h>
|
||||
#include <osmocom/core/utils.h>
|
||||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/gsm/gsup.h>
|
||||
|
||||
#include <osmocom/msc/gsup_client.h>
|
||||
#include <osmocom/msc/debug.h>
|
||||
|
||||
static struct gsup_client *g_gc;
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include <errno.h>
|
||||
|
||||
#include <osmocom/core/utils.h>
|
||||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/crypt/auth.h>
|
||||
#include <osmocom/gsm/oap.h>
|
||||
|
||||
|
|
|
@ -19,8 +19,7 @@
|
|||
|
||||
|
||||
#include "smpp_smsc.h"
|
||||
#include <osmocom/msc/debug.h>
|
||||
|
||||
#include <osmocom/core/logging.h>
|
||||
|
||||
int smpp_determine_scheme(uint8_t dcs, uint8_t *data_coding, int *mode)
|
||||
{
|
||||
|
|
|
@ -401,6 +401,118 @@ static int ss7_setup(void *ctx)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const struct log_info_cat msc_default_categories[] = {
|
||||
[DRLL] = {
|
||||
.name = "DRLL",
|
||||
.description = "A-bis Radio Link Layer (RLL)",
|
||||
.color = "\033[1;31m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DCC] = {
|
||||
.name = "DCC",
|
||||
.description = "Layer3 Call Control (CC)",
|
||||
.color = "\033[1;32m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DMM] = {
|
||||
.name = "DMM",
|
||||
.description = "Layer3 Mobility Management (MM)",
|
||||
.color = "\033[1;33m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DRR] = {
|
||||
.name = "DRR",
|
||||
.description = "Layer3 Radio Resource (RR)",
|
||||
.color = "\033[1;34m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DMNCC] = {
|
||||
.name = "DMNCC",
|
||||
.description = "MNCC API for Call Control application",
|
||||
.color = "\033[1;39m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DPAG] = {
|
||||
.name = "DPAG",
|
||||
.description = "Paging Subsystem",
|
||||
.color = "\033[1;38m",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DMSC] = {
|
||||
.name = "DMSC",
|
||||
.description = "Mobile Switching Center",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DMGCP] = {
|
||||
.name = "DMGCP",
|
||||
.description = "Media Gateway Control Protocol",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DHO] = {
|
||||
.name = "DHO",
|
||||
.description = "Hand-Over",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DDB] = {
|
||||
.name = "DDB",
|
||||
.description = "Database Layer",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DREF] = {
|
||||
.name = "DREF",
|
||||
.description = "Reference Counting",
|
||||
.enabled = 0, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DCTRL] = {
|
||||
.name = "DCTRL",
|
||||
.description = "Control interface",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
[DSMPP] = {
|
||||
.name = "DSMPP",
|
||||
.description = "SMPP interface for external SMS apps",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
[DRANAP] = {
|
||||
.name = "DRANAP",
|
||||
.description = "Radio Access Network Application Part Protocol",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
[DVLR] = {
|
||||
.name = "DVLR",
|
||||
.description = "Visitor Location Register",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
[DIUCS] = {
|
||||
.name = "DIUCS",
|
||||
.description = "Iu-CS Protocol",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
[DBSSAP] = {
|
||||
.name = "DBSSAP",
|
||||
.description = "BSSAP Protocol (A Interface)",
|
||||
.enabled = 1, .loglevel = LOGL_NOTICE,
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
static int filter_fn(const struct log_context *ctx, struct log_target *tar)
|
||||
{
|
||||
const struct vlr_subscr *vsub = ctx->ctx[LOG_CTX_VLR_SUBSCR];
|
||||
|
||||
if ((tar->filter_map & (1 << LOG_FLT_VLR_SUBSCR)) != 0
|
||||
&& vsub && vsub == tar->filter_data[LOG_FLT_VLR_SUBSCR])
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
const struct log_info log_info = {
|
||||
.filter_fn = filter_fn,
|
||||
.cat = msc_default_categories,
|
||||
.num_cat = ARRAY_SIZE(msc_default_categories),
|
||||
};
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int rc;
|
||||
|
|
|
@ -324,6 +324,18 @@ static int smpp_esme_init(struct esme *esme, const char *host, uint16_t port)
|
|||
return bind_transceiver(esme);
|
||||
}
|
||||
|
||||
static const struct log_info_cat smpp_mirror_default_categories[] = {
|
||||
[DSMPP] = {
|
||||
.name = "DSMPP",
|
||||
.description = "SMPP interface for external SMS apps",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
};
|
||||
|
||||
const struct log_info log_info = {
|
||||
.cat = smpp_mirror_default_categories,
|
||||
.num_cat = ARRAY_SIZE(smpp_mirror_default_categories),
|
||||
};
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
|
|
|
@ -62,6 +62,19 @@ static void test_coding_scheme(void)
|
|||
}
|
||||
}
|
||||
|
||||
static const struct log_info_cat smpp_mirror_default_categories[] = {
|
||||
[DSMPP] = {
|
||||
.name = "DSMPP",
|
||||
.description = "SMPP interface for external SMS apps",
|
||||
.enabled = 1, .loglevel = LOGL_DEBUG,
|
||||
},
|
||||
};
|
||||
|
||||
const struct log_info log_info = {
|
||||
.cat = smpp_mirror_default_categories,
|
||||
.num_cat = ARRAY_SIZE(smpp_mirror_default_categories),
|
||||
};
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
osmo_init_logging(&log_info);
|
||||
|
|
Loading…
Reference in New Issue