matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

zebra: rename pseudowire destination api

Browse source 
In prep for adding nexthop info for pws, rename the accessor
for the pw destination. Add a nexthop-group to the pw
data in the dataplane module.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2019-02-28 16:23:21 -05:00
parent 414d04adb8
commit 16d697870b
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
zebra/zebra_dplane.c
View file

@ -111,10 +111,13 @@ struct dplane_pw_info {
int af; int af;
int status; int status;
uint32_t flags; uint32_t flags;
union g_addr nexthop; union g_addr dest;
mpls_label_t local_label; mpls_label_t local_label;
mpls_label_t remote_label; mpls_label_t remote_label;
/* Nexthops */
struct nexthop_group nhg;
union pw_protocol_fields fields; union pw_protocol_fields fields;
}; };
@ -386,6 +389,15 @@ static void dplane_ctx_free(struct zebra_dplane_ctx **pctx)
case DPLANE_OP_PW_INSTALL: case DPLANE_OP_PW_INSTALL:
case DPLANE_OP_PW_UNINSTALL: case DPLANE_OP_PW_UNINSTALL:
/* Free allocated nexthops */
if ((*pctx)->u.pw.nhg.nexthop) {
/* This deals with recursive nexthops too */
nexthops_free((*pctx)->u.pw.nhg.nexthop);
(*pctx)->u.pw.nhg.nexthop = NULL;
}
break;
case DPLANE_OP_NONE: case DPLANE_OP_NONE:
break; break;
} }
@ -814,12 +826,12 @@ int dplane_ctx_get_pw_status(const struct zebra_dplane_ctx *ctx)
return ctx->u.pw.status; return ctx->u.pw.status;
} }
const union g_addr *dplane_ctx_get_pw_nexthop( const union g_addr *dplane_ctx_get_pw_dest(
const struct zebra_dplane_ctx *ctx) const struct zebra_dplane_ctx *ctx)
{ {
DPLANE_CTX_VALID(ctx); DPLANE_CTX_VALID(ctx);
return &(ctx->u.pw.nexthop); return &(ctx->u.pw.dest);
} }
const union pw_protocol_fields *dplane_ctx_get_pw_proto( const union pw_protocol_fields *dplane_ctx_get_pw_proto(
@ -1056,6 +1068,7 @@ static int dplane_ctx_pw_init(struct zebra_dplane_ctx *ctx,
/* This name appears to be c-string, so we use string copy. */ /* This name appears to be c-string, so we use string copy. */
strlcpy(ctx->u.pw.ifname, pw->ifname, sizeof(ctx->u.pw.ifname)); strlcpy(ctx->u.pw.ifname, pw->ifname, sizeof(ctx->u.pw.ifname));
ctx->zd_vrf_id = pw->vrf_id; ctx->zd_vrf_id = pw->vrf_id;
ctx->u.pw.ifindex = pw->ifindex; ctx->u.pw.ifindex = pw->ifindex;
ctx->u.pw.type = pw->type; ctx->u.pw.type = pw->type;
@ -1064,7 +1077,7 @@ static int dplane_ctx_pw_init(struct zebra_dplane_ctx *ctx,
ctx->u.pw.remote_label = pw->remote_label; ctx->u.pw.remote_label = pw->remote_label;
ctx->u.pw.flags = pw->flags; ctx->u.pw.flags = pw->flags;
ctx->u.pw.nexthop = pw->nexthop; ctx->u.pw.dest = pw->nexthop;
ctx->u.pw.fields = pw->data; ctx->u.pw.fields = pw->data;

2
zebra/zebra_dplane.h
View file

@ -215,7 +215,7 @@ int dplane_ctx_get_pw_type(const struct zebra_dplane_ctx *ctx);
int dplane_ctx_get_pw_af(const struct zebra_dplane_ctx *ctx); int dplane_ctx_get_pw_af(const struct zebra_dplane_ctx *ctx);
uint32_t dplane_ctx_get_pw_flags(const struct zebra_dplane_ctx *ctx); uint32_t dplane_ctx_get_pw_flags(const struct zebra_dplane_ctx *ctx);
int dplane_ctx_get_pw_status(const struct zebra_dplane_ctx *ctx); int dplane_ctx_get_pw_status(const struct zebra_dplane_ctx *ctx);
const union g_addr *dplane_ctx_get_pw_nexthop( const union g_addr *dplane_ctx_get_pw_dest(
const struct zebra_dplane_ctx *ctx); const struct zebra_dplane_ctx *ctx);
const union pw_protocol_fields *dplane_ctx_get_pw_proto( const union pw_protocol_fields *dplane_ctx_get_pw_proto(
const struct zebra_dplane_ctx *ctx); const struct zebra_dplane_ctx *ctx);

2
zebra/zebra_mpls_openbsd.c
View file

@ -342,7 +342,7 @@ static enum zebra_dplane_result kmpw_install(struct zebra_dplane_ctx *ctx)
/* pseudowire nexthop */ /* pseudowire nexthop */
memset(&ss, 0, sizeof(ss)); memset(&ss, 0, sizeof(ss));
gaddr = dplane_ctx_get_pw_nexthop(ctx); gaddr = dplane_ctx_get_pw_dest(ctx);
switch (dplane_ctx_get_pw_af(ctx)) { switch (dplane_ctx_get_pw_af(ctx)) {
case AF_INET: case AF_INET:
sa_in->sin_family = AF_INET; sa_in->sin_family = AF_INET;