proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-24 06:35:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7578 from mjstapp/fix_pim_subdir_am

Browse Source 
pimd: fix build and compilation errors
This commit is contained in:
Donald Sharp 2020-12-01 07:41:33 -05:00 committed by GitHub
commit b8a9f6c6a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 492 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pimd/pim_cmd.c
View File

@ -722,8 +722,8 @@ static void igmp_show_interfaces_single(struct pim_instance *pim,
} else { } else {
vty_out(vty, "Interface : %s\n", ifp->name); vty_out(vty, "Interface : %s\n", ifp->name);
vty_out(vty, "State : %s\n", vty_out(vty, "State : %s\n",
if_is_up(ifp) if_is_up(ifp) ? (igmp->mtrace_only ?
? (igmp->mtrace_only ? "mtrace" "mtrace"
: "up") : "up")
: "down"); : "down");
vty_out(vty, "Address : %pI4\n", vty_out(vty, "Address : %pI4\n",
@ -3894,9 +3894,9 @@ static void clear_mroute(struct pim_instance *pim)
} }
/* clean up all upstreams*/ /* clean up all upstreams*/
while ((up = rb_pim_upstream_first(&pim->upstream_head))) { while ((up = rb_pim_upstream_first(&pim->upstream_head)))
pim_upstream_del(pim, up, __func__); pim_upstream_del(pim, up, __func__);
}
} }
DEFUN (clear_ip_mroute, DEFUN (clear_ip_mroute,
@ -4713,8 +4713,10 @@ DEFUN (show_ip_pim_local_membership,
} }
static void pim_show_mlag_up_entry_detail(struct vrf *vrf, static void pim_show_mlag_up_entry_detail(struct vrf *vrf,
struct vty *vty, struct pim_upstream *up, struct vty *vty,
char *src_str, char *grp_str, json_object *json) struct pim_upstream *up,
char *src_str, char *grp_str,
json_object *json)
{ {
if (json) { if (json) {
json_object *json_row = NULL; json_object *json_row = NULL;
@ -4865,11 +4867,13 @@ static void pim_show_mlag_up_vrf(struct vrf *vrf, struct vty *vty, bool uj)
if (pim_up_mlag_is_local(up)) { if (pim_up_mlag_is_local(up)) {
json_object_array_add(own_list, json_object_array_add(own_list,
json_object_new_string("local")); json_object_new_string(
"local"));
} }
if (up->flags & (PIM_UPSTREAM_FLAG_MASK_MLAG_PEER)) { if (up->flags & (PIM_UPSTREAM_FLAG_MASK_MLAG_PEER)) {
json_object_array_add(own_list, json_object_array_add(own_list,
json_object_new_string("peer")); json_object_new_string(
"peer"));
} }
json_object_object_add(json_row, "owners", own_list); json_object_object_add(json_row, "owners", own_list);
@ -8028,7 +8032,7 @@ DEFUN (interface_no_ip_igmp,
IFACE_IGMP_STR) IFACE_IGMP_STR)
{ {
const struct lyd_node *pim_enable_dnode; const struct lyd_node *pim_enable_dnode;
char pim_if_xpath[XPATH_MAXLEN]; char pim_if_xpath[XPATH_MAXLEN + 20];
snprintf(pim_if_xpath, sizeof(pim_if_xpath), snprintf(pim_if_xpath, sizeof(pim_if_xpath),
"%s/frr-pim:pim", VTY_CURR_XPATH); "%s/frr-pim:pim", VTY_CURR_XPATH);
@ -8574,7 +8578,7 @@ DEFUN_HIDDEN (interface_no_ip_pim_ssm,
IFACE_PIM_STR) IFACE_PIM_STR)
{ {
const struct lyd_node *igmp_enable_dnode; const struct lyd_node *igmp_enable_dnode;
char igmp_if_xpath[XPATH_MAXLEN]; char igmp_if_xpath[XPATH_MAXLEN + 20];
snprintf(igmp_if_xpath, sizeof(igmp_if_xpath), snprintf(igmp_if_xpath, sizeof(igmp_if_xpath),
"%s/frr-igmp:igmp", VTY_CURR_XPATH); "%s/frr-igmp:igmp", VTY_CURR_XPATH);
@ -8606,7 +8610,7 @@ DEFUN_HIDDEN (interface_no_ip_pim_sm,
IFACE_PIM_SM_STR) IFACE_PIM_SM_STR)
{ {
const struct lyd_node *igmp_enable_dnode; const struct lyd_node *igmp_enable_dnode;
char igmp_if_xpath[XPATH_MAXLEN]; char igmp_if_xpath[XPATH_MAXLEN + 20];
snprintf(igmp_if_xpath, sizeof(igmp_if_xpath), snprintf(igmp_if_xpath, sizeof(igmp_if_xpath),
"%s/frr-igmp:igmp", VTY_CURR_XPATH); "%s/frr-igmp:igmp", VTY_CURR_XPATH);
@ -8637,7 +8641,7 @@ DEFUN (interface_no_ip_pim,
PIM_STR) PIM_STR)
{ {
const struct lyd_node *igmp_enable_dnode; const struct lyd_node *igmp_enable_dnode;
char igmp_if_xpath[XPATH_MAXLEN]; char igmp_if_xpath[XPATH_MAXLEN + 20];
snprintf(igmp_if_xpath, sizeof(igmp_if_xpath), snprintf(igmp_if_xpath, sizeof(igmp_if_xpath),
"%s/frr-igmp:igmp", VTY_CURR_XPATH); "%s/frr-igmp:igmp", VTY_CURR_XPATH);
@ -8720,7 +8724,8 @@ DEFUN (interface_ip_mroute,
return nb_cli_apply_changes(vty, return nb_cli_apply_changes(vty,
"./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']", "./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']",
"frr-routing:ipv4", source_str, argv[idx_ipv4]->arg); "frr-routing:ipv4", source_str,
argv[idx_ipv4]->arg);
} }
DEFUN (interface_no_ip_mroute, DEFUN (interface_no_ip_mroute,
@ -8745,7 +8750,8 @@ DEFUN (interface_no_ip_mroute,
return nb_cli_apply_changes(vty, return nb_cli_apply_changes(vty,
"./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']", "./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']",
"frr-routing:ipv4", source_str, argv[idx_ipv4]->arg); "frr-routing:ipv4", source_str,
argv[idx_ipv4]->arg);
} }
DEFUN (interface_ip_pim_hello, DEFUN (interface_ip_pim_hello,
@ -9482,7 +9488,7 @@ DEFUN (ip_pim_bfd,
char default_tx_interval[5]; char default_tx_interval[5];
char default_detect_mult[3]; char default_detect_mult[3];
const struct lyd_node *igmp_enable_dnode; const struct lyd_node *igmp_enable_dnode;
char bfd_xpath[XPATH_MAXLEN]; char bfd_xpath[XPATH_MAXLEN + 20];
igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode,
"%s/frr-igmp:igmp/igmp-enable", "%s/frr-igmp:igmp/igmp-enable",
@ -9626,7 +9632,7 @@ DEFUN_HIDDEN(
"Required min receive interval\n" "Required min receive interval\n"
"Desired min transmit interval\n") "Desired min transmit interval\n")
#else #else
DEFUN( DEFUN(
ip_pim_bfd_param, ip_pim_bfd_param,
ip_pim_bfd_param_cmd, ip_pim_bfd_param_cmd,
"ip pim bfd (2-255) (50-60000) (50-60000)", "ip pim bfd (2-255) (50-60000) (50-60000)",
@ -9685,7 +9691,7 @@ ALIAS(no_ip_pim_bfd, no_ip_pim_bfd_param_cmd,
"Desired min transmit interval\n") "Desired min transmit interval\n")
#endif /* !HAVE_BFDD */ #endif /* !HAVE_BFDD */
DEFUN (ip_msdp_peer, DEFUN (ip_msdp_peer,
ip_msdp_peer_cmd, ip_msdp_peer_cmd,
"ip msdp peer A.B.C.D source A.B.C.D", "ip msdp peer A.B.C.D source A.B.C.D",
IP_STR IP_STR
@ -10910,7 +10916,8 @@ static void pim_show_vxlan_sg(struct pim_instance *pim,
} }
static void pim_show_vxlan_sg_match_addr(struct pim_instance *pim, static void pim_show_vxlan_sg_match_addr(struct pim_instance *pim,
struct vty *vty, char *addr_str, bool uj) struct vty *vty, char *addr_str,
bool uj)
{ {
json_object *json = NULL; json_object *json = NULL;
struct pim_sg_cache_walk_data cwd; struct pim_sg_cache_walk_data cwd;
@ -10945,7 +10952,8 @@ static void pim_show_vxlan_sg_match_addr(struct pim_instance *pim,
} }
static void pim_show_vxlan_sg_one(struct pim_instance *pim, static void pim_show_vxlan_sg_one(struct pim_instance *pim,
struct vty *vty, char *src_str, char *grp_str, bool uj) struct vty *vty, char *src_str, char *grp_str,
bool uj)
{ {
json_object *json = NULL; json_object *json = NULL;
struct prefix_sg sg; struct prefix_sg sg;

6
pimd/subdir.am
View File

@ -151,9 +151,3 @@ pimd_mtracebis_SOURCES = pimd/mtracebis.c \
pimd/mtracebis_netlink.c \ pimd/mtracebis_netlink.c \
pimd/mtracebis_routeget.c \ pimd/mtracebis_routeget.c \
# end # end
nodist_pimd_pimd_SOURCES = \
yang/frr-pim.yang.c \
yang/frr-pim-rp.yang.c \
yang/frr-igmp.yang.c \
# end