commit 15cc8c812553e60422ce1917ba8e4230d7eab0b4
author Jacob Erlbeck <jerlbeck@sysmocom.de> Mon Jan 19 14:29:43 2015 +0100
committer Holger Hans Peter Freyther <holger@moiji-mobile.com> Tue Jan 20 16:13:55 2015 +0100
tree fedb782cb0610caa929de77552c19345e5781489
parent d6267d12d8bd945f219b3d2f7bf04060fe2d83bd

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

openbsc/src/gprs/sgsn_vty.c

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 @@
 		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 @@
 
 	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 @@
 
 	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 @@
 
 	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 @@
 	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 @@
 
 	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 @@
 
 	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;
 	}