diff options
| author | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-26 12:36:23 +0000 |
|---|---|---|
| committer | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-26 12:36:23 +0000 |
| commit | 32c8ca47a58e56bdaf59200ef2cd3f917a804dc7 (patch) | |
| tree | de6799b757f3550a8142bce55479f962bcd6bb02 /package | |
| parent | 8436680884ad31001d12f022e737fc40cde7d43f (diff) | |
Oops, wrong path for the two previous commits
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17013 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/openwrt-packages/net/quagga-unstable/patches/130-confed_aspath_delete_on_prepend.patch | 13 | ||||
| -rw-r--r-- | package/openwrt-packages/net/quagga-unstable/patches/140-holdtimer-set.patch | 22 |
2 files changed, 0 insertions, 35 deletions
diff --git a/package/openwrt-packages/net/quagga-unstable/patches/130-confed_aspath_delete_on_prepend.patch b/package/openwrt-packages/net/quagga-unstable/patches/130-confed_aspath_delete_on_prepend.patch deleted file mode 100644 index 3970b13d91..0000000000 --- a/package/openwrt-packages/net/quagga-unstable/patches/130-confed_aspath_delete_on_prepend.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/bgpd/bgp_aspath.c -+++ b/bgpd/bgp_aspath.c -@@ -1208,6 +1208,10 @@ aspath_prepend (struct aspath *as1, stru - while (seg1 && seg1->next) - seg1 = seg1->next; - -+ /* Delete any AS_CONFED_SEQUENCE segment from as2. */ -+ if (seg1->type == AS_SEQUENCE && seg2->type == AS_CONFED_SEQUENCE) -+ as2 = aspath_delete_confed_seq (as2); -+ - /* Compare last segment type of as1 and first segment type of as2. */ - if (seg1->type != seg2->type) - return aspath_merge (as1, as2); diff --git a/package/openwrt-packages/net/quagga-unstable/patches/140-holdtimer-set.patch b/package/openwrt-packages/net/quagga-unstable/patches/140-holdtimer-set.patch deleted file mode 100644 index 1895f548f6..0000000000 --- a/package/openwrt-packages/net/quagga-unstable/patches/140-holdtimer-set.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/bgpd/bgp_network.c -+++ b/bgpd/bgp_network.c -@@ -185,8 +185,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 -@@ -709,6 +709,7 @@ struct bgp_nlri - /* BGP timers default value. */ - #define BGP_INIT_START_TIMER 5 - #define BGP_ERROR_START_TIMER 30 -+#define BGP_LARGE_HOLDTIME 240 - #define BGP_DEFAULT_HOLDTIME 180 - #define BGP_DEFAULT_KEEPALIVE 60 - #define BGP_DEFAULT_ASORIGINATE 15 |