diff options
| author | paul <paul> | 2003-04-19 15:49:49 +0000 |
|---|---|---|
| committer | paul <paul> | 2003-04-19 15:49:49 +0000 |
| commit | 73ffb25bec41d729b0dac34d17b6ccd4aa25803b (patch) | |
| tree | 69906ad70c8dd767c51677480f8034a3be3f5edd /vtysh | |
| parent | 147193a28a19f2f98545b14ad38935423415f53e (diff) | |
Hasso Tepper
http://hasso.linux.ee/zebra/ht-routemap-18042003_5.patch
Trivial fixes to sync daemon's route-map commands to have same syntax. Fixes
a lot of errors with "match ..." and "set ..." commands when using vtysh.
Diffstat (limited to 'vtysh')
| -rwxr-xr-x | vtysh/extract.pl | 2 | ||||
| -rw-r--r-- | vtysh/vtysh.c | 18 | ||||
| -rw-r--r-- | vtysh/vtysh.h | 2 |
3 files changed, 2 insertions, 20 deletions
diff --git a/vtysh/extract.pl b/vtysh/extract.pl index 5d29f8ab..91c817b4 100755 --- a/vtysh/extract.pl +++ b/vtysh/extract.pl @@ -85,7 +85,7 @@ foreach (@ARGV) { $protocol = "VTYSH_RIPD"; } if ($file =~ /routemap.c/) { - $protocol = "VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD"; + $protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD"; } if ($file =~ /filter.c/) { if ($defun_array[1] =~ m/ipv6/) { diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 78830055..a3b21c7b 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1174,21 +1174,6 @@ DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD, NO_STR "Interface specific description\n") -DEFSH (VTYSH_RIPD|VTYSH_BGPD, - set_ip_nexthop_cmd, - "set ip next-hop A.B.C.D", - SET_STR - IP_STR - "Next hop address\n" - "IP address of next hop\n") - -DEFSH (VTYSH_RMAP, - set_metric_cmd, - "set metric <0-4294967295>", - SET_STR - "Metric value for destination routing protocol\n" - "Metric value\n") - DEFUNSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD|VTYSH_OSPF6D, vtysh_exit_interface, vtysh_exit_interface_cmd, @@ -1909,9 +1894,6 @@ vtysh_init_vty () install_element (ENABLE_NODE, &vtysh_start_bash_cmd); install_element (ENABLE_NODE, &vtysh_start_zsh_cmd); - install_element (RMAP_NODE, &set_metric_cmd); - install_element (RMAP_NODE, &set_ip_nexthop_cmd); - install_element (CONFIG_NODE, &vtysh_log_stdout_cmd); install_element (CONFIG_NODE, &no_vtysh_log_stdout_cmd); install_element (CONFIG_NODE, &vtysh_log_file_cmd); diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h index 5527d0da..08184df9 100644 --- a/vtysh/vtysh.h +++ b/vtysh/vtysh.h @@ -29,7 +29,7 @@ #define VTYSH_OSPF6D 0x10 #define VTYSH_BGPD 0x20 #define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD -#define VTYSH_RMAP VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD +#define VTYSH_RMAP VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD #define VTYSH_INDEX_ZEBRA 0 #define VTYSH_INDEX_RIP 1 |