summaryrefslogtreecommitdiff
path: root/pimd
diff options
context:
space:
mode:
Diffstat (limited to 'pimd')
-rw-r--r--pimd/mtracebis.c2
-rw-r--r--pimd/mtracebis_netlink.c182
-rw-r--r--pimd/mtracebis_netlink.h90
-rw-r--r--pimd/pim_assert.c6
-rw-r--r--pimd/pim_bfd.c11
-rw-r--r--pimd/pim_cmd.c268
-rw-r--r--pimd/pim_hello.c6
-rw-r--r--pimd/pim_iface.c5
-rw-r--r--pimd/pim_iface.h7
-rw-r--r--pimd/pim_ifchannel.c40
-rw-r--r--pimd/pim_ifchannel.h4
-rw-r--r--pimd/pim_igmp.c3
-rw-r--r--pimd/pim_igmp_mtrace.c2
-rw-r--r--pimd/pim_igmp_mtrace.h52
-rw-r--r--pimd/pim_instance.c4
-rw-r--r--pimd/pim_mroute.c33
-rw-r--r--pimd/pim_msdp.h6
-rw-r--r--pimd/pim_nht.c33
-rw-r--r--pimd/pim_oil.c6
-rw-r--r--pimd/pim_register.c6
-rw-r--r--pimd/pim_rp.c32
-rw-r--r--pimd/pim_rpf.c7
-rw-r--r--pimd/pim_tlv.c12
-rw-r--r--pimd/pim_upstream.c28
-rw-r--r--pimd/pim_zebra.c13
-rw-r--r--pimd/pim_zlookup.c5
26 files changed, 415 insertions, 448 deletions
diff --git a/pimd/mtracebis.c b/pimd/mtracebis.c
index 1e7aee858a..337d420d34 100644
--- a/pimd/mtracebis.c
+++ b/pimd/mtracebis.c
@@ -230,7 +230,7 @@ int main(int argc, char *const argv[])
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'v'},
- {0, 0, 0, 0} };
+ {0, 0, 0, 0}};
int option_index = 0;
c = getopt_long(argc, argv, "vh", long_options, &option_index);
diff --git a/pimd/mtracebis_netlink.c b/pimd/mtracebis_netlink.c
index 42b80b218b..a66da87e1b 100644
--- a/pimd/mtracebis_netlink.c
+++ b/pimd/mtracebis_netlink.c
@@ -52,12 +52,14 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions,
return -1;
}
- if (setsockopt(rth->fd,SOL_SOCKET,SO_SNDBUF,&sndbuf,sizeof(sndbuf)) < 0) {
+ if (setsockopt(rth->fd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))
+ < 0) {
perror("SO_SNDBUF");
return -1;
}
- if (setsockopt(rth->fd,SOL_SOCKET,SO_RCVBUF,&rcvbuf,sizeof(rcvbuf)) < 0) {
+ if (setsockopt(rth->fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf))
+ < 0) {
perror("SO_RCVBUF");
return -1;
}
@@ -66,12 +68,14 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions,
rth->local.nl_family = AF_NETLINK;
rth->local.nl_groups = subscriptions;
- if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) {
+ if (bind(rth->fd, (struct sockaddr *)&rth->local, sizeof(rth->local))
+ < 0) {
perror("Cannot bind netlink socket");
return -1;
}
addr_len = sizeof(rth->local);
- if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) {
+ if (getsockname(rth->fd, (struct sockaddr *)&rth->local, &addr_len)
+ < 0) {
perror("Cannot getsockname");
return -1;
}
@@ -80,7 +84,8 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions,
return -1;
}
if (rth->local.nl_family != AF_NETLINK) {
- fprintf(stderr, "Wrong address family %d\n", rth->local.nl_family);
+ fprintf(stderr, "Wrong address family %d\n",
+ rth->local.nl_family);
return -1;
}
rth->seq = time(NULL);
@@ -102,12 +107,12 @@ int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
memset(&req, 0, sizeof(req));
req.nlh.nlmsg_len = sizeof(req);
req.nlh.nlmsg_type = type;
- req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+ req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
req.nlh.nlmsg_pid = 0;
req.nlh.nlmsg_seq = rth->dump = ++rth->seq;
req.g.rtgen_family = family;
- return send(rth->fd, (void*)&req, sizeof(req), 0);
+ return send(rth->fd, (void *)&req, sizeof(req), 0);
}
int rtnl_send(struct rtnl_handle *rth, const char *buf, int len)
@@ -126,7 +131,7 @@ int rtnl_send_check(struct rtnl_handle *rth, const char *buf, int len)
return status;
/* Check for immediate errors */
- status = recv(rth->fd, resp, sizeof(resp), MSG_DONTWAIT|MSG_PEEK);
+ status = recv(rth->fd, resp, sizeof(resp), MSG_DONTWAIT | MSG_PEEK);
if (status < 0) {
if (errno == EAGAIN)
return 0;
@@ -136,8 +141,9 @@ int rtnl_send_check(struct rtnl_handle *rth, const char *buf, int len)
for (h = (struct nlmsghdr *)resp; NLMSG_OK(h, (uint32_t)status);
h = NLMSG_NEXT(h, status)) {
if (h->nlmsg_type == NLMSG_ERROR) {
- struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
- if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
+ struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(h);
+ if (h->nlmsg_len
+ < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
fprintf(stderr, "ERROR truncated\n");
else
errno = -err->error;
@@ -152,13 +158,11 @@ int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
{
struct nlmsghdr nlh;
struct sockaddr_nl nladdr;
- struct iovec iov[2] = {
- { .iov_base = &nlh, .iov_len = sizeof(nlh) },
- { .iov_base = req, .iov_len = len }
- };
+ struct iovec iov[2] = {{.iov_base = &nlh, .iov_len = sizeof(nlh)},
+ {.iov_base = req, .iov_len = len}};
struct msghdr msg = {
.msg_name = &nladdr,
- .msg_namelen = sizeof(nladdr),
+ .msg_namelen = sizeof(nladdr),
.msg_iov = iov,
.msg_iovlen = 2,
};
@@ -168,7 +172,7 @@ int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
nlh.nlmsg_len = NLMSG_LENGTH(len);
nlh.nlmsg_type = type;
- nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+ nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
nlh.nlmsg_pid = 0;
nlh.nlmsg_seq = rth->dump = ++rth->seq;
@@ -212,15 +216,15 @@ int rtnl_dump_filter_l(struct rtnl_handle *rth,
}
for (a = arg; a->filter; a++) {
- struct nlmsghdr *h = (struct nlmsghdr*)buf;
+ struct nlmsghdr *h = (struct nlmsghdr *)buf;
msglen = status;
while (NLMSG_OK(h, (uint32_t)msglen)) {
int err;
- if (nladdr.nl_pid != 0 ||
- h->nlmsg_pid != rth->local.nl_pid ||
- h->nlmsg_seq != rth->dump) {
+ if (nladdr.nl_pid != 0
+ || h->nlmsg_pid != rth->local.nl_pid
+ || h->nlmsg_seq != rth->dump) {
if (a->junk) {
err = a->junk(&nladdr, h,
a->arg2);
@@ -235,8 +239,12 @@ int rtnl_dump_filter_l(struct rtnl_handle *rth,
break; /* process next filter */
}
if (h->nlmsg_type == NLMSG_ERROR) {
- struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
- if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
+ struct nlmsgerr *err =
+ (struct nlmsgerr *)NLMSG_DATA(
+ h);
+ if (h->nlmsg_len
+ < NLMSG_LENGTH(sizeof(
+ struct nlmsgerr))) {
fprintf(stderr,
"ERROR truncated\n");
} else {
@@ -249,7 +257,7 @@ int rtnl_dump_filter_l(struct rtnl_handle *rth,
if (err < 0)
return err;
-skip_it:
+ skip_it:
h = NLMSG_NEXT(h, msglen);
}
}
@@ -268,40 +276,32 @@ skip_it:
}
}
-int rtnl_dump_filter(struct rtnl_handle *rth,
- rtnl_filter_t filter,
- void *arg1,
- rtnl_filter_t junk,
- void *arg2)
+int rtnl_dump_filter(struct rtnl_handle *rth, rtnl_filter_t filter, void *arg1,
+ rtnl_filter_t junk, void *arg2)
{
const struct rtnl_dump_filter_arg a[2] = {
- { .filter = filter, .arg1 = arg1, .junk = junk, .arg2 = arg2 },
- { .filter = NULL, .arg1 = NULL, .junk = NULL, .arg2 = NULL }
- };
+ {.filter = filter, .arg1 = arg1, .junk = junk, .arg2 = arg2},
+ {.filter = NULL, .arg1 = NULL, .junk = NULL, .arg2 = NULL}};
return rtnl_dump_filter_l(rth, a);
}
int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
- unsigned groups, struct nlmsghdr *answer,
- rtnl_filter_t junk,
+ unsigned groups, struct nlmsghdr *answer, rtnl_filter_t junk,
void *jarg)
{
int status;
unsigned seq;
struct nlmsghdr *h;
struct sockaddr_nl nladdr;
- struct iovec iov = {
- .iov_base = (void*) n,
- .iov_len = n->nlmsg_len
- };
+ struct iovec iov = {.iov_base = (void *)n, .iov_len = n->nlmsg_len};
struct msghdr msg = {
.msg_name = &nladdr,
.msg_namelen = sizeof(nladdr),
.msg_iov = &iov,
.msg_iovlen = 1,
};
- char buf[16384];
+ char buf[16384];
memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK;
@@ -320,7 +320,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
return -1;
}
- memset(buf,0,sizeof(buf));
+ memset(buf, 0, sizeof(buf));
iov.iov_base = buf;
@@ -340,26 +340,28 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
return -1;
}
if (msg.msg_namelen != sizeof(nladdr)) {
- fprintf(stderr, "sender address length == %d\n", msg.msg_namelen);
+ fprintf(stderr, "sender address length == %d\n",
+ msg.msg_namelen);
exit(1);
}
- for (h = (struct nlmsghdr*)buf; status >= (int)sizeof(*h); ) {
+ for (h = (struct nlmsghdr *)buf; status >= (int)sizeof(*h);) {
int err;
int len = h->nlmsg_len;
int l = len - sizeof(*h);
- if (l<0 || len>status) {
+ if (l < 0 || len > status) {
if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Truncated message\n");
return -1;
}
- fprintf(stderr, "!!!malformed message: len=%d\n", len);
+ fprintf(stderr,
+ "!!!malformed message: len=%d\n", len);
exit(1);
}
- if ((int)nladdr.nl_pid != peer ||
- h->nlmsg_pid != rtnl->local.nl_pid ||
- h->nlmsg_seq != seq) {
+ if ((int)nladdr.nl_pid != peer
+ || h->nlmsg_pid != rtnl->local.nl_pid
+ || h->nlmsg_seq != seq) {
if (junk) {
err = junk(&nladdr, h, jarg);
if (err < 0)
@@ -367,19 +369,22 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
}
/* Don't forget to skip that message. */
status -= NLMSG_ALIGN(len);
- h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
+ h = (struct nlmsghdr *)((char *)h
+ + NLMSG_ALIGN(len));
continue;
}
if (h->nlmsg_type == NLMSG_ERROR) {
- struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
+ struct nlmsgerr *err =
+ (struct nlmsgerr *)NLMSG_DATA(h);
if (l < (int)sizeof(struct nlmsgerr)) {
fprintf(stderr, "ERROR truncated\n");
} else {
errno = -err->error;
if (errno == 0) {
if (answer)
- memcpy(answer, h, h->nlmsg_len);
+ memcpy(answer, h,
+ h->nlmsg_len);
return 0;
}
perror("RTNETLINK answers");
@@ -394,7 +399,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
fprintf(stderr, "Unexpected reply!!!\n");
status -= NLMSG_ALIGN(len);
- h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
+ h = (struct nlmsghdr *)((char *)h + NLMSG_ALIGN(len));
}
if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Message truncated\n");
@@ -407,9 +412,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
}
}
-int rtnl_listen(struct rtnl_handle *rtnl,
- rtnl_filter_t handler,
- void *jarg)
+int rtnl_listen(struct rtnl_handle *rtnl, rtnl_filter_t handler, void *jarg)
{
int status;
struct nlmsghdr *h;
@@ -421,7 +424,7 @@ int rtnl_listen(struct rtnl_handle *rtnl,
.msg_iov = &iov,
.msg_iovlen = 1,
};
- char buf[8192];
+ char buf[8192];
memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK;
@@ -447,20 +450,22 @@ int rtnl_listen(struct rtnl_handle *rtnl,
return -1;
}
if (msg.msg_namelen != sizeof(nladdr)) {
- fprintf(stderr, "Sender address length == %d\n", msg.msg_namelen);
+ fprintf(stderr, "Sender address length == %d\n",
+ msg.msg_namelen);
exit(1);
}
- for (h =(struct nlmsghdr*)buf; status >= (int)sizeof(*h); ) {
+ for (h = (struct nlmsghdr *)buf; status >= (int)sizeof(*h);) {
int err;
int len = h->nlmsg_len;
int l = len - sizeof(*h);
- if (l<0 || len>status) {
+ if (l < 0 || len > status) {
if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Truncated message\n");
return -1;
}
- fprintf(stderr, "!!!malformed message: len=%d\n", len);
+ fprintf(stderr,
+ "!!!malformed message: len=%d\n", len);
exit(1);
}
@@ -469,7 +474,7 @@ int rtnl_listen(struct rtnl_handle *rtnl,
return err;
status -= NLMSG_ALIGN(len);
- h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
+ h = (struct nlmsghdr *)((char *)h + NLMSG_ALIGN(len));
}
if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Message truncated\n");
@@ -482,13 +487,12 @@ int rtnl_listen(struct rtnl_handle *rtnl,
}
}
-int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
- void *jarg)
+int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler, void *jarg)
{
int status;
struct sockaddr_nl nladdr;
- char buf[8192];
- struct nlmsghdr *h = (void*)buf;
+ char buf[8192];
+ struct nlmsghdr *h = (void *)buf;
memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK;
@@ -513,7 +517,7 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
len = h->nlmsg_len;
l = len - sizeof(*h);
- if (l<0 || len>(int)sizeof(buf)) {
+ if (l < 0 || len > (int)sizeof(buf)) {
fprintf(stderr, "!!!malformed message: len=%d @%lu\n",
len, ftell(rtnl));
return -1;
@@ -541,7 +545,9 @@ int addattr32(struct nlmsghdr *n, int maxlen, int type, __u32 data)
int len = RTA_LENGTH(4);
struct rtattr *rta;
if ((int)(NLMSG_ALIGN(n->nlmsg_len) + len) > maxlen) {
- fprintf(stderr,"addattr32: Error! max allowed bound %d exceeded\n",maxlen);
+ fprintf(stderr,
+ "addattr32: Error! max allowed bound %d exceeded\n",
+ maxlen);
return -1;
}
rta = NLMSG_TAIL(n);
@@ -559,7 +565,9 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
struct rtattr *rta;
if ((int)(NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len)) > maxlen) {
- fprintf(stderr, "addattr_l ERROR: message exceeded bound of %d\n",maxlen);
+ fprintf(stderr,
+ "addattr_l ERROR: message exceeded bound of %d\n",
+ maxlen);
return -1;
}
rta = NLMSG_TAIL(n);
@@ -578,12 +586,14 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
{
if ((int)(NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len)) > maxlen) {
- fprintf(stderr, "addraw_l ERROR: message exceeded bound of %d\n",maxlen);
+ fprintf(stderr,
+ "addraw_l ERROR: message exceeded bound of %d\n",
+ maxlen);
return -1;
}
memcpy(NLMSG_TAIL(n), data, len);
- memset((uint8_t *) NLMSG_TAIL(n) + len, 0, NLMSG_ALIGN(len) - len);
+ memset((uint8_t *)NLMSG_TAIL(n) + len, 0, NLMSG_ALIGN(len) - len);
n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len);
return 0;
}
@@ -627,10 +637,12 @@ int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data)
struct rtattr *subrta;
if ((int)(RTA_ALIGN(rta->rta_len) + len) > maxlen) {
- fprintf(stderr,"rta_addattr32: Error! max allowed bound %d exceeded\n",maxlen);
+ fprintf(stderr,
+ "rta_addattr32: Error! max allowed bound %d exceeded\n",
+ maxlen);
return -1;
}
- subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len));
+ subrta = (struct rtattr *)(((char *)rta) + RTA_ALIGN(rta->rta_len));
subrta->rta_type = type;
subrta->rta_len = len;
memcpy(RTA_DATA(subrta), &data, 4);
@@ -638,17 +650,19 @@ int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data)
return 0;
}
-int rta_addattr_l(struct rtattr *rta, int maxlen, int type,
- const void *data, int alen)
+int rta_addattr_l(struct rtattr *rta, int maxlen, int type, const void *data,
+ int alen)
{
struct rtattr *subrta;
int len = RTA_LENGTH(alen);
if ((int)(RTA_ALIGN(rta->rta_len) + RTA_ALIGN(len)) > maxlen) {
- fprintf(stderr,"rta_addattr_l: Error! max allowed bound %d exceeded\n",maxlen);
+ fprintf(stderr,
+ "rta_addattr_l: Error! max allowed bound %d exceeded\n",
+ maxlen);
return -1;
}
- subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len));
+ subrta = (struct rtattr *)(((char *)rta) + RTA_ALIGN(rta->rta_len));
subrta->rta_type = type;
subrta->rta_len = len;
memcpy(RTA_DATA(subrta), data, alen);
@@ -662,14 +676,16 @@ int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
while (RTA_OK(rta, len)) {
if ((rta->rta_type <= max) && (!tb[rta->rta_type]))
tb[rta->rta_type] = rta;
- rta = RTA_NEXT(rta,len);
+ rta = RTA_NEXT(rta, len);
}
if (len)
- fprintf(stderr, "!!!Deficit %d, rta_len=%d\n", len, rta->rta_len);
+ fprintf(stderr, "!!!Deficit %d, rta_len=%d\n", len,
+ rta->rta_len);
return 0;
}
-int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta, int len)
+int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta,
+ int len)
{
int i = 0;
@@ -677,20 +693,22 @@ int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta, int l
while (RTA_OK(rta, len)) {
if (rta->rta_type <= max && i < max)
tb[i++] = rta;
- rta = RTA_NEXT(rta,len);
+ rta = RTA_NEXT(rta, len);
}
if (len)
- fprintf(stderr, "!!!Deficit %d, rta_len=%d\n", len, rta->rta_len);
+ fprintf(stderr, "!!!Deficit %d, rta_len=%d\n", len,
+ rta->rta_len);
return i;
}
-int __parse_rtattr_nested_compat(struct rtattr *tb[], int max, struct rtattr *rta,
- int len)
+int __parse_rtattr_nested_compat(struct rtattr *tb[], int max,
+ struct rtattr *rta, int len)
{
if ((int)RTA_PAYLOAD(rta) < len)
return -1;
if (RTA_PAYLOAD(rta) >= RTA_ALIGN(len) + sizeof(struct rtattr)) {
- rta = (struct rtattr *)(uint8_t *)RTA_DATA(rta)+RTA_ALIGN(len);
+ rta = (struct rtattr *)(uint8_t *)RTA_DATA(rta)
+ + RTA_ALIGN(len);
return parse_rtattr_nested(tb, max, rta);
}
memset(tb, 0, sizeof(struct rtattr *) * (max + 1));
diff --git a/pimd/mtracebis_netlink.h b/pimd/mtracebis_netlink.h
index 7a60ead975..46e176e726 100644
--- a/pimd/mtracebis_netlink.h
+++ b/pimd/mtracebis_netlink.h
@@ -22,28 +22,28 @@
#include <linux/if_addr.h>
#include <linux/neighbour.h>
-struct rtnl_handle
-{
- int fd;
- struct sockaddr_nl local;
- struct sockaddr_nl peer;
- __u32 seq;
- __u32 dump;
+struct rtnl_handle {
+ int fd;
+ struct sockaddr_nl local;
+ struct sockaddr_nl peer;
+ __u32 seq;
+ __u32 dump;
};
extern int rcvbuf;
extern int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions);
-extern int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int protocol);
+extern int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions,
+ int protocol);
extern void rtnl_close(struct rtnl_handle *rth);
extern int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type);
-extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len);
+extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req,
+ int len);
-typedef int (*rtnl_filter_t)(const struct sockaddr_nl *,
- struct nlmsghdr *n, void *);
+typedef int (*rtnl_filter_t)(const struct sockaddr_nl *, struct nlmsghdr *n,
+ void *);
-struct rtnl_dump_filter_arg
-{
+struct rtnl_dump_filter_arg {
rtnl_filter_t filter;
void *arg1;
rtnl_filter_t junk;
@@ -53,73 +53,79 @@ struct rtnl_dump_filter_arg
extern int rtnl_dump_filter_l(struct rtnl_handle *rth,
const struct rtnl_dump_filter_arg *arg);
extern int rtnl_dump_filter(struct rtnl_handle *rth, rtnl_filter_t filter,
- void *arg1,
- rtnl_filter_t junk,
- void *arg2);
+ void *arg1, rtnl_filter_t junk, void *arg2);
extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
unsigned groups, struct nlmsghdr *answer,
- rtnl_filter_t junk,
- void *jarg);
+ rtnl_filter_t junk, void *jarg);
extern int rtnl_send(struct rtnl_handle *rth, const char *buf, int);
extern int rtnl_send_check(struct rtnl_handle *rth, const char *buf, int);
extern int addattr32(struct nlmsghdr *n, int maxlen, int type, __u32 data);
-extern int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, int alen);
+extern int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
+ int alen);
extern int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len);
extern struct rtattr *addattr_nest(struct nlmsghdr *n, int maxlen, int type);
extern int addattr_nest_end(struct nlmsghdr *n, struct rtattr *nest);
-extern struct rtattr *addattr_nest_compat(struct nlmsghdr *n, int maxlen, int type, const void *data, int len);
+extern struct rtattr *addattr_nest_compat(struct nlmsghdr *n, int maxlen,
+ int type, const void *data, int len);
extern int addattr_nest_compat_end(struct nlmsghdr *n, struct rtattr *nest);
extern int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data);
-extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type, const void *data, int alen);
+extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type,
+ const void *data, int alen);
-extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len);
-extern int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta, int len);
-extern int __parse_rtattr_nested_compat(struct rtattr *tb[], int max, struct rtattr *rta, int len);
+extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta,
+ int len);
+extern int parse_rtattr_byindex(struct rtattr *tb[], int max,
+ struct rtattr *rta, int len);
+extern int __parse_rtattr_nested_compat(struct rtattr *tb[], int max,
+ struct rtattr *rta, int len);
-#define parse_rtattr_nested(tb, max, rta) \
+#define parse_rtattr_nested(tb, max, rta) \
(parse_rtattr((tb), (max), RTA_DATA(rta), RTA_PAYLOAD(rta)))
-#define parse_rtattr_nested_compat(tb, max, rta, data, len) \
-({ data = RTA_PAYLOAD(rta) >= len ? RTA_DATA(rta) : NULL; \
- __parse_rtattr_nested_compat(tb, max, rta, len); })
+#define parse_rtattr_nested_compat(tb, max, rta, data, len) \
+ ({ \
+ data = RTA_PAYLOAD(rta) >= len ? RTA_DATA(rta) : NULL; \
+ __parse_rtattr_nested_compat(tb, max, rta, len); \
+ })
-extern int rtnl_listen(struct rtnl_handle *, rtnl_filter_t handler,
- void *jarg);
-extern int rtnl_from_file(FILE *, rtnl_filter_t handler,
- void *jarg);
+extern int rtnl_listen(struct rtnl_handle *, rtnl_filter_t handler, void *jarg);
+extern int rtnl_from_file(FILE *, rtnl_filter_t handler, void *jarg);
-#define NLMSG_TAIL(nmsg) \
- ((struct rtattr *) (((uint8_t *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
+#define NLMSG_TAIL(nmsg) \
+ ((struct rtattr *)(((uint8_t *)(nmsg)) \
+ + NLMSG_ALIGN((nmsg)->nlmsg_len)))
#ifndef IFA_RTA
-#define IFA_RTA(r) \
- ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
+#define IFA_RTA(r) \
+ ((struct rtattr *)(((char *)(r)) \
+ + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
#endif
#ifndef IFA_PAYLOAD
#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
#endif
#ifndef IFLA_RTA
-#define IFLA_RTA(r) \
- ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
+#define IFLA_RTA(r) \
+ ((struct rtattr *)(((char *)(r)) \
+ + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
#endif
#ifndef IFLA_PAYLOAD
#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
#endif
#ifndef NDA_RTA
-#define NDA_RTA(r) \
- ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg))))
+#define NDA_RTA(r) \
+ ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg))))
#endif
#ifndef NDA_PAYLOAD
#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg))
#endif
#ifndef NDTA_RTA
-#define NDTA_RTA(r) \
- ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg))))
+#define NDTA_RTA(r) \
+ ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg))))
#endif
#ifndef NDTA_PAYLOAD
#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg))
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index 934fea5a9e..3f863ebeca 100644
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -405,9 +405,9 @@ int pim_assert_build_msg(uint8_t *pim_msg, int buf_size, struct interface *ifp,
}
/* Metric preference */
- pim_write_uint32(pim_msg_curr, rpt_bit_flag
- ? metric_preference | 0x80000000
- : metric_preference);
+ pim_write_uint32(pim_msg_curr,
+ rpt_bit_flag ? metric_preference | 0x80000000
+ : metric_preference);
pim_msg_curr += 4;
/* Route metric */
diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c
index f8903d71e9..29ff337d96 100644
--- a/pimd/pim_bfd.c
+++ b/pimd/pim_bfd.c
@@ -318,11 +318,12 @@ static int pim_bfd_nbr_replay(int command, struct zclient *zclient,
char str[INET_ADDRSTRLEN];
pim_inet4_dump("<bfd_nbr?>",
- neigh->source_addr,
- str, sizeof(str));
- zlog_debug("%s: Replaying Pim Neigh %s to BFD vrf_id %u",
- __PRETTY_FUNCTION__, str,
- vrf->vrf_id);
+ neigh->source_addr, str,
+ sizeof(str));
+ zlog_debug(
+ "%s: Replaying Pim Neigh %s to BFD vrf_id %u",
+ __PRETTY_FUNCTION__, str,
+ vrf->vrf_id);
}
pim_bfd_reg_dereg_nbr(neigh,
ZEBRA_BFD_DEST_UPDATE);
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index fc07b706a9..6002794658 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -175,8 +175,7 @@ static void pim_if_membership_refresh(struct interface *ifp)
static void pim_show_assert_helper(struct vty *vty,
struct pim_interface *pim_ifp,
- struct pim_ifchannel *ch,
- time_t now)
+ struct pim_ifchannel *ch, time_t now)
{
char ch_src_str[INET_ADDRSTRLEN];
char ch_grp_str[INET_ADDRSTRLEN];
@@ -187,23 +186,18 @@ static void pim_show_assert_helper(struct vty *vty,
ifaddr = pim_ifp->primary_address;
- pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
- sizeof(ch_src_str));
- pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
- sizeof(ch_grp_str));
+ pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str, sizeof(ch_src_str));
+ pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str, sizeof(ch_grp_str));
pim_inet4_dump("<assrt_win?>", ch->ifassert_winner, winner_str,
sizeof(winner_str));
- pim_time_uptime(uptime, sizeof(uptime),
- now - ch->ifassert_creation);
- pim_time_timer_to_mmss(timer, sizeof(timer),
- ch->t_ifassert_timer);
+ pim_time_uptime(uptime, sizeof(uptime), now - ch->ifassert_creation);
+ pim_time_timer_to_mmss(timer, sizeof(timer), ch->t_ifassert_timer);
vty_out(vty, "%-9s %-15s %-15s %-15s %-6s %-15s %-8s %-5s\n",
- ch->interface->name, inet_ntoa(ifaddr), ch_src_str,
- ch_grp_str,
- pim_ifchannel_ifassert_name(ch->ifassert_state),
- winner_str, uptime, timer);
+ ch->interface->name, inet_ntoa(ifaddr), ch_src_str, ch_grp_str,
+ pim_ifchannel_ifassert_name(ch->ifassert_state), winner_str,
+ uptime, timer);
}
static void pim_show_assert(struct pim_instance *pim, struct vty *vty)
@@ -239,20 +233,15 @@ static void pim_show_assert_internal_helper(struct vty *vty,
ifaddr = pim_ifp->primary_address;
- pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
- sizeof(ch_src_str));
- pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
- sizeof(ch_grp_str));
+ pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str, sizeof(ch_src_str));
+ pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str, sizeof(ch_grp_str));
vty_out(vty, "%-9s %-15s %-15s %-15s %-3s %-3s %-3s %-4s\n",
- ch->interface->name, inet_ntoa(ifaddr), ch_src_str,
- ch_grp_str,
+ ch->interface->name, inet_ntoa(ifaddr), ch_src_str, ch_grp_str,
PIM_IF_FLAG_TEST_COULD_ASSERT(ch->flags) ? "yes" : "no",
pim_macro_ch_could_assert_eval(ch) ? "yes" : "no",
- PIM_IF_FLAG_TEST_ASSERT_TRACKING_DESIRED(ch->flags)
- ? "yes"
- : "no",
- pim_macro_assert_tracking_desired_eval(ch) ? "yes"
- : "no");
+ PIM_IF_FLAG_TEST_ASSERT_TRACKING_DESIRED(ch->flags) ? "yes"
+ : "no",
+ pim_macro_assert_tracking_desired_eval(ch) ? "yes" : "no");
}
static void pim_show_assert_internal(struct pim_instance *pim, struct vty *vty)
@@ -295,17 +284,14 @@ static void pim_show_assert_metric_helper(struct vty *vty,
am = pim_macro_spt_assert_metric(&ch->upstream->rpf,
pim_ifp->primary_address);
- pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
- sizeof(ch_src_str));
- pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
- sizeof(ch_grp_str));
- pim_inet4_dump("<addr?>", am.ip_address, addr_str,
- sizeof(addr_str));
+ pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str, sizeof(ch_src_str));
+ pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str, sizeof(ch_grp_str));
+ pim_inet4_dump("<addr?>", am.ip_address, addr_str, sizeof(addr_str));
vty_out(vty, "%-9s %-15s %-15s %-15s %-3s %4u %6u %-15s\n",
- ch->interface->name, inet_ntoa(ifaddr), ch_src_str,
- ch_grp_str, am.rpt_bit_flag ? "yes" : "no",
- am.metric_preference, am.route_metric, addr_str);
+ ch->interface->name, inet_ntoa(ifaddr), ch_src_str, ch_grp_str,
+ am.rpt_bit_flag ? "yes" : "no", am.metric_preference,
+ am.route_metric, addr_str);
}
static void pim_show_assert_metric(struct pim_instance *pim, struct vty *vty)
@@ -344,12 +330,9 @@ static void pim_show_assert_winner_metric_helper(struct vty *vty,
am = &ch->ifassert_winner_metric;
- pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
- sizeof(ch_src_str));
- pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
- sizeof(ch_grp_str));
- pim_inet4_dump("<addr?>", am->ip_address, addr_str,
- sizeof(addr_str));
+ pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str, sizeof(ch_src_str));
+ pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str, sizeof(ch_grp_str));
+ pim_inet4_dump("<addr?>", am->ip_address, addr_str, sizeof(addr_str));
if (am->metric_preference == PIM_ASSERT_METRIC_PREFERENCE_MAX)
snprintf(pref_str, sizeof(pref_str), "INFI");
@@ -360,13 +343,11 @@ static void pim_show_assert_winner_metric_helper(struct vty *vty,
if (am->route_metric == PIM_ASSERT_ROUTE_METRIC_MAX)
snprintf(metr_str, sizeof(metr_str), "INFI");
else
- snprintf(metr_str, sizeof(metr_str), "%6u",
- am->route_metric);
+ snprintf(metr_str, sizeof(metr_str), "%6u", am->route_metric);
vty_out(vty, "%-9s %-15s %-15s %-15s %-3s %-4s %-6s %-15s\n",
- ch->interface->name, inet_ntoa(ifaddr), ch_src_str,
- ch_grp_str, am->rpt_bit_flag ? "yes" : "no", pref_str,
- metr_str, addr_str);
+ ch->interface->name, inet_ntoa(ifaddr), ch_src_str, ch_grp_str,
+ am->rpt_bit_flag ? "yes" : "no", pref_str, metr_str, addr_str);
}
static void pim_show_assert_winner_metric(struct pim_instance *pim,
@@ -431,30 +412,24 @@ static void pim_show_membership_helper(struct vty *vty,
json_object *json_iface = NULL;
json_object *json_row = NULL;
- pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
- sizeof(ch_src_str));
- pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
- sizeof(ch_grp_str));
+ pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str, sizeof(ch_src_str));
+ pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str, sizeof(ch_grp_str));
- json_object_object_get_ex(json, ch->interface->name,
- &json_iface);
+ json_object_object_get_ex(json, ch->interface->name, &json_iface);
if (!json_iface) {
json_iface = json_object_new_object();
json_object_pim_ifp_add(json_iface, ch->interface);
- json_object_object_add(json, ch->interface->name,
- json_iface);
+ json_object_object_add(json, ch->interface->name, json_iface);
}
json_row = json_object_new_object();
json_object_string_add(json_row, "source", ch_src_str);
json_object_string_add(json_row, "group", ch_grp_str);
- json_object_string_add(
- json_row, "localMembership",
- ch->local_ifmembership == PIM_IFMEMBERSHIP_NOINFO
- ? "NOINFO"
- : "INCLUDE");
+ json_object_string_add(json_row, "localMembership",
+ ch->local_ifmembership == PIM_IFMEMBERSHIP_NOINFO
+ ? "NOINFO"
+ : "INCLUDE");
json_object_object_add(json_iface, ch_grp_str, json_row);
-
}
static void pim_show_membership(struct pim_instance *pim, struct vty *vty,
u_char uj)
@@ -1060,10 +1035,10 @@ static void pim_show_interfaces_single(struct pim_instance *pim,
json_fhr_sources =
json_object_new_object();
- pim_inet4_dump("<src?>", up->sg.src,
- src_str, sizeof(src_str));
- pim_inet4_dump("<grp?>", up->sg.grp,
- grp_str, sizeof(grp_str));
+ pim_inet4_dump("<src?>", up->sg.src, src_str,
+ sizeof(src_str));
+ pim_inet4_dump("<grp?>", up->sg.grp, grp_str,
+ sizeof(grp_str));
pim_time_uptime(uptime, sizeof(uptime),
now - up->state_transition);
@@ -1072,15 +1047,13 @@ static void pim_show_interfaces_single(struct pim_instance *pim,
* If not create it.
*/
json_object_object_get_ex(json_fhr_sources,
- grp_str,
- &json_group);
+ grp_str, &json_group);
if (!json_group) {
json_group = json_object_new_object();
- json_object_object_add(
- json_fhr_sources,
- grp_str,
- json_group);
+ json_object_object_add(json_fhr_sources,
+ grp_str,
+ json_group);
}
json_group_source = json_object_new_object();
@@ -1216,8 +1189,9 @@ static void pim_show_interfaces_single(struct pim_instance *pim,
up)) {
if (strcmp(ifp->name,
- up->rpf.source_nexthop.
- interface->name) != 0)
+ up->rpf.source_nexthop
+ .interface->name)
+ != 0)
continue;
if (!(up->flags & PIM_UPSTREAM_FLAG_MASK_FHR))
@@ -1231,16 +1205,15 @@ static void pim_show_interfaces_single(struct pim_instance *pim,
print_header = 0;
}
- pim_inet4_dump("<src?>", up->sg.src,
- src_str, sizeof(src_str));
- pim_inet4_dump("<grp?>", up->sg.grp,
- grp_str, sizeof(grp_str));
+ pim_inet4_dump("<src?>", up->sg.src, src_str,
+ sizeof(src_str));
+ pim_inet4_dump("<grp?>", up->sg.grp, grp_str,
+ sizeof(grp_str));
pim_time_uptime(uptime, sizeof(uptime),
now - up->state_transition);
vty_out(vty,
"%s : %s is a source, uptime is %s\n",
- grp_str, src_str,
- uptime);
+ grp_str, src_str, uptime);
}
if (!print_header) {
@@ -1568,12 +1541,9 @@ static void pim_show_interface_traffic_single(struct pim_instance *pim,
}
}
-static void pim_show_join_helper(struct vty *vty,
- struct pim_interface *pim_ifp,
- struct pim_ifchannel *ch,
- json_object *json,
- time_t now,
- u_char uj)
+static void pim_show_join_helper(struct vty *vty, struct pim_interface *pim_ifp,
+ struct pim_ifchannel *ch, json_object *json,
+ time_t now, u_char uj)
{
char ch_src_str[INET_ADDRSTRLEN];
char ch_grp_str[INET_ADDRSTRLEN];
@@ -1587,13 +1557,10 @@ static void pim_show_join_helper(struct vty *vty,
ifaddr = pim_ifp->primary_address;
- pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
- sizeof(ch_src_str));
- pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
- sizeof(ch_grp_str));
+ pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str, sizeof(ch_src_str));
+ pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str, sizeof(ch_grp_str));
- pim_time_uptime_begin(uptime, sizeof(uptime), now,
- ch->ifjoin_creation);
+ pim_time_uptime_begin(uptime, sizeof(uptime), now, ch->ifjoin_creation);
pim_time_timer_to_mmss(expire, sizeof(expire),
ch->t_ifjoin_expiry_timer);
pim_time_timer_to_mmss(prune, sizeof(prune),
@@ -1605,10 +1572,9 @@ static void pim_show_join_helper(struct vty *vty,
if (!json_iface) {
json_iface = json_object_new_object();
- json_object_pim_ifp_add(json_iface,
- ch->interface);
- json_object_object_add(
- json, ch->interface->name, json_iface);
+ json_object_pim_ifp_add(json_iface, ch->interface);
+ json_object_object_add(json, ch->interface->name,
+ json_iface);
}
json_row = json_object_new_object();
@@ -1619,29 +1585,23 @@ static void pim_show_join_helper(struct vty *vty,
json_object_string_add(json_row, "prune", prune);
json_object_string_add(
json_row, "channelJoinName",
- pim_ifchannel_ifjoin_name(ch->ifjoin_state,
- ch->flags));
+ pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags));
if (PIM_IF_FLAG_TEST_S_G_RPT(ch->flags))
json_object_int_add(json_row, "SGRpt", 1);
- json_object_object_get_ex(json_iface, ch_grp_str,
- &json_grp);
+ json_object_object_get_ex(json_iface, ch_grp_str, &json_grp);
if (!json_grp) {
json_grp = json_object_new_object();
- json_object_object_add(json_grp, ch_src_str,
- json_row);
+ json_object_object_add(json_grp, ch_src_str, json_row);
json_object_object_add(json_iface, ch_grp_str,
json_grp);
} else
- json_object_object_add(json_grp, ch_src_str,
- json_row);
+ json_object_object_add(json_grp, ch_src_str, json_row);
} else {
- vty_out(vty,
- "%-9s %-15s %-15s %-15s %-10s %8s %-6s %5s\n",
- ch->interface->name, inet_ntoa(ifaddr),
- ch_src_str, ch_grp_str,
- pim_ifchannel_ifjoin_name(ch->ifjoin_state,
- ch->flags),
+ vty_out(vty, "%-9s %-15s %-15s %-15s %-10s %8s %-6s %5s\n",
+ ch->interface->name, inet_ntoa(ifaddr), ch_src_str,
+ ch_grp_str,
+ pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags),
uptime, expire, prune);
}
}
@@ -1674,7 +1634,7 @@ static void pim_show_join(struct pim_instance *pim, struct vty *vty, u_char uj)
if (uj) {
vty_out(vty, "%s\n", json_object_to_json_string_ext(
- json, JSON_C_TO_STRING_PRETTY));
+ json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
}
@@ -2374,20 +2334,20 @@ static void pim_show_upstream(struct pim_instance *pim, struct vty *vty,
* we are the FHR, else we just put
* the RP as the rpfAddress
*/
- if (up->flags & PIM_UPSTREAM_FLAG_MASK_FHR ||
- up->sg.src.s_addr == INADDR_ANY) {
+ if (up->flags & PIM_UPSTREAM_FLAG_MASK_FHR
+ || up->sg.src.s_addr == INADDR_ANY) {
char rpf[PREFIX_STRLEN];
struct pim_rpf *rpg;
rpg = RP(pim, up->sg.grp);
pim_inet4_dump("<rpf?>",
- rpg->rpf_addr.u.prefix4,
- rpf, sizeof(rpf));
- json_object_string_add(json_row,
- "rpfAddress", rpf);
+ rpg->rpf_addr.u.prefix4, rpf,
+ sizeof(rpf));
+ json_object_string_add(json_row, "rpfAddress",
+ rpf);
} else {
- json_object_string_add(json_row,
- "rpfAddress", src_str);
+ json_object_string_add(json_row, "rpfAddress",
+ src_str);
}
json_object_string_add(json_row, "source", src_str);
@@ -2432,8 +2392,7 @@ static void pim_show_join_desired_helper(struct pim_instance *pim,
struct vty *vty,
struct pim_interface *pim_ifp,
struct pim_ifchannel *ch,
- json_object *json,
- u_char uj)
+ json_object *json, u_char uj)
{
struct pim_upstream *up = ch->upstream;
json_object *json_group = NULL;
@@ -2449,8 +2408,7 @@ static void pim_show_join_desired_helper(struct pim_instance *pim,
if (!json_group) {
json_group = json_object_new_object();
- json_object_object_add(json, grp_str,
- json_group);
+ json_object_object_add(json, grp_str, json_group);
}
json_row = json_object_new_object();
@@ -2461,36 +2419,31 @@ static void pim_show_join_desired_helper(struct pim_instance *pim,
json_object_string_add(json_row, "group", grp_str);
if (pim_macro_ch_lost_assert(ch))
- json_object_boolean_true_add(json_row,
- "lostAssert");
+ json_object_boolean_true_add(json_row, "lostAssert");
if (pim_macro_chisin_joins(ch))
json_object_boolean_true_add(json_row, "joins");
if (pim_macro_chisin_pim_include(ch))
- json_object_boolean_true_add(json_row,
- "pimInclude");
+ json_object_boolean_true_add(json_row, "pimInclude");
if (pim_upstream_evaluate_join_desired(pim, up))
- json_object_boolean_true_add(
- json_row, "evaluateJoinDesired");
+ json_object_boolean_true_add(json_row,
+ "evaluateJoinDesired");
json_object_object_add(json_group, src_str, json_row);
} else {
- vty_out(vty,
- "%-9s %-15s %-15s %-10s %-5s %-10s %-11s %-6s\n",
+ vty_out(vty, "%-9s %-15s %-15s %-10s %-5s %-10s %-11s %-6s\n",
ch->interface->name, src_str, grp_str,
pim_macro_ch_lost_assert(ch) ? "yes" : "no",
pim_macro_chisin_joins(ch) ? "yes" : "no",
pim_macro_chisin_pim_include(ch) ? "yes" : "no",
- PIM_UPSTREAM_FLAG_TEST_DR_JOIN_DESIRED(
- up->flags)
- ? "yes"
- : "no",
- pim_upstream_evaluate_join_desired(pim, up)
- ? "yes"
- : "no");
+ PIM_UPSTREAM_FLAG_TEST_DR_JOIN_DESIRED(up->flags)
+ ? "yes"
+ : "no",
+ pim_upstream_evaluate_join_desired(pim, up) ? "yes"
+ : "no");
}
}
@@ -2518,8 +2471,7 @@ static void pim_show_join_desired(struct pim_instance *pim, struct vty *vty,
RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
/* scan all interfaces */
- pim_show_join_desired_helper(pim, vty,
- pim_ifp, ch,
+ pim_show_join_desired_helper(pim, vty, pim_ifp, ch,
json, uj);
}
}
@@ -3136,12 +3088,12 @@ static void clear_interfaces(struct pim_instance *pim)
clear_pim_interfaces(pim);
}
-#define PIM_GET_PIM_INTERFACE(pim_ifp, ifp) \
- pim_ifp = ifp->info; \
- if (!pim_ifp) { \
- vty_out(vty, \
+#define PIM_GET_PIM_INTERFACE(pim_ifp, ifp) \
+ pim_ifp = ifp->info; \
+ if (!pim_ifp) { \
+ vty_out(vty, \
"%% Enable PIM and/or IGMP on this interface first\n"); \
- return CMD_WARNING_CONFIG_FAILED; \
+ return CMD_WARNING_CONFIG_FAILED; \
}
DEFUN (clear_ip_interfaces,
@@ -4251,11 +4203,12 @@ DEFUN (show_ip_pim_nexthop_lookup,
result = pim_ecmp_nexthop_search(vrf->info, &pnc, &nexthop,
&nht_p, &grp, 0);
else
- result = pim_ecmp_nexthop_lookup(vrf->info, &nexthop, vif_source,
- &nht_p, &grp, 0);
+ result = pim_ecmp_nexthop_lookup(vrf->info, &nexthop,
+ vif_source, &nht_p, &grp, 0);
if (!result) {
- vty_out(vty, "Nexthop Lookup failed, no usable routes returned.\n");
+ vty_out(vty,
+ "Nexthop Lookup failed, no usable routes returned.\n");
return CMD_SUCCESS;
}
@@ -4428,8 +4381,8 @@ DEFUN (show_ip_multicast_vrf_all,
return CMD_SUCCESS;
}
-static void show_mroute(struct pim_instance *pim, struct vty *vty,
- bool fill, u_char uj)
+static void show_mroute(struct pim_instance *pim, struct vty *vty, bool fill,
+ u_char uj)
{
struct listnode *node;
struct channel_oil *c_oil;
@@ -4682,9 +4635,11 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
continue;
ifp_out = pim_if_find_by_vif_index(pim, oif_vif_index);
- pim_time_uptime(oif_uptime, sizeof(oif_uptime),
- now -
- s_route->c_oil.oif_creation[oif_vif_index]);
+ pim_time_uptime(
+ oif_uptime, sizeof(oif_uptime),
+ now
+ - s_route->c_oil
+ .oif_creation[oif_vif_index]);
found_oif = 1;
if (ifp_out)
@@ -5055,7 +5010,8 @@ static int pim_rp_cmd_worker(struct pim_instance *pim, struct vty *vty,
}
if (result == PIM_GROUP_OVERLAP) {
- vty_out(vty, "%% Group range specified cannot exact match another\n");
+ vty_out(vty,
+ "%% Group range specified cannot exact match another\n");
return CMD_WARNING_CONFIG_FAILED;
}
@@ -6122,8 +6078,8 @@ DEFUN (interface_ip_igmp_version,
PIM_IF_DO_IGMP(pim_ifp->options);
pim_if_addr_add_all(ifp);
pim_if_membership_refresh(ifp);
- old_version = igmp_version; // avoid refreshing membership
- // again.
+ old_version = igmp_version;
+ // avoid refreshing membership again.
}
/* Current and new version is different refresh existing
membership. Going from 3 -> 2 or 2 -> 3. */
@@ -8508,10 +8464,10 @@ DEFUN (show_ip_msdp_sa_sg_vrf_all,
int idx = 2;
char *src_ip = argv_find(argv, argc, "A.B.C.D", &idx) ? argv[idx++]->arg
- : NULL;
+ : NULL;
char *grp_ip = idx < argc && argv_find(argv, argc, "A.B.C.D", &idx)
- ? argv[idx]->arg
- : NULL;
+ ? argv[idx]->arg
+ : NULL;
if (uj)
vty_out(vty, "{ ");
diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c
index 08a1432bb0..b6c5bc432d 100644
--- a/pimd/pim_hello.c
+++ b/pimd/pim_hello.c
@@ -125,9 +125,9 @@ static void tlv_trace_list(const char *label, const char *tlv_name,
}
}
-#define FREE_ADDR_LIST \
- if (hello_option_addr_list) { \
- list_delete_and_null(&hello_option_addr_list); \
+#define FREE_ADDR_LIST \
+ if (hello_option_addr_list) { \
+ list_delete_and_null(&hello_option_addr_list); \
}
#define FREE_ADDR_LIST_THEN_RETURN(code) \
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index a807c69c60..998f8fc2ca 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -427,8 +427,7 @@ static int pim_sec_addr_update(struct interface *ifp)
struct pim_secondary_addr *sec_addr;
int changed = 0;
- for (ALL_LIST_ELEMENTS_RO(pim_ifp->sec_addr_list, node,
- sec_addr)) {
+ for (ALL_LIST_ELEMENTS_RO(pim_ifp->sec_addr_list, node, sec_addr)) {
sec_addr->flags |= PIM_SEC_ADDRF_STALE;
}
@@ -1286,7 +1285,7 @@ static struct igmp_join *igmp_join_new(struct interface *ifp,
}
ferr_r pim_if_igmp_join_add(struct interface *ifp, struct in_addr group_addr,
- struct in_addr source_addr)
+ struct in_addr source_addr)
{
struct pim_interface *pim_ifp;
struct igmp_join *ij;
diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index 09bd2b06e4..5ecd07d227 100644
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -81,10 +81,9 @@ struct pim_interface {
struct in_addr update_source; /* user can statically set the primary
* address of the interface */
- int igmp_version; /* IGMP version */
- int igmp_default_robustness_variable; /* IGMPv3 QRV */
- int
- igmp_default_query_interval; /* IGMPv3 secs between general
+ int igmp_version; /* IGMP version */
+ int igmp_default_robustness_variable; /* IGMPv3 QRV */
+ int igmp_default_query_interval; /* IGMPv3 secs between general
queries */
int igmp_query_max_response_time_dsec; /* IGMPv3 Max Response Time in
dsecs for general queries */
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 4d564e5046..bb56379c14 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -44,8 +44,7 @@
#include "pim_ssm.h"
#include "pim_rp.h"
-RB_GENERATE(pim_ifchannel_rb, pim_ifchannel,
- pim_ifp_rb, pim_ifchannel_compare);
+RB_GENERATE(pim_ifchannel_rb, pim_ifchannel, pim_ifp_rb, pim_ifchannel_compare);
int pim_ifchannel_compare(const struct pim_ifchannel *ch1,
const struct pim_ifchannel *ch2)
@@ -642,11 +641,10 @@ static int on_ifjoin_prune_pending_timer(struct thread *t)
ch = THREAD_ARG(t);
if (PIM_DEBUG_TRACE)
- zlog_debug("%s: IFCHANNEL%s %s Prune Pending Timer Popped",
- __PRETTY_FUNCTION__,
- pim_str_sg_dump(&ch->sg),
- pim_ifchannel_ifjoin_name(ch->ifjoin_state,
- ch->flags));
+ zlog_debug(
+ "%s: IFCHANNEL%s %s Prune Pending Timer Popped",
+ __PRETTY_FUNCTION__, pim_str_sg_dump(&ch->sg),
+ pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags));
if (ch->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING) {
ifp = ch->interface;
@@ -662,9 +660,8 @@ static int on_ifjoin_prune_pending_timer(struct thread *t)
rpf.source_nexthop.interface = ifp;
rpf.rpf_addr.u.prefix4 =
pim_ifp->primary_address;
- pim_jp_agg_single_upstream_send(&rpf,
- ch->upstream,
- 0);
+ pim_jp_agg_single_upstream_send(
+ &rpf, ch->upstream, 0);
}
ifjoin_to_noinfo(ch, true);
@@ -681,8 +678,7 @@ static int on_ifjoin_prune_pending_timer(struct thread *t)
ch->upstream);
pim_jp_agg_single_upstream_send(&parent->rpf,
- parent,
- true);
+ parent, true);
}
}
/* from here ch may have been deleted */
@@ -1374,8 +1370,7 @@ void pim_ifchannel_set_star_g_join_state(struct pim_ifchannel *ch, int eom,
if (child->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING_TMP)
THREAD_OFF(child->t_ifjoin_prune_pending_timer);
THREAD_OFF(child->t_ifjoin_expiry_timer);
- struct pim_upstream *parent =
- child->upstream->parent;
+ struct pim_upstream *parent = child->upstream->parent;
PIM_IF_FLAG_UNSET_S_G_RPT(child->flags);
child->ifjoin_state = PIM_IFJOIN_NOINFO;
@@ -1383,19 +1378,16 @@ void pim_ifchannel_set_star_g_join_state(struct pim_ifchannel *ch, int eom,
if (I_am_RP(pim, child->sg.grp)) {
pim_channel_add_oif(
child->upstream->channel_oil,
- ch->interface,
- PIM_OIF_FLAG_PROTO_STAR);
- pim_upstream_switch(
- pim, child->upstream,
- PIM_UPSTREAM_JOINED);
+ ch->interface, PIM_OIF_FLAG_PROTO_STAR);
+ pim_upstream_switch(pim, child->upstream,
+ PIM_UPSTREAM_JOINED);
pim_jp_agg_single_upstream_send(
- &child->upstream->rpf,
- child->upstream, true);
+ &child->upstream->rpf, child->upstream,
+ true);
}
if (parent)
- pim_jp_agg_single_upstream_send(
- &parent->rpf,
- parent, true);
+ pim_jp_agg_single_upstream_send(&parent->rpf,
+ parent, true);
delete_on_noinfo(child);
break;
diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index 0b1a8ea0e8..0af9ebf0be 100644
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@ -111,8 +111,8 @@ struct pim_ifchannel {
};
RB_HEAD(pim_ifchannel_rb, pim_ifchannel);
-RB_PROTOTYPE(pim_ifchannel_rb, pim_ifchannel,
- pim_ifp_rb, pim_ifchannel_compare);
+RB_PROTOTYPE(pim_ifchannel_rb, pim_ifchannel, pim_ifp_rb,
+ pim_ifchannel_compare);
void pim_ifchannel_free(struct pim_ifchannel *ch);
void pim_ifchannel_delete(struct pim_ifchannel *ch);
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 0522420364..c0a58516d9 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -850,8 +850,7 @@ static struct igmp_sock *igmp_sock_new(int fd, struct in_addr ifaddr,
snprintf(hash_name, 64, "IGMP %s hash", ifp->name);
igmp->igmp_group_hash = hash_create(igmp_group_hash_key,
- igmp_group_hash_equal,
- hash_name);
+ igmp_group_hash_equal, hash_name);
igmp->fd = fd;
igmp->interface = ifp;
diff --git a/pimd/pim_igmp_mtrace.c b/pimd/pim_igmp_mtrace.c
index feb326c45c..5e2e316d85 100644
--- a/pimd/pim_igmp_mtrace.c
+++ b/pimd/pim_igmp_mtrace.c
@@ -99,7 +99,7 @@ static void mtrace_debug(struct pim_interface *pim_ifp,
if (PIM_DEBUG_MTRACE)
zlog_debug(
"Mtrace response block of wrong"
- " length");
+ " length");
responses = responses / sizeof(struct igmp_mtrace_rsp);
diff --git a/pimd/pim_igmp_mtrace.h b/pimd/pim_igmp_mtrace.h
index b5c1008444..d47da3557a 100644
--- a/pimd/pim_igmp_mtrace.h
+++ b/pimd/pim_igmp_mtrace.h
@@ -28,35 +28,35 @@
#define MTRACE_UNKNOWN_COUNT (0xffffffff)
enum mtrace_fwd_code {
- MTRACE_FWD_CODE_NO_ERROR = 0x00,
- MTRACE_FWD_CODE_WRONG_IF = 0x01,
- MTRACE_FWD_CODE_PRUNE_SENT = 0x02,
- MTRACE_FWD_CODE_PRUNE_RCVD = 0x03,
- MTRACE_FWD_CODE_SCOPED = 0x04,
- MTRACE_FWD_CODE_NO_ROUTE = 0x05,
- MTRACE_FWD_CODE_WRONG_LAST_HOP = 0x06,
- MTRACE_FWD_CODE_NOT_FORWARDING = 0x07,
- MTRACE_FWD_CODE_REACHED_RP = 0x08,
- MTRACE_FWD_CODE_RPF_IF = 0x09,
- MTRACE_FWD_CODE_NO_MULTICAST = 0x0A,
- MTRACE_FWD_CODE_INFO_HIDDEN = 0x0B,
- MTRACE_FWD_CODE_NO_SPACE = 0x81,
- MTRACE_FWD_CODE_OLD_ROUTER = 0x82,
- MTRACE_FWD_CODE_ADMIN_PROHIB = 0x83
+ MTRACE_FWD_CODE_NO_ERROR = 0x00,
+ MTRACE_FWD_CODE_WRONG_IF = 0x01,
+ MTRACE_FWD_CODE_PRUNE_SENT = 0x02,
+ MTRACE_FWD_CODE_PRUNE_RCVD = 0x03,
+ MTRACE_FWD_CODE_SCOPED = 0x04,
+ MTRACE_FWD_CODE_NO_ROUTE = 0x05,
+ MTRACE_FWD_CODE_WRONG_LAST_HOP = 0x06,
+ MTRACE_FWD_CODE_NOT_FORWARDING = 0x07,
+ MTRACE_FWD_CODE_REACHED_RP = 0x08,
+ MTRACE_FWD_CODE_RPF_IF = 0x09,
+ MTRACE_FWD_CODE_NO_MULTICAST = 0x0A,
+ MTRACE_FWD_CODE_INFO_HIDDEN = 0x0B,
+ MTRACE_FWD_CODE_NO_SPACE = 0x81,
+ MTRACE_FWD_CODE_OLD_ROUTER = 0x82,
+ MTRACE_FWD_CODE_ADMIN_PROHIB = 0x83
};
enum mtrace_rtg_proto {
- MTRACE_RTG_PROTO_DVMRP = 1,
- MTRACE_RTG_PROTO_MOSPF = 2,
- MTRACE_RTG_PROTO_PIM = 3,
- MTRACE_RTG_PROTO_CBT = 4,
- MTRACE_RTG_PROTO_PIM_SPECIAL = 5,
- MTRACE_RTG_PROTO_PIM_STATIC = 6,
- MTRACE_RTG_PROTO_DVMRP_STATIC = 7,
- MTRACE_RTG_PROTO_PIM_MBGP = 8,
- MTRACE_RTG_PROTO_CBT_SPECIAL = 9,
- MTRACE_RTG_PROTO_CBT_STATIC = 10,
- MTRACE_RTG_PROTO_PIM_ASSERT = 11,
+ MTRACE_RTG_PROTO_DVMRP = 1,
+ MTRACE_RTG_PROTO_MOSPF = 2,
+ MTRACE_RTG_PROTO_PIM = 3,
+ MTRACE_RTG_PROTO_CBT = 4,
+ MTRACE_RTG_PROTO_PIM_SPECIAL = 5,
+ MTRACE_RTG_PROTO_PIM_STATIC = 6,
+ MTRACE_RTG_PROTO_DVMRP_STATIC = 7,
+ MTRACE_RTG_PROTO_PIM_MBGP = 8,
+ MTRACE_RTG_PROTO_CBT_SPECIAL = 9,
+ MTRACE_RTG_PROTO_CBT_STATIC = 10,
+ MTRACE_RTG_PROTO_PIM_ASSERT = 11,
};
struct igmp_mtrace_rsp {
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index 9b7ef2e073..f92da7fe70 100644
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -87,8 +87,8 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf)
pim_msdp_init(pim, master);
snprintf(hash_name, 64, "PIM %s RPF Hash", vrf->name);
- pim->rpf_hash = hash_create_size(256, pim_rpf_hash_key,
- pim_rpf_equal, hash_name);
+ pim->rpf_hash = hash_create_size(256, pim_rpf_hash_key, pim_rpf_equal,
+ hash_name);
if (PIM_DEBUG_ZEBRA)
zlog_debug("%s: NHT rpf hash init ", __PRETTY_FUNCTION__);
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index f8d8a602da..8462a4fdf8 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -530,7 +530,8 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp,
return -2;
}
PIM_UPSTREAM_FLAG_SET_SRC_STREAM(up->flags);
- pim_upstream_keep_alive_timer_start(up, pim_ifp->pim->keep_alive_time);
+ pim_upstream_keep_alive_timer_start(
+ up, pim_ifp->pim->keep_alive_time);
up->channel_oil = oil;
up->channel_oil->cc.pktcnt++;
pim_register_join(up);
@@ -720,9 +721,9 @@ int pim_mroute_socket_enable(struct pim_instance *pim)
}
#ifdef SO_BINDTODEVICE
- if (pim->vrf->vrf_id != VRF_DEFAULT &&
- setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, pim->vrf->name,
- strlen(pim->vrf->name))) {
+ if (pim->vrf->vrf_id != VRF_DEFAULT
+ && setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, pim->vrf->name,
+ strlen(pim->vrf->name))) {
zlog_warn("Could not setsockopt SO_BINDTODEVICE: %s",
safe_strerror(errno));
close(fd);
@@ -786,8 +787,8 @@ int pim_mroute_add_vif(struct interface *ifp, struct in_addr ifaddr,
if (PIM_DEBUG_MROUTE)
zlog_debug("%s: Add Vif %d (%s[%s])", __PRETTY_FUNCTION__,
- pim_ifp->mroute_vif_index,
- ifp->name, pim_ifp->pim->vrf->name);
+ pim_ifp->mroute_vif_index, ifp->name,
+ pim_ifp->pim->vrf->name);
memset(&vc, 0, sizeof(vc));
vc.vifc_vifi = pim_ifp->mroute_vif_index;
@@ -823,9 +824,9 @@ int pim_mroute_add_vif(struct interface *ifp, struct in_addr ifaddr,
zlog_warn(
"%s: failure: setsockopt(fd=%d,IPPROTO_IP,MRT_ADD_VIF,vif_index=%d,ifaddr=%s,flag=%d): errno=%d: %s",
- __PRETTY_FUNCTION__,
- pim_ifp->pim->mroute_socket, ifp->ifindex, ifaddr_str,
- flags, errno, safe_strerror(errno));
+ __PRETTY_FUNCTION__, pim_ifp->pim->mroute_socket,
+ ifp->ifindex, ifaddr_str, flags, errno,
+ safe_strerror(errno));
return -2;
}
@@ -839,9 +840,9 @@ int pim_mroute_del_vif(struct interface *ifp)
int err;
if (PIM_DEBUG_MROUTE)
- zlog_debug("%s: Del Vif %d (%s[%s])", __PRETTY_FUNCTION__,
- pim_ifp->mroute_vif_index,
- ifp->name, pim_ifp->pim->vrf->name);
+ zlog_debug("%s: Del Vif %d (%s[%s])", __PRETTY_FUNCTION__,
+ pim_ifp->mroute_vif_index, ifp->name,
+ pim_ifp->pim->vrf->name);
memset(&vc, 0, sizeof(vc));
vc.vifc_vifi = pim_ifp->mroute_vif_index;
@@ -927,8 +928,8 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name)
if (PIM_DEBUG_MROUTE) {
char buf[1000];
- zlog_debug("%s(%s), vrf %s Added Route: %s", __PRETTY_FUNCTION__, name,
- pim->vrf->name,
+ zlog_debug("%s(%s), vrf %s Added Route: %s",
+ __PRETTY_FUNCTION__, name, pim->vrf->name,
pim_channel_oil_dump(c_oil, buf, sizeof(buf)));
}
@@ -970,8 +971,8 @@ int pim_mroute_del(struct channel_oil *c_oil, const char *name)
if (PIM_DEBUG_MROUTE) {
char buf[1000];
- zlog_debug("%s(%s), vrf %s Deleted Route: %s", __PRETTY_FUNCTION__,
- name, pim->vrf->name,
+ zlog_debug("%s(%s), vrf %s Deleted Route: %s",
+ __PRETTY_FUNCTION__, name, pim->vrf->name,
pim_channel_oil_dump(c_oil, buf, sizeof(buf)));
}
diff --git a/pimd/pim_msdp.h b/pimd/pim_msdp.h
index 0627ee5f47..8363d50991 100644
--- a/pimd/pim_msdp.h
+++ b/pimd/pim_msdp.h
@@ -119,12 +119,8 @@ struct pim_msdp_peer {
/* protocol timers */
#define PIM_MSDP_PEER_HOLD_TIME 75
struct thread *hold_timer; // 5.4
- /* $FRR indent$ */
-/* clang-format off */
#define PIM_MSDP_PEER_KA_TIME 60
struct thread *ka_timer; // 5.5
- /* $FRR indent$ */
- /* clang-format off */
#define PIM_MSDP_PEER_CONNECT_RETRY_TIME 30
struct thread *cr_timer; // 5.6
@@ -139,8 +135,6 @@ struct pim_msdp_peer {
uint32_t conn_attempts;
uint32_t est_flaps;
uint32_t sa_cnt; /* number of SAs attributed to this peer */
- /* $FRR indent$ */
- /* clang-format off */
#define PIM_MSDP_PEER_LAST_RESET_STR 20
char last_reset[PIM_MSDP_PEER_LAST_RESET_STR];
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index 5b297253b2..94f19bea77 100644
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -107,11 +107,9 @@ static struct pim_nexthop_cache *pim_nexthop_cache_add(struct pim_instance *pim,
pnc->rp_list->cmp = pim_rp_list_cmp;
snprintf(hash_name, 64, "PNC %s(%s) Upstream Hash",
- prefix2str(&pnc->rpf.rpf_addr, buf1, 64),
- pim->vrf->name);
+ prefix2str(&pnc->rpf.rpf_addr, buf1, 64), pim->vrf->name);
pnc->upstream_hash = hash_create_size(8192, pim_upstream_hash_key,
- pim_upstream_equal,
- hash_name);
+ pim_upstream_equal, hash_name);
return pnc;
}
@@ -234,10 +232,9 @@ static void pim_update_rp_nh(struct pim_instance *pim,
continue;
// Compute PIM RPF using cached nexthop
- pim_ecmp_nexthop_search(pim, pnc,
- &rp_info->rp.source_nexthop,
- &rp_info->rp.rpf_addr,
- &rp_info->group, 1);
+ pim_ecmp_nexthop_search(pim, pnc, &rp_info->rp.source_nexthop,
+ &rp_info->rp.rpf_addr, &rp_info->group,
+ 1);
}
}
@@ -327,8 +324,7 @@ static int pim_update_upstream_nh_helper(struct hash_backet *backet, void *arg)
* We have detected a case where we might need to rescan
* the inherited o_list so do it.
*/
- if (up->channel_oil
- && up->channel_oil->oil_inherited_rescan) {
+ if (up->channel_oil && up->channel_oil->oil_inherited_rescan) {
pim_upstream_inherited_olist_decide(pim, up);
up->channel_oil->oil_inherited_rescan = 0;
}
@@ -339,8 +335,7 @@ static int pim_update_upstream_nh_helper(struct hash_backet *backet, void *arg)
* where the mroute has not been installed
* so install it.
*/
- if (up->channel_oil
- && !up->channel_oil->installed)
+ if (up->channel_oil && !up->channel_oil->installed)
pim_mroute_add(up->channel_oil,
__PRETTY_FUNCTION__);
@@ -627,8 +622,9 @@ int pim_parse_nexthop_update(int command, struct zclient *zclient,
if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
if (PIM_DEBUG_PIM_NHT)
- zlog_debug("%s: Decode of nexthop update from zebra failed",
- __PRETTY_FUNCTION__);
+ zlog_debug(
+ "%s: Decode of nexthop update from zebra failed",
+ __PRETTY_FUNCTION__);
return 0;
}
@@ -760,8 +756,7 @@ int pim_parse_nexthop_update(int command, struct zclient *zclient,
"%s: NHT Update for %s(%s) num_nh %d num_pim_nh %d vrf:%u up %ld rp %d",
__PRETTY_FUNCTION__, buf, pim->vrf->name,
nhr.nexthop_num, pnc->nexthop_num, vrf_id,
- pnc->upstream_hash->count,
- listcount(pnc->rp_list));
+ pnc->upstream_hash->count, listcount(pnc->rp_list));
}
pim_rpf_set_refresh_time();
@@ -803,11 +798,11 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
if (num_ifindex < 1) {
if (PIM_DEBUG_PIM_NHT) {
char addr_str[INET_ADDRSTRLEN];
- pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str));
+ pim_inet4_dump("<addr?>", addr, addr_str,
+ sizeof(addr_str));
zlog_warn(
"%s: could not find nexthop ifindex for address %s(%s)",
- __PRETTY_FUNCTION__, addr_str,
- pim->vrf->name);
+ __PRETTY_FUNCTION__, addr_str, pim->vrf->name);
}
return 0;
}
diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index 53bbf54f3e..fd3c04e8ca 100644
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -104,10 +104,8 @@ void pim_oil_init(struct pim_instance *pim)
char hash_name[64];
snprintf(hash_name, 64, "PIM %s Oil Hash", pim->vrf->name);
- pim->channel_oil_hash = hash_create_size(8192,
- pim_oil_hash_key,
- pim_oil_equal,
- hash_name);
+ pim->channel_oil_hash = hash_create_size(8192, pim_oil_hash_key,
+ pim_oil_equal, hash_name);
pim->channel_oil_list = list_new();
if (!pim->channel_oil_list) {
diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index a393d0bbda..b9908ae22b 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -417,10 +417,12 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr,
|| (SwitchToSptDesired(pim_ifp->pim, &sg))) {
if (sentRegisterStop) {
pim_upstream_keep_alive_timer_start(
- upstream, pim_ifp->pim->rp_keep_alive_time);
+ upstream,
+ pim_ifp->pim->rp_keep_alive_time);
} else {
pim_upstream_keep_alive_timer_start(
- upstream, pim_ifp->pim->keep_alive_time);
+ upstream,
+ pim_ifp->pim->keep_alive_time);
}
}
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index d961aa4c49..2395361180 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -147,8 +147,9 @@ void pim_rp_init(struct pim_instance *pim)
rn->info = rp_info;
if (PIM_DEBUG_TRACE)
- zlog_debug("Allocated: %p for rp_info: %p(224.0.0.0/4) Lock: %d",
- rn, rp_info, rn->lock);
+ zlog_debug(
+ "Allocated: %p for rp_info: %p(224.0.0.0/4) Lock: %d",
+ rn, rp_info, rn->lock);
}
void pim_rp_free(struct pim_instance *pim)
@@ -232,7 +233,8 @@ static struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,
if (rp_info->plist) {
plist = prefix_list_lookup(AFI_IP, rp_info->plist);
- if (prefix_list_apply_which_prefix(plist, &p, group) == PREFIX_DENY)
+ if (prefix_list_apply_which_prefix(plist, &p, group)
+ == PREFIX_DENY)
continue;
if (!best) {
@@ -250,8 +252,9 @@ static struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,
rn = route_node_match(pim->rp_table, group);
if (!rn) {
- zlog_err("%s: BUG We should have found default group information\n",
- __PRETTY_FUNCTION__);
+ zlog_err(
+ "%s: BUG We should have found default group information\n",
+ __PRETTY_FUNCTION__);
return best;
}
@@ -260,8 +263,8 @@ static struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,
char buf[PREFIX_STRLEN];
route_unlock_node(rn);
- zlog_debug("Lookedup: %p for rp_info: %p(%s) Lock: %d",
- rn, rp_info,
+ zlog_debug("Lookedup: %p for rp_info: %p(%s) Lock: %d", rn,
+ rp_info,
prefix2str(&rp_info->group, buf, sizeof(buf)),
rn->lock);
}
@@ -542,8 +545,8 @@ int pim_rp_new(struct pim_instance *pim, const char *rp,
if (PIM_DEBUG_TRACE) {
char buf[PREFIX_STRLEN];
- zlog_debug("Allocated: %p for rp_info: %p(%s) Lock: %d",
- rn, rp_info,
+ zlog_debug("Allocated: %p for rp_info: %p(%s) Lock: %d", rn,
+ rp_info,
prefix2str(&rp_info->group, buf, sizeof(buf)),
rn->lock);
}
@@ -653,11 +656,12 @@ int pim_rp_del(struct pim_instance *pim, const char *rp,
if (PIM_DEBUG_TRACE) {
char buf[PREFIX_STRLEN];
- zlog_debug("%s:Found for Freeing: %p for rp_info: %p(%s) Lock: %d",
- __PRETTY_FUNCTION__,
- rn, rp_info,
- prefix2str(&rp_info->group, buf, sizeof(buf)),
- rn->lock);
+ zlog_debug(
+ "%s:Found for Freeing: %p for rp_info: %p(%s) Lock: %d",
+ __PRETTY_FUNCTION__, rn, rp_info,
+ prefix2str(&rp_info->group, buf,
+ sizeof(buf)),
+ rn->lock);
}
rn->info = NULL;
route_unlock_node(rn);
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index fd09b04b8a..b5d5f006f2 100644
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -241,9 +241,10 @@ enum pim_rpf_result pim_rpf_update(struct pim_instance *pim,
} else {
if (!pim_ecmp_nexthop_lookup(
pim, &rpf->source_nexthop, up->upstream_addr, &src,
- &grp, !PIM_UPSTREAM_FLAG_TEST_FHR(up->flags)
- && !PIM_UPSTREAM_FLAG_TEST_SRC_IGMP(
- up->flags)))
+ &grp,
+ !PIM_UPSTREAM_FLAG_TEST_FHR(up->flags)
+ && !PIM_UPSTREAM_FLAG_TEST_SRC_IGMP(
+ up->flags)))
return PIM_RPF_FAILURE;
}
diff --git a/pimd/pim_tlv.c b/pimd/pim_tlv.c
index 3c9ef28f5a..eddec3c29e 100644
--- a/pimd/pim_tlv.c
+++ b/pimd/pim_tlv.c
@@ -654,12 +654,12 @@ int pim_parse_addr_source(struct prefix_sg *sg, uint8_t *flags,
return addr - buf;
}
-#define FREE_ADDR_LIST(hello_option_addr_list) \
- { \
- if (hello_option_addr_list) { \
- list_delete_and_null(&hello_option_addr_list); \
- hello_option_addr_list = 0; \
- } \
+#define FREE_ADDR_LIST(hello_option_addr_list) \
+ { \
+ if (hello_option_addr_list) { \
+ list_delete_and_null(&hello_option_addr_list); \
+ hello_option_addr_list = 0; \
+ } \
}
int pim_tlv_parse_addr_list(const char *ifname, struct in_addr src_addr,
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index fdd37f2b91..b5f5f646d4 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -167,9 +167,9 @@ struct pim_upstream *pim_upstream_del(struct pim_instance *pim,
if (PIM_DEBUG_TRACE)
zlog_debug(
"%s(%s): Delete %s[%s] ref count: %d , flags: %d c_oil ref count %d (Pre decrement)",
- __PRETTY_FUNCTION__, name, up->sg_str,
- pim->vrf->name, up->ref_count,
- up->flags, up->channel_oil->oil_ref_count);
+ __PRETTY_FUNCTION__, name, up->sg_str, pim->vrf->name,
+ up->ref_count, up->flags,
+ up->channel_oil->oil_ref_count);
--up->ref_count;
@@ -949,7 +949,8 @@ void pim_upstream_rpf_genid_changed(struct pim_instance *pim,
sizeof(rpf_addr_str));
zlog_debug(
"%s: matching neigh=%s against upstream (S,G)=%s[%s] joined=%d rpf_addr=%s",
- __PRETTY_FUNCTION__, neigh_str, up->sg_str, pim->vrf->name,
+ __PRETTY_FUNCTION__, neigh_str, up->sg_str,
+ pim->vrf->name,
up->join_state == PIM_UPSTREAM_JOINED,
rpf_addr_str);
}
@@ -1106,8 +1107,9 @@ static int pim_upstream_keep_alive_timer(struct thread *t)
if (PIM_UPSTREAM_FLAG_TEST_SRC_STREAM(up->flags)) {
pim_upstream_fhr_kat_expiry(pim, up);
if (PIM_DEBUG_TRACE)
- zlog_debug("kat expired on %s[%s]; remove stream reference",
- up->sg_str, pim->vrf->name);
+ zlog_debug(
+ "kat expired on %s[%s]; remove stream reference",
+ up->sg_str, pim->vrf->name);
PIM_UPSTREAM_FLAG_UNSET_SRC_STREAM(up->flags);
pim_upstream_del(pim, up, __PRETTY_FUNCTION__);
} else if (PIM_UPSTREAM_FLAG_TEST_SRC_LHR(up->flags)) {
@@ -1117,8 +1119,8 @@ static int pim_upstream_keep_alive_timer(struct thread *t)
pim_upstream_del(pim, up, __PRETTY_FUNCTION__);
if (parent) {
- pim_jp_agg_single_upstream_send(&parent->rpf,
- parent, true);
+ pim_jp_agg_single_upstream_send(&parent->rpf, parent,
+ true);
}
}
@@ -1620,8 +1622,8 @@ static void pim_upstream_sg_running(void *arg)
if (!up->channel_oil->installed) {
if (PIM_DEBUG_TRACE)
zlog_debug("%s: %s[%s] is not installed in mroute",
- __PRETTY_FUNCTION__,
- up->sg_str, pim->vrf->name);
+ __PRETTY_FUNCTION__, up->sg_str,
+ pim->vrf->name);
return;
}
@@ -1637,7 +1639,8 @@ static void pim_upstream_sg_running(void *arg)
if (PIM_DEBUG_TRACE)
zlog_debug(
"%s: Handling unscanned inherited_olist for %s[%s]",
- __PRETTY_FUNCTION__, up->sg_str, pim->vrf->name);
+ __PRETTY_FUNCTION__, up->sg_str,
+ pim->vrf->name);
pim_upstream_inherited_olist_decide(pim, up);
up->channel_oil->oil_inherited_rescan = 0;
}
@@ -1765,8 +1768,7 @@ void pim_upstream_init(struct pim_instance *pim)
wheel_init(master, 31000, 100, pim_upstream_hash_key,
pim_upstream_sg_running);
- snprintf(hash_name, 64, "PIM %s Upstream Hash",
- pim->vrf->name);
+ snprintf(hash_name, 64, "PIM %s Upstream Hash", pim->vrf->name);
pim->upstream_hash = hash_create_size(8192, pim_upstream_hash_key,
pim_upstream_equal, hash_name);
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 2970dcee5e..81c0cb6efb 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -185,9 +185,9 @@ static int pim_zebra_if_state_up(int command, struct zclient *zclient,
vrf->name, vrf->vrf_id);
if (!master) {
- zlog_debug("%s: Unable to find Master interface for %s",
- __PRETTY_FUNCTION__,
- vrf->name);
+ zlog_debug(
+ "%s: Unable to find Master interface for %s",
+ __PRETTY_FUNCTION__, vrf->name);
return 0;
}
zclient_interface_set_master(zclient, master,
@@ -295,9 +295,10 @@ static int pim_zebra_if_address_add(int command, struct zclient *zclient,
prefix2str(p, buf, BUFSIZ);
zlog_debug("%s: %s(%u) connected IP address %s flags %u %s",
__PRETTY_FUNCTION__, c->ifp->name, vrf_id, buf,
- c->flags, CHECK_FLAG(c->flags, ZEBRA_IFA_SECONDARY)
- ? "secondary"
- : "primary");
+ c->flags,
+ CHECK_FLAG(c->flags, ZEBRA_IFA_SECONDARY)
+ ? "secondary"
+ : "primary");
#ifdef PIM_DEBUG_IFADDR_DUMP
dump_if_address(c->ifp);
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index bcaf4a38dd..8006148f93 100644
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -441,9 +441,8 @@ int zclient_lookup_nexthop(struct pim_instance *pim,
nexthop_tab[0].route_metric);
}
- addr =
- nexthop_addr.u.prefix4; /* use nexthop addr for
- recursive lookup */
+ addr = nexthop_addr.u.prefix4; /* use nexthop addr for
+ recursive lookup */
} /* for (max_lookup) */
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-10 01:37:11 +0000