pimd: use bool instead of int to pass true/false

In pim_if_new use bool instead of an int to pass
true/false values for what we should create the
pim interface type for.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index dd2ba937386204a5922596e54201314a828c25b8..1f3336811f0236d48e85d452cf7a6f0bb6b4c23d 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -5766,8 +5766,7 @@ static int pim_cmd_igmp_start(struct vty *vty, struct interface *ifp)
        pim_ifp = ifp->info;
 
        if (!pim_ifp) {
-               pim_ifp = pim_if_new(ifp, 1 /* igmp=true */, 0 /* pim=false */,
-                                    false);
+               pim_ifp = pim_if_new(ifp, true, false, false);
                if (!pim_ifp) {
                        vty_out(vty, "Could not enable IGMP on interface %s\n",
                                ifp->name);
@@ -6378,8 +6377,7 @@ static int pim_cmd_interface_add(struct interface *ifp)
        struct pim_interface *pim_ifp = ifp->info;
 
        if (!pim_ifp) {
-               pim_ifp = pim_if_new(ifp, 0 /* igmp=false */, 1 /* pim=true */,
-                                    false);
+               pim_ifp = pim_if_new(ifp, false, true, false);
                if (!pim_ifp) {
                        return 0;
                }

diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 66773efb330619cbac7621f8adf11a5699250698..249b24c0d77415abd2a498bf9d9736a894224b96 100644 (file)
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -108,7 +108,7 @@ static int pim_sec_addr_comp(const void *p1, const void *p2)
        return 0;
 }
 
-struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim,
+struct pim_interface *pim_if_new(struct interface *ifp, bool igmp, bool pim,
                                 bool ispimreg)
 {
        struct pim_interface *pim_ifp;
@@ -1468,7 +1468,7 @@ void pim_if_create_pimreg(struct pim_instance *pim)
                pim->regiface = if_create(pimreg_name, pim->vrf_id);
                pim->regiface->ifindex = PIM_OIF_PIM_REGISTER_VIF;
 
-               pim_if_new(pim->regiface, 0, 0, true);
+               pim_if_new(pim->regiface, false, false, true);
        }
 }
 

diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index 189153449ac8f0fc13644944828924644d34db89..a7dc097f882cbda1a7237e2391313ef2c744c063 100644 (file)
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -154,7 +154,7 @@ struct pim_interface {
 void pim_if_init(struct pim_instance *pim);
 void pim_if_terminate(struct pim_instance *pim);
 
-struct pim_interface *pim_if_new(struct interface *ifp, int igmp, int pim,
+struct pim_interface *pim_if_new(struct interface *ifp, bool igmp, bool pim,
                                 bool ispimreg);
 void pim_if_delete(struct interface *ifp);
 void pim_if_addr_add(struct connected *ifc);

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index ad60e8e3a6a6aaef35d169892dda1557f0a15b2b..4fa4ea857fed7af63b5122dfb855b680cdf2cd70 100644 (file)
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -112,7 +112,7 @@ static int pim_zebra_if_add(int command, struct zclient *zclient,
                struct pim_interface *pim_ifp;
 
                if (!ifp->info) {
-                       pim_ifp = pim_if_new(ifp, 0, 0, false);
+                       pim_ifp = pim_if_new(ifp, false, false, false);
                        ifp->info = pim_ifp;
                }