migrate to DLBSSGP as log sub-system for BSSGP
Change-Id: I94864c5fa2688fc91b8b6077a14ad098851afdc7
Depends: libosmocore.git Change-Id I506190aae9217c0956e4b5764d1a0c0772268e93
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 40932ee..eee6aa2 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -8,4 +8,4 @@
# If any interfaces have been removed or changed since the last public release: c:r:0.
#library what description / commit summary line
osmo-pcu update osmo-gsm-manuals dependency to > 0.3.0 for vty_cpu_sched.adoc include
-osmo-pcu update libosmocore dependency > 1.4.x for osmo_fd_{read,write}_{enable,disable}
+osmo-pcu update libosmocore dependency > 1.4.x for osmo_fd_{read,write}_{enable,disable}+DLBSSGP
diff --git a/src/gprs_debug.cpp b/src/gprs_debug.cpp
index da5974b..a790e3f 100644
--- a/src/gprs_debug.cpp
+++ b/src/gprs_debug.cpp
@@ -112,13 +112,6 @@
.loglevel = LOGL_NOTICE,
.enabled = 1,
},
- [DBSSGP] = {
- .name = "DBSSGP",
- .color = "\033[1;34m",
- .description = "GPRS BSS Gateway Protocol (BSSGP)",
- .loglevel = LOGL_NOTICE,
- .enabled = 1,
- },
[DPCU] = {
.name = "DPCU",
.color = "\033[1;35m",
diff --git a/src/gprs_debug.h b/src/gprs_debug.h
index 4c57633..84a0a07 100644
--- a/src/gprs_debug.h
+++ b/src/gprs_debug.h
@@ -27,6 +27,10 @@
};
#endif
+/* we used to have DBSSGP definded in each application, and applications telling
+ * libosmogb which sub-system to use. That creates problems and has been deprecated */
+#define DBSSGP DLBSSGP
+
/* Debug Areas of the code */
enum {
DCSN1,
@@ -41,7 +45,6 @@
DTBFDL,
DTBFUL,
DNS,
- DBSSGP,
DPCU,
aDebug_LastEntry
};
diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp
index 2138fd9..16d73de 100644
--- a/src/pcu_main.cpp
+++ b/src/pcu_main.cpp
@@ -43,6 +43,7 @@
#include <osmocom/vty/command.h>
#include <osmocom/vty/vty.h>
#include <osmocom/vty/ports.h>
+#include <osmocom/vty/logging.h>
#include <osmocom/vty/cpu_sched_vty.h>
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/select.h>
@@ -242,12 +243,12 @@
osmo_stats_init(tall_pcu_ctx);
rate_ctr_init(tall_pcu_ctx);
- bssgp_set_log_ss(DBSSGP);
pcu_vty_info.tall_ctx = tall_pcu_ctx;
vty_init(&pcu_vty_info);
pcu_vty_init();
osmo_cpu_sched_vty_init(tall_pcu_ctx);
+ logging_vty_add_deprecated_subsys(tall_pcu_ctx, "bssgp");
handle_options(argc, argv);
if ((!!spoof_mcc) + (!!spoof_mnc) == 1) {
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index 505f510..1a1dc6f 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -3256,9 +3256,8 @@
osmo_init_logging2(tall_pcu_ctx, &gprs_log_info);
log_set_use_color(osmo_stderr_target, 0);
log_set_print_filename(osmo_stderr_target, 0);
- bssgp_set_log_ss(DBSSGP);
log_parse_category_mask(osmo_stderr_target, "DRLCMAC,1:DRLCMACDATA,3:DRLCMACDL,3:DRLCMACUL,3:"
- "DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DBSSGP,3:DPCU,5:"
+ "DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DLBSSGP,3:DPCU,5:"
"DL1IF,6:DTBF,1:DTBFUL,1:DTBFDL,1:DLGLOBAL,2:");
vty_init(&pcu_vty_info);