diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
| commit | b58ed1f8a89ea32c2380bf79057e5333109d72d4 (patch) | |
| tree | a9ead45b8895edce92ab69621a52816b45725e36 /ripngd/ripng_zebra.c | |
| parent | 01cb1466423363a2f8b42246464feb3858df1c9f (diff) | |
| parent | 5551c072e187c76c3d6a885cd043d6db811bab23 (diff) | |
Merge remote-tracking branch 'origin/master' into pim_lib_work2
Diffstat (limited to 'ripngd/ripng_zebra.c')
| -rw-r--r-- | ripngd/ripng_zebra.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index 09472683d7..bb8fed3e93 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -317,15 +317,16 @@ 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; - type = proto_redistnum(AFI_IP6, argv[2]->arg); + char *proto = argv[argc - 1]->text; + type = proto_redistnum(AFI_IP6, proto); if (type < 0) { - vty_out(vty, "Invalid type %s%s", argv[2]->arg, VTY_NEWLINE); + vty_out(vty, "Invalid type %s%s", proto, VTY_NEWLINE); return CMD_WARNING; } @@ -338,18 +339,20 @@ 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" "Pointer to route-map entries\n") { int type; - type = proto_redistnum(AFI_IP6, argv[2]->text); + + char *proto = argv[2]->text; + type = proto_redistnum(AFI_IP6, proto); if (type < 0) { - vty_out(vty, "Invalid type %s%s", argv[2]->text, VTY_NEWLINE); + vty_out(vty, "Invalid type %s%s", proto, VTY_NEWLINE); return CMD_WARNING; } @@ -363,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") { @@ -387,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") { @@ -414,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" @@ -446,7 +447,6 @@ DEFUN (ripng_redistribute_type_metric_routemap, return CMD_SUCCESS; } - void ripng_redistribute_write (struct vty *vty, int config_mode) { |