proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 20:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7538 from ton31337/fix/zebra_set_src_7.4

Browse Source 
zebra: [7.4] Allow `set src X` to work on startup
This commit is contained in:
Donald Sharp 2020-11-19 19:26:50 -05:00 committed by GitHub
commit 507bf79cd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zebra/zebra_nb_config.c
View File

@ -1455,11 +1455,14 @@ int lib_route_map_entry_set_action_source_v4_modify(
if (pif != NULL) if (pif != NULL)
break; break;
} }
if (pif == NULL) { /*
zlog_warn("%s: is not a local adddress: %s", __func__, * On startup the local address *may* not have come up
yang_dnode_get_string(args->dnode, NULL)); * yet. We need to allow startup configuration of
return NB_ERR_VALIDATION; * set src or we are fudged. Log it for future fun
} */
if (pif == NULL)
zlog_warn("set src %pI4 is not a local address",
&p.u.prefix4);
return NB_OK; return NB_OK;
case NB_EV_PREPARE: case NB_EV_PREPARE:
case NB_EV_ABORT: case NB_EV_ABORT:
@ -1521,11 +1524,14 @@ int lib_route_map_entry_set_action_source_v6_modify(
if (pif != NULL) if (pif != NULL)
break; break;
} }
if (pif == NULL) { /*
zlog_warn("%s: is not a local adddress: %s", __func__, * On startup the local address *may* not have come up
yang_dnode_get_string(args->dnode, NULL)); * yet. We need to allow startup configuration of
return NB_ERR_VALIDATION; * set src or we are fudged. Log it for future fun
} */
if (pif == NULL)
zlog_warn("set src %pI6 is not a local address",
&p.u.prefix6);
return NB_OK; return NB_OK;
case NB_EV_PREPARE: case NB_EV_PREPARE:
case NB_EV_ABORT: case NB_EV_ABORT: