aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <vyanitskiy@sysmocom.de>2023-07-21 00:51:48 +0700
committerlaforge <laforge@osmocom.org>2023-07-21 11:06:27 +0000
commit57b36e58cb90b98bbe4fff9e695a5a03ab471e2f (patch)
treee4ef9c338b2b1e8bf5d78a12ccd5a7d65e5a38e5
parentb265247171d1db63f45eda9f1306ddb089f3eec0 (diff)
msc_vty: support spaces in short/long network name
-rw-r--r--src/libmsc/msc_vty.c12
-rw-r--r--tests/test_nodes.vty4
2 files changed, 10 insertions, 6 deletions
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 20321356f..70b3b6bb1 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -132,19 +132,23 @@ DEFUN(cfg_net_mnc,
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;
}
diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty
index b8f031089..a1c443589 100644
--- a/tests/test_nodes.vty
+++ b/tests/test_nodes.vty
@@ -16,8 +16,8 @@ OsmoMSC(config-net)# list
...
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)