diff options
| -rw-r--r-- | lib/vty.c | 2 | ||||
| -rw-r--r-- | zebra/connected.c | 8 | ||||
| -rw-r--r-- | zebra/redistribute.c | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -2321,7 +2321,7 @@ static void vty_read_file(struct nb_config *config, FILE *confp) nl = strchr(ve->error_buf, '\n'); if (nl) *nl = '\0'; - flog_err(EC_LIB_VTY, "ERROR: %s on config line %u: %s", + flog_err(EC_LIB_VTY, "%s on config line %u: %s", message, ve->line_num, ve->error_buf); } } diff --git a/zebra/connected.c b/zebra/connected.c index c885c533e6..dd8fab5e4e 100644 --- a/zebra/connected.c +++ b/zebra/connected.c @@ -321,11 +321,11 @@ void connected_add_ipv4(struct interface *ifp, int flags, struct in_addr *addr, if (IPV4_ADDR_SAME(addr, dest)) flog_warn( EC_ZEBRA_IFACE_SAME_LOCAL_AS_PEER, - "warning: interface %s has same local and peer address %pI4, routing protocols may malfunction", + "interface %s has same local and peer address %pI4, routing protocols may malfunction", ifp->name, addr); } else { zlog_debug( - "warning: %s called for interface %s with peer flag set, but no peer address supplied", + "%s called for interface %s with peer flag set, but no peer address supplied", __func__, ifp->name); UNSET_FLAG(ifc->flags, ZEBRA_IFA_PEER); } @@ -335,7 +335,7 @@ void connected_add_ipv4(struct interface *ifp, int flags, struct in_addr *addr, if (!dest && (prefixlen == IPV4_MAX_PREFIXLEN) && if_is_pointopoint(ifp)) zlog_debug( - "warning: PtP interface %s with addr %pI4/%d needs a peer address", + "PtP interface %s with addr %pI4/%d needs a peer address", ifp->name, addr, prefixlen); /* Label of this address. */ @@ -503,7 +503,7 @@ void connected_add_ipv6(struct interface *ifp, int flags, struct in6_addr *addr, } else { if (CHECK_FLAG(ifc->flags, ZEBRA_IFA_PEER)) { zlog_debug( - "warning: %s called for interface %s with peer flag set, but no peer address supplied", + "%s called for interface %s with peer flag set, but no peer address supplied", __func__, ifp->name); UNSET_FLAG(ifc->flags, ZEBRA_IFA_PEER); } diff --git a/zebra/redistribute.c b/zebra/redistribute.c index b0f124ed55..ac60d09ecc 100644 --- a/zebra/redistribute.c +++ b/zebra/redistribute.c @@ -542,7 +542,7 @@ void zebra_interface_address_add_update(struct interface *ifp, if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_REAL)) flog_warn( EC_ZEBRA_ADVERTISING_UNUSABLE_ADDR, - "WARNING: advertising address to clients that is not yet usable."); + "advertising address to clients that is not yet usable."); zebra_vxlan_add_del_gw_macip(ifp, ifc->address, 1); |