0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 07:31:54 +00:00

Merge commit 'd61505b039bf0aa6697e28b2a4e07907c89ba1fb' into thread-next

This commit is contained in:
Maria Matejka 2023-04-24 10:40:53 +02:00
commit db2b67268c

View File

@ -324,7 +324,7 @@ krt_send_route(struct krt_proto *p, int cmd, const rte *e)
if (ipa_is_link_local(gw)) if (ipa_is_link_local(gw))
_I0(gw) = 0xfe800000 | (i->index & 0x0000ffff); _I0(gw) = 0xfe800000 | (i->index & 0x0000ffff);
sockaddr_fill(&gate, af, gw, NULL, 0); sockaddr_fill(&gate, (ipa_is_ip4(gw) ? AF_INET : AF_INET6), gw, NULL, 0);
msg.rtm.rtm_flags |= RTF_GATEWAY; msg.rtm.rtm_flags |= RTF_GATEWAY;
msg.rtm.rtm_addrs |= RTA_GATEWAY; msg.rtm.rtm_addrs |= RTA_GATEWAY;
break; break;
@ -479,7 +479,7 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
idst = ipa_from_sa(&dst); idst = ipa_from_sa(&dst);
imask = ipa_from_sa(&mask); imask = ipa_from_sa(&mask);
igate = (gate.sa.sa_family == dst.sa.sa_family) ? ipa_from_sa(&gate) : IPA_NONE; igate = ipa_from_sa(&gate);
#ifdef KRT_SHARED_SOCKET #ifdef KRT_SHARED_SOCKET
if (!scan) if (!scan)