lynxis lazus has uploaded this change for review.
routing area: add LOGRA() logging macro
Prepend the routing area in the log message.
Change-Id: Ib287b70c34b21ce64bc864f69fcf6af5fa0698b9
---
M include/osmocom/sgsn/gprs_routing_area.h
M src/sgsn/gprs_routing_area.c
2 files changed, 24 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/92/40692/1
diff --git a/include/osmocom/sgsn/gprs_routing_area.h b/include/osmocom/sgsn/gprs_routing_area.h
index 018e986..feb2733 100644
--- a/include/osmocom/sgsn/gprs_routing_area.h
+++ b/include/osmocom/sgsn/gprs_routing_area.h
@@ -9,6 +9,18 @@
#include <osmocom/core/utils.h>
#include <osmocom/gsm/gsm23003.h>
+/* rai -> struct osmo_routing_area_id * */
+#define LOGRAI(level, rai, fmt, args...) \
+ do {\
+ char __log_rai_buf[32]; \
+ osmo_rai_name2_buf(__log_rai_buf, sizeof(__log_rai_buf), rai); \
+ LOGP(DRA, level, "RA(%s) " fmt, __log_rai_buf, ## args); \
+ } while (0)
+
+/* ra -> struct sgsn_ra * */
+#define LOGRA(level, ra, fmt, args...) \
+ LOGRAI(level, (&(ra)->rai), fmt, ## args)
+
struct sgsn_instance;
struct sgsn_mm_ctx;
diff --git a/src/sgsn/gprs_routing_area.c b/src/sgsn/gprs_routing_area.c
index 5c465d9..eb595e9 100644
--- a/src/sgsn/gprs_routing_area.c
+++ b/src/sgsn/gprs_routing_area.c
@@ -84,14 +84,14 @@
if (ra) {
if (ra->ran_type == ran_type) {
- LOGP(DRA, LOGL_ERROR, "Trying to create an already existing RA %s with the same ran type %s. Using old RA.\n",
- osmo_rai_name2(rai), get_value_string(sgsn_ra_ran_type_names, ra->ran_type));
+ LOGRAI(LOGL_ERROR, rai, "Trying to create an already existing RA with the same ran type %s. Using old RA.\n",
+ get_value_string(sgsn_ra_ran_type_names, ra->ran_type));
return ra;
}
- LOGP(DRA, LOGL_ERROR, "Failed to create an already existing RA %s with a different ran type %s.\n",
- osmo_rai_name2(rai), get_value_string(sgsn_ra_ran_type_names, ra->ran_type));
+ LOGRAI(LOGL_ERROR, rai, "Failed to create an already existing RA with a different ran type %s.\n",
+ get_value_string(sgsn_ra_ran_type_names, ra->ran_type));
return NULL;
}
@@ -311,8 +311,8 @@
if (cell && cell->ran_type == RA_TYPE_GERAN_Gb) {
/* Cell already exist, update NSEI/BVCI */
if (cell->u.geran.bvci != bvci || cell->u.geran.nsei != nsei) {
- LOGP(DRA, LOGL_INFO, "GERAN Cell changed DLCI. Old: nsei/bvci %05u/%05u New: nsei/bvci %05u/%05u\n",
- cell->u.geran.nsei, cell->u.geran.bvci, nsei, bvci);
+ LOGRA(LOGL_INFO, ra, "GERAN Cell changed DLCI. Old: nsei/bvci %05u/%05u New: nsei/bvci %05u/%05u\n",
+ cell->u.geran.nsei, cell->u.geran.bvci, nsei, bvci);
cell->u.geran.bvci = bvci;
cell->u.geran.nsei = nsei;
}
@@ -321,7 +321,7 @@
if (cell && cell->ran_type != RA_TYPE_GERAN_Gb) {
/* How can we have here a RA change? Must be a configuration error. */
- LOGP(DRA, LOGL_INFO, "CGI %s: RAN change detected to GERAN!", osmo_cgi_ps_name(cgi_ps));
+ LOGRAI(LOGL_INFO, &cgi_ps->rai, "CGI %s: RAN change detected to GERAN!", osmo_cgi_ps_name(cgi_ps));
_sgsn_ra_cell_free(cell, false);
cell = NULL;
}
@@ -333,10 +333,10 @@
* This should only happen when a Cell is changing routing areas */
cell = sgsn_ra_get_cell_by_lai(&cgi_ps->rai.lac, cgi_ps->cell_identity);
if (cell) {
- LOGP(DRA, LOGL_INFO, "CGI %s: changed Routing Area. Old: %s, New: %s\n",
- osmo_cgi_ps_name(cgi_ps),
- osmo_rai_name2_buf(old_ra, sizeof(old_ra), &cell->ra->rai),
- osmo_rai_name2_buf(new_ra, sizeof(new_ra), &cgi_ps->rai));
+ LOGRAI(LOGL_INFO, &cgi_ps->rai, "CGI %s: changed Routing Area. Old: %s, New: %s\n",
+ osmo_cgi_ps_name(cgi_ps),
+ osmo_rai_name2_buf(old_ra, sizeof(old_ra), &cell->ra->rai),
+ osmo_rai_name2_buf(new_ra, sizeof(new_ra), &cgi_ps->rai));
OSMO_ASSERT(cell->ra != ra);
@@ -351,7 +351,7 @@
if (!cell)
return -ENOMEM;
- LOGP(DRA, LOGL_INFO, "New cell registered %s via nsei/bvci %05u/%05u\n", osmo_cgi_ps_name(cgi_ps), nsei, bvci);
+ LOGRA(LOGL_INFO, ra, "New cell registered %s via nsei/bvci %05u/%05u\n", osmo_cgi_ps_name(cgi_ps), nsei, bvci);
return 0;
}
To view, visit change 40692. To unsubscribe, or for help writing mail filters, visit settings.