diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2007-05-02 16:05:35 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@sun.com> | 2007-05-02 16:05:35 +0000 |
| commit | 7514fb7739f74311830e9ddd1381d0d228224f61 (patch) | |
| tree | 4d4b9a4fdfcea4cb6fa496085327f1aae9a9a380 /vtysh | |
| parent | 5fa05099567bbe42aae87a9bef8fd630b3666a4d (diff) | |
[zebra] Routemap support on received routes, with 'set src' command (linux)
2007-05-01 David L Stevens <dlstevens@us.ibm.com>
* (general) These changes collectively add route-map and
prefix-list support to zebra and fix a bug in "show
route-map" (with no argument).
* doc/main.texi: added route-map, prefix-list, ip protocol
and set src documentation
* lib/command.h: added PROTOCOL_NODE type
* lib/log.c: (proto_name2num) new function, protocol name to
number translation.
* lib/routemap.c: (vty_show_route_map) fixed "show route-map"
without route-map name
* lib/routemap.h: added RMAP_ZEBRA type
* lib/zebra.h: added proto_name2num() prototype
* vtysh/extract.pl.in: added VTYSH_ZEBRA flag for route-map and
plist
* vtysh/Makefile.am: added zebra_routemap.c
* vtysh/vtysh.h: added VTYSH_ZEBRA flag to VTYSH_RMAP
* zebra/connected.c: (connected_up_ipv4) added src preference argument
to rib_add_ipv4()
* zebra/kernel_socket.c: (rtm_read) ditto
* zebra/main.c: added prefix list initialization
* zebra/Makefile.am: added zebra_routemap.c source file
* zebra/rib.h: added generic address union "g_addr" and use in
existing places that had an explicit union.
Added "src" to struct nexthop.
Added preferred src arg to nexthop_ipv4_add and rib_add_ipv4.
* zebra/rt_netlink.c: (netlink_routing_table) set preferred source on
netlink messages.
(netlink_route_change) ditto
(netlink_route_multipath) ditto.
* zebra/rtread_getmsg.c: (handle_route_entry) added (NULL) src to
rib_add_ipv4() call.
* zebra/rtread_proc.c: (proc_route_read) ditto
* zebra/zebra_rib.c: (nexthop_ipv4_add) add src argument.
(nexthop_ipv4_ifindex_add) ditto
(rib_add_ipv4) ditto
(nexthop_active_check) Add route-map processing.
* zebra/zebra_routemap.c: new file for zebra route-map commands.
* zebra/zebra_vty.c: (ip_protocol_cmd) Apply route-map to protocol
(vty_show_ip_route_detail) added "src" printing
(vty_show_ip_route) ditto
(show_ip_protocol_cmd) new command, list routemaps.
(config_write_protocol) write out routemap protocl config.
(zebra_vty_init) Install the new routemap protocol commands.
* zebra/zserv.c: (zread_ipv4_add) added (NULL) src arg
(zebra_init) init zebra route-maps.
* zebra/zserv.h: add zebra_route_map_init
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/ChangeLog | 7 | ||||
| -rwxr-xr-x | vtysh/extract.pl.in | 6 | ||||
| -rw-r--r-- | vtysh/vtysh.h | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog index 4ca5df94..a582b959 100644 --- a/vtysh/ChangeLog +++ b/vtysh/ChangeLog @@ -1,3 +1,10 @@ +2007-05-01 David L Stevens <dlstevens@us.ibm.com> + + * vtysh/extract.pl.in: added VTYSH_ZEBRA flag for route-map and + plist + * vtysh/Makefile.am: added zebra_routemap.c + * vtysh/vtysh.h: added VTYSH_ZEBRA flag to VTYSH_RMAP + 2007-04-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu> * vtysh.c: (vtysh_log_timestamp_precision, diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in index 98a9ddde..723fe8d6 100755 --- a/vtysh/extract.pl.in +++ b/vtysh/extract.pl.in @@ -94,16 +94,16 @@ foreach (@ARGV) { $protocol = "VTYSH_RIPD"; } if ($file =~ /routemap.c/) { - $protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD"; + $protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA"; } if ($file =~ /filter.c/) { $protocol = "VTYSH_ALL"; } if ($file =~ /plist.c/) { if ($defun_array[1] =~ m/ipv6/) { - $protocol = "VTYSH_RIPNGD|VTYSH_OSPF6D|VTYSH_BGPD"; + $protocol = "VTYSH_RIPNGD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA"; } else { - $protocol = "VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD"; + $protocol = "VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD|VTYSH_ZEBRA"; } } if ($file =~ /distribute.c/) { diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h index dd2bcbd0..3ed0dd32 100644 --- a/vtysh/vtysh.h +++ b/vtysh/vtysh.h @@ -30,7 +30,7 @@ #define VTYSH_BGPD 0x20 #define VTYSH_ISISD 0x40 #define VTYSH_ALL VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD -#define VTYSH_RMAP VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD +#define VTYSH_RMAP VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD #define VTYSH_INTERFACE VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD /* vtysh local configuration file. */ |