summaryrefslogtreecommitdiffstats
path: root/zebra
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2021-02-14 15:35:07 +0100
committerDavid Lamparter <equinox@diac24.net>2021-02-14 15:36:51 +0100
commit1d5453d6070f5266f0bdf709690282a0dc5dc83d (patch)
tree7eb4346adce641e92cc79a0be696908e924466e1 /zebra
parentMerge pull request #8036 from qlyoung/disable-mallinfo (diff)
downloadfrr-1d5453d6070f5266f0bdf709690282a0dc5dc83d.tar.xz
frr-1d5453d6070f5266f0bdf709690282a0dc5dc83d.zip
*: remove tabs & newlines from log messages
Neither tabs nor newlines are acceptable in syslog messages. They also break line-based parsing of file logs. Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'zebra')
-rw-r--r--zebra/interface.c12
-rw-r--r--zebra/irdp_packet.c6
-rw-r--r--zebra/kernel_netlink.c4
-rw-r--r--zebra/redistribute.c4
-rw-r--r--zebra/rt_netlink.c4
-rw-r--r--zebra/zapi_msg.c8
-rw-r--r--zebra/zebra_rib.c2
-rw-r--r--zebra/zebra_rnh.c2
-rw-r--r--zebra/zebra_vxlan.c2
9 files changed, 22 insertions, 22 deletions
diff --git a/zebra/interface.c b/zebra/interface.c
index 4072eb156..fc34a6fb9 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1029,7 +1029,7 @@ void if_up(struct interface *ifp)
/* Notify the protocol daemons. */
if (ifp->ptm_enable && (ifp->ptm_status == ZEBRA_PTM_STATUS_DOWN)) {
flog_warn(EC_ZEBRA_PTM_NOT_READY,
- "%s: interface %s hasn't passed ptm check\n",
+ "%s: interface %s hasn't passed ptm check",
__func__, ifp->name);
return;
}
@@ -2977,7 +2977,7 @@ int if_ip_address_install(struct interface *ifp, struct prefix *prefix,
dplane_res = dplane_intf_addr_set(ifp, ifc);
if (dplane_res == ZEBRA_DPLANE_REQUEST_FAILURE) {
zlog_debug(
- "dplane can't set interface IP address: %s.\n",
+ "dplane can't set interface IP address: %s.",
dplane_res2str(dplane_res));
return NB_ERR;
}
@@ -3095,7 +3095,7 @@ int if_ip_address_uinstall(struct interface *ifp, struct prefix *prefix)
/* Check current interface address. */
ifc = connected_check_ptp(ifp, prefix, NULL);
if (!ifc) {
- zlog_debug("interface %s Can't find address\n",
+ zlog_debug("interface %s Can't find address",
ifp->name);
return -1;
}
@@ -3106,7 +3106,7 @@ int if_ip_address_uinstall(struct interface *ifp, struct prefix *prefix)
}
if (!ifc) {
- zlog_debug("interface %s Can't find address\n", ifp->name);
+ zlog_debug("interface %s Can't find address", ifp->name);
return -1;
}
UNSET_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED);
@@ -3122,7 +3122,7 @@ int if_ip_address_uinstall(struct interface *ifp, struct prefix *prefix)
/* This is real route. */
dplane_res = dplane_intf_addr_unset(ifp, ifc);
if (dplane_res == ZEBRA_DPLANE_REQUEST_FAILURE) {
- zlog_debug("Can't unset interface IP address: %s.\n",
+ zlog_debug("Can't unset interface IP address: %s.",
dplane_res2str(dplane_res));
return -1;
}
@@ -3335,7 +3335,7 @@ int if_ipv6_address_install(struct interface *ifp, struct prefix *prefix,
dplane_res = dplane_intf_addr_set(ifp, ifc);
if (dplane_res == ZEBRA_DPLANE_REQUEST_FAILURE) {
zlog_debug(
- "dplane can't set interface IP address: %s.\n",
+ "dplane can't set interface IP address: %s.",
dplane_res2str(dplane_res));
return NB_ERR;
}
diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c
index 56fd35a73..6134df9c4 100644
--- a/zebra/irdp_packet.c
+++ b/zebra/irdp_packet.c
@@ -105,7 +105,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
if (iplen < ICMP_MINLEN) {
flog_err(EC_ZEBRA_IRDP_LEN_MISMATCH,
- "IRDP: RX ICMP packet too short from %pI4\n",
+ "IRDP: RX ICMP packet too short from %pI4",
&src);
return;
}
@@ -116,7 +116,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
len of IP-header) 14+20 */
if (iplen > IRDP_RX_BUF - 34) {
flog_err(EC_ZEBRA_IRDP_LEN_MISMATCH,
- "IRDP: RX ICMP packet too long from %pI4\n",
+ "IRDP: RX ICMP packet too long from %pI4",
&src);
return;
}
@@ -153,7 +153,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
&& !(irdp->flags & IF_BROADCAST))) {
flog_warn(
EC_ZEBRA_IRDP_BAD_RX_FLAGS,
- "IRDP: RX illegal from %pI4 to %s while %s operates in %s; Please correct settings\n",
+ "IRDP: RX illegal from %pI4 to %s while %s operates in %s; Please correct settings",
&src,
ntohl(ip->ip_dst.s_addr) == INADDR_ALLRTRS_GROUP
? "multicast"
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index 7d2f9e372..c77a357e9 100644
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -383,7 +383,7 @@ static int netlink_information_fetch(struct nlmsghdr *h, ns_id_t ns_id,
* it to be sent up to us
*/
flog_err(EC_ZEBRA_UNKNOWN_NLMSG,
- "Unknown netlink nlmsg_type %s(%d) vrf %u\n",
+ "Unknown netlink nlmsg_type %s(%d) vrf %u",
nl_msg_type_to_str(h->nlmsg_type), h->nlmsg_type,
ns_id);
break;
@@ -485,7 +485,7 @@ static void netlink_install_filter(int sock, __u32 pid, __u32 dplane_pid)
if (setsockopt(sock, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog))
< 0)
- flog_err_sys(EC_LIB_SOCKET, "Can't install socket filter: %s\n",
+ flog_err_sys(EC_LIB_SOCKET, "Can't install socket filter: %s",
safe_strerror(errno));
}
diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index 370dbaa24..b0f124ed5 100644
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -206,7 +206,7 @@ void redistribute_update(const struct prefix *p, const struct prefix *src_p,
afi = family2afi(p->family);
if (!afi) {
flog_warn(EC_ZEBRA_REDISTRIBUTE_UNKNOWN_AF,
- "%s: Unknown AFI/SAFI prefix received\n", __func__);
+ "%s: Unknown AFI/SAFI prefix received", __func__);
return;
}
if (!zebra_check_addr(p)) {
@@ -276,7 +276,7 @@ void redistribute_delete(const struct prefix *p, const struct prefix *src_p,
afi = family2afi(p->family);
if (!afi) {
flog_warn(EC_ZEBRA_REDISTRIBUTE_UNKNOWN_AF,
- "%s: Unknown AFI/SAFI prefix received\n",
+ "%s: Unknown AFI/SAFI prefix received",
__func__);
return;
}
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 3af3586d3..1cae0b1f9 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -3343,7 +3343,7 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
netlink_handle_5549(ndm, zif, ifp, &ip, false);
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
- "\tNeighbor Entry Received is a 5549 entry, finished");
+ " Neighbor Entry Received is a 5549 entry, finished");
return 0;
}
@@ -3372,7 +3372,7 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
else {
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
- "\tNeighbor Entry received is not on a VLAN or a BRIDGE, ignoring");
+ " Neighbor Entry received is not on a VLAN or a BRIDGE, ignoring");
return 0;
}
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 21bff96b7..46171df84 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -1146,7 +1146,7 @@ static void zread_rnh_register(ZAPI_HANDLER_ARGS)
} else {
flog_err(
EC_ZEBRA_UNKNOWN_FAMILY,
- "rnh_register: Received unknown family type %d\n",
+ "rnh_register: Received unknown family type %d",
p.family);
return;
}
@@ -1237,7 +1237,7 @@ static void zread_rnh_unregister(ZAPI_HANDLER_ARGS)
} else {
flog_err(
EC_ZEBRA_UNKNOWN_FAMILY,
- "rnh_register: Received unknown family type %d\n",
+ "rnh_register: Received unknown family type %d",
p.family);
return;
}
@@ -1287,7 +1287,7 @@ static void zread_fec_register(ZAPI_HANDLER_ARGS)
if (p.family != AF_INET && p.family != AF_INET6) {
flog_err(
EC_ZEBRA_UNKNOWN_FAMILY,
- "fec_register: Received unknown family type %d\n",
+ "fec_register: Received unknown family type %d",
p.family);
return;
}
@@ -1353,7 +1353,7 @@ static void zread_fec_unregister(ZAPI_HANDLER_ARGS)
if (p.family != AF_INET && p.family != AF_INET6) {
flog_err(
EC_ZEBRA_UNKNOWN_FAMILY,
- "fec_unregister: Received unknown family type %d\n",
+ "fec_unregister: Received unknown family type %d",
p.family);
return;
}
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 69d3a577c..c5d977017 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -745,7 +745,7 @@ void zebra_rib_evaluate_rn_nexthops(struct route_node *rn, uint32_t seq)
if (rnh->seqno == seq) {
if (IS_ZEBRA_DEBUG_NHT_DETAILED)
zlog_debug(
- "\tNode processed and moved already");
+ " Node processed and moved already");
continue;
}
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 3c4dbc5e9..48e2bafe4 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -1124,7 +1124,7 @@ int zebra_send_rnh_update(struct rnh *rnh, struct zserv *client,
break;
default:
flog_err(EC_ZEBRA_RNH_UNKNOWN_FAMILY,
- "%s: Unknown family (%d) notification attempted\n",
+ "%s: Unknown family (%d) notification attempted",
__func__, rn->p.family);
goto failure;
}
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 3a0874da4..424c00d5e 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -3333,7 +3333,7 @@ int zebra_vxlan_clear_dup_detect_vni(struct zebra_vrf *zvrf, vni_t vni)
zevpn = zebra_evpn_lookup(vni);
if (!zevpn) {
- zlog_warn("VNI %u does not exist\n", vni);
+ zlog_warn("VNI %u does not exist", vni);
return CMD_WARNING;
}