diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-06-23 15:37:18 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-06-23 15:37:56 +0300 |
| commit | e2dabbc61e74358c3512a05f11a347dd31f016dc (patch) | |
| tree | 1a37a37fb1f3bc70e9c60725f41fb2ac120f60de /main/quagga/bgpd-route-selection-crash.patch | |
| parent | dab9ad4db7c6f53919079cda7c612c00bd68ba1a (diff) | |
| download | aports-e2dabbc61e74358c3512a05f11a347dd31f016dc.tar.bz2 aports-e2dabbc61e74358c3512a05f11a347dd31f016dc.tar.xz | |
main/quagga: fix bgpd patch, and disable handling of coredump signals
Diffstat (limited to 'main/quagga/bgpd-route-selection-crash.patch')
| -rw-r--r-- | main/quagga/bgpd-route-selection-crash.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/main/quagga/bgpd-route-selection-crash.patch b/main/quagga/bgpd-route-selection-crash.patch index 3f1797395e..473e4e564b 100644 --- a/main/quagga/bgpd-route-selection-crash.patch +++ b/main/quagga/bgpd-route-selection-crash.patch @@ -1,16 +1,16 @@ diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c -index 34ba1ab..ad8642e 100644 +index 34ba1ab..7ade22f 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c -@@ -348,9 +348,9 @@ bgp_info_cmp (struct bgp *bgp, struct bgp_info *new, struct bgp_info *exist, - *paths_eq = 0; - - /* 0. Null check. */ -- if (new == NULL) -+ if (new == NULL || new->peer->su_remote == NULL) +@@ -553,6 +553,11 @@ bgp_info_cmp (struct bgp *bgp, struct bgp_info *new, struct bgp_info *exist, return 0; -- if (exist == NULL) -+ if (exist == NULL || exist->peer->su_remote == NULL) - return 1; - newattr = new->attr; + /* 13. Neighbor address comparision. */ ++ if (new->peer->su_remote == NULL) ++ return 0; ++ if (exist->peer->su_remote == NULL) ++ return 1; ++ + ret = sockunion_cmp (new->peer->su_remote, exist->peer->su_remote); + + if (ret == 1) |