proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 18:46:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7175 from idryzhov/fix-nb-bypass

Browse Source 
*: move all userdata when changing node xpath
This commit is contained in:
Quentin Young 2020-09-25 13:05:21 -04:00 committed by GitHub
commit ea8dd244aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfdd/bfd.c
View File

@ -2158,6 +2158,7 @@ void bfd_session_update_vrf_name(struct bfd_session *bs, struct vrf *vrf)
if (yang_module_find("frr-bfdd") && bs->key.vrfname[0]) { if (yang_module_find("frr-bfdd") && bs->key.vrfname[0]) {
struct lyd_node *bfd_dnode; struct lyd_node *bfd_dnode;
char xpath[XPATH_MAXLEN], xpath_srcaddr[XPATH_MAXLEN + 32]; char xpath[XPATH_MAXLEN], xpath_srcaddr[XPATH_MAXLEN + 32];
char oldpath[XPATH_MAXLEN], newpath[XPATH_MAXLEN];
char addr_buf[INET6_ADDRSTRLEN]; char addr_buf[INET6_ADDRSTRLEN];
int slen; int slen;
@ -2185,7 +2186,12 @@ void bfd_session_update_vrf_name(struct bfd_session *bs, struct vrf *vrf)
bfd_dnode = yang_dnode_get(running_config->dnode, xpath, bfd_dnode = yang_dnode_get(running_config->dnode, xpath,
bs->key.vrfname); bs->key.vrfname);
if (bfd_dnode) { if (bfd_dnode) {
yang_dnode_get_path(bfd_dnode->parent, oldpath,
sizeof(oldpath));
yang_dnode_change_leaf(bfd_dnode, vrf->name); yang_dnode_change_leaf(bfd_dnode, vrf->name);
yang_dnode_get_path(bfd_dnode->parent, newpath,
sizeof(newpath));
nb_running_move_tree(oldpath, newpath);
running_config->version++; running_config->version++;
} }
} }

7
ripd/ripd.c
View File

@ -3667,13 +3667,20 @@ static int rip_vrf_enable(struct vrf *vrf)
*/ */
if (yang_module_find("frr-ripd") && old_vrf_name) { if (yang_module_find("frr-ripd") && old_vrf_name) {
struct lyd_node *rip_dnode; struct lyd_node *rip_dnode;
char oldpath[XPATH_MAXLEN];
char newpath[XPATH_MAXLEN];
rip_dnode = yang_dnode_get( rip_dnode = yang_dnode_get(
running_config->dnode, running_config->dnode,
"/frr-ripd:ripd/instance[vrf='%s']/vrf", "/frr-ripd:ripd/instance[vrf='%s']/vrf",
old_vrf_name); old_vrf_name);
if (rip_dnode) { if (rip_dnode) {
yang_dnode_get_path(rip_dnode->parent, oldpath,
sizeof(oldpath));
yang_dnode_change_leaf(rip_dnode, vrf->name); yang_dnode_change_leaf(rip_dnode, vrf->name);
yang_dnode_get_path(rip_dnode->parent, newpath,
sizeof(newpath));
nb_running_move_tree(oldpath, newpath);
running_config->version++; running_config->version++;
} }
} }

7
ripngd/ripngd.c
View File

@ -2791,13 +2791,20 @@ static int ripng_vrf_enable(struct vrf *vrf)
*/ */
if (yang_module_find("frr-ripngd") && old_vrf_name) { if (yang_module_find("frr-ripngd") && old_vrf_name) {
struct lyd_node *ripng_dnode; struct lyd_node *ripng_dnode;
char oldpath[XPATH_MAXLEN];
char newpath[XPATH_MAXLEN];
ripng_dnode = yang_dnode_get( ripng_dnode = yang_dnode_get(
running_config->dnode, running_config->dnode,
"/frr-ripngd:ripngd/instance[vrf='%s']/vrf", "/frr-ripngd:ripngd/instance[vrf='%s']/vrf",
old_vrf_name); old_vrf_name);
if (ripng_dnode) { if (ripng_dnode) {
yang_dnode_get_path(ripng_dnode->parent, oldpath,
sizeof(oldpath));
yang_dnode_change_leaf(ripng_dnode, vrf->name); yang_dnode_change_leaf(ripng_dnode, vrf->name);
yang_dnode_get_path(ripng_dnode->parent, newpath,
sizeof(newpath));
nb_running_move_tree(oldpath, newpath);
running_config->version++; running_config->version++;
} }
} }