nhrpd: Fix style violation issues

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>

diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c
index 2f9665ab88aed15813544b50fd114ed662213854..6fb54cd709ab99368deb92a970a2b45acf798b38 100755 (executable)
--- a/nhrpd/nhrp_multicast.c
+++ b/nhrpd/nhrp_multicast.c
@@ -47,19 +47,22 @@ static void nhrp_multicast_send(struct nhrp_peer *p, struct zbuf *zb)
 
        addrlen = sockunion_get_addrlen(&p->vc->remote.nbma);
        ret = os_sendmsg(zb->head, zbuf_used(zb), p->ifp->ifindex,
-                  sockunion_get_addr(&p->vc->remote.nbma),
-                  addrlen, addrlen == 4 ? 0x0800 : 0x86DD);
-
-       debugf(NHRP_DEBUG_COMMON, "Multicast Packet: %s -> %s, ret = %d, size = %zu, addrlen = %zu",
-                  sockunion2str(&p->vc->local.nbma, buf[0], sizeof(buf[0])),
-                  sockunion2str(&p->vc->remote.nbma, buf[1], sizeof(buf[1])),
-                  ret, zbuf_used(zb), addrlen);
+                        sockunion_get_addr(&p->vc->remote.nbma), addrlen,
+                        addrlen == 4 ? 0x0800 : 0x86DD);
+
+       debugf(NHRP_DEBUG_COMMON,
+              "Multicast Packet: %s -> %s, ret = %d, size = %zu, addrlen = %zu",
+              sockunion2str(&p->vc->local.nbma, buf[0], sizeof(buf[0])),
+              sockunion2str(&p->vc->remote.nbma, buf[1], sizeof(buf[1])), ret,
+              zbuf_used(zb), addrlen);
 }
 
-static void nhrp_multicast_forward_nbma(union sockunion *nbma_addr, struct interface *ifp, struct zbuf *pkt)
+static void nhrp_multicast_forward_nbma(union sockunion *nbma_addr,
+                                       struct interface *ifp, struct zbuf *pkt)
 {
        struct nhrp_peer *p = nhrp_peer_get(ifp, nbma_addr);
-       if(p && p->online) {
+
+       if (p && p->online) {
                /* Send packet */
                nhrp_multicast_send(p, pkt);
        }
@@ -71,7 +74,8 @@ static void nhrp_multicast_forward_cache(struct nhrp_cache *c, void *pctx)
        struct mcast_ctx *ctx = (struct mcast_ctx *)pctx;
 
        if (c->cur.type == NHRP_CACHE_DYNAMIC && c->cur.peer)
-               nhrp_multicast_forward_nbma(&c->cur.peer->vc->remote.nbma, ctx->ifp, ctx->pkt);
+               nhrp_multicast_forward_nbma(&c->cur.peer->vc->remote.nbma,
+                                           ctx->ifp, ctx->pkt);
 }
 
 static void nhrp_multicast_forward(struct nhrp_multicast *mcast, void *pctx)
@@ -84,7 +88,8 @@ static void nhrp_multicast_forward(struct nhrp_multicast *mcast, void *pctx)
 
        /* dynamic */
        if (sockunion_family(&mcast->nbma_addr) == AF_UNSPEC) {
-               nhrp_cache_foreach(ctx->ifp, nhrp_multicast_forward_cache, pctx);
+               nhrp_cache_foreach(ctx->ifp, nhrp_multicast_forward_cache,
+                                  pctx);
                return;
        }
 
@@ -102,7 +107,7 @@ static void netlink_mcast_log_handler(struct nlmsghdr *msg, struct zbuf *zb)
        afi_t afi;
        struct mcast_ctx ctx;
 
-       debugf(NHRP_DEBUG_COMMON,"Inside %s\n", __func__);
+       debugf(NHRP_DEBUG_COMMON, "Inside %s\n", __func__);
 
        nf = znl_pull(zb, sizeof(*nf));
        if (!nf)
@@ -120,7 +125,8 @@ static void netlink_mcast_log_handler(struct nlmsghdr *msg, struct zbuf *zb)
                        /* NFULA_HWHDR exists and is supposed to contain source
                         * hardware address. However, for ip_gre it seems to be
                         * the nexthop destination address if the packet matches
-                        * route. */
+                        * route.
+                        */
                }
        }
 
@@ -131,15 +137,15 @@ static void netlink_mcast_log_handler(struct nlmsghdr *msg, struct zbuf *zb)
        if (!ifp)
                return;
 
-       debugf(NHRP_DEBUG_COMMON,"Outgoing interface = %s\n", ifp->name);
+       debugf(NHRP_DEBUG_COMMON, "Outgoing interface = %s\n", ifp->name);
 
