Merge pull request #238 from ecsv/batman-adv-2016.4

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

diff --git a/quagga/patches/140-holdtimer-set.patch b/quagga/patches/140-holdtimer-set.patch
index b699775273d88934f9180b8a8d6adb9ce59d3b2f..6d1c1ea95b239b960e96adac7cad86ad1cc08c3f 100644 (file)
--- a/quagga/patches/140-holdtimer-set.patch
+++ b/quagga/patches/140-holdtimer-set.patch
@@ -1,6 +1,6 @@
 --- a/bgpd/bgp_network.c
 +++ b/bgpd/bgp_network.c
-@@ -193,8 +193,7 @@ bgp_accept (struct thread *thread)
+@@ -257,8 +257,7 @@ bgp_accept (struct thread *thread)
      peer->fd = bgp_sock;
      peer->status = Active;
      peer->local_id = peer1->local_id;
@@ -12,11 +12,11 @@
      sockunion2str (&su, buf, SU_ADDRSTRLEN);
 --- a/bgpd/bgpd.h
 +++ b/bgpd/bgpd.h
-@@ -732,6 +732,7 @@ struct bgp_nlri
+@@ -752,6 +752,7 @@ struct bgp_nlri
+ 
  /* BGP timers default value.  */
- #define BGP_INIT_START_TIMER                     5
- #define BGP_ERROR_START_TIMER                   30
+ #define BGP_INIT_START_TIMER                     1
 +#define BGP_LARGE_HOLDTIME                     240
  #define BGP_DEFAULT_HOLDTIME                   180
  #define BGP_DEFAULT_KEEPALIVE                   60 
- #define BGP_DEFAULT_ASORIGINATE                 15
+ #define BGP_DEFAULT_EBGP_ROUTEADV               30