<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21597">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging: Introduce DLBSSGP logging constant<br><br>Historically, BSSGP uses a non-constant, user-configurable integer<br>varieable for the logging sub-system. Let's replace this with a<br>statically-allocated library logging constant.<br><br>This is required if we want to use the subsystem number in e.g.<br>static initialized for osmo_fsm.log_subsys.<br><br>Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93<br>---<br>M include/osmocom/core/logging.h<br>M include/osmocom/gprs/gprs_bssgp.h<br>M src/gb/common_vty.c<br>M src/gb/common_vty.h<br>M src/gb/gprs_bssgp.c<br>M src/gb/gprs_bssgp_bss.c<br>M src/gb/gprs_bssgp_util.c<br>M src/gb/gprs_bssgp_vty.c<br>M src/logging.c<br>M tests/logging/logging_vty_test.vty<br>10 files changed, 75 insertions(+), 73 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h</span><br><span>index 418a42e..c7f89de 100644</span><br><span>--- a/include/osmocom/core/logging.h</span><br><span>+++ b/include/osmocom/core/logging.h</span><br><span>@@ -121,7 +121,8 @@</span><br><span> #define DLJIBUF -18 /*!< Osmocom Jitter Buffer */</span><br><span> #define DLRSPRO -19 /*!< Osmocom Remote SIM Protocol */</span><br><span> #define DLNS -20 /*!< Osmocom NS layer */</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMO_NUM_DLIB 20 /*!< Number of logging sub-systems in libraries */</span><br><span style="color: hsl(120, 100%, 40%);">+#define DLBSSGP -21 /*!< Osmocom BSSGP layer */</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_NUM_DLIB 21 /*!< Number of logging sub-systems in libraries */</span><br><span> </span><br><span> /* Colors that can be used in log_info_cat.color */</span><br><span> #define OSMO_LOGCOLOR_NORMAL NULL</span><br><span>diff --git a/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h</span><br><span>index dc2a8d0..dfbd9b7 100644</span><br><span>--- a/include/osmocom/gprs/gprs_bssgp.h</span><br><span>+++ b/include/osmocom/gprs/gprs_bssgp.h</span><br><span>@@ -233,6 +233,6 @@</span><br><span> </span><br><span> /* gprs_bssgp_vty.c */</span><br><span> int bssgp_vty_init(void);</span><br><span style="color: hsl(0, 100%, 40%);">-void bssgp_set_log_ss(int ss);</span><br><span style="color: hsl(120, 100%, 40%);">+void bssgp_set_log_ss(int ss) OSMO_DEPRECATED("Use DLBSSGP instead!\n");</span><br><span> </span><br><span> int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx);</span><br><span>diff --git a/src/gb/common_vty.c b/src/gb/common_vty.c</span><br><span>index 42f3404..ad3dea2 100644</span><br><span>--- a/src/gb/common_vty.c</span><br><span>+++ b/src/gb/common_vty.c</span><br><span>@@ -63,4 +63,4 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int DNS, DBSSGP;</span><br><span style="color: hsl(120, 100%, 40%);">+int DNS;</span><br><span>diff --git a/src/gb/common_vty.h b/src/gb/common_vty.h</span><br><span>index 801d2da..8e88331 100644</span><br><span>--- a/src/gb/common_vty.h</span><br><span>+++ b/src/gb/common_vty.h</span><br><span>@@ -3,5 +3,5 @@</span><br><span> #include <osmocom/vty/command.h></span><br><span> #include <osmocom/core/logging.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern int DNS, DBSSGP;</span><br><span style="color: hsl(120, 100%, 40%);">+extern int DNS;</span><br><span> </span><br><span>diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c</span><br><span>index 7fb3a30..b5dec58 100644</span><br><span>--- a/src/gb/gprs_bssgp.c</span><br><span>+++ b/src/gb/gprs_bssgp.c</span><br><span>@@ -40,7 +40,6 @@</span><br><span> #include <osmocom/gprs/gprs_bssgp_bss.h></span><br><span> #include <osmocom/gprs/gprs_ns.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "common_vty.h"</span><br><span> #include "osmocom/gsm/gsm48.h"</span><br><span> </span><br><span> void *bssgp_tall_ctx = NULL;</span><br><span>@@ -110,7 +109,7 @@</span><br><span> msgb_nsei(msg) = nsei;</span><br><span> msgb_bvci(msg) = 0; /* Signalling */</span><br><span> bgph->pdu_type = BSSGP_PDUT_BVC_RESET;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-RESET "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-RESET "</span><br><span> "CAUSE=%s\n", bvci, bssgp_cause_str(cause));</span><br><span> </span><br><span> msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci);</span><br><span>@@ -140,7 +139,7 @@</span><br><span> </span><br><span> llist_for_each_entry(bctx, &bssgp_bvc_ctxts, list) {</span><br><span> if (bctx->nsei == nsei && bctx->bvci != BVCI_SIGNALLING) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_DEBUG, "NSEI=%u/BVCI=%u RESET due to %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_DEBUG, "NSEI=%u/BVCI=%u RESET due to %s\n",</span><br><span> nsei, bctx->bvci, bssgp_cause_str(cause));</span><br><span> rc = bssgp_tx_bvc_reset(bctx, bctx->bvci, cause);</span><br><span> if (rc < 0)</span><br><span>@@ -337,7 +336,7 @@</span><br><span> uint16_t bvci;</span><br><span> </span><br><span> bvci = tlvp_val16be(tp, BSSGP_IE_BVCI);</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx RESET cause=%s\n", bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u Rx RESET cause=%s\n", bvci,</span><br><span> bssgp_cause_str(*TLVP_VAL(tp, BSSGP_IE_CAUSE)));</span><br><span> </span><br><span> /* look-up or create the BTS context for this BVC */</span><br><span>@@ -352,14 +351,14 @@</span><br><span> * informs us about its RAC + Cell ID, so we can create a mapping */</span><br><span> if (bvci != 0 && bvci != 1) {</span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_CELL_ID, 8)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx RESET "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx RESET "</span><br><span> "missing mandatory IE\n", bvci);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> /* actually extract RAC / CID */</span><br><span> bctx->cell_id = bssgp_parse_cell_id(&bctx->ra_id,</span><br><span> TLVP_VAL(tp, BSSGP_IE_CELL_ID));</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "Cell %s CI %u on BVCI %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "Cell %s CI %u on BVCI %u\n",</span><br><span> osmo_rai_name(&bctx->ra_id), bctx->cell_id, bvci);</span><br><span> }</span><br><span> </span><br><span>@@ -388,13 +387,13 @@</span><br><span> bvci = tlvp_val16be(tp, BSSGP_IE_BVCI);</span><br><span> if (bvci == BVCI_SIGNALLING) {</span><br><span> /* 8.3.2: Signalling BVC shall never be blocked */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "NSEI=%u/BVCI=%u "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "NSEI=%u/BVCI=%u "</span><br><span> "received block for signalling BVC!?!\n",</span><br><span> nsei, msgb_bvci(msg));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_INFO, "BSSGP Rx BVCI=%u BVC-BLOCK\n", bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_INFO, "BSSGP Rx BVCI=%u BVC-BLOCK\n", bvci);</span><br><span> </span><br><span> ptp_ctx = btsctx_by_bvci_nsei(bvci, nsei);</span><br><span> if (!ptp_ctx)</span><br><span>@@ -426,13 +425,13 @@</span><br><span> bvci = tlvp_val16be(tp, BSSGP_IE_BVCI);</span><br><span> if (bvci == BVCI_SIGNALLING) {</span><br><span> /* 8.3.2: Signalling BVC shall never be blocked */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "NSEI=%u/BVCI=%u "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "NSEI=%u/BVCI=%u "</span><br><span> "received unblock for signalling BVC!?!\n",</span><br><span> nsei, msgb_bvci(msg));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx BVC-UNBLOCK\n", bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u Rx BVC-UNBLOCK\n", bvci);</span><br><span> </span><br><span> ptp_ctx = btsctx_by_bvci_nsei(bvci, nsei);</span><br><span> if (!ptp_ctx)</span><br><span>@@ -464,12 +463,12 @@</span><br><span> /* extract TLLI and parse TLV IEs */</span><br><span> msgb_tlli(msg) = osmo_ntohl(budh->tlli);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP TLLI=0x%08x Rx UPLINK-UNITDATA\n", msgb_tlli(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP TLLI=0x%08x Rx UPLINK-UNITDATA\n", msgb_tlli(msg));</span><br><span> </span><br><span> /* Cell ID and LLC_PDU are the only mandatory IE */</span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_CELL_ID, 8) ||</span><br><span> !TLVP_PRESENT(tp, BSSGP_IE_LLC_PDU)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP TLLI=0x%08x Rx UL-UD "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP TLLI=0x%08x Rx UL-UD "</span><br><span> "missing mandatory IE\n", msgb_tlli(msg));</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_MISSING_MAND_IE, NULL, msg);</span><br><span> }</span><br><span>@@ -499,14 +498,14 @@</span><br><span> </span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_TLLI, 4) ||</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_ROUTEING_AREA, 6)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx SUSPEND "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx SUSPEND "</span><br><span> "missing mandatory IE\n", ns_bvci);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_MISSING_MAND_IE, NULL, msg);</span><br><span> }</span><br><span> </span><br><span> tlli = tlvp_val32be(tp, BSSGP_IE_TLLI);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u TLLI=0x%08x Rx SUSPEND\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u TLLI=0x%08x Rx SUSPEND\n",</span><br><span> ns_bvci, tlli);</span><br><span> </span><br><span> gsm48_parse_ra(&raid, TLVP_VAL(tp, BSSGP_IE_ROUTEING_AREA));</span><br><span>@@ -541,7 +540,7 @@</span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_TLLI, 4 ) ||</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_ROUTEING_AREA, 6) ||</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_SUSPEND_REF_NR, 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx RESUME "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx RESUME "</span><br><span> "missing mandatory IE\n", ns_bvci);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_MISSING_MAND_IE, NULL, msg);</span><br><span> }</span><br><span>@@ -549,7 +548,7 @@</span><br><span> tlli = tlvp_val32be(tp, BSSGP_IE_TLLI);</span><br><span> suspend_ref = *TLVP_VAL(tp, BSSGP_IE_SUSPEND_REF_NR);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u TLLI=0x%08x Rx RESUME\n", ns_bvci, tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u TLLI=0x%08x Rx RESUME\n", ns_bvci, tlli);</span><br><span> </span><br><span> gsm48_parse_ra(&raid, TLVP_VAL(tp, BSSGP_IE_ROUTEING_AREA));</span><br><span> </span><br><span>@@ -584,14 +583,14 @@</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_LLC_FRAMES_DISCARDED, 1) ||</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_BVCI, 2) ||</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_NUM_OCT_AFF, 3)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx LLC DISCARDED "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx LLC DISCARDED "</span><br><span> "missing mandatory IE\n", ctx->bvci);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_MISSING_MAND_IE, NULL, msg);</span><br><span> }</span><br><span> </span><br><span> tlli = tlvp_val32be(tp, BSSGP_IE_TLLI);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u TLLI=%08x Rx LLC DISCARDED\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u TLLI=%08x Rx LLC DISCARDED\n",</span><br><span> ctx->bvci, tlli);</span><br><span> </span><br><span> rate_ctr_inc(&ctx->ctrg->ctr[BSSGP_CTR_DISCARDED]);</span><br><span>@@ -616,19 +615,19 @@</span><br><span> enum gprs_bssgp_cause cause;</span><br><span> </span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_CAUSE, 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx STATUS "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx STATUS "</span><br><span> "missing mandatory IE\n", bvci);</span><br><span> cause = BSSGP_CAUSE_PROTO_ERR_UNSPEC;</span><br><span> } else {</span><br><span> cause = *TLVP_VAL(tp, BSSGP_IE_CAUSE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP BVCI=%u Rx BVC STATUS, cause=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP BVCI=%u Rx BVC STATUS, cause=%s\n",</span><br><span> bvci, bssgp_cause_str(cause));</span><br><span> </span><br><span> if (cause == BSSGP_CAUSE_BVCI_BLOCKED || cause == BSSGP_CAUSE_UNKNOWN_BVCI) {</span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_BVCI, 2))</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR,</span><br><span> "BSSGP BVCI=%u Rx STATUS cause=%s "</span><br><span> "missing conditional BVCI IE\n",</span><br><span> bvci, bssgp_cause_str(cause));</span><br><span>@@ -680,7 +679,7 @@</span><br><span> list);</span><br><span> </span><br><span> if (bssgp_fc_needs_queueing(fc, fcqe->llc_pdu_len)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP-FC: fc_timer_cb() but still "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP-FC: fc_timer_cb() but still "</span><br><span> "not able to send PDU of %u bytes\n", fcqe->llc_pdu_len);</span><br><span> /* make sure we re-start the timer */</span><br><span> fc_queue_timer_cfg(fc);</span><br><span>@@ -818,7 +817,7 @@</span><br><span> struct timeval time_now;</span><br><span> </span><br><span> if (llc_pdu_len > fc->bucket_size_max) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "Single PDU (size=%u) is larger "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "Single PDU (size=%u) is larger "</span><br><span> "than maximum bucket size (%u)!\n", llc_pdu_len,</span><br><span> fc->bucket_size_max);</span><br><span> msgb_free(msg);</span><br><span>@@ -879,7 +878,7 @@</span><br><span> uint32_t old_leak_rate = bctx->fc->bucket_leak_rate;</span><br><span> uint32_t old_r_def_ms = bctx->r_default_ms;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx Flow Control BVC\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u Rx Flow Control BVC\n",</span><br><span> bctx->bvci);</span><br><span> </span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_TAG, 1) ||</span><br><span>@@ -887,7 +886,7 @@</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_BUCKET_LEAK_RATE, 2) ||</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_BMAX_DEFAULT_MS, 2) ||</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_R_DEFAULT_MS,2)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx FC BVC "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx FC BVC "</span><br><span> "missing mandatory IE\n", bctx->bvci);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_MISSING_MAND_IE, NULL, msg);</span><br><span> }</span><br><span>@@ -902,17 +901,17 @@</span><br><span> bctx->r_default_ms = 100 * tlvp_val16be(tp, BSSGP_IE_R_DEFAULT_MS) / 8;</span><br><span> </span><br><span> if (old_leak_rate != 0 && bctx->fc->bucket_leak_rate == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSS instructs us to bucket leak "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSS instructs us to bucket leak "</span><br><span> "rate of 0, stopping all DL GPRS!\n");</span><br><span> else if (old_leak_rate == 0 && bctx->fc->bucket_leak_rate != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSS instructs us to bucket leak "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSS instructs us to bucket leak "</span><br><span> "rate of != 0, restarting all DL GPRS!\n");</span><br><span> </span><br><span> if (old_r_def_ms != 0 && bctx->r_default_ms == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSS instructs us to MS default "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSS instructs us to MS default "</span><br><span> "bucket leak rate of 0, stopping DL GPRS!\n");</span><br><span> else if (old_r_def_ms == 0 && bctx->r_default_ms != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSS instructs us to MS default "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSS instructs us to MS default "</span><br><span> "bucket leak rate != 0, restarting DL GPRS!\n");</span><br><span> </span><br><span> /* reconfigure the timer for flow control based on new values */</span><br><span>@@ -949,13 +948,13 @@</span><br><span> break;</span><br><span> case BSSGP_PDUT_RA_CAPABILITY:</span><br><span> /* BSS requests RA capability or IMSI */</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx RA CAPABILITY UPDATE\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u Rx RA CAPABILITY UPDATE\n",</span><br><span> bctx->bvci);</span><br><span> /* FIXME: send GMM_RA_CAPABILITY_UPDATE.ind to GMM */</span><br><span> /* FIXME: send RA_CAPA_UPDATE_ACK */</span><br><span> break;</span><br><span> case BSSGP_PDUT_RADIO_STATUS:</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx RADIO STATUS\n", bctx->bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u Rx RADIO STATUS\n", bctx->bvci);</span><br><span> /* BSS informs us of some exception */</span><br><span> /* FIXME: send GMM_RADIO_STATUS.ind to GMM */</span><br><span> break;</span><br><span>@@ -965,7 +964,7 @@</span><br><span> break;</span><br><span> case BSSGP_PDUT_FLOW_CONTROL_MS:</span><br><span> /* BSS informs us of available bandwidth to one MS */</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx Flow Control MS\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u Rx Flow Control MS\n",</span><br><span> bctx->bvci);</span><br><span> /* FIXME: actually implement flow control */</span><br><span> /* FIXME: Send FLOW_CONTROL_MS_ACK */</span><br><span>@@ -978,7 +977,7 @@</span><br><span> case BSSGP_PDUT_CREATE_BSS_PFC_NACK:</span><br><span> case BSSGP_PDUT_MODIFY_BSS_PFC:</span><br><span> case BSSGP_PDUT_DELETE_BSS_PFC_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx PDU type %s not [yet] "</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u Rx PDU type %s not [yet] "</span><br><span> "implemented\n", bctx->bvci, bssgp_pdu_str(pdu_type));</span><br><span> rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg);</span><br><span> break;</span><br><span>@@ -989,13 +988,13 @@</span><br><span> case BSSGP_PDUT_RA_CAPA_UPDATE_ACK:</span><br><span> case BSSGP_PDUT_FLOW_CONTROL_BVC_ACK:</span><br><span> case BSSGP_PDUT_FLOW_CONTROL_MS_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u PDU type %s only exists in DL\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u PDU type %s only exists in DL\n",</span><br><span> bctx->bvci, bssgp_pdu_str(pdu_type));</span><br><span> bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);</span><br><span> rc = -EINVAL;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u PDU type %s unknown\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u PDU type %s unknown\n",</span><br><span> bctx->bvci, bssgp_pdu_str(pdu_type));</span><br><span> rc = bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);</span><br><span> break;</span><br><span>@@ -1026,13 +1025,13 @@</span><br><span> break;</span><br><span> case BSSGP_PDUT_FLUSH_LL_ACK:</span><br><span> /* BSS informs us it has performed LL FLUSH */</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP Rx BVCI=%u FLUSH LL ACK\n", bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP Rx BVCI=%u FLUSH LL ACK\n", bvci);</span><br><span> /* FIXME: send NM_FLUSH_LL.res to NM */</span><br><span> break;</span><br><span> case BSSGP_PDUT_LLC_DISCARD:</span><br><span> /* BSS informs that some LLC PDU's have been discarded */</span><br><span> if (!bctx) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR,</span><br><span> "BSSGP Rx LLC-DISCARD missing mandatory BVCI\n");</span><br><span> goto err_mand_ie;</span><br><span> }</span><br><span>@@ -1042,7 +1041,7 @@</span><br><span> /* BSS tells us that BVC shall be blocked */</span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_BVCI, 2) ||</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_CAUSE, 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP Rx BVC-BLOCK "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP Rx BVC-BLOCK "</span><br><span> "missing mandatory IE\n");</span><br><span> goto err_mand_ie;</span><br><span> }</span><br><span>@@ -1051,20 +1050,20 @@</span><br><span> case BSSGP_PDUT_BVC_UNBLOCK:</span><br><span> /* BSS tells us that BVC shall be unblocked */</span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_BVCI, 2)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP Rx BVC-UNBLOCK "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP Rx BVC-UNBLOCK "</span><br><span> "missing mandatory IE\n");</span><br><span> goto err_mand_ie;</span><br><span> }</span><br><span> rc = bssgp_rx_bvc_unblock(msg, tp);</span><br><span> break;</span><br><span> case BSSGP_PDUT_BVC_RESET_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx BVC-RESET-ACK\n", bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP BVCI=%u Rx BVC-RESET-ACK\n", bvci);</span><br><span> break;</span><br><span> case BSSGP_PDUT_BVC_RESET:</span><br><span> /* BSS tells us that BVC init is required */</span><br><span> if (!TLVP_PRES_LEN(tp, BSSGP_IE_BVCI, 2) ||</span><br><span> !TLVP_PRES_LEN(tp, BSSGP_IE_CAUSE, 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP Rx BVC-RESET "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP Rx BVC-RESET "</span><br><span> "missing mandatory IE\n");</span><br><span> goto err_mand_ie;</span><br><span> }</span><br><span>@@ -1084,13 +1083,13 @@</span><br><span> case BSSGP_PDUT_BVC_BLOCK_ACK:</span><br><span> case BSSGP_PDUT_BVC_UNBLOCK_ACK:</span><br><span> case BSSGP_PDUT_SGSN_INVOKE_TRACE:</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx PDU type %s only exists in DL\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u Rx PDU type %s only exists in DL\n",</span><br><span> bvci, bssgp_pdu_str(pdu_type));</span><br><span> bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);</span><br><span> rc = -EINVAL;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx PDU type %s unknown\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLBSSGP, "BSSGP BVCI=%u Rx PDU type %s unknown\n",</span><br><span> bvci, bssgp_pdu_str(pdu_type));</span><br><span> rc = bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);</span><br><span> break;</span><br><span>@@ -1128,7 +1127,7 @@</span><br><span> rc = bssgp_tlv_parse(&tp, budh->data, data_len);</span><br><span> }</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "Failed to parse BSSGP %s message. Invalid message was: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "Failed to parse BSSGP %s message. Invalid message was: %s\n",</span><br><span> bssgp_pdu_str(pdu_type), msgb_hexdump(msg));</span><br><span> if (pdu_type != BSSGP_PDUT_STATUS)</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg);</span><br><span>@@ -1158,7 +1157,7 @@</span><br><span> * registered if a BVCI is given. */</span><br><span> if (!bctx && bvci != BVCI_SIGNALLING &&</span><br><span> pdu_type != BSSGP_PDUT_BVC_RESET) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "NSEI=%u/BVCI=%u Rejecting PDU type %s for unknown BVCI\n", nsei, bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "NSEI=%u/BVCI=%u Rejecting PDU type %s for unknown BVCI\n", nsei, bvci,</span><br><span> bssgp_pdu_str(pdu_type));</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &bvci, msg);</span><br><span> }</span><br><span>@@ -1170,7 +1169,7 @@</span><br><span> else if (bctx)</span><br><span> rc = bssgp_rx_ptp(msg, &tp, bctx);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE,</span><br><span> "NSEI=%u/BVCI=%u Cannot handle PDU type %s for unknown BVCI, NS BVCI %u\n", nsei, bvci,</span><br><span> bssgp_pdu_str(pdu_type), ns_bvci);</span><br><span> </span><br><span>@@ -1194,7 +1193,7 @@</span><br><span> </span><br><span> /* Identifiers from UP: TLLI, BVCI, NSEI (all in msgb->cb) */</span><br><span> if (bvci <= BVCI_PTM ) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "Cannot send DL-UD to BVCI %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "Cannot send DL-UD to BVCI %u\n",</span><br><span> bvci);</span><br><span> msgb_free(msg);</span><br><span> return -EINVAL;</span><br><span>@@ -1202,7 +1201,7 @@</span><br><span> </span><br><span> bctx = btsctx_by_bvci_nsei(bvci, nsei);</span><br><span> if (!bctx) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "Cannot send DL-UD to unknown BVCI %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "Cannot send DL-UD to unknown BVCI %u\n",</span><br><span> bvci);</span><br><span> msgb_free(msg);</span><br><span> return -ENODEV;</span><br><span>@@ -1353,7 +1352,7 @@</span><br><span> </span><br><span> void bssgp_set_log_ss(int ss)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- DBSSGP = ss;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLGLOBAL, LOGL_ERROR, "BSSGP has moved from DGPRS to DLGPRS, please update your code\n");</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span>diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c</span><br><span>index 462666a..a066e91 100644</span><br><span>--- a/src/gb/gprs_bssgp_bss.c</span><br><span>+++ b/src/gb/gprs_bssgp_bss.c</span><br><span>@@ -35,7 +35,6 @@</span><br><span> #include <osmocom/gprs/gprs_ns.h></span><br><span> </span><br><span> #include "gprs_bssgp_internal.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "common_vty.h"</span><br><span> </span><br><span> #define GSM_IMSI_LENGTH 17</span><br><span> </span><br><span>@@ -61,7 +60,7 @@</span><br><span> struct bssgp_normal_hdr *bgph =</span><br><span> (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=0) Tx SUSPEND (TLLI=0x%04x)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP (BVCI=0) Tx SUSPEND (TLLI=0x%04x)\n",</span><br><span> tlli);</span><br><span> msgb_nsei(msg) = nsei;</span><br><span> msgb_bvci(msg) = 0; /* Signalling */</span><br><span>@@ -81,7 +80,7 @@</span><br><span> struct bssgp_normal_hdr *bgph =</span><br><span> (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=0) Tx RESUME (TLLI=0x%04x)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP (BVCI=0) Tx RESUME (TLLI=0x%04x)\n",</span><br><span> tlli);</span><br><span> msgb_nsei(msg) = nsei;</span><br><span> msgb_bvci(msg) = 0; /* Signalling */</span><br><span>@@ -102,7 +101,7 @@</span><br><span> struct bssgp_normal_hdr *bgph =</span><br><span> (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx RA-CAPA-UPD (TLLI=0x%04x)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx RA-CAPA-UPD (TLLI=0x%04x)\n",</span><br><span> bctx->bvci, tlli);</span><br><span> </span><br><span> /* set NSEI and BVCI in msgb cb */</span><br><span>@@ -124,7 +123,7 @@</span><br><span> struct bssgp_normal_hdr *bgph =</span><br><span> (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx RADIO-STATUS ",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx RADIO-STATUS ",</span><br><span> bctx->bvci);</span><br><span> </span><br><span> /* set NSEI and BVCI in msgb cb */</span><br><span>@@ -140,7 +139,7 @@</span><br><span> static int common_tx_radio_status2(struct msgb *msg, uint8_t cause)</span><br><span> {</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, &cause);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DBSSGP, LOGL_NOTICE, "CAUSE=%s\n", bssgp_cause_str(cause));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLBSSGP, LOGL_NOTICE, "CAUSE=%s\n", bssgp_cause_str(cause));</span><br><span> </span><br><span> return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span>@@ -154,7 +153,7 @@</span><br><span> if (!msg)</span><br><span> return -ENOMEM;</span><br><span> bssgp_msgb_tlli_put(msg, tlli);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DBSSGP, LOGL_NOTICE, "TLLI=0x%08x ", tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLBSSGP, LOGL_NOTICE, "TLLI=0x%08x ", tlli);</span><br><span> </span><br><span> return common_tx_radio_status2(msg, cause);</span><br><span> }</span><br><span>@@ -169,7 +168,7 @@</span><br><span> if (!msg)</span><br><span> return -ENOMEM;</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_TMSI, 4, (uint8_t *)&_tmsi);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DBSSGP, LOGL_NOTICE, "TMSI=0x%08x ", tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLBSSGP, LOGL_NOTICE, "TMSI=0x%08x ", tmsi);</span><br><span> </span><br><span> return common_tx_radio_status2(msg, cause);</span><br><span> }</span><br><span>@@ -195,7 +194,7 @@</span><br><span> if (imsi_len > 2)</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_IMSI, imsi_len-2, mi+2);</span><br><span> #pragma GCC diagnostic pop</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPC(DBSSGP, LOGL_NOTICE, "IMSI=%s ", imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPC(DLBSSGP, LOGL_NOTICE, "IMSI=%s ", imsi);</span><br><span> </span><br><span> return common_tx_radio_status2(msg, cause);</span><br><span> }</span><br><span>@@ -234,7 +233,7 @@</span><br><span> uint16_t _bvci = osmo_htons(bctx->bvci);</span><br><span> uint32_t _oct_aff = osmo_htonl(num_octets & 0xFFFFFF);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx LLC-DISCARDED "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx LLC-DISCARDED "</span><br><span> "TLLI=0x%04x, FRAMES=%u, OCTETS=%u\n", bctx->bvci, tlli,</span><br><span> num_frames, num_octets);</span><br><span> msgb_nsei(msg) = bctx->nsei;</span><br><span>@@ -258,7 +257,7 @@</span><br><span> (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph));</span><br><span> uint16_t _bvci = osmo_htons(bctx->bvci);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-BLOCK "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-BLOCK "</span><br><span> "CAUSE=%s\n", bctx->bvci, bssgp_cause_str(cause));</span><br><span> </span><br><span> msgb_nsei(msg) = bctx->nsei;</span><br><span>@@ -279,7 +278,7 @@</span><br><span> (struct bssgp_normal_hdr *) msgb_put(msg, sizeof(*bgph));</span><br><span> uint16_t _bvci = osmo_htons(bctx->bvci);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-UNBLOCK\n", bctx->bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP (BVCI=%u) Tx BVC-UNBLOCK\n", bctx->bvci);</span><br><span> </span><br><span> msgb_nsei(msg) = bctx->nsei;</span><br><span> msgb_bvci(msg) = 0; /* Signalling */</span><br><span>diff --git a/src/gb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c</span><br><span>index 8342d7c..5245c5f 100644</span><br><span>--- a/src/gb/gprs_bssgp_util.c</span><br><span>+++ b/src/gb/gprs_bssgp_util.c</span><br><span>@@ -33,7 +33,6 @@</span><br><span> #include <osmocom/gprs/gprs_ns.h></span><br><span> </span><br><span> #include "gprs_bssgp_internal.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "common_vty.h"</span><br><span> </span><br><span> struct gprs_ns_inst *bssgp_nsi;</span><br><span> </span><br><span>@@ -561,17 +560,17 @@</span><br><span> cause is either "BVCI blocked" or "BVCI unknown" */</span><br><span> if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause == BSSGP_CAUSE_BVCI_BLOCKED) {</span><br><span> if (bvci == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP Tx STATUS, cause=%s: "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP Tx STATUS, cause=%s: "</span><br><span> "missing conditional BVCI\n",</span><br><span> bssgp_cause_str(cause));</span><br><span> } else {</span><br><span> if (bvci != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_ERROR, "BSSGP Tx STATUS, cause=%s: "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_ERROR, "BSSGP Tx STATUS, cause=%s: "</span><br><span> "unexpected conditional BVCI\n",</span><br><span> bssgp_cause_str(cause));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "BSSGP BVCI=%u Tx STATUS, cause=%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLBSSGP, LOGL_NOTICE, "BSSGP BVCI=%u Tx STATUS, cause=%s\n",</span><br><span> bvci ? *bvci : 0, bssgp_cause_str(cause));</span><br><span> msgb_nsei(msg) = msgb_nsei(orig_msg);</span><br><span> msgb_bvci(msg) = 0;</span><br><span>diff --git a/src/gb/gprs_bssgp_vty.c b/src/gb/gprs_bssgp_vty.c</span><br><span>index 3dee18e..d04641d 100644</span><br><span>--- a/src/gb/gprs_bssgp_vty.c</span><br><span>+++ b/src/gb/gprs_bssgp_vty.c</span><br><span>@@ -44,8 +44,6 @@</span><br><span> #include <osmocom/vty/telnet_interface.h></span><br><span> #include <osmocom/vty/misc.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "common_vty.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void log_set_bvc_filter(struct log_target *target,</span><br><span> struct bssgp_bvc_ctx *bctx)</span><br><span> {</span><br><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index d60d6e4..0b4c1ff 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -238,6 +238,11 @@</span><br><span> .description = "GPRS NS layer",</span><br><span> .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [INT2IDX(DLBSSGP)] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DLBSSGP",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "GPRS BSSGP layer",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> void assert_loginfo(const char *src)</span><br><span>diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty</span><br><span>index 5a5d7e6..dd2db63 100644</span><br><span>--- a/tests/logging/logging_vty_test.vty</span><br><span>+++ b/tests/logging/logging_vty_test.vty</span><br><span>@@ -53,7 +53,7 @@</span><br><span> logging print level (0|1)</span><br><span> logging print file (0|1|basename) [last]</span><br><span> logging set-log-mask MASK</span><br><span style="color: hsl(0, 100%, 40%);">- logging level (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns) (debug|info|notice|error|fatal)</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp) (debug|info|notice|error|fatal)</span><br><span> logging level set-all (debug|info|notice|error|fatal)</span><br><span> logging level force-all (debug|info|notice|error|fatal)</span><br><span> no logging level force-all</span><br><span>@@ -471,7 +471,7 @@</span><br><span> </span><br><span> logging_vty_test# list</span><br><span> ...</span><br><span style="color: hsl(0, 100%, 40%);">- logp (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns) (debug|info|notice|error|fatal) .LOGMESSAGE</span><br><span style="color: hsl(120, 100%, 40%);">+ logp (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro|lns|lbssgp) (debug|info|notice|error|fatal) .LOGMESSAGE</span><br><span> ...</span><br><span> </span><br><span> logging_vty_test# logp?</span><br><span>@@ -503,6 +503,7 @@</span><br><span> ljibuf libosmo-netif Jitter Buffer</span><br><span> lrspro Remote SIM protocol</span><br><span> lns GPRS NS layer</span><br><span style="color: hsl(120, 100%, 40%);">+ lbssgp GPRS BSSGP layer</span><br><span> </span><br><span> logging_vty_test# logp lglobal ?</span><br><span> debug Log debug messages and higher levels</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21597">change 21597</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/21597"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93 </div>
<div style="display:none"> Gerrit-Change-Number: 21597 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>