From: Donald Sharp Date: Fri, 13 Nov 2020 17:06:57 +0000 (-0500) Subject: zebra: Allow `set src X` to work on startup X-Git-Tag: base_7.6~276^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6d12b207033f90603a0a6642346c39aac17d1f9a;p=mirror%2Ffrr.git zebra: Allow `set src X` to work on startup If a route-map in zebra has `set src X` and the interface X is on has not been configured yet, we are rejecting the command outright. This is a problem on boot up especially( and where I found this issue ) in that interfaces *can* and *will* be slow on startup and config can easily be read in *before* the interface has an ip address. Let's modify zebra to just warn to the user we may have a problem and let the chips fall where they may. Signed-off-by: Donald Sharp --- diff --git a/zebra/zebra_nb_config.c b/zebra/zebra_nb_config.c index df95770307..ea2e20ed3b 100644 --- a/zebra/zebra_nb_config.c +++ b/zebra/zebra_nb_config.c @@ -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: