commit 57b36e58cb90b98bbe4fff9e695a5a03ab471e2f
author Vadim Yanitskiy <vyanitskiy@sysmocom.de> Fri Jul 21 00:51:48 2023 +0700
committer laforge <laforge@osmocom.org> Fri Jul 21 11:06:27 2023 +0000
tree e4ef9c338b2b1e8bf5d78a12ccd5a7d65e5a38e5
parent b265247171d1db63f45eda9f1306ddb089f3eec0

msc_vty: support spaces in short/long network name

Change-Id: If55c92669f06f0d038e8d90088a6bd76133055a2

src/libmsc/msc_vty.c

diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 2032135..70b3b6b 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -132,19 +132,23 @@
 
 DEFUN(cfg_net_name_short,
       cfg_net_name_short_cmd,
-      "short name NAME",
+      "short name .NAME",
       "Set the short GSM network name\n" NAME_CMD_STR NAME_STR)
 {
-	osmo_talloc_replace_string(gsmnet, &gsmnet->name_short, argv[0]);
+	if (gsmnet->name_short != NULL)
+		talloc_free(gsmnet->name_short);
+	gsmnet->name_short = argv_concat(argv, argc, 0);
 	return CMD_SUCCESS;
 }
 
 DEFUN(cfg_net_name_long,
       cfg_net_name_long_cmd,
-      "long name NAME",
+      "long name .NAME",
       "Set the long GSM network name\n" NAME_CMD_STR NAME_STR)
 {
-	osmo_talloc_replace_string(gsmnet, &gsmnet->name_long, argv[0]);
+	if (gsmnet->name_long != NULL)
+		talloc_free(gsmnet->name_long);
+	gsmnet->name_long = argv_concat(argv, argc, 0);
 	return CMD_SUCCESS;
 }
 

tests/test_nodes.vty

diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty
index b8f0310..a1c4435 100644
--- a/tests/test_nodes.vty
+++ b/tests/test_nodes.vty
@@ -16,8 +16,8 @@
 ...
   network country code <1-999>
   mobile network code <0-999>
-  short name NAME
-  long name NAME
+  short name .NAME
+  long name .NAME
   encryption a5 <0-4> [<0-4>] [<0-4>] [<0-4>] [<0-4>]
   encryption uea <0-2> [<0-2>] [<0-2>]
   authentication (optional|required)