Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'mq-fix-eattr-setting' into backport

Browse source
This commit is contained in:
Maria Matejka 2022-08-18 22:07:50 +02:00
commit d2c1036a42
1 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
sysdep/linux/netlink.c
View file

@ -1775,30 +1775,33 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
ra->eattrs = ea; ra->eattrs = ea;
ea->flags = EALF_SORTED; ea->flags = EALF_SORTED;
ea->count = 1; ea->count = 1;
ea->attrs[0].id = EA_KRT_SCOPE; ea->attrs[0] = (eattr) {
ea->attrs[0].flags = 0; .id = EA_KRT_SCOPE,
ea->attrs[0].type = EAF_TYPE_INT; .flags = 0,
ea->attrs[0].u.data = i->rtm_scope; .type = EAF_TYPE_INT,
.u.data = i->rtm_scope,
};
} }
if (a[RTA_PREFSRC]) if (a[RTA_PREFSRC])
{ {
ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]); ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]);
struct adata *ad = lp_alloc(s->pool, sizeof(struct adata) + sizeof(ps));
ad->length = sizeof(ps);
memcpy(ad->data, &ps, sizeof(ps));
ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr)); ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
ea->next = ra->eattrs; ea->next = ra->eattrs;
ra->eattrs = ea; ra->eattrs = ea;
ea->flags = EALF_SORTED; ea->flags = EALF_SORTED;
ea->count = 1; ea->count = 1;
ea->attrs[0].id = EA_KRT_PREFSRC; ea->attrs[0] = (eattr) {
ea->attrs[0].flags = 0; .id = EA_KRT_PREFSRC,
ea->attrs[0].type = EAF_TYPE_IP_ADDRESS; .flags = 0,
.type = EAF_TYPE_IP_ADDRESS,
struct adata *ad = lp_alloc(s->pool, sizeof(struct adata) + sizeof(ps)); .u.ptr = ad,
ad->length = sizeof(ps); };
memcpy(ad->data, &ps, sizeof(ps));
ea->attrs[0].u.ptr = ad;
} }
/* Can be set per-route or per-nexthop */ /* Can be set per-route or per-nexthop */
@ -1809,10 +1812,12 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
ra->eattrs = ea; ra->eattrs = ea;
ea->flags = EALF_SORTED; ea->flags = EALF_SORTED;
ea->count = 1; ea->count = 1;
ea->attrs[0].id = EA_KRT_REALM; ea->attrs[0] = (eattr) {
ea->attrs[0].flags = 0; .id = EA_KRT_REALM,
ea->attrs[0].type = EAF_TYPE_INT; .flags = 0,
ea->attrs[0].u.data = s->rta_flow; .type = EAF_TYPE_INT,
.u.data = s->rta_flow,
};
} }
if (a[RTA_METRICS]) if (a[RTA_METRICS])
@ -1829,13 +1834,12 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
for (t = 1; t < KRT_METRICS_MAX; t++) for (t = 1; t < KRT_METRICS_MAX; t++)
if (metrics[0] & (1 << t)) if (metrics[0] & (1 << t))
{ ea->attrs[n++] = (eattr) {
ea->attrs[n].id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t); .id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t),
ea->attrs[n].flags = 0; .flags = 0,
ea->attrs[n].type = EAF_TYPE_INT; /* FIXME: Some are EAF_TYPE_BITFIELD */ .type = EAF_TYPE_INT, /* FIXME: Some are EAF_TYPE_BITFIELD */
ea->attrs[n].u.data = metrics[t]; .u.data = metrics[t],
n++; };
}
if (n > 0) if (n > 0)
{ {