diff options
| author | Quentin Young <qlyoung@users.noreply.github.com> | 2017-01-07 01:44:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-07 01:44:46 +0100 |
| commit | b84aadae447e1d5e534d2d46e3922f47c316d107 (patch) | |
| tree | aba0baabd2a34ec52b5f8a37db92bec576d53e4a /ripngd/ripng_zebra.c | |
| parent | all: use ->text when parsing protocol argument (diff) | |
| parent | Merge pull request #32 from qlyoung/fix-cli-nits2 (diff) | |
| download | frr-b84aadae447e1d5e534d2d46e3922f47c316d107.tar.xz frr-b84aadae447e1d5e534d2d46e3922f47c316d107.zip | |
Merge branch 'master' into fix-proto_redistnum
Diffstat (limited to 'ripngd/ripng_zebra.c')
| -rw-r--r-- | ripngd/ripng_zebra.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index 7daa3a887..bb8fed3e9 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -317,7 +317,7 @@ DEFUN (ripng_redistribute_type, ripng_redistribute_type_cmd, "redistribute <kernel|connected|static|ospf6|isis|bgp|table>", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD) + FRR_REDIST_HELP_STR_RIPNGD) { int type; @@ -339,7 +339,7 @@ DEFUN (no_ripng_redistribute_type, "no redistribute <kernel|connected|static|ospf6|isis|bgp|table> [metric (0-16)] [route-map WORD]", NO_STR "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Metric\n" "Metric value\n" "Route map reference\n" @@ -366,7 +366,7 @@ DEFUN (ripng_redistribute_type_metric, ripng_redistribute_type_metric_cmd, "redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16)", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Metric\n" "Metric value\n") { @@ -390,12 +390,11 @@ DEFUN (ripng_redistribute_type_metric, return CMD_SUCCESS; } - DEFUN (ripng_redistribute_type_routemap, ripng_redistribute_type_routemap_cmd, "redistribute <kernel|connected|static|ospf6|isis|bgp|table> route-map WORD", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Route map reference\n" "Pointer to route-map entries\n") { @@ -417,12 +416,11 @@ DEFUN (ripng_redistribute_type_routemap, return CMD_SUCCESS; } - DEFUN (ripng_redistribute_type_metric_routemap, ripng_redistribute_type_metric_routemap_cmd, "redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16) route-map WORD", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_RIPNGD + FRR_REDIST_HELP_STR_RIPNGD "Metric\n" "Metric value\n" "Route map reference\n" @@ -449,7 +447,6 @@ DEFUN (ripng_redistribute_type_metric_routemap, return CMD_SUCCESS; } - void ripng_redistribute_write (struct vty *vty, int config_mode) { |