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

bfdd: actually return validation error instead of logging

Browse Source 
Before:
```
(config-bfd)# peer fe80::a00:27ff:fea2:5803 multihop local-address fe80::a00:27ff:fea2:5802
% Configuration failed.

Error type: validation
```

After:
```
(config-bfd)# peer fe80::a00:27ff:fea2:5803 multihop local-address fe80::a00:27ff:fea2:5802
% Configuration failed.

Error type: validation
Error description: When using link-local you must specify an interface
```

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-03-03 19:43:00 +03:00
parent 4cce733fc2
commit 5e4d0fbc93
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bfdd/bfdd_nb_config.c
View File

@ -55,36 +55,35 @@ static void bfd_session_get_key(bool mhop, const struct lyd_node *dnode,
gen_bfd_key(bk, &psa, &lsa, mhop, ifname, vrfname); gen_bfd_key(bk, &psa, &lsa, mhop, ifname, vrfname);
} }
static int bfd_session_create(enum nb_event event, const struct lyd_node *dnode, static int bfd_session_create(struct nb_cb_create_args *args, bool mhop)
union nb_resource *resource, bool mhop)
{ {
struct bfd_session *bs; struct bfd_session *bs;
const char *ifname; const char *ifname;
struct bfd_key bk; struct bfd_key bk;
struct prefix p; struct prefix p;
switch (event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
/* /*
* When `dest-addr` is IPv6 and link-local we must * When `dest-addr` is IPv6 and link-local we must
* require interface name, otherwise we can't figure * require interface name, otherwise we can't figure
* which interface to use to send the packets. * which interface to use to send the packets.
*/ */
yang_dnode_get_prefix(&p, dnode, "./dest-addr"); yang_dnode_get_prefix(&p, args->dnode, "./dest-addr");
ifname = yang_dnode_get_string(dnode, "./interface"); ifname = yang_dnode_get_string(args->dnode, "./interface");
if (p.family == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&p.u.prefix6) if (p.family == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&p.u.prefix6)
&& strcmp(ifname, "*") == 0) { && strcmp(ifname, "*") == 0) {
zlog_warn( snprintf(
"%s: when using link-local you must specify an interface.", args->errmsg, args->errmsg_len,
__func__); "When using link-local you must specify an interface");
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
break; break;
case NB_EV_PREPARE: case NB_EV_PREPARE:
bfd_session_get_key(mhop, dnode, &bk); bfd_session_get_key(mhop, args->dnode, &bk);
bs = bfd_key_lookup(bk); bs = bfd_key_lookup(bk);
/* This session was already configured by another daemon. */ /* This session was already configured by another daemon. */
@ -93,14 +92,14 @@ static int bfd_session_create(enum nb_event event, const struct lyd_node *dnode,
SET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG); SET_FLAG(bs->flags, BFD_SESS_FLAG_CONFIG);
bs->refcount++; bs->refcount++;
resource->ptr = bs; args->resource->ptr = bs;
break; break;
} }
bs = bfd_session_new(); bs = bfd_session_new();
/* Fill the session key. */ /* Fill the session key. */
bfd_session_get_key(mhop, dnode, &bs->key); bfd_session_get_key(mhop, args->dnode, &bs->key);
/* Set configuration flags. */ /* Set configuration flags. */
bs->refcount = 1; bs->refcount = 1;
@ -110,23 +109,23 @@ static int bfd_session_create(enum nb_event event, const struct lyd_node *dnode,
if (bs->key.family == AF_INET6) if (bs->key.family == AF_INET6)
SET_FLAG(bs->flags, BFD_SESS_FLAG_IPV6); SET_FLAG(bs->flags, BFD_SESS_FLAG_IPV6);
resource->ptr = bs; args->resource->ptr = bs;
break; break;
case NB_EV_APPLY: case NB_EV_APPLY:
bs = resource->ptr; bs = args->resource->ptr;
/* Only attempt to registrate if freshly allocated. */ /* Only attempt to registrate if freshly allocated. */
if (bs->discrs.my_discr == 0 && bs_registrate(bs) == NULL) if (bs->discrs.my_discr == 0 && bs_registrate(bs) == NULL)
return NB_ERR_RESOURCE; return NB_ERR_RESOURCE;
nb_running_set_entry(dnode, bs); nb_running_set_entry(args->dnode, bs);
break; break;
case NB_EV_ABORT: case NB_EV_ABORT:
bs = resource->ptr; bs = args->resource->ptr;
if (bs->refcount <= 1) if (bs->refcount <= 1)
bfd_session_free(resource->ptr); bfd_session_free(bs);
break; break;
} }
@ -474,8 +473,7 @@ int bfdd_bfd_profile_desired_echo_transmission_interval_modify(
*/ */
int bfdd_bfd_sessions_single_hop_create(struct nb_cb_create_args *args) int bfdd_bfd_sessions_single_hop_create(struct nb_cb_create_args *args)
{ {
return bfd_session_create(args->event, args->dnode, args->resource, return bfd_session_create(args, false);
false);
} }
int bfdd_bfd_sessions_single_hop_destroy(struct nb_cb_destroy_args *args) int bfdd_bfd_sessions_single_hop_destroy(struct nb_cb_destroy_args *args)
@ -759,8 +757,7 @@ int bfdd_bfd_sessions_single_hop_desired_echo_transmission_interval_modify(
*/ */
int bfdd_bfd_sessions_multi_hop_create(struct nb_cb_create_args *args) int bfdd_bfd_sessions_multi_hop_create(struct nb_cb_create_args *args)
{ {
return bfd_session_create(args->event, args->dnode, args->resource, return bfd_session_create(args, true);
true);
} }
int bfdd_bfd_sessions_multi_hop_destroy(struct nb_cb_destroy_args *args) int bfdd_bfd_sessions_multi_hop_destroy(struct nb_cb_destroy_args *args)