SGSN: print additional GTP-related info
* print libgtp version on startup
* print GSN addresses in 'sh sgsn'
Change-Id: I699a9eb56c4b362984ea8292a3d2b22b71f53c15
Related: SYS#3610
diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c
index d79beb3..7036bf6 100644
--- a/src/gprs/sgsn_main.c
+++ b/src/gprs/sgsn_main.c
@@ -447,7 +447,8 @@
if (rc) {
LOGP(DGPRS, LOGL_FATAL, "Cannot bind/listen on GTP socket\n");
exit(2);
- }
+ } else
+ LOGP(DGPRS, LOGL_NOTICE, "libGTP v%s initialized\n", gtp_version());
rc = gprs_subscr_init(&sgsn_inst);
if (rc < 0) {
diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index 1882852..ab02d81 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -44,6 +44,7 @@
#include <osmocom/abis/ipa.h>
#include <pdp.h>
+#include <gtp.h>
#include "../../bscconfig.h"
@@ -511,6 +512,10 @@
link->addr, link->port,
VTY_NEWLINE);
}
+ if (sgsn->gsn)
+ vty_out(vty, " GSN: signalling %s, user traffic %s%s",
+ inet_ntoa(sgsn->gsn->gsnc), inet_ntoa(sgsn->gsn->gsnu), VTY_NEWLINE);
+
/* FIXME: statistics */
return CMD_SUCCESS;
}
diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py
index 104bba4..9b8c560 100644
--- a/tests/vty_test_runner.py
+++ b/tests/vty_test_runner.py
@@ -152,7 +152,7 @@
self.assertTrue(self.vty.verify('show bssgp stats', ['']))
self.assertTrue(self.vty.verify('show bssgp nsei 123', ['']))
self.assertTrue(self.vty.verify('show bssgp nsei 123 stats', ['']))
- self.assertTrue(self.vty.verify('show sgsn', ['']))
+ self.assertTrue(self.vty.verify('show sgsn', [' GSN: signalling 127.0.0.1, user traffic 127.0.0.1']))
self.assertTrue(self.vty.verify('show mm-context all', ['']))
self.assertTrue(self.vty.verify('show mm-context imsi 000001234567', ['No MM context for IMSI 000001234567']))
self.assertTrue(self.vty.verify('show pdp-context all', ['']))