Merge pull request #995 from marek22k/master
[feed/routing.git] / quagga / patches / 140-holdtimer-set.patch
1 --- a/bgpd/bgp_network.c
2 +++ b/bgpd/bgp_network.c
3 @@ -255,8 +255,7 @@ bgp_accept (struct thread *thread)
4
5 /* Config state that should affect OPEN packet must be copied over */
6 peer->local_id = peer1->local_id;
7 - peer->v_holdtime = peer1->v_holdtime;
8 - peer->v_keepalive = peer1->v_keepalive;
9 + peer->v_holdtime = BGP_LARGE_HOLDTIME;
10 peer->local_as = peer1->local_as;
11 peer->change_local_as = peer1->change_local_as;
12 peer->flags = peer1->flags;
13 --- a/bgpd/bgpd.h
14 +++ b/bgpd/bgpd.h
15 @@ -754,6 +754,7 @@ struct bgp_nlri
16
17 /* BGP timers default value. */
18 #define BGP_INIT_START_TIMER 1
19 +#define BGP_LARGE_HOLDTIME 240
20 #define BGP_DEFAULT_HOLDTIME 180
21 #define BGP_DEFAULT_KEEPALIVE 60
22 #define BGP_DEFAULT_EBGP_ROUTEADV 3