Merge pull request #7521 from donaldsharp/set_src_future_us

zebra: Allow `set src X` to work on startup
This commit is contained in:
Donatas Abraitis 2020-11-17 08:33:59 +02:00 committed by GitHub
commit 81a8a58b99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1550,12 +1550,14 @@ int lib_route_map_entry_set_action_source_v4_modify(
if (pif != NULL)
break;
}
if (pif == NULL) {
snprintf(args->errmsg, args->errmsg_len,
"is not a local address: %s",
yang_dnode_get_string(args->dnode, NULL));
return NB_ERR_VALIDATION;
}
/*
* On startup the local address *may* not have come up
* yet. We need to allow startup configuration of
* 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;
case NB_EV_PREPARE:
case NB_EV_ABORT:
@ -1618,12 +1620,14 @@ int lib_route_map_entry_set_action_source_v6_modify(
if (pif != NULL)
break;
}
if (pif == NULL) {
snprintf(args->errmsg, args->errmsg_len,
"is not a local adddress: %s",
yang_dnode_get_string(args->dnode, NULL));
return NB_ERR_VALIDATION;
}
/*
* On startup the local address *may* not have come up
* yet. We need to allow startup configuration of
* 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;
case NB_EV_PREPARE:
case NB_EV_ABORT: