diff options
author | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:26:25 +0200 |
---|---|---|
committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:26:25 +0200 |
commit | 41508ceac3cdd74ca705d3bfc6a79464bf38e0b5 (patch) | |
tree | 4a0506a93849b3b7e61faeeaba1af289e13d646a /sysdep | |
parent | 65254128e105903b6b470c6b4bb4729f56cf81bc (diff) | |
parent | 1c30b689ddd032ef8000fb7836348a48ba3184ff (diff) |
Merge commit '1c30b689ddd032ef8000fb7836348a48ba3184ff' into haugesund
Diffstat (limited to 'sysdep')
-rw-r--r-- | sysdep/bsd/krt-sock.c | 3 | ||||
-rw-r--r-- | sysdep/linux/netlink.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c index 19ef2394..1c1bd50c 100644 --- a/sysdep/bsd/krt-sock.c +++ b/sysdep/bsd/krt-sock.c @@ -518,9 +518,10 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan) net = net_get(p->p.main_channel->table, &ndst); rta a = { - .source = RTS_INHERIT, }; + ea_set_attr_u32(&a->eattrs, &ea_gen_source, 0, RTS_INHERIT); + /* reject/blackhole routes have also set RTF_GATEWAY, we wil check them first. */ diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c index 2dbe59e9..9c78ca48 100644 --- a/sysdep/linux/netlink.c +++ b/sysdep/linux/netlink.c @@ -1853,7 +1853,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h) nl_announce_route(s); rta *ra = lp_allocz(s->pool, RTA_MAX_SIZE); - ra->source = RTS_INHERIT; + ea_set_attr_u32(&ra->eattrs, &ea_gen_source, 0, RTS_INHERIT); if (a[RTA_FLOW]) s->rta_flow = rta_get_u32(a[RTA_FLOW]); |