]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: Fix up > 80 columns 2635/head
authorDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 7 Jul 2018 20:00:48 +0000 (16:00 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 7 Jul 2018 20:00:48 +0000 (16:00 -0400)
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_nht.c
pimd/pim_rp.c

index f2115010efe0de21e40154a6c1c56777ae1c7b5b..74a39171808444e4152a8dac71e5a167c77540a8 100644 (file)
@@ -513,6 +513,7 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim,
                        nbrs[i] = pim_neighbor_find(ifps[i],
                                                    nh_node->gate.ipv4);
                        if (nbrs[i] || pim_if_connected_to_source(ifps[i],
+
                                                                  src->u.prefix4))
                                num_nbrs++;
                }
index c837e01549b257b1f46494eb486486e0d706f8f6..8ede416a53d17082ba412f333e65b0605618773a 100644 (file)
@@ -700,9 +700,9 @@ void pim_rp_setup(struct pim_instance *pim)
                                        "%s: NHT Local Nexthop not found for RP %s ",
                                        __PRETTY_FUNCTION__, buf);
                        }
-                       if (!pim_ecmp_nexthop_lookup(
-                                                    pim, &rp_info->rp.source_nexthop,
-                                                    &nht_p, &rp_info->group, 1))
+                       if (!pim_ecmp_nexthop_lookup(pim,
+                                                    &rp_info->rp.source_nexthop,
+                                                     &nht_p, &rp_info->group, 1))
                                if (PIM_DEBUG_PIM_NHT_RP)
                                        zlog_debug(
                                                "Unable to lookup nexthop for rp specified");
@@ -867,7 +867,8 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, struct in_addr group)
                                        __PRETTY_FUNCTION__, buf, buf1);
                        }
                        pim_rpf_set_refresh_time(pim);
-                       pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop,
+                       pim_ecmp_nexthop_lookup(pim,
+                                               &rp_info->rp.source_nexthop,
                                                &nht_p, &rp_info->group, 1);
                }
                return (&rp_info->rp);