]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #4369 from patrasar/lmqc_lmqt
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 31 May 2019 01:23:11 +0000 (21:23 -0400)
committerGitHub <noreply@github.com>
Fri, 31 May 2019 01:23:11 +0000 (21:23 -0400)
pimd: new cli to configure last-member-query-count & last-member-quer…

1  2 
doc/user/pim.rst
pimd/pim_cmd.c
pimd/pim_cmd.h
pimd/pim_iface.c
pimd/pim_iface.h
pimd/pim_vty.c

Simple merge
diff --cc pimd/pim_cmd.c
Simple merge
diff --cc pimd/pim_cmd.h
Simple merge
index 08be38c138abe570908e2949650f3152652b172b,74fb6424bc6da46b54c9cf11da1367ae64efd061..7b8f045697884cd7de1a85f7e8c7e841a77b883a
@@@ -131,11 -131,9 +131,13 @@@ struct pim_interface *pim_if_new(struc
                IGMP_QUERY_MAX_RESPONSE_TIME_DSEC;
        pim_ifp->igmp_specific_query_max_response_time_dsec =
                IGMP_SPECIFIC_QUERY_MAX_RESPONSE_TIME_DSEC;
+       pim_ifp->igmp_last_member_query_count =
+               IGMP_DEFAULT_ROBUSTNESS_VARIABLE;
  
 +      /* BSM config on interface: TRUE by default */
 +      pim_ifp->bsm_enable = true;
 +      pim_ifp->ucast_bsm_accept = true;
 +
        /*
          RFC 3376: 8.3. Query Response Interval
          The number of seconds represented by the [Query Response Interval]
Simple merge
diff --cc pimd/pim_vty.c
Simple merge