diff options
Diffstat (limited to 'src/gb')
| -rw-r--r-- | src/gb/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gb/gprs_bssgp.c | 5 | ||||
| -rw-r--r-- | src/gb/gprs_bssgp_vty.c | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 1e0aa1e1..70a451d2 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=5:0:0 +LIBVERSION=6:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} -fno-strict-aliasing $(TALLOC_CFLAGS) diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 4c0bb8a9..d5d4ea8a 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -284,9 +284,8 @@ static int bssgp_rx_bvc_reset(struct msgb *msg, struct tlv_parsed *tp, /* actually extract RAC / CID */ bctx->cell_id = bssgp_parse_cell_id(&bctx->ra_id, TLVP_VAL(tp, BSSGP_IE_CELL_ID)); - LOGP(DBSSGP, LOGL_NOTICE, "Cell %u-%u-%u-%u CI %u on BVCI %u\n", - bctx->ra_id.mcc, bctx->ra_id.mnc, bctx->ra_id.lac, - bctx->ra_id.rac, bctx->cell_id, bvci); + LOGP(DBSSGP, LOGL_NOTICE, "Cell %s CI %u on BVCI %u\n", + osmo_rai_name(&bctx->ra_id), bctx->cell_id, bvci); } /* Send NM_BVC_RESET.ind to NM */ diff --git a/src/gb/gprs_bssgp_vty.c b/src/gb/gprs_bssgp_vty.c index 6131e6b1..3af6517f 100644 --- a/src/gb/gprs_bssgp_vty.c +++ b/src/gb/gprs_bssgp_vty.c @@ -81,11 +81,9 @@ DEFUN(cfg_bssgp, cfg_bssgp_cmd, static void dump_bvc(struct vty *vty, struct bssgp_bvc_ctx *bvc, int stats) { - vty_out(vty, "NSEI %5u, BVCI %5u, RA-ID: %u-%u-%u-%u, CID: %u, " - "STATE: %s%s", bvc->nsei, bvc->bvci, bvc->ra_id.mcc, - bvc->ra_id.mnc, bvc->ra_id.lac, bvc->ra_id.rac, bvc->cell_id, - bvc->state & BVC_S_BLOCKED ? "BLOCKED" : "UNBLOCKED", - VTY_NEWLINE); + vty_out(vty, "NSEI %5u, BVCI %5u, RA-ID: %s, CID: %u, " + "STATE: %s%s", bvc->nsei, bvc->bvci, osmo_rai_name(&bvc->ra_id), + bvc->cell_id, bvc->state & BVC_S_BLOCKED ? "BLOCKED" : "UNBLOCKED", VTY_NEWLINE); if (stats) { struct bssgp_flow_control *fc = bvc->fc; |