[packages] quagga{,-unstable}: Merge quagga-unstable package with quagga package

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

diff --git a/patches/140-holdtimer-set.patch b/patches/140-holdtimer-set.patch
index 1264f5b727be904c9eed5904487a5532d12ac6b5..8642bbfc665c0ebeef5f64152a46d54b4bb926b9 100644 (file)
--- a/patches/140-holdtimer-set.patch
+++ b/patches/140-holdtimer-set.patch
@@ -1,16 +1,18 @@
 --- a/bgpd/bgp_network.c
 +++ b/bgpd/bgp_network.c
-@@ -109,6 +109,7 @@ bgp_accept (struct thread *thread)
+@@ -188,8 +188,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);
 --- a/bgpd/bgpd.h
 +++ b/bgpd/bgpd.h
-@@ -656,6 +656,7 @@ struct bgp_nlri
+@@ -709,6 +709,7 @@ struct bgp_nlri
  /* BGP timers default value.  */
  #define BGP_INIT_START_TIMER                     5
  #define BGP_ERROR_START_TIMER                   30