Merge pull request #10400 from opensourcerouting/pim6-compilefix

[mirror_frr.git] / pimd / pim_upstream.c

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 891364a9fb21d82495c8992876965f4526818846..7d835996f09b0209c223ec0a0195e4ef37e7c25a 100644 (file)
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -302,7 +302,7 @@ void pim_upstream_send_join(struct pim_upstream *up)
        pim_jp_agg_single_upstream_send(&up->rpf, up, 1 /* join */);
 }
 
-static int on_join_timer(struct thread *t)
+static void on_join_timer(struct thread *t)
 {
        struct pim_upstream *up;
 
@@ -312,14 +312,14 @@ static int on_join_timer(struct thread *t)
                if (PIM_DEBUG_PIM_TRACE)
                        zlog_debug("%s: up %s RPF is not present", __func__,
                                   up->sg_str);
-               return 0;
+               return;
        }
 
        /*
         * In the case of a HFR we will not ahve anyone to send this to.
         */
        if (PIM_UPSTREAM_FLAG_TEST_FHR(up->flags))
-               return 0;
+               return;
 
        /*
         * Don't send the join if the outgoing interface is a loopback
@@ -330,8 +330,6 @@ static int on_join_timer(struct thread *t)
                pim_upstream_send_join(up);
 
        join_timer_start(up);
-
-       return 0;
 }
 
 static void join_timer_stop(struct pim_upstream *up)
@@ -1482,7 +1480,7 @@ struct pim_upstream *pim_upstream_keep_alive_timer_proc(
 
        return up;
 }
-static int pim_upstream_keep_alive_timer(struct thread *t)
+static void pim_upstream_keep_alive_timer(struct thread *t)
 {
        struct pim_upstream *up;
 
@@ -1491,10 +1489,9 @@ static int pim_upstream_keep_alive_timer(struct thread *t)
        /* pull the stats and re-check */
        if (pim_upstream_sg_running_proc(up))
                /* kat was restarted because of new activity */
-               return 0;
+               return;
 
        pim_upstream_keep_alive_timer_proc(up);
-       return 0;
 }
 
 void pim_upstream_keep_alive_timer_start(struct pim_upstream *up, uint32_t time)
@@ -1516,15 +1513,15 @@ void pim_upstream_keep_alive_timer_start(struct pim_upstream *up, uint32_t time)
 }
 
 /* MSDP on RP needs to know if a source is registerable to this RP */
-static int pim_upstream_msdp_reg_timer(struct thread *t)
+static void pim_upstream_msdp_reg_timer(struct thread *t)
 {
        struct pim_upstream *up = THREAD_ARG(t);
        struct pim_instance *pim = up->channel_oil->pim;
 
        /* source is no longer active - pull the SA from MSDP's cache */
        pim_msdp_sa_local_del(pim, &up->sg);
-       return 1;
 }
+
 void pim_upstream_msdp_reg_timer_start(struct pim_upstream *up)
 {
        THREAD_OFF(up->t_msdp_reg_timer);
@@ -1702,7 +1699,7 @@ const char *pim_reg_state2str(enum pim_reg_state reg_state, char *state_str,
        return state_str;
 }
 
-static int pim_upstream_register_stop_timer(struct thread *t)
+static void pim_upstream_register_stop_timer(struct thread *t)
 {
        struct pim_interface *pim_ifp;
        struct pim_instance *pim;
@@ -1735,7 +1732,7 @@ static int pim_upstream_register_stop_timer(struct thread *t)
                                zlog_debug("%s: up %s RPF is not present",
                                           __func__, up->sg_str);
                        up->reg_state = PIM_REG_NOINFO;
-                       return 0;
+                       return;
                }
 
                pim_ifp = up->rpf.source_nexthop.interface->info;
@@ -1745,7 +1742,7 @@ static int pim_upstream_register_stop_timer(struct thread *t)
                                        "%s: Interface: %s is not configured for pim",
                                        __func__,
                                        up->rpf.source_nexthop.interface->name);
-                       return 0;
+                       return;
                }
                up->reg_state = PIM_REG_JOIN_PENDING;
                pim_upstream_start_register_stop_timer(up, 1);
@@ -1757,15 +1754,13 @@ static int pim_upstream_register_stop_timer(struct thread *t)
                                zlog_debug(
                                        "%s: Stop sending the register, because I am the RP and we haven't seen a packet in a while",
                                        __func__);
-                       return 0;
+                       return;
                }
                pim_null_register_send(up);
                break;
        case PIM_REG_NOINFO:
                break;
        }
-
-       return 0;
 }
 
 void pim_upstream_start_register_stop_timer(struct pim_upstream *up,