proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 10:49:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

babeld: We do not need to put Warning into our warning messages

Browse Source 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-03-10 10:09:38 -05:00 committed by David Lamparter
parent 6dd43a35f3
commit 5c997d2916
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
babeld/babeld.c
View File

@ -265,8 +265,7 @@ babel_get_myid(void)
return; return;
} }
flog_err(EC_BABEL_CONFIG, flog_err(EC_BABEL_CONFIG, "Couldn't find router id -- using random value.");
"Warning: couldn't find router id -- using random value.");
rc = read_random_bytes(myid, 8); rc = read_random_bytes(myid, 8);
if(rc < 0) { if(rc < 0) {

15
babeld/message.c
View File

@ -746,10 +746,9 @@ flushbuf(struct interface *ifp)
if(rc < 0) if(rc < 0)
flog_err(EC_BABEL_PACKET, "send: %s", safe_strerror(errno)); flog_err(EC_BABEL_PACKET, "send: %s", safe_strerror(errno));
} else { } else {
flog_err(EC_BABEL_PACKET, flog_err(EC_BABEL_PACKET, "Bucket full, dropping packet to %s.",
"Warning: bucket full, dropping packet to %s.", ifp->name);
ifp->name); }
}
} }
VALGRIND_MAKE_MEM_UNDEFINED(babel_ifp->sendbuf, babel_ifp->bufsize); VALGRIND_MAKE_MEM_UNDEFINED(babel_ifp->sendbuf, babel_ifp->bufsize);
babel_ifp->buffered = 0; babel_ifp->buffered = 0;
@ -1009,10 +1008,10 @@ flush_unicast(int dofree)
flog_err(EC_BABEL_PACKET, "send(unicast): %s", flog_err(EC_BABEL_PACKET, "send(unicast): %s",
safe_strerror(errno)); safe_strerror(errno));
} else { } else {
flog_err(EC_BABEL_PACKET, flog_err(EC_BABEL_PACKET,
"Warning: bucket full, dropping unicast packet to %s if %s.", "Bucket full, dropping unicast packet to %s if %s.",
format_address(unicast_neighbour->address), format_address(unicast_neighbour->address),
unicast_neighbour->ifp->name); unicast_neighbour->ifp->name);
} }
done: done:

13
babeld/route.c
View File

@ -399,15 +399,17 @@ install_route(struct babel_route *route)
return; return;
if(!route_feasible(route)) if(!route_feasible(route))
flog_err(EC_BABEL_ROUTE, "WARNING: installing unfeasible route (this shouldn't happen)."); flog_err(EC_BABEL_ROUTE,
"Installing unfeasible route (this shouldn't happen).");
i = find_route_slot(route->src->prefix, route->src->plen, NULL); i = find_route_slot(route->src->prefix, route->src->plen, NULL);
assert(i >= 0 && i < route_slots); assert(i >= 0 && i < route_slots);
if(routes[i] != route && routes[i]->installed) { if(routes[i] != route && routes[i]->installed) {
flog_err(EC_BABEL_ROUTE, flog_err(
"WARNING: attempting to install duplicate route (this shouldn't happen)."); EC_BABEL_ROUTE,
return; "Attempting to install duplicate route (this shouldn't happen).");
return;
} }
rc = kernel_route(ROUTE_ADD, route->src->prefix, route->src->plen, rc = kernel_route(ROUTE_ADD, route->src->prefix, route->src->plen,
@ -463,7 +465,8 @@ switch_routes(struct babel_route *old, struct babel_route *new)
return; return;
if(!route_feasible(new)) if(!route_feasible(new))
flog_err(EC_BABEL_ROUTE, "WARNING: switching to unfeasible route (this shouldn't happen)."); flog_err(EC_BABEL_ROUTE,
"Switching to unfeasible route (this shouldn't happen).");
rc = kernel_route(ROUTE_MODIFY, old->src->prefix, old->src->plen, rc = kernel_route(ROUTE_MODIFY, old->src->prefix, old->src->plen,
old->nexthop, old->neigh->ifp->ifindex, old->nexthop, old->neigh->ifp->ifindex,