summaryrefslogtreecommitdiffstats
path: root/openbsc/src
diff options
context:
space:
mode:
authorJacob Erlbeck <jerlbeck@sysmocom.de>2015-01-19 14:29:43 +0100
committerJacob Erlbeck <jerlbeck@sysmocom.de>2015-01-19 15:10:57 +0100
commita94708c025f864b38a6c1f4463f3e8de9a542547 (patch)
tree96a3af830f7dea4dc74a9a418d7e7460717111d8 /openbsc/src
parentbbb716965344a46653ab388823570d575a7a6d8d (diff)
sgsn: Fix vty_out newlines
Currently '\n' is used to end lines in the VTY output string constants instead of inserting VTY_NEWLINE. This leads to incorrect line starts in error messages. This patch fixes that accordingly. Sponsored-by: On-Waves ehf
Diffstat (limited to 'openbsc/src')
-rw-r--r--openbsc/src/gprs/sgsn_vty.c32
1 files changed, 21 insertions, 11 deletions
diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c
index 84fd5ef..a22f70c 100644
--- a/openbsc/src/gprs/sgsn_vty.c
+++ b/openbsc/src/gprs/sgsn_vty.c
@@ -373,7 +373,8 @@ DEFUN(imsi_acl, cfg_imsi_acl_cmd,
rc = sgsn_acl_del(imsi, g_cfg);
if (rc < 0) {
- vty_out(vty, "%% unable to %s ACL\n", op);
+ vty_out(vty, "%% unable to %s ACL%s", op, VTY_NEWLINE);
+
return CMD_WARNING;
}
@@ -516,7 +517,8 @@ DEFUN(update_subscr_insert, update_subscr_insert_cmd,
subscr = gprs_subscr_get_or_create(imsi);
if (!subscr) {
- vty_out(vty, "%% unable get subscriber record for %s\n", imsi);
+ vty_out(vty, "%% unable get subscriber record for %s%s",
+ imsi, VTY_NEWLINE);
return CMD_WARNING;
}
@@ -548,22 +550,26 @@ DEFUN(update_subscr_insert_auth_triplet, update_subscr_insert_auth_triplet_cmd,
subscr = gprs_subscr_get_or_create(imsi);
if (!subscr) {
- vty_out(vty, "%% unable get subscriber record for %s\n", imsi);
+ vty_out(vty, "%% unable get subscriber record for %s%s",
+ imsi, VTY_NEWLINE);
return CMD_WARNING;
}
OSMO_ASSERT(subscr->sgsn_data);
if (osmo_hexparse(sres_str, &at.sres[0], sizeof(at.sres)) < 0) {
- vty_out(vty, "%% invalid SRES value '%s'\n", sres_str);
+ vty_out(vty, "%% invalid SRES value '%s'%s",
+ sres_str, VTY_NEWLINE);
goto failed;
}
if (osmo_hexparse(rand_str, &at.rand[0], sizeof(at.rand)) < 0) {
- vty_out(vty, "%% invalid RAND value '%s'\n", rand_str);
+ vty_out(vty, "%% invalid RAND value '%s'%s",
+ rand_str, VTY_NEWLINE);
goto failed;
}
if (osmo_hexparse(kc_str, &at.kc[0], sizeof(at.kc)) < 0) {
- vty_out(vty, "%% invalid Kc value '%s'\n", kc_str);
+ vty_out(vty, "%% invalid Kc value '%s'%s",
+ kc_str, VTY_NEWLINE);
goto failed;
}
at.key_seq = cksn;
@@ -591,7 +597,8 @@ DEFUN(update_subscr_cancel, update_subscr_cancel_cmd,
subscr = gprs_subscr_get_by_imsi(imsi);
if (!subscr) {
- vty_out(vty, "%% no subscriber record for %s\n", imsi);
+ vty_out(vty, "%% no subscriber record for %s%s",
+ imsi, VTY_NEWLINE);
return CMD_WARNING;
}
@@ -610,8 +617,9 @@ DEFUN(update_subscr_commit, update_subscr_commit_cmd,
struct gsm_subscriber *subscr;
subscr = gprs_subscr_get_by_imsi(imsi);
- if (!subscr) {
- vty_out(vty, "%% unable to get subscriber record for %s\n", imsi);
+ if (subscr) {
+ vty_out(vty, "%% subscriber record already exists for %s%s",
+ imsi, VTY_NEWLINE);
return CMD_WARNING;
}
@@ -655,7 +663,8 @@ DEFUN(update_subscr_update_location_result, update_subscr_update_location_result
subscr = gprs_subscr_get_by_imsi(imsi);
if (!subscr) {
- vty_out(vty, "%% unable to get subscriber record for %s\n", imsi);
+ vty_out(vty, "%% unable to get subscriber record for %s%s",
+ imsi, VTY_NEWLINE);
return CMD_WARNING;
}
@@ -686,7 +695,8 @@ DEFUN(update_subscr_update_auth_info, update_subscr_update_auth_info_cmd,
subscr = gprs_subscr_get_by_imsi(imsi);
if (!subscr) {
- vty_out(vty, "%% unable to get subscriber record for %s\n", imsi);
+ vty_out(vty, "%% unable to get subscriber record for %s%s",
+ imsi, VTY_NEWLINE);
return CMD_WARNING;
}