diff options
| -rw-r--r-- | doc/user/pim.rst | 10 | ||||
| -rw-r--r-- | ospfd/ospf_ri.c | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/doc/user/pim.rst b/doc/user/pim.rst index 04bda5f236..feb77db1e1 100644 --- a/doc/user/pim.rst +++ b/doc/user/pim.rst @@ -189,8 +189,8 @@ is in a vrf, enter the interface command with the vrf keyword at the end. Tell pim to receive IGMP reports and Query on this interface. The default version is v3. This command is useful on the LHR. -.. index:: ip igmp join -.. clicmd:: ip igmp join +.. index:: ip igmp join A.B.C.D A.B.C.D +.. clicmd:: ip igmp join A.B.C.D A.B.C.D Join multicast source-group on an interface. @@ -404,10 +404,10 @@ cause great confusion. Display the multicast RIB created in zebra. -.. index:: mtrace -.. clicmd:: mtrace +.. index:: mtrace A.B.C.D [A.B.C.D] +.. clicmd:: mtrace A.B.C.D [A.B.C.D] - Display multicast traceroute towards source. + Display multicast traceroute towards source, optionally for particular group. PIM Debug Commands ================== diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index 786b199029..93267156f2 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -516,12 +516,13 @@ static void unset_sr_node_msd(void) TLV_LEN(OspfRI.sr_info.msd) = htons(0); } -static void unset_param(struct tlv_header *tlv) +static void unset_param(void *tlv_buffer) { + struct tlv_header *tlv = (struct tlv_header *)tlv_buffer; tlv->type = 0; /* Fill the Value to 0 */ - memset(TLV_DATA(tlv), 0, TLV_BODY_SIZE(tlv)); + memset(TLV_DATA(tlv_buffer), 0, TLV_BODY_SIZE(tlv)); tlv->length = 0; return; @@ -1571,7 +1572,7 @@ DEFUN (no_pce_address, "PCE address in IPv4 address format\n") { - unset_param(&OspfRI.pce_info.pce_address.header); + unset_param(&OspfRI.pce_info.pce_address); /* Refresh RI LSA if already engaged */ if (CHECK_FLAG(OspfRI.flags, RIFLG_LSA_ENGAGED)) @@ -1621,7 +1622,7 @@ DEFUN (no_pce_path_scope, "32-bit Hexadecimal value\n") { - unset_param(&OspfRI.pce_info.pce_address.header); + unset_param(&OspfRI.pce_info.pce_address); /* Refresh RI LSA if already engaged */ if (CHECK_FLAG(OspfRI.flags, RIFLG_LSA_ENGAGED)) @@ -1810,7 +1811,7 @@ DEFUN (no_pce_cap_flag, "Disable PCE capabilities\n") { - unset_param(&OspfRI.pce_info.pce_cap_flag.header); + unset_param(&OspfRI.pce_info.pce_cap_flag); /* Refresh RI LSA if already engaged */ if (CHECK_FLAG(OspfRI.flags, RIFLG_LSA_ENGAGED)) |