proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 16:20:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: correctly get interface name for error message

Browse Source 
This was found while doing libyang2 work (causes assert); however, it is
also incorrect for libyang1 (empty canonical value for incorrectly
referenced interface vs interface-name node).

While here, fix 2 other incorrect uses of "." on a container node.

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2021-02-28 11:49:40 -05:00
parent f60e5fd3d1
commit e184ea7311
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pimd/pim_nb_config.c
View File

@ -1181,7 +1181,7 @@ int routing_control_plane_protocols_control_plane_protocol_pim_address_family_ms
case NB_EV_APPLY: case NB_EV_APPLY:
vrf = nb_running_get_entry(args->dnode, NULL, true); vrf = nb_running_get_entry(args->dnode, NULL, true);
pim = vrf->info; pim = vrf->info;
mesh_group_name = yang_dnode_get_string(args->dnode, "."); mesh_group_name = yang_dnode_get_string(args->dnode, "mesh-group-name");
result = ip_no_msdp_mesh_group_cmd_worker(pim, mesh_group_name, result = ip_no_msdp_mesh_group_cmd_worker(pim, mesh_group_name,
args->errmsg, args->errmsg,
@ -2716,11 +2716,11 @@ int lib_interface_igmp_igmp_enable_modify(struct nb_cb_modify_args *args)
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
if_dnode = yang_dnode_get_parent(args->dnode, "interface"); if_dnode = yang_dnode_get_parent(args->dnode, "interface");
ifp_name = yang_dnode_get_string(if_dnode, ".");
mcast_if_count = mcast_if_count =
yang_get_list_elements_count(if_dnode); yang_get_list_elements_count(if_dnode);
/* Limiting mcast interfaces to number of VIFs */ /* Limiting mcast interfaces to number of VIFs */
if (mcast_if_count == MAXVIFS) { if (mcast_if_count == MAXVIFS) {
ifp_name = yang_dnode_get_string(if_dnode, "name");
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"Max multicast interfaces(%d) Reached. Could not enable IGMP on interface %s", "Max multicast interfaces(%d) Reached. Could not enable IGMP on interface %s",
MAXVIFS, ifp_name); MAXVIFS, ifp_name);
@ -2991,7 +2991,7 @@ int lib_interface_igmp_address_family_static_group_create(
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
if_dnode = yang_dnode_get_parent(args->dnode, "interface"); if_dnode = yang_dnode_get_parent(args->dnode, "interface");
if (!is_pim_interface(if_dnode)) { if (!is_pim_interface(if_dnode)) {
ifp_name = yang_dnode_get_string(if_dnode, "."); ifp_name = yang_dnode_get_string(if_dnode, "name");
snprintf(args->errmsg, args->errmsg_len, snprintf(args->errmsg, args->errmsg_len,
"multicast not enabled on interface %s", "multicast not enabled on interface %s",
ifp_name); ifp_name);