[packages] quagga: Update to v0.99.20

[feed/routing.git] / patches / 140-holdtimer-set.patch

diff --git a/patches/140-holdtimer-set.patch b/patches/140-holdtimer-set.patch
index bfc95d5c1eae4c1c89e4572d2780af2a509c290e..eb85b40347166abdc2021d72769afb4d0442f49a 100644 (file)
--- a/patches/140-holdtimer-set.patch
+++ b/patches/140-holdtimer-set.patch
@@ -1,20 +1,18 @@
-diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
-index df37783..c4d5a61 100644
 --- a/bgpd/bgp_network.c
 +++ b/bgpd/bgp_network.c
-@@ -109,6 +109,7 @@ bgp_accept (struct thread *thread)
+@@ -193,8 +193,7 @@ bgp_accept (struct thread *thread)
      peer->fd = bgp_sock;
      peer->status = Active;
      peer->local_id = peer1->local_id;
+-    peer->v_holdtime = peer1->v_holdtime;
+-    peer->v_keepalive = peer1->v_keepalive;
 +    peer->v_holdtime = BGP_LARGE_HOLDTIME;
  
      /* Make peer's address string. */
      sockunion2str (&su, buf, SU_ADDRSTRLEN);
-diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
-index 4137baf..8615ac8 100644
 --- a/bgpd/bgpd.h
 +++ b/bgpd/bgpd.h
-@@ -656,6 +656,7 @@ struct bgp_nlri
+@@ -712,6 +712,7 @@ struct bgp_nlri
  /* BGP timers default value.  */
  #define BGP_INIT_START_TIMER                     5
  #define BGP_ERROR_START_TIMER                   30