commit 538621f2f80ced838048fa7402e57face3b224a5
author hasso <hasso> Fri May 21 09:31:30 2004 +0000
committer hasso <hasso> Fri May 21 09:31:30 2004 +0000
tree 1193f5948da15db665aa6d4a43027c466c0614b4
parent 3950fda506e4db58a0ccc50156cf70f97da95bc3

Merge graceful restart capability display and some small fixes from Zebra
repository by Rivo Nurges.

bgpd/bgpd.c

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 510e296..47df3c8 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -515,7 +515,6 @@
   if (! bgp)
     return -1;
 
-  bgp_config_set (bgp, BGP_CONFIG_DEFAULT_LOCAL_PREF);
   bgp->default_local_pref = local_pref;
 
   return 0;
@@ -527,7 +526,6 @@
   if (! bgp)
     return -1;
 
-  bgp_config_unset (bgp, BGP_CONFIG_DEFAULT_LOCAL_PREF);
   bgp->default_local_pref = BGP_DEFAULT_LOCAL_PREF;
 
   return 0;
@@ -1685,6 +1683,8 @@
   bgp->default_local_pref = BGP_DEFAULT_LOCAL_PREF;
   bgp->default_holdtime = BGP_DEFAULT_HOLDTIME;
   bgp->default_keepalive = BGP_DEFAULT_KEEPALIVE;
+  bgp->restart_time = BGP_DEFAULT_RESTART_TIME;
+  bgp->stalepath_time = BGP_DEFAULT_STALEPATH_TIME;
 
   bgp->as = *as;
 
@@ -4612,7 +4612,11 @@
       /* BGP deterministic-med. */
       if (bgp_flag_check (bgp, BGP_FLAG_DETERMINISTIC_MED))
 	vty_out (vty, " bgp deterministic-med%s", VTY_NEWLINE);
-      
+
+      /* BGP graceful-restart. */
+      if (bgp_flag_check (bgp, BGP_FLAG_GRACEFUL_RESTART))
+       vty_out (vty, " bgp graceful-restart%s", VTY_NEWLINE);
+
       /* BGP bestpath method. */
       if (bgp_flag_check (bgp, BGP_FLAG_ASPATH_IGNORE))
 	vty_out (vty, " bgp bestpath as-path ignore%s", VTY_NEWLINE);