proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-19 09:57:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

babeld: change the modify route system.

Browse Source 
Zebra doesn't set errno to EEXIST if we add a route who was already in
the kernel, so we always returned after just doing "add; delete". This
patch fix the problem by doing "delete; add" always.
This commit is contained in:
Matthieu Boutier 2012-01-20 15:32:16 +01:00 committed by Paul Jakma
parent 6dfeb3f6cf
commit ec8d8d5ba6
1 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
babeld/kernel_zebra.c
View File

@ -142,26 +142,7 @@ kernel_route(int operation, const unsigned char *pref, unsigned short plen,
if(newmetric == metric && memcmp(newgate, gate, 16) == 0 &&
newifindex == ifindex)
return 0;
/* It is better to add the new route before removing the old
one, to avoid losing packets. However, if the old and new
priorities are equal, this only works if the kernel supports
ECMP. So we first try the "right" order, and fall back on
the "wrong" order if it fails with EEXIST. */
rc = ipv4 ?
kernel_route_add_v4(pref, plen,
newgate, newifindex, newmetric,
NULL, 0, 0):
kernel_route_add_v6(pref, plen,
newgate, newifindex, newmetric,
NULL, 0, 0);
if(rc < 0) {
if(errno != EEXIST)
return rc;
added = 0;
} else {
added = 1;
}
debugf(BABEL_DEBUG_ROUTE, "Modify route: delete old; add new.");
if (ipv4) {
kernel_route_delete_v4(pref, plen,
gate, ifindex, metric,
@ -172,21 +153,19 @@ kernel_route(int operation, const unsigned char *pref, unsigned short plen,
NULL, 0, 0);
}
if(!added) {
rc = ipv4 ?
kernel_route_add_v4(pref, plen,
newgate, newifindex, newmetric,
NULL, 0, 0):
kernel_route_add_v6(pref, plen,
newgate, newifindex, newmetric,
NULL, 0, 0);
if(rc < 0) {
if(errno == EEXIST)
rc = 1;
/* In principle, we should try to re-install the flushed
route on failure to preserve. However, this should
hopefully not matter much in practice. */
}
rc = ipv4 ?
kernel_route_add_v4(pref, plen,
newgate, newifindex, newmetric,
NULL, 0, 0):
kernel_route_add_v6(pref, plen,
newgate, newifindex, newmetric,
NULL, 0, 0);
if(rc < 0) {
if(errno == EEXIST)
rc = 1;
/* In principle, we should try to re-install the flushed
route on failure to preserve. However, this should
hopefully not matter much in practice. */
}
return rc;