*: s/TRUE/true/, s/FALSE/false/

[mirror_frr.git] / pimd / pim_assert.c

diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index 6af52bbf4d1e4a810650bbb2b358597c4de65728..a850de8df015cdacccd4e84f2aab7121a49d9d39 100644 (file)
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -147,7 +147,7 @@ static int dispatch_assert(struct interface *ifp, struct in_addr source_addr,
        memset(&sg, 0, sizeof(struct prefix_sg));
        sg.src = source_addr;
        sg.grp = group_addr;
-       ch = pim_ifchannel_add(ifp, &sg, 0);
+       ch = pim_ifchannel_add(ifp, &sg, 0, 0);
        if (!ch) {
                zlog_warn(
                        "%s: (S,G)=%s failure creating channel on interface %s",
@@ -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 */
@@ -569,7 +569,7 @@ static void pim_assert_timer_set(struct pim_ifchannel *ch, int interval)
                           ch->interface->name);
        }
 
-       thread_add_timer(master, on_assert_timer, ch, interval,
+       thread_add_timer(router->master, on_assert_timer, ch, interval,
                         &ch->t_ifassert_timer);
 }
 
@@ -734,7 +734,7 @@ void assert_action_a5(struct pim_ifchannel *ch)
          winner metric as AssertWinnerMetric(S,G,I).
          Set Assert Timer to Assert_Time.
          If (I is RPF_interface(S)) AND (UpstreamJPState(S,G) == true)
-         set SPTbit(S,G) to TRUE.
+         set SPTbit(S,G) to true.
 */
 static void assert_action_a6(struct pim_ifchannel *ch,
                             struct pim_assert_metric winner_metric)
@@ -743,7 +743,7 @@ static void assert_action_a6(struct pim_ifchannel *ch,
 
        /*
          If (I is RPF_interface(S)) AND (UpstreamJPState(S,G) == true) set
-         SPTbit(S,G) to TRUE.
+         SPTbit(S,G) to true.
        */
        if (ch->upstream->rpf.source_nexthop.interface == ch->interface)
                if (ch->upstream->join_state == PIM_UPSTREAM_JOINED)