diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2021-03-10 10:09:38 -0500 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2021-03-14 22:56:07 +0100 |
| commit | 5c997d2916664b6a7824bfa39fe834ebcc24e1b6 (patch) | |
| tree | 59a63fe44e04ca0ec8c0f9b55e493bf26c94ce78 /babeld | |
| parent | 6dd43a35f3683a695e825961c2398c5427aa9928 (diff) | |
babeld: We do not need to put Warning into our warning messages
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'babeld')
| -rw-r--r-- | babeld/babeld.c | 3 | ||||
| -rw-r--r-- | babeld/message.c | 15 | ||||
| -rw-r--r-- | babeld/route.c | 13 |
3 files changed, 16 insertions, 15 deletions
diff --git a/babeld/babeld.c b/babeld/babeld.c index 895ede7040..a907daf6c2 100644 --- a/babeld/babeld.c +++ b/babeld/babeld.c @@ -265,8 +265,7 @@ babel_get_myid(void) return; } - flog_err(EC_BABEL_CONFIG, - "Warning: couldn't find router id -- using random value."); + flog_err(EC_BABEL_CONFIG, "Couldn't find router id -- using random value."); rc = read_random_bytes(myid, 8); if(rc < 0) { diff --git a/babeld/message.c b/babeld/message.c index edb9806011..5c2e29d8b3 100644 --- a/babeld/message.c +++ b/babeld/message.c @@ -746,10 +746,9 @@ flushbuf(struct interface *ifp) if(rc < 0) flog_err(EC_BABEL_PACKET, "send: %s", safe_strerror(errno)); } else { - flog_err(EC_BABEL_PACKET, - "Warning: bucket full, dropping packet to %s.", - ifp->name); - } + flog_err(EC_BABEL_PACKET, "Bucket full, dropping packet to %s.", + ifp->name); + } } VALGRIND_MAKE_MEM_UNDEFINED(babel_ifp->sendbuf, babel_ifp->bufsize); babel_ifp->buffered = 0; @@ -1009,10 +1008,10 @@ flush_unicast(int dofree) flog_err(EC_BABEL_PACKET, "send(unicast): %s", safe_strerror(errno)); } else { - flog_err(EC_BABEL_PACKET, - "Warning: bucket full, dropping unicast packet to %s if %s.", - format_address(unicast_neighbour->address), - unicast_neighbour->ifp->name); + flog_err(EC_BABEL_PACKET, + "Bucket full, dropping unicast packet to %s if %s.", + format_address(unicast_neighbour->address), + unicast_neighbour->ifp->name); } done: diff --git a/babeld/route.c b/babeld/route.c index 0f6f6486f2..dfd0bfab89 100644 --- a/babeld/route.c +++ b/babeld/route.c @@ -399,15 +399,17 @@ install_route(struct babel_route *route) return; 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); assert(i >= 0 && i < route_slots); if(routes[i] != route && routes[i]->installed) { - flog_err(EC_BABEL_ROUTE, - "WARNING: attempting to install duplicate route (this shouldn't happen)."); - return; + flog_err( + EC_BABEL_ROUTE, + "Attempting to install duplicate route (this shouldn't happen)."); + return; } 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; 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, old->nexthop, old->neigh->ifp->ifindex, |