aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-10-29 14:49:25 +0100
committerOliver Smith <osmith@sysmocom.de>2019-10-29 15:09:36 +0100
commitd4b4edd316df5918f0c04360f05d01e230895e7d (patch)
tree0a2673e0cb8f2331fecc102f7fbbc1930d966b74
parent69e00ccd6ff3a19b771070b78ed3d85dd219799f (diff)
gprs_ns_vty: return success for disabled FR/GRE
Do not return a warning and therefore fail parsing the config when the "encapsulation framerelay-gre local-ip" command is used and FR/GRE is disabled. Having this in the config does no harm and allows keeping the same config if it is enabled later. This fixes the currently failing vty tests for osmo-sgsn. Fixes: a0c8195ad37292ab800a6c777fc28383995b4b64 ("vty: Return error if cmd returns CMD_WARNING while reading cfg file") Change-Id: Ic225232fbfca49ba868427eaf898e1f6e34e1ca8
-rw-r--r--src/gb/gprs_ns_vty.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gb/gprs_ns_vty.c b/src/gb/gprs_ns_vty.c
index 4a904368..9cffb71d 100644
--- a/src/gb/gprs_ns_vty.c
+++ b/src/gb/gprs_ns_vty.c
@@ -508,10 +508,6 @@ DEFUN(cfg_frgre_local_ip, cfg_frgre_local_ip_cmd,
{
struct in_addr ia;
- if (!vty_nsi->frgre.enabled) {
- vty_out(vty, "FR/GRE is not enabled%s", VTY_NEWLINE);
- return CMD_WARNING;
- }
inet_aton(argv[0], &ia);
vty_nsi->frgre.local_ip = osmo_ntohl(ia.s_addr);