+++ /dev/null
-diff -urN quagga-0.99.11/vtysh/vtysh_main.c.orig quagga-0.99.11/vtysh/vtysh_main.c
---- quagga-0.99.11/vtysh/vtysh_main.c.orig 2008-08-14 16:43:42.000000000 +0200
-+++ quagga-0.99.11/vtysh/vtysh_main.c 2009-04-10 01:53:47.000000000 +0200
-@@ -42,6 +42,7 @@
-
- /* Configuration file name and directory. */
- char config_default[] = SYSCONFDIR VTYSH_DEFAULT_CONFIG;
-+char history_file[MAXPATHLEN];
-
- /* Flag for indicate executing child command. */
- int execute_flag = 0;
-@@ -184,8 +185,10 @@
- {
- using_history();
- last = previous_history();
-- if (!last || strcmp (last->line, line_read) != 0)
-+ if (!last || strcmp (last->line, line_read) != 0) {
- add_history (line_read);
-+ append_history(1,history_file);
-+ }
- }
-
- return (line_read);
-@@ -348,10 +351,13 @@
- sigsetjmp (jmpbuf, 1);
- jmpflag = 1;
-
-+ snprintf(history_file, sizeof(history_file), "%s/.history_quagga", getenv("HOME"));
-+ read_history(history_file);
- /* Main command loop. */
- while (vtysh_rl_gets ())
- vtysh_execute (line_read);
-
-+ history_truncate_file(history_file,1000);
- printf ("\n");
-
- /* Rest in peace. */
+++ /dev/null
-diff -urN quagga-0.99.11.orig/bgpd/bgp_route.c quagga-0.99.11/bgpd/bgp_route.c
---- quagga-0.99.11.orig/bgpd/bgp_route.c 2008-10-02 10:28:50.000000000 +0200
-+++ quagga-0.99.11/bgpd/bgp_route.c 2009-04-08 01:19:30.000000000 +0200
-@@ -9658,12 +9682,14 @@
- return CMD_SUCCESS;
- }
-
--DEFUN (show_ip_bgp_neighbor_advertised_route,
-- show_ip_bgp_neighbor_advertised_route_cmd,
-- "show ip bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes",
-+DEFUN (show_ip_bgp_view_neighbor_advertised_route,
-+ show_ip_bgp_view_neighbor_advertised_route_cmd,
-+ "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X) advertised-routes",
- SHOW_STR
- IP_STR
- BGP_STR
-+ "BGP view\n"
-+ "View name\n"
- "Detailed information on TCP and BGP neighbor connections\n"
- "Neighbor to display information about\n"
- "Neighbor to display information about\n"
-@@ -9671,13 +9697,28 @@
- {
- struct peer *peer;
-
-- peer = peer_lookup_in_view (vty, NULL, argv[0]);
-+ if (argc == 2)
-+ peer = peer_lookup_in_view (vty, argv[0], argv[1]);
-+ else
-+ peer = peer_lookup_in_view (vty, NULL, argv[0]);
-+
- if (! peer)
- return CMD_WARNING;
-
- return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 0);
- }
-
-+ALIAS (show_ip_bgp_view_neighbor_advertised_route,
-+ show_ip_bgp_neighbor_advertised_route_cmd,
-+ "show ip bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes",
-+ SHOW_STR
-+ IP_STR
-+ BGP_STR
-+ "Detailed information on TCP and BGP neighbor connections\n"
-+ "Neighbor to display information about\n"
-+ "Neighbor to display information about\n"
-+ "Display the routes advertised to a BGP neighbor\n")
-+
- DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route,
- show_ip_bgp_ipv4_neighbor_advertised_route_cmd,
- "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) advertised-routes",
-@@ -9836,12 +9889,14 @@
- }
- #endif /* HAVE_IPV6 */
- \f
--DEFUN (show_ip_bgp_neighbor_received_routes,
-- show_ip_bgp_neighbor_received_routes_cmd,
-- "show ip bgp neighbors (A.B.C.D|X:X::X:X) received-routes",
-+DEFUN (show_ip_bgp_view_neighbor_received_routes,
-+ show_ip_bgp_view_neighbor_received_routes_cmd,
-+ "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X) received-routes",
- SHOW_STR
- IP_STR
- BGP_STR
-+ "BGP view\n"
-+ "View name\n"
- "Detailed information on TCP and BGP neighbor connections\n"
- "Neighbor to display information about\n"
- "Neighbor to display information about\n"
-@@ -9849,13 +9904,28 @@
- {
- struct peer *peer;
-
-- peer = peer_lookup_in_view (vty, NULL, argv[0]);
-+ if (argc == 2)
-+ peer = peer_lookup_in_view (vty, argv[0], argv[1]);
-+ else
-+ peer = peer_lookup_in_view (vty, NULL, argv[0]);
-+
- if (! peer)
- return CMD_WARNING;
-
- return peer_adj_routes (vty, peer, AFI_IP, SAFI_UNICAST, 1);
- }
-
-+ALIAS (show_ip_bgp_view_neighbor_received_routes,
-+ show_ip_bgp_neighbor_received_routes_cmd,
-+ "show ip bgp neighbors (A.B.C.D|X:X::X:X) received-routes",
-+ SHOW_STR
-+ IP_STR
-+ BGP_STR
-+ "Detailed information on TCP and BGP neighbor connections\n"
-+ "Neighbor to display information about\n"
-+ "Neighbor to display information about\n"
-+ "Display the received routes from neighbor\n")
-+
- DEFUN (show_ip_bgp_ipv4_neighbor_received_routes,
- show_ip_bgp_ipv4_neighbor_received_routes_cmd,
- "show ip bgp ipv4 (unicast|multicast) neighbors (A.B.C.D|X:X::X:X) received-routes",
-@@ -11784,6 +11896,8 @@
- install_element (VIEW_NODE, &show_ip_bgp_rsclient_cmd);
- install_element (VIEW_NODE, &show_ip_bgp_rsclient_route_cmd);
- install_element (VIEW_NODE, &show_ip_bgp_rsclient_prefix_cmd);
-+ install_element (VIEW_NODE, &show_ip_bgp_view_neighbor_advertised_route_cmd);
-+ install_element (VIEW_NODE, &show_ip_bgp_view_neighbor_received_routes_cmd);
- install_element (VIEW_NODE, &show_ip_bgp_view_rsclient_cmd);
- install_element (VIEW_NODE, &show_ip_bgp_view_rsclient_route_cmd);
- install_element (VIEW_NODE, &show_ip_bgp_view_rsclient_prefix_cmd);
-@@ -11889,6 +12003,8 @@
- install_element (ENABLE_NODE, &show_ip_bgp_rsclient_cmd);
- install_element (ENABLE_NODE, &show_ip_bgp_rsclient_route_cmd);
- install_element (ENABLE_NODE, &show_ip_bgp_rsclient_prefix_cmd);
-+ install_element (ENABLE_NODE, &show_ip_bgp_view_neighbor_advertised_route_cmd);
-+ install_element (ENABLE_NODE, &show_ip_bgp_view_neighbor_received_routes_cmd);
- install_element (ENABLE_NODE, &show_ip_bgp_view_rsclient_cmd);
- install_element (ENABLE_NODE, &show_ip_bgp_view_rsclient_route_cmd);
- install_element (ENABLE_NODE, &show_ip_bgp_view_rsclient_prefix_cmd);