diff options
Diffstat (limited to 'bfdd/config.c')
| -rw-r--r-- | bfdd/config.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bfdd/config.c b/bfdd/config.c index 06089780c6..d1342eff1e 100644 --- a/bfdd/config.c +++ b/bfdd/config.c @@ -314,16 +314,16 @@ static int parse_peer_label_config(struct json_object *jo, if (bpc->bpc_mhop) { bpc->bpc_peer = pl->pl_bs->mhop.peer; bpc->bpc_local = pl->pl_bs->mhop.local; - if (pl->pl_bs->mhop.vrf_name[0]) { + if (pl->pl_bs->mhop.vrfid != VRF_DEFAULT) { bpc->bpc_has_vrfname = true; - strlcpy(bpc->bpc_vrfname, pl->pl_bs->mhop.vrf_name, + strlcpy(bpc->bpc_vrfname, pl->pl_bs->vrf->name, sizeof(bpc->bpc_vrfname)); } } else { bpc->bpc_peer = pl->pl_bs->shop.peer; - if (pl->pl_bs->shop.port_name[0]) { + if (pl->pl_bs->ifname[0]) { bpc->bpc_has_localif = true; - strlcpy(bpc->bpc_localif, pl->pl_bs->shop.port_name, + strlcpy(bpc->bpc_localif, pl->pl_bs->ifname, sizeof(bpc->bpc_localif)); } } @@ -471,7 +471,8 @@ char *config_notify_config(const char *op, struct bfd_session *bs) json_object_int_add(resp, "detect-multiplier", bs->detect_mult); json_object_int_add(resp, "receive-interval", bs->timers.required_min_rx / 1000); - json_object_int_add(resp, "transmit-interval", bs->up_min_tx / 1000); + json_object_int_add(resp, "transmit-interval", + bs->timers.desired_min_tx / 1000); json_object_int_add(resp, "echo-interval", bs->timers.required_min_echo / 1000); @@ -530,9 +531,8 @@ static int json_object_add_peer(struct json_object *jo, struct bfd_session *bs) satostr(&bs->mhop.peer)); json_object_string_add(jo, "local-address", satostr(&bs->mhop.local)); - if (strlen(bs->mhop.vrf_name) > 0) - json_object_string_add(jo, "vrf-name", - bs->mhop.vrf_name); + if (bs->vrfname[0]) + json_object_string_add(jo, "vrf-name", bs->vrfname); } else { json_object_boolean_false_add(jo, "multihop"); json_object_string_add(jo, "peer-address", @@ -540,9 +540,9 @@ static int json_object_add_peer(struct json_object *jo, struct bfd_session *bs) if (bs->local_address.sa_sin.sin_family != AF_UNSPEC) json_object_string_add(jo, "local-address", satostr(&bs->local_address)); - if (strlen(bs->shop.port_name) > 0) + if (bs->ifname[0]) json_object_string_add(jo, "local-interface", - bs->shop.port_name); + bs->ifname); } if (bs->pl) |