diff options
| author | Max <msuraev@sysmocom.de> | 2017-10-20 13:39:57 +0200 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2017-10-20 13:39:57 +0200 |
| commit | baabc681aea5d950d97db59aea96002e08d3b955 (patch) | |
| tree | 87c09f1a7f9899299c7cedd84b59ff8f44f22ee3 | |
| parent | 72ad237d607b3680c8d86d3449bfcbbb5e8f0318 (diff) | |
SGSN: print additional GTP-related info
* print libgtp version on startup
* print GSN addresses in 'sh sgsn'
Change-Id: I699a9eb56c4b362984ea8292a3d2b22b71f53c15
Related: SYS#3610
| -rw-r--r-- | src/gprs/sgsn_main.c | 3 | ||||
| -rw-r--r-- | src/gprs/sgsn_vty.c | 5 | ||||
| -rw-r--r-- | tests/vty_test_runner.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index d79beb33f..7036bf65c 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -447,7 +447,8 @@ int main(int argc, char **argv) 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 18828525d..ab02d8175 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 @@ DEFUN(show_sgsn, show_sgsn_cmd, "show sgsn", 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 104bba49d..9b8c56062 100644 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -152,7 +152,7 @@ class TestVTYSGSN(TestVTYBase): 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', [''])) |