diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
| commit | 2d8270596a085e7a815cebaea21e17cba9e26111 (patch) | |
| tree | f9a559f654e7d704ecacc9dadedbe01868615610 /babeld | |
| parent | *: remove VTYNL, part 6 of 6 (diff) | |
| parent | Merge pull request #815 from dwalton76/CMD_WARNING_take2 (diff) | |
| download | frr-2d8270596a085e7a815cebaea21e17cba9e26111.tar.xz frr-2d8270596a085e7a815cebaea21e17cba9e26111.zip | |
Merge remote-tracking branch 'frr/master' into newline-redux
Lots of conflicts from CMD_WARNING_CONFIG_FAILED...
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'babeld')
| -rw-r--r-- | babeld/babel_interface.c | 4 | ||||
| -rw-r--r-- | babeld/babel_zebra.c | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c index 831df9b68..1ae33b3a2 100644 --- a/babeld/babel_interface.c +++ b/babeld/babel_interface.c @@ -292,7 +292,7 @@ DEFUN (babel_network, if (ret < 0) { vty_out (vty, "There is same network configuration %s\n", argv[1]->arg); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } return CMD_SUCCESS; @@ -319,7 +319,7 @@ DEFUN (no_babel_network, if (ret < 0) { vty_out (vty, "can't find network %s\n",argv[2]->arg); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } return CMD_SUCCESS; diff --git a/babeld/babel_zebra.c b/babeld/babel_zebra.c index a41908285..52d7eaee8 100644 --- a/babeld/babel_zebra.c +++ b/babeld/babel_zebra.c @@ -223,10 +223,11 @@ DEFUN (babel_redistribute_type, if (type < 0) { vty_out (vty, "Invalid type %s\n", argv[1]->arg); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP, type, 0, VRF_DEFAULT); + zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0, VRF_DEFAULT); return CMD_SUCCESS; } @@ -244,10 +245,11 @@ DEFUN (no_babel_redistribute_type, if (type < 0) { vty_out (vty, "Invalid type %s\n", argv[2]->arg); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } zclient_redistribute (ZEBRA_REDISTRIBUTE_DELETE, zclient, AFI_IP, type, 0, VRF_DEFAULT); + zclient_redistribute (ZEBRA_REDISTRIBUTE_DELETE, zclient, AFI_IP6, type, 0, VRF_DEFAULT); /* perhaps should we remove xroutes having the same type... */ return CMD_SUCCESS; } @@ -279,7 +281,7 @@ DEFUN (debug_babel, vty_out (vty, "Invalid type %s\n", argv[2]->arg); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } /* [Babel Command] */ @@ -309,7 +311,7 @@ DEFUN (no_debug_babel, vty_out (vty, "Invalid type %s\n", argv[3]->arg); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } #endif /* NO_DEBUG */ |