summaryrefslogtreecommitdiffstats
path: root/ripd
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2020-03-27 12:35:23 +0100
committerDavid Lamparter <equinox@diac24.net>2020-07-14 10:37:25 +0200
commit3efd0893d01696b680325679077382992d4eb33f (patch)
treeaac81fef8b8f5194e8280092f625b3f7b58da73b /ripd
parenttools: add source code string mangler (diff)
downloadfrr-3efd0893d01696b680325679077382992d4eb33f.tar.xz
frr-3efd0893d01696b680325679077382992d4eb33f.zip
*: un-split strings across lines
Remove mid-string line breaks, cf. workflow doc: .. [#tool_style_conflicts] For example, lines over 80 characters are allowed for text strings to make it possible to search the code for them: please see `Linux kernel style (breaking long lines and strings) <https://www.kernel.org/doc/html/v4.10/process/coding-style.html#breaking-long-lines-and-strings>`_ and `Issue #1794 <https://github.com/FRRouting/frr/issues/1794>`_. Scripted commit, idempotent to running: ``` python3 tools/stringmangle.py --unwrap `git ls-files | egrep '\.[ch]$'` ``` Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'ripd')
-rw-r--r--ripd/rip_interface.c3
-rw-r--r--ripd/ripd.c24
2 files changed, 9 insertions, 18 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 177f53db4..6ea657401 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -118,8 +118,7 @@ void rip_interface_multicast_set(int sock, struct connected *connected)
if (setsockopt_ipv4_multicast_if(sock, addr, connected->ifp->ifindex)
< 0) {
zlog_warn(
- "Can't setsockopt IP_MULTICAST_IF on fd %d to "
- "ifindex %d for interface %s",
+ "Can't setsockopt IP_MULTICAST_IF on fd %d to ifindex %d for interface %s",
sock, connected->ifp->ifindex, connected->ifp->name);
}
diff --git a/ripd/ripd.c b/ripd/ripd.c
index fc53796bd..ecadf8fb7 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -742,8 +742,7 @@ static void rip_packet_dump(struct rip_packet *packet, int size,
ntohs(md5->family),
ntohs(md5->type));
zlog_debug(
- " RIP-2 packet len %d Key ID %d"
- " Auth Data len %d",
+ " RIP-2 packet len %d Key ID %d Auth Data len %d",
ntohs(md5->packet_len),
md5->keyid, md5->auth_len);
zlog_debug(" Sequence Number %ld",
@@ -757,8 +756,7 @@ static void rip_packet_dump(struct rip_packet *packet, int size,
ntohs(rte->family),
ntohs(rte->tag));
zlog_debug(
- " MD5: %02X%02X%02X%02X%02X%02X%02X%02X"
- "%02X%02X%02X%02X%02X%02X%02X%02X",
+ " MD5: %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
p[0], p[1], p[2], p[3], p[4],
p[5], p[6], p[7], p[8], p[9],
p[10], p[11], p[12], p[13],
@@ -904,8 +902,7 @@ static int rip_auth_md5(struct rip_packet *packet, struct sockaddr_in *from,
|| (md5->auth_len == RIP_AUTH_MD5_COMPAT_SIZE))) {
if (IS_RIP_DEBUG_EVENT)
zlog_debug(
- "RIPv2 MD5 authentication, strange authentication "
- "length field %d",
+ "RIPv2 MD5 authentication, strange authentication length field %d",
md5->auth_len);
return 0;
}
@@ -916,8 +913,7 @@ static int rip_auth_md5(struct rip_packet *packet, struct sockaddr_in *from,
if (packet_len > (length - RIP_HEADER_SIZE - RIP_AUTH_MD5_SIZE)) {
if (IS_RIP_DEBUG_EVENT)
zlog_debug(
- "RIPv2 MD5 authentication, packet length field %d "
- "greater than received length %d!",
+ "RIPv2 MD5 authentication, packet length field %d greater than received length %d!",
md5->packet_len, length);
return 0;
}
@@ -1645,8 +1641,7 @@ void rip_redistribute_delete(struct rip *rip, int type, int sub_type,
if (IS_RIP_DEBUG_EVENT)
zlog_debug(
- "Poison %s/%d on the interface %s with an "
- "infinity metric [delete]",
+ "Poison %s/%d on the interface %s with an infinity metric [delete]",
inet_ntoa(p->prefix),
p->prefixlen,
ifindex2ifname(
@@ -1814,8 +1809,7 @@ static int rip_read(struct thread *t)
if (ifc == NULL) {
zlog_info(
- "rip_read: cannot find connected address for packet from %s "
- "port %d on interface %s (VRF %s)",
+ "rip_read: cannot find connected address for packet from %s port %d on interface %s (VRF %s)",
inet_ntoa(from.sin_addr), ntohs(from.sin_port),
ifp->name, rip->vrf_name);
return -1;
@@ -1937,8 +1931,7 @@ static int rip_read(struct thread *t)
if (packet->command != RIP_REQUEST) {
if (IS_RIP_DEBUG_PACKET)
zlog_debug(
- "RIPv1"
- " dropped because authentication enabled");
+ "RIPv1 dropped because authentication enabled");
ripd_notif_send_auth_type_failure(ifp->name);
rip_peer_bad_packet(rip, &from);
return -1;
@@ -1961,8 +1954,7 @@ static int rip_read(struct thread *t)
if (packet->rte->family != htons(RIP_FAMILY_AUTH)) {
if (IS_RIP_DEBUG_PACKET)
zlog_debug(
- "RIPv2"
- " dropped because authentication enabled");
+ "RIPv2 dropped because authentication enabled");
ripd_notif_send_auth_type_failure(ifp->name);
rip_peer_bad_packet(rip, &from);
return -1;