aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2015-11-16 13:45:13 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2015-11-16 15:17:00 +0100
commit390e9101253331b58297a3526ea2fed0982815c8 (patch)
tree7c0fef7e0bf0f5bc0f9b3d1a5bcdfa66d949487a
parenta208c734a20a525a897b7a7184361da61604208e (diff)
gtphub: add logging labels to bind struct.
Allow logging the plane (Ctrl/User) and side (SGSN/GGSN) in functions that only have a gtphub_bind* to work with, by adding a constant label to each bind. Sponsored-by: On-Waves ehi
-rw-r--r--openbsc/include/openbsc/gtphub.h2
-rw-r--r--openbsc/src/gprs/gtphub.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/openbsc/include/openbsc/gtphub.h b/openbsc/include/openbsc/gtphub.h
index a0125669d..bf5bc9ec8 100644
--- a/openbsc/include/openbsc/gtphub.h
+++ b/openbsc/include/openbsc/gtphub.h
@@ -370,6 +370,8 @@ struct gtphub_bind {
/* list of struct gtphub_peer */
struct llist_head peers;
+
+ const char *label; /* For logging */
};
struct gtphub_resolved_ggsn {
diff --git a/openbsc/src/gprs/gtphub.c b/openbsc/src/gprs/gtphub.c
index a4b0360f0..63194d8b7 100644
--- a/openbsc/src/gprs/gtphub.c
+++ b/openbsc/src/gprs/gtphub.c
@@ -1787,6 +1787,11 @@ void gtphub_init(struct gtphub *hub)
gtphub_bind_init(&hub->to_ggsns[plane_idx]);
gtphub_bind_init(&hub->to_sgsns[plane_idx]);
}
+
+ hub->to_sgsns[GTPH_PLANE_CTRL].label = "SGSN Ctrl";
+ hub->to_ggsns[GTPH_PLANE_CTRL].label = "GGSN Ctrl";
+ hub->to_sgsns[GTPH_PLANE_USER].label = "SGSN User";
+ hub->to_ggsns[GTPH_PLANE_USER].label = "GGSN User";
}
static int gtphub_make_proxy(struct gtphub *hub,
@@ -1981,7 +1986,8 @@ static struct gtphub_peer_addr *gtphub_addr_have(struct gtphub *hub,
a = gtphub_peer_add_addr(peer, addr);
- LOG("New peer address: %s\n",
+ LOG("New peer address: %s %s\n",
+ bind->label,
gsn_addr_to_str(&a->addr));
return a;