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

zebra: clean up a debug and an api in netlink code

Browse Source 
Simplify the netlink nexthop api; clean up a debug too.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-01-31 13:57:26 -05:00
parent e4a1ec7454
commit bf1626a6b1
1 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
zebra/rt_netlink.c
View File

@ -1982,6 +1982,12 @@ static int netlink_nexthop(int cmd, struct zebra_dplane_ctx *ctx)
addattr32(&req.n, req_size, NHA_ID, id); addattr32(&req.n, req_size, NHA_ID, id);
if (cmd == RTM_NEWNEXTHOP) { if (cmd == RTM_NEWNEXTHOP) {
/*
* We distinguish between a "group", which is a collection
* of ids, and a singleton nexthop with an id. The
* group is installed as an id that just refers to a list of
* other ids.
*/
if (dplane_ctx_get_nhe_nh_grp_count(ctx)) if (dplane_ctx_get_nhe_nh_grp_count(ctx))
_netlink_nexthop_build_group( _netlink_nexthop_build_group(
&req.n, req_size, id, &req.n, req_size, id,
@ -2068,14 +2074,13 @@ static int netlink_nexthop(int cmd, struct zebra_dplane_ctx *ctx)
} }
} }
nexthop_done: nexthop_done:
if (IS_ZEBRA_DEBUG_KERNEL) {
char buf[NEXTHOP_STRLEN]; if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("%s: ID (%u): %pNHv (%u) %s ",
__func__, id, nh, nh->vrf_id,
label_buf);
snprintfrr(buf, sizeof(buf), "%pNHv", nh);
zlog_debug("%s: ID (%u): %s (%u) %s ", __func__,
id, buf, nh->vrf_id, label_buf);
}
} }
req.nhm.nh_protocol = zebra2proto(dplane_ctx_get_nhe_type(ctx)); req.nhm.nh_protocol = zebra2proto(dplane_ctx_get_nhe_type(ctx));
@ -2103,43 +2108,19 @@ static int netlink_nexthop(int cmd, struct zebra_dplane_ctx *ctx)
*/ */
enum zebra_dplane_result kernel_nexthop_update(struct zebra_dplane_ctx *ctx) enum zebra_dplane_result kernel_nexthop_update(struct zebra_dplane_ctx *ctx)
{ {
enum dplane_op_e op;
int cmd = 0; int cmd = 0;
int ret = 0; int ret = 0;
switch (dplane_ctx_get_op(ctx)) { op = dplane_ctx_get_op(ctx);
case DPLANE_OP_NH_DELETE: if (op == DPLANE_OP_NH_INSTALL || op == DPLANE_OP_NH_UPDATE)
cmd = RTM_DELNEXTHOP;
break;
case DPLANE_OP_NH_INSTALL:
case DPLANE_OP_NH_UPDATE:
cmd = RTM_NEWNEXTHOP; cmd = RTM_NEWNEXTHOP;
break; else if (op == DPLANE_OP_NH_DELETE)
case DPLANE_OP_ROUTE_INSTALL: cmd = RTM_DELNEXTHOP;
case DPLANE_OP_ROUTE_UPDATE: else {
case DPLANE_OP_ROUTE_DELETE: flog_err(EC_ZEBRA_NHG_FIB_UPDATE,
case DPLANE_OP_ROUTE_NOTIFY: "Context received for kernel nexthop update with incorrect OP code (%u)",
case DPLANE_OP_LSP_INSTALL: op);
case DPLANE_OP_LSP_UPDATE:
case DPLANE_OP_LSP_DELETE:
case DPLANE_OP_LSP_NOTIFY:
case DPLANE_OP_PW_INSTALL:
case DPLANE_OP_PW_UNINSTALL:
case DPLANE_OP_SYS_ROUTE_ADD:
case DPLANE_OP_SYS_ROUTE_DELETE:
case DPLANE_OP_ADDR_INSTALL:
case DPLANE_OP_ADDR_UNINSTALL:
case DPLANE_OP_MAC_INSTALL:
case DPLANE_OP_MAC_DELETE:
case DPLANE_OP_NEIGH_INSTALL:
case DPLANE_OP_NEIGH_UPDATE:
case DPLANE_OP_NEIGH_DELETE:
case DPLANE_OP_VTEP_ADD:
case DPLANE_OP_VTEP_DELETE:
case DPLANE_OP_NONE:
flog_err(
EC_ZEBRA_NHG_FIB_UPDATE,
"Context received for kernel nexthop update with incorrect OP code (%u)",
dplane_ctx_get_op(ctx));
return ZEBRA_DPLANE_REQUEST_FAILURE; return ZEBRA_DPLANE_REQUEST_FAILURE;
} }