aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-05-06 23:28:11 +0200
committerHarald Welte <laforge@gnumonks.org>2016-06-19 18:32:22 +0200
commite015a72629c3cb23c8b8cd6284b1f9fe6b614d19 (patch)
tree621f29190e5db9b71558851e36f4dd1e1b305216
parent8dd0c5e85824ca10992ea7c3b53545bf9e8a80a3 (diff)
VTY: Print 3G auth tuples, not just 2G auth tuples
-rw-r--r--openbsc/src/gprs/sgsn_vty.c33
1 files changed, 24 insertions, 9 deletions
diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c
index 02c0f318c..2ed0e794a 100644
--- a/openbsc/src/gprs/sgsn_vty.c
+++ b/openbsc/src/gprs/sgsn_vty.c
@@ -1,5 +1,5 @@
/*
- * (C) 2010-2013 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2010-2016 by Harald Welte <laforge@gnumonks.org>
* (C) 2010 by On-Waves
* (C) 2015 by Holger Hans Peter Freyther
* All Rights Reserved
@@ -610,15 +610,30 @@ static void subscr_dump_full_vty(struct vty *vty, struct gsm_subscriber *subscr,
vty_out(vty, " A3A8 tuple (used %d times): ",
at->use_count);
- vty_out(vty, " seq # : %d, ",
+ vty_out(vty, " CKSN: %d, ",
at->key_seq);
- vty_out(vty, " RAND : %s, ",
- osmo_hexdump(at->vec.rand, sizeof(at->vec.rand)));
- vty_out(vty, " SRES : %s, ",
- osmo_hexdump(at->vec.sres, sizeof(at->vec.sres)));
- vty_out(vty, " Kc : %s%s",
- osmo_hexdump(at->vec.kc, sizeof(at->vec.kc)),
- VTY_NEWLINE);
+ if (at->vec.auth_types & OSMO_AUTH_TYPE_GSM) {
+ vty_out(vty, "RAND: %s, ",
+ osmo_hexdump(at->vec.rand,
+ sizeof(at->vec.rand)));
+ vty_out(vty, "SRES: %s, ",
+ osmo_hexdump(at->vec.sres,
+ sizeof(at->vec.sres)));
+ vty_out(vty, "Kc: %s%s",
+ osmo_hexdump(at->vec.kc,
+ sizeof(at->vec.kc)), VTY_NEWLINE);
+ }
+ if (at->vec.auth_types & OSMO_AUTH_TYPE_UMTS) {
+ vty_out(vty, " AUTN: %s, ",
+ osmo_hexdump(at->vec.autn,
+ sizeof(at->vec.autn)));
+ vty_out(vty, "RES: %s, ",
+ osmo_hexdump(at->vec.res, at->vec.res_len));
+ vty_out(vty, "IK: %s, ",
+ osmo_hexdump(at->vec.ik, sizeof(at->vec.ik)));
+ vty_out(vty, "CK: %s, ",
+ osmo_hexdump(at->vec.ck, sizeof(at->vec.ck)));
+ }
}
llist_for_each_entry(pdp, &subscr->sgsn_data->pdp_list, list) {