Merge pull request #5430 from taruta811/build-docker-centos

[mirror_frr.git] / pimd / pim_assert.c

diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index 228218e3a31879dfd29e332bc9f74c617d944e0c..53ab22754ca1103336300b75138a4c6f829dd25c 100644 (file)
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -259,11 +259,11 @@ int pim_assert_recv(struct interface *ifp, struct pim_neighbor *neigh,
        curr += offset;
        curr_size -= offset;
 
-       if (curr_size != 8) {
+       if (curr_size < 8) {
                char src_str[INET_ADDRSTRLEN];
                pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str));
                zlog_warn(
-                       "%s: preference/metric size is not 8: size=%d from %s on interface %s",
+                       "%s: preference/metric size is less than 8 bytes: size=%d from %s on interface %s",
                        __PRETTY_FUNCTION__, curr_size, src_str, ifp->name);
                return -3;
        }
@@ -728,7 +728,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)
@@ -737,7 +737,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)