-       ctx = (struct mcast_ctx) {
-               .ifp = ifp,
-               .pkt = &pktpl,
+       ctx = (struct mcast_ctx){
+               .ifp = ifp, .pkt = &pktpl,
        };
 
        for (afi = 0; afi < AFI_MAX; afi++) {
-               nhrp_multicast_foreach(ifp, afi, nhrp_multicast_forward, (void *)&ctx);
+               nhrp_multicast_foreach(ifp, afi, nhrp_multicast_forward,
+                                      (void *)&ctx);
        }
 }
 
@@ -195,7 +201,8 @@ static void netlink_mcast_log_register(int fd, int group)
        zbuf_free(zb);
 }
 
-static int nhrp_multicast_free(struct interface *ifp, struct nhrp_multicast *mcast)
+static int nhrp_multicast_free(struct interface *ifp,
+                              struct nhrp_multicast *mcast)
 {
        list_del(&mcast->list_entry);
        XFREE(MTYPE_NHRP_MULTICAST, mcast);
@@ -217,13 +224,16 @@ static void netlink_mcast_set_nflog_group(struct interface *ifp, int nlgroup)
                        return;
 
                netlink_mcast_log_register(netlink_mcast_log_fd, nlgroup);
-               thread_add_read(master, netlink_mcast_log_recv, 0, netlink_mcast_log_fd,
+               thread_add_read(master, netlink_mcast_log_recv, 0,
+                               netlink_mcast_log_fd,
                                &netlink_mcast_log_thread);
-               debugf(NHRP_DEBUG_COMMON, "Register nflog group: %d", netlink_mcast_nflog_group);
+               debugf(NHRP_DEBUG_COMMON, "Register nflog group: %d",
+                      netlink_mcast_nflog_group);
        }
 }
 
-int nhrp_multicast_add(struct interface *ifp, afi_t afi, union sockunion *nbma_addr)
+int nhrp_multicast_add(struct interface *ifp, afi_t afi,
+                      union sockunion *nbma_addr)
 {
        struct nhrp_interface *nifp = ifp->info;
        struct nhrp_multicast *mcast;
@@ -238,9 +248,7 @@ int nhrp_multicast_add(struct interface *ifp, afi_t afi, union sockunion *nbma_a
        mcast = XMALLOC(MTYPE_NHRP_MULTICAST, sizeof(struct nhrp_multicast));
 
        *mcast = (struct nhrp_multicast){
-               .afi = afi,
-               .ifp = ifp,
-               .nbma_addr = *nbma_addr,
+               .afi = afi, .ifp = ifp, .nbma_addr = *nbma_addr,
        };
        list_add_tail(&mcast->list_entry, &nifp->afi[afi].mcastlist_head);
 
@@ -253,7 +261,8 @@ int nhrp_multicast_add(struct interface *ifp, afi_t afi, union sockunion *nbma_a
        return NHRP_OK;
 }
 
-int nhrp_multicast_del(struct interface *ifp, afi_t afi, union sockunion *nbma_addr)
+int nhrp_multicast_del(struct interface *ifp, afi_t afi,
+                      union sockunion *nbma_addr)
 {
        struct nhrp_interface *nifp = ifp->info;
        struct nhrp_multicast *mcast, *tmp;
@@ -283,25 +292,27 @@ void nhrp_multicast_interface_del(struct interface *ifp)
        afi_t afi;
 
        for (afi = 0; afi < AFI_MAX; afi++) {
-               debugf(NHRP_DEBUG_COMMON, "Cleaning up multicast entries (%d)", !list_empty(&nifp->afi[afi].mcastlist_head));
+               debugf(NHRP_DEBUG_COMMON,
+                      "Cleaning up multicast entries (%d)",
+                      !list_empty(&nifp->afi[afi].mcastlist_head));
 
                list_for_each_entry_safe(
-                               mcast, tmp, &nifp->afi[afi].mcastlist_head,
-                               list_entry) {
+                       mcast, tmp, &nifp->afi[afi].mcastlist_head, list_entry)
+               {
                        nhrp_multicast_free(ifp, mcast);
                }
        }
 }
 
 void nhrp_multicast_foreach(struct interface *ifp, afi_t afi,
-                     void (*cb)(struct nhrp_multicast *, void *),
-                     void *ctx)
+                           void (*cb)(struct nhrp_multicast *, void *),
+                           void *ctx)
 {
        struct nhrp_interface *nifp = ifp->info;
        struct nhrp_multicast *mcast;
 
        list_for_each_entry(mcast, &nifp->afi[afi].mcastlist_head, list_entry)
        {
-               cb (mcast, ctx);
+               cb(mcast, ctx);
        }
 }

diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c
index 81746807601574fbcbd7e4d35ef6ee2386611dff..0c2259dc9fd389661af36ba8036bd751e6766ba7 100644 (file)
--- a/nhrpd/nhrp_peer.c
+++ b/nhrpd/nhrp_peer.c
@@ -375,8 +375,7 @@ void nhrp_peer_send(struct nhrp_peer *p, struct zbuf *zb)
 
        os_sendmsg(zb->head, zbuf_used(zb), p->ifp->ifindex,
                   sockunion_get_addr(&p->vc->remote.nbma),
-                  sockunion_get_addrlen(&p->vc->remote.nbma),
-                  ETH_P_NHRP);
+                  sockunion_get_addrlen(&p->vc->remote.nbma), ETH_P_NHRP);
        zbuf_reset(zb);
 }
 

diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c
index e649dc34e31d809bc9621608e88bc091ce9df0da..c16a816a36a527e84ffd01afa56e4c8384f1a794 100644 (file)
--- a/nhrpd/nhrp_vty.c
+++ b/nhrpd/nhrp_vty.c
@@ -779,8 +779,8 @@ static void show_ip_nhrp_nhs(struct nhrp_nhs *n, struct nhrp_registration *reg,
        ctx->count++;
 
        if (reg && reg->peer)
-               sockunion2str(&reg->peer->vc->remote.nbma,
-                             buf[0], sizeof(buf[0]));
+               sockunion2str(&reg->peer->vc->remote.nbma, buf[0],
+                             sizeof(buf[0]));
        else
                snprintf(buf[0], sizeof(buf[0]), "-");
        sockunion2str(reg ? &reg->proto_addr : &n->proto_addr, buf[1],
@@ -1094,7 +1094,8 @@ struct write_map_ctx {
        const char *aficmd;
 };
 
-static void interface_config_write_nhrp_map(struct nhrp_cache_config *c, void *data)
+static void interface_config_write_nhrp_map(struct nhrp_cache_config *c,
+                                           void *data)
 {
        struct write_map_ctx *ctx = data;
        struct vty *vty = ctx->vty;
@@ -1106,7 +1107,8 @@ static void interface_config_write_nhrp_map(struct nhrp_cache_config *c, void *d
        vty_out(vty, " %s nhrp map %s %s\n", ctx->aficmd,
                sockunion2str(&c->remote_addr, buf[0], sizeof(buf[0])),
                c->type == NHRP_CACHE_LOCAL
-               ? "local" : sockunion2str(&c->nbma, buf[1], sizeof(buf[1])));
+                       ? "local"
+                       : sockunion2str(&c->nbma, buf[1], sizeof(buf[1])));
 }
 
 static int interface_config_write(struct vty *vty)
@@ -1170,8 +1172,8 @@ static int interface_config_write(struct vty *vty)
                                .family = afi2family(afi),
                                .aficmd = aficmd,
                        };
-                       nhrp_cache_config_foreach(ifp, interface_config_write_nhrp_map,
-                                                 &mapctx);
+                       nhrp_cache_config_foreach(
+                               ifp, interface_config_write_nhrp_map, &mapctx);
 
                        list_for_each_entry(nhs, &ad->nhslist_head,
                                            nhslist_entry)
@@ -1196,8 +1198,8 @@ static int interface_config_write(struct vty *vty)
                                                        == AF_UNSPEC
                                                ? "dynamic"
                                                : sockunion2str(
-                                                         &mcast->nbma_addr, buf,
-                                                         sizeof(buf)));
+                                                         &mcast->nbma_addr,
+                                                         buf, sizeof(buf)));
                        }
                }
 

diff --git a/nhrpd/nhrpd.h b/nhrpd/nhrpd.h
index 1d0d9991575f125784b02d2f1c3022e0b00baaa4..db7828f71583302ce5ae5095ce7b9dbca61221cb 100644 (file)
--- a/nhrpd/nhrpd.h
+++ b/nhrpd/nhrpd.h
@@ -359,12 +359,14 @@ void nhrp_nhs_foreach(struct interface *ifp, afi_t afi,
                      void *ctx);
 void nhrp_nhs_interface_del(struct interface *ifp);
 
-int nhrp_multicast_add(struct interface *ifp, afi_t afi, union sockunion *nbma_addr);
-int nhrp_multicast_del(struct interface *ifp, afi_t afi, union sockunion *nbma_addr);
+int nhrp_multicast_add(struct interface *ifp, afi_t afi,
+                      union sockunion *nbma_addr);
+int nhrp_multicast_del(struct interface *ifp, afi_t afi,
+                      union sockunion *nbma_addr);
 void nhrp_multicast_interface_del(struct interface *ifp);
 void nhrp_multicast_foreach(struct interface *ifp, afi_t afi,
-                     void (*cb)(struct nhrp_multicast *, void *),
-                     void *ctx);
+                           void (*cb)(struct nhrp_multicast *, void *),
+                           void *ctx);
 
 void nhrp_route_update_nhrp(const struct prefix *p, struct interface *ifp);
 void nhrp_route_announce(int add, enum nhrp_cache_type type,