matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pim6d: Impelmenting "ipv6 mld join"

Browse source 
Fixes: #12014

Signed-off-by: Abhishek N R <abnr@vmware.com>
This commit is contained in:
Abhishek N R 2022-12-13 22:34:25 -08:00
parent bdf62ec61b
commit bd2c824a21
9 changed files with 162 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/prefix.h
View file

@ -598,6 +598,14 @@ static inline bool ipv6_mcast_ssm(const struct in6_addr *addr)
return (bits & 0xfff0ffff) == 0xff300000; return (bits & 0xfff0ffff) == 0xff300000;
} }
static inline bool ipv6_mcast_reserved(const struct in6_addr *addr)
{
uint32_t bits = ntohl(addr->s6_addr32[0]);
/* ffx2::/16 */
return (bits & 0xff0fffff) == 0xff020000;
}
static inline uint8_t ipv4_mcast_scope(const struct in_addr *addr) static inline uint8_t ipv4_mcast_scope(const struct in_addr *addr)
{ {
uint32_t bits = ntohl(addr->s_addr); uint32_t bits = ntohl(addr->s_addr);

2
pimd/pim_addr.h
View file

@ -28,6 +28,7 @@ typedef struct in_addr pim_addr;
#define PIM_MROUTE_DBG "mroute" #define PIM_MROUTE_DBG "mroute"
#define PIMREG "pimreg" #define PIMREG "pimreg"
#define GM "IGMP" #define GM "IGMP"
#define IPPROTO_GM IPPROTO_IGMP
#define PIM_ADDR_FUNCNAME(name) ipv4_##name #define PIM_ADDR_FUNCNAME(name) ipv4_##name
@ -57,6 +58,7 @@ typedef struct in6_addr pim_addr;
#define PIM_MROUTE_DBG "mroute6" #define PIM_MROUTE_DBG "mroute6"
#define PIMREG "pim6reg" #define PIMREG "pim6reg"
#define GM "MLD" #define GM "MLD"
#define IPPROTO_GM IPPROTO_ICMPV6
#define PIM_ADDR_FUNCNAME(name) ipv6_##name #define PIM_ADDR_FUNCNAME(name) ipv6_##name

145
pimd/pim_iface.c
View file

@ -42,10 +42,10 @@
#if PIM_IPV == 4 #if PIM_IPV == 4
static void pim_if_igmp_join_del_all(struct interface *ifp); static void pim_if_igmp_join_del_all(struct interface *ifp);
static int igmp_join_sock(const char *ifname, ifindex_t ifindex,
struct in_addr group_addr, struct in_addr source_addr,
struct pim_interface *pim_ifp);
#endif #endif
static int gm_join_sock(const char *ifname, ifindex_t ifindex,
pim_addr group_addr, pim_addr source_addr,
struct pim_interface *pim_ifp);
void pim_if_init(struct pim_instance *pim) void pim_if_init(struct pim_instance *pim)
{ {
@ -560,7 +560,7 @@ void pim_if_addr_add(struct connected *ifc)
/* Close socket and reopen with Source and Group /* Close socket and reopen with Source and Group
*/ */
close(ij->sock_fd); close(ij->sock_fd);
join_fd = igmp_join_sock( join_fd = gm_join_sock(
ifp->name, ifp->ifindex, ij->group_addr, ifp->name, ifp->ifindex, ij->group_addr,
ij->source_addr, pim_ifp); ij->source_addr, pim_ifp);
if (join_fd < 0) { if (join_fd < 0) {
@ -573,7 +573,7 @@ void pim_if_addr_add(struct connected *ifc)
"<src?>", ij->source_addr, "<src?>", ij->source_addr,
source_str, sizeof(source_str)); source_str, sizeof(source_str));
zlog_warn( zlog_warn(
"%s: igmp_join_sock() failure for IGMP group %s source %s on interface %s", "%s: gm_join_sock() failure for IGMP group %s source %s on interface %s",
__func__, group_str, source_str, __func__, group_str, source_str,
ifp->name); ifp->name);
/* warning only */ /* warning only */
@ -1214,15 +1214,13 @@ long pim_if_t_suppressed_msec(struct interface *ifp)
return t_suppressed_msec; return t_suppressed_msec;
} }
#if PIM_IPV == 4 static void gm_join_free(struct gm_join *ij)
static void igmp_join_free(struct gm_join *ij)
{ {
XFREE(MTYPE_PIM_IGMP_JOIN, ij); XFREE(MTYPE_PIM_IGMP_JOIN, ij);
} }
static struct gm_join *igmp_join_find(struct list *join_list, static struct gm_join *gm_join_find(struct list *join_list, pim_addr group_addr,
struct in_addr group_addr, pim_addr source_addr)
struct in_addr source_addr)
{ {
struct listnode *node; struct listnode *node;
struct gm_join *ij; struct gm_join *ij;
@ -1230,38 +1228,33 @@ static struct gm_join *igmp_join_find(struct list *join_list,
assert(join_list); assert(join_list);
for (ALL_LIST_ELEMENTS_RO(join_list, node, ij)) { for (ALL_LIST_ELEMENTS_RO(join_list, node, ij)) {
if ((group_addr.s_addr == ij->group_addr.s_addr) if ((!pim_addr_cmp(group_addr, ij->group_addr)) &&
&& (source_addr.s_addr == ij->source_addr.s_addr)) (!pim_addr_cmp(source_addr, ij->source_addr)))
return ij; return ij;
} }
return 0; return 0;
} }
static int igmp_join_sock(const char *ifname, ifindex_t ifindex, static int gm_join_sock(const char *ifname, ifindex_t ifindex,
struct in_addr group_addr, struct in_addr source_addr, pim_addr group_addr, pim_addr source_addr,
struct pim_interface *pim_ifp) struct pim_interface *pim_ifp)
{ {
int join_fd; int join_fd;
pim_ifp->igmp_ifstat_joins_sent++; pim_ifp->igmp_ifstat_joins_sent++;
join_fd = pim_socket_raw(IPPROTO_IGMP); join_fd = pim_socket_raw(IPPROTO_GM);
if (join_fd < 0) { if (join_fd < 0) {
pim_ifp->igmp_ifstat_joins_failed++; pim_ifp->igmp_ifstat_joins_failed++;
return -1; return -1;
} }
if (pim_igmp_join_source(join_fd, ifindex, group_addr, source_addr)) { if (pim_gm_join_source(join_fd, ifindex, group_addr, source_addr)) {
char group_str[INET_ADDRSTRLEN];
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<grp?>", group_addr, group_str,
sizeof(group_str));
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
zlog_warn( zlog_warn(
"%s: setsockopt(fd=%d) failure for IGMP group %s source %s ifindex %d on interface %s: errno=%d: %s", "%s: setsockopt(fd=%d) failure for " GM
__func__, join_fd, group_str, source_str, ifindex, " group %pPAs source %pPAs ifindex %d on interface %s: errno=%d: %s",
__func__, join_fd, &group_addr, &source_addr, ifindex,
ifname, errno, safe_strerror(errno)); ifname, errno, safe_strerror(errno));
pim_ifp->igmp_ifstat_joins_failed++; pim_ifp->igmp_ifstat_joins_failed++;
@ -1273,10 +1266,8 @@ static int igmp_join_sock(const char *ifname, ifindex_t ifindex,
return join_fd; return join_fd;
} }
#if PIM_IPV == 4 static struct gm_join *gm_join_new(struct interface *ifp, pim_addr group_addr,
static struct gm_join *igmp_join_new(struct interface *ifp, pim_addr source_addr)
struct in_addr group_addr,
struct in_addr source_addr)
{ {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct gm_join *ij; struct gm_join *ij;
@ -1285,19 +1276,12 @@ static struct gm_join *igmp_join_new(struct interface *ifp,
pim_ifp = ifp->info; pim_ifp = ifp->info;
assert(pim_ifp); assert(pim_ifp);
join_fd = igmp_join_sock(ifp->name, ifp->ifindex, group_addr, join_fd = gm_join_sock(ifp->name, ifp->ifindex, group_addr, source_addr,
source_addr, pim_ifp); pim_ifp);
if (join_fd < 0) { if (join_fd < 0) {
char group_str[INET_ADDRSTRLEN]; zlog_warn("%s: gm_join_sock() failure for " GM
char source_str[INET_ADDRSTRLEN]; " group %pPAs source %pPAs on interface %s",
__func__, &group_addr, &source_addr, ifp->name);
pim_inet4_dump("<grp?>", group_addr, group_str,
sizeof(group_str));
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
zlog_warn(
"%s: igmp_join_sock() failure for IGMP group %s source %s on interface %s",
__func__, group_str, source_str, ifp->name);
return 0; return 0;
} }
@ -1312,11 +1296,9 @@ static struct gm_join *igmp_join_new(struct interface *ifp,
return ij; return ij;
} }
#endif /* PIM_IPV == 4 */
#if PIM_IPV == 4 ferr_r pim_if_gm_join_add(struct interface *ifp, pim_addr group_addr,
ferr_r pim_if_igmp_join_add(struct interface *ifp, struct in_addr group_addr, pim_addr source_addr)
struct in_addr source_addr)
{ {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct gm_join *ij; struct gm_join *ij;
@ -1329,37 +1311,32 @@ ferr_r pim_if_igmp_join_add(struct interface *ifp, struct in_addr group_addr,
if (!pim_ifp->gm_join_list) { if (!pim_ifp->gm_join_list) {
pim_ifp->gm_join_list = list_new(); pim_ifp->gm_join_list = list_new();
pim_ifp->gm_join_list->del = (void (*)(void *))igmp_join_free; pim_ifp->gm_join_list->del = (void (*)(void *))gm_join_free;
} }
ij = igmp_join_find(pim_ifp->gm_join_list, group_addr, source_addr); ij = gm_join_find(pim_ifp->gm_join_list, group_addr, source_addr);
/* This interface has already been configured to join this IGMP group /* This interface has already been configured to join this IGMP/MLD
* group
*/ */
if (ij) { if (ij) {
return ferr_ok(); return ferr_ok();
} }
(void)igmp_join_new(ifp, group_addr, source_addr); (void)gm_join_new(ifp, group_addr, source_addr);
if (PIM_DEBUG_GM_EVENTS) { if (PIM_DEBUG_GM_EVENTS) {
char group_str[INET_ADDRSTRLEN];
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<grp?>", group_addr, group_str,
sizeof(group_str));
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
zlog_debug( zlog_debug(
"%s: issued static igmp join for channel (S,G)=(%s,%s) on interface %s", "%s: issued static " GM
__func__, source_str, group_str, ifp->name); " join for channel (S,G)=(%pPA,%pPA) on interface %s",
__func__, &source_addr, &group_addr, ifp->name);
} }
return ferr_ok(); return ferr_ok();
} }
#endif /* PIM_IPV == 4 */
int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr, int pim_if_gm_join_del(struct interface *ifp, pim_addr group_addr,
struct in_addr source_addr) pim_addr source_addr)
{ {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
struct gm_join *ij; struct gm_join *ij;
@ -1372,40 +1349,29 @@ int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr,
} }
if (!pim_ifp->gm_join_list) { if (!pim_ifp->gm_join_list) {
zlog_warn("%s: no IGMP join on interface %s", __func__, zlog_warn("%s: no " GM " join on interface %s", __func__,
ifp->name); ifp->name);
return -2; return -2;
} }
ij = igmp_join_find(pim_ifp->gm_join_list, group_addr, source_addr); ij = gm_join_find(pim_ifp->gm_join_list, group_addr, source_addr);
if (!ij) { if (!ij) {
char group_str[INET_ADDRSTRLEN]; zlog_warn("%s: could not find " GM
char source_str[INET_ADDRSTRLEN]; " group %pPAs source %pPAs on interface %s",
pim_inet4_dump("<grp?>", group_addr, group_str, __func__, &group_addr, &source_addr, ifp->name);
sizeof(group_str));
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
zlog_warn(
"%s: could not find IGMP group %s source %s on interface %s",
__func__, group_str, source_str, ifp->name);
return -3; return -3;
} }
if (close(ij->sock_fd)) { if (close(ij->sock_fd)) {
char group_str[INET_ADDRSTRLEN];
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<grp?>", group_addr, group_str,
sizeof(group_str));
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
zlog_warn( zlog_warn(
"%s: failure closing sock_fd=%d for IGMP group %s source %s on interface %s: errno=%d: %s", "%s: failure closing sock_fd=%d for " GM
__func__, ij->sock_fd, group_str, source_str, ifp->name, " group %pPAs source %pPAs on interface %s: errno=%d: %s",
errno, safe_strerror(errno)); __func__, ij->sock_fd, &group_addr, &source_addr,
ifp->name, errno, safe_strerror(errno));
/* warning only */ /* warning only */
} }
listnode_delete(pim_ifp->gm_join_list, ij); listnode_delete(pim_ifp->gm_join_list, ij);
igmp_join_free(ij); gm_join_free(ij);
if (listcount(pim_ifp->gm_join_list) < 1) { if (listcount(pim_ifp->gm_join_list) < 1) {
list_delete(&pim_ifp->gm_join_list); list_delete(&pim_ifp->gm_join_list);
pim_ifp->gm_join_list = 0; pim_ifp->gm_join_list = 0;
@ -1414,6 +1380,7 @@ int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr,
return 0; return 0;
} }
#if PIM_IPV == 4
__attribute__((unused)) __attribute__((unused))
static void pim_if_igmp_join_del_all(struct interface *ifp) static void pim_if_igmp_join_del_all(struct interface *ifp)
{ {
@ -1433,21 +1400,9 @@ static void pim_if_igmp_join_del_all(struct interface *ifp)
return; return;
for (ALL_LIST_ELEMENTS(pim_ifp->gm_join_list, node, nextnode, ij)) for (ALL_LIST_ELEMENTS(pim_ifp->gm_join_list, node, nextnode, ij))
pim_if_igmp_join_del(ifp, ij->group_addr, ij->source_addr); pim_if_gm_join_del(ifp, ij->group_addr, ij->source_addr);
} }
#else /* PIM_IPV != 4 */ #endif /* PIM_IPV == 4 */
ferr_r pim_if_igmp_join_add(struct interface *ifp, struct in_addr group_addr,
struct in_addr source_addr)
{
return ferr_ok();
}
int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr,
struct in_addr source_addr)
{
return 0;
}
#endif /* PIM_IPV != 4 */
/* /*
RFC 4601 RFC 4601

8
pimd/pim_iface.h
View file

@ -217,10 +217,10 @@ int pim_if_t_override_msec(struct interface *ifp);
pim_addr pim_find_primary_addr(struct interface *ifp); pim_addr pim_find_primary_addr(struct interface *ifp);
ferr_r pim_if_igmp_join_add(struct interface *ifp, struct in_addr group_addr, ferr_r pim_if_gm_join_add(struct interface *ifp, pim_addr group_addr,
struct in_addr source_addr); pim_addr source_addr);
int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr, int pim_if_gm_join_del(struct interface *ifp, pim_addr group_addr,
struct in_addr source_addr); pim_addr source_addr);
void pim_if_update_could_assert(struct interface *ifp); void pim_if_update_could_assert(struct interface *ifp);

55
pimd/pim_igmp_join.h
View file

@ -7,6 +7,8 @@
#ifndef PIM_IGMP_JOIN_H #ifndef PIM_IGMP_JOIN_H
#define PIM_IGMP_JOIN_H #define PIM_IGMP_JOIN_H
#include "pim_addr.h"
/* required headers #include'd by caller */ /* required headers #include'd by caller */
#ifndef SOL_IP #ifndef SOL_IP
@ -26,35 +28,64 @@ struct group_source_req {
}; };
#endif #endif
static inline int pim_igmp_join_source(int fd, ifindex_t ifindex, #if PIM_IPV == 4
struct in_addr group_addr, static inline int pim_gm_join_source(int fd, ifindex_t ifindex,
struct in_addr source_addr) pim_addr group_addr, pim_addr source_addr)
{ {
struct group_source_req req; struct group_source_req req;
struct sockaddr_in group; struct sockaddr_in group = {};
struct sockaddr_in source; struct sockaddr_in source = {};
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
memset(&group, 0, sizeof(group));
group.sin_family = AF_INET; group.sin_family = PIM_AF;
group.sin_addr = group_addr; group.sin_addr = group_addr;
group.sin_port = htons(0); group.sin_port = htons(0);
memcpy(&req.gsr_group, &group, sizeof(struct sockaddr_in)); memcpy(&req.gsr_group, &group, sizeof(group));
memset(&source, 0, sizeof(source)); source.sin_family = PIM_AF;
source.sin_family = AF_INET;
source.sin_addr = source_addr; source.sin_addr = source_addr;
source.sin_port = htons(0); source.sin_port = htons(0);
memcpy(&req.gsr_source, &source, sizeof(struct sockaddr_in)); memcpy(&req.gsr_source, &source, sizeof(source));
req.gsr_interface = ifindex; req.gsr_interface = ifindex;
if (source_addr.s_addr == INADDR_ANY) if (pim_addr_is_any(source_addr))
return setsockopt(fd, SOL_IP, MCAST_JOIN_GROUP, &req, return setsockopt(fd, SOL_IP, MCAST_JOIN_GROUP, &req,
sizeof(req)); sizeof(req));
else else
return setsockopt(fd, SOL_IP, MCAST_JOIN_SOURCE_GROUP, &req, return setsockopt(fd, SOL_IP, MCAST_JOIN_SOURCE_GROUP, &req,
sizeof(req)); sizeof(req));
} }
#else /* PIM_IPV != 4*/
static inline int pim_gm_join_source(int fd, ifindex_t ifindex,
pim_addr group_addr, pim_addr source_addr)
{
struct group_source_req req;
struct sockaddr_in6 group = {};
struct sockaddr_in6 source = {};
memset(&req, 0, sizeof(req));
group.sin6_family = PIM_AF;
group.sin6_addr = group_addr;
group.sin6_port = htons(0);
memcpy(&req.gsr_group, &group, sizeof(group));
source.sin6_family = PIM_AF;
source.sin6_addr = source_addr;
source.sin6_port = htons(0);
memcpy(&req.gsr_source, &source, sizeof(source));
req.gsr_interface = ifindex;
if (pim_addr_is_any(source_addr))
return setsockopt(fd, SOL_IPV6, MCAST_JOIN_GROUP, &req,
sizeof(req));
else
return setsockopt(fd, SOL_IPV6, MCAST_JOIN_SOURCE_GROUP, &req,
sizeof(req));
}
#endif /* PIM_IPV != 4*/
#endif /* PIM_IGMP_JOIN_H */ #endif /* PIM_IGMP_JOIN_H */

59
pimd/pim_nb_config.c
View file

@ -2880,10 +2880,9 @@ int lib_interface_gmp_address_family_robustness_variable_modify(
int lib_interface_gmp_address_family_static_group_create( int lib_interface_gmp_address_family_static_group_create(
struct nb_cb_create_args *args) struct nb_cb_create_args *args)
{ {
#if PIM_IPV == 4
struct interface *ifp; struct interface *ifp;
struct ipaddr source_addr; pim_addr source_addr;
struct ipaddr group_addr; pim_addr group_addr;
int result; int result;
const char *ifp_name; const char *ifp_name;
const struct lyd_node *if_dnode; const struct lyd_node *if_dnode;
@ -2899,33 +2898,40 @@ int lib_interface_gmp_address_family_static_group_create(
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
yang_dnode_get_ip(&group_addr, args->dnode, "./group-addr"); yang_dnode_get_pimaddr(&group_addr, args->dnode,
if (pim_is_group_224_0_0_0_24(group_addr.ip._v4_addr)) { "./group-addr");
#if PIM_IPV == 4
if (pim_is_group_224_0_0_0_24(group_addr)) {
snprintf( snprintf(
args->errmsg, args->errmsg_len, args->errmsg, args->errmsg_len,
"Groups within 224.0.0.0/24 are reserved and cannot be joined"); "Groups within 224.0.0.0/24 are reserved and cannot be joined");
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
#else
if (ipv6_mcast_reserved(&group_addr)) {
snprintf(
args->errmsg, args->errmsg_len,
"Groups within ffx2::/16 are reserved and cannot be joined");
return NB_ERR_VALIDATION;
}
#endif
break; break;
case NB_EV_PREPARE: case NB_EV_PREPARE:
case NB_EV_ABORT: case NB_EV_ABORT:
break; break;
case NB_EV_APPLY: case NB_EV_APPLY:
ifp = nb_running_get_entry(args->dnode, NULL, true); ifp = nb_running_get_entry(args->dnode, NULL, true);
yang_dnode_get_ip(&source_addr, args->dnode, "./source-addr"); yang_dnode_get_pimaddr(&source_addr, args->dnode,
yang_dnode_get_ip(&group_addr, args->dnode, "./group-addr"); "./source-addr");
yang_dnode_get_pimaddr(&group_addr, args->dnode,
result = pim_if_igmp_join_add(ifp, group_addr.ip._v4_addr, "./group-addr");
source_addr.ip._v4_addr); result = pim_if_gm_join_add(ifp, group_addr, source_addr);
if (result) { if (result) {
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"Failure joining IGMP group"); "Failure joining " GM " group");
return NB_ERR_INCONSISTENCY; return NB_ERR_INCONSISTENCY;
} }
} }
#else
/* TBD Depends on MLD data structure changes */
#endif /* PIM_IPV == 4 */
return NB_OK; return NB_OK;
} }
@ -2933,8 +2939,8 @@ int lib_interface_gmp_address_family_static_group_destroy(
struct nb_cb_destroy_args *args) struct nb_cb_destroy_args *args)
{ {
struct interface *ifp; struct interface *ifp;
struct ipaddr source_addr; pim_addr source_addr;
struct ipaddr group_addr; pim_addr group_addr;
int result; int result;
switch (args->event) { switch (args->event) {
@ -2944,22 +2950,17 @@ int lib_interface_gmp_address_family_static_group_destroy(
break; break;
case NB_EV_APPLY: case NB_EV_APPLY:
ifp = nb_running_get_entry(args->dnode, NULL, true); ifp = nb_running_get_entry(args->dnode, NULL, true);
yang_dnode_get_ip(&source_addr, args->dnode, "./source-addr"); yang_dnode_get_pimaddr(&source_addr, args->dnode,
yang_dnode_get_ip(&group_addr, args->dnode, "./group-addr"); "./source-addr");
yang_dnode_get_pimaddr(&group_addr, args->dnode,
result = pim_if_igmp_join_del(ifp, group_addr.ip._v4_addr, "./group-addr");
source_addr.ip._v4_addr); result = pim_if_gm_join_del(ifp, group_addr, source_addr);
if (result) { if (result) {
char src_str[INET_ADDRSTRLEN];
char grp_str[INET_ADDRSTRLEN];
ipaddr2str(&source_addr, src_str, sizeof(src_str));
ipaddr2str(&group_addr, grp_str, sizeof(grp_str));
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"%% Failure leaving IGMP group %s %s on interface %s: %d", "%% Failure leaving " GM
src_str, grp_str, ifp->name, result); " group %pPAs %pPAs on interface %s: %d",
&source_addr, &group_addr, ifp->name, result);
return NB_ERR_INCONSISTENCY; return NB_ERR_INCONSISTENCY;
} }

33
pimd/pim_vty.c
View file

@ -335,18 +335,12 @@ static int gm_config_write(struct vty *vty, int writes,
struct listnode *node; struct listnode *node;
struct gm_join *ij; struct gm_join *ij;
for (ALL_LIST_ELEMENTS_RO(pim_ifp->gm_join_list, node, ij)) { for (ALL_LIST_ELEMENTS_RO(pim_ifp->gm_join_list, node, ij)) {
char group_str[INET_ADDRSTRLEN]; if (pim_addr_is_any(ij->source_addr))
char source_str[INET_ADDRSTRLEN]; vty_out(vty, " ip igmp join %pPAs\n",
pim_inet4_dump("<grp?>", ij->group_addr, group_str, &ij->group_addr);
sizeof(group_str)); else
if (ij->source_addr.s_addr == INADDR_ANY) { vty_out(vty, " ip igmp join %pPAs %pPAs\n",
vty_out(vty, " ip igmp join %s\n", group_str); &ij->group_addr, &ij->source_addr);
} else {
inet_ntop(AF_INET, &ij->source_addr, source_str,
sizeof(source_str));
vty_out(vty, " ip igmp join %s %s\n", group_str,
source_str);
}
++writes; ++writes;
} }
} }
@ -388,6 +382,21 @@ static int gm_config_write(struct vty *vty, int writes,
vty_out(vty, " ipv6 mld last-member-query-interval %d\n", vty_out(vty, " ipv6 mld last-member-query-interval %d\n",
pim_ifp->gm_specific_query_max_response_time_dsec); pim_ifp->gm_specific_query_max_response_time_dsec);
/* IF ipv6 mld join */
if (pim_ifp->gm_join_list) {
struct listnode *node;
struct gm_join *ij;
for (ALL_LIST_ELEMENTS_RO(pim_ifp->gm_join_list, node, ij)) {
if (pim_addr_is_any(ij->source_addr))
vty_out(vty, " ipv6 mld join %pPAs\n",
&ij->group_addr);
else
vty_out(vty, " ipv6 mld join %pPAs %pPAs\n",
&ij->group_addr, &ij->source_addr);
++writes;
}
}
return writes; return writes;
} }
#endif #endif

1
pimd/subdir.am
View file

@ -169,6 +169,7 @@ pimd_pim6d_CFLAGS = $(AM_CFLAGS) -DPIM_IPV=6
pimd_pim6d_LDADD = lib/libfrr.la $(LIBCAP) pimd_pim6d_LDADD = lib/libfrr.la $(LIBCAP)
endif endif
pimd_test_igmpv3_join_CFLAGS = $(AM_CFLAGS) -DPIM_IPV=4
pimd_test_igmpv3_join_LDADD = lib/libfrr.la pimd_test_igmpv3_join_LDADD = lib/libfrr.la
pimd_test_igmpv3_join_SOURCES = pimd/test_igmpv3_join.c pimd_test_igmpv3_join_SOURCES = pimd/test_igmpv3_join.c

6
pimd/test_igmpv3_join.c
View file

@ -54,8 +54,8 @@ static int iface_solve_index(const char *ifname)
int main(int argc, const char *argv[]) int main(int argc, const char *argv[])
{ {
struct in_addr group_addr; pim_addr group_addr;
struct in_addr source_addr; pim_addr source_addr;
const char *ifname; const char *ifname;
const char *group; const char *group;
const char *source; const char *source;
@ -106,7 +106,7 @@ int main(int argc, const char *argv[])
exit(1); exit(1);
} }
result = pim_igmp_join_source(fd, ifindex, group_addr, source_addr); result = pim_gm_join_source(fd, ifindex, group_addr, source_addr);
if (result) { if (result) {
fprintf(stderr, fprintf(stderr,
"%s: setsockopt(fd=%d) failure for IGMP group %s source %s ifindex %d on interface %s: errno=%d: %s\n", "%s: setsockopt(fd=%d) failure for IGMP group %s source %s ifindex %d on interface %s: errno=%d: %s\n",