diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-05-29 17:36:37 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-05-29 17:36:37 +0200 |
| commit | 51f4469f03759642870a45634d9b53054e3deb92 (patch) | |
| tree | 4ccff855d8bb37c97f89d28abfb9fa84bf2bad77 | |
| parent | 6f68f066b63e992321ec1873a15c233f567b9aca (diff) | |
Fixes problems with rewriting of kernel device routes.
| -rw-r--r-- | sysdep/linux/netlink/netlink.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c index e586847a..2e85f54b 100644 --- a/sysdep/linux/netlink/netlink.c +++ b/sysdep/linux/netlink/netlink.c @@ -500,7 +500,7 @@ nl_send_route(struct krt_proto *p, rte *e, int new) bzero(&r.r, sizeof(r.r)); r.h.nlmsg_type = new ? RTM_NEWROUTE : RTM_DELROUTE; r.h.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg)); - r.h.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | (new ? NLM_F_CREATE|NLM_F_REPLACE : 0); + r.h.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | (new ? NLM_F_CREATE|NLM_F_EXCL : 0); r.r.rtm_family = BIRD_AF; r.r.rtm_dst_len = net->n.pxlen; @@ -540,22 +540,11 @@ nl_send_route(struct krt_proto *p, rte *e, int new) void krt_set_notify(struct krt_proto *p, net *n UNUSED, rte *new, rte *old) { - if (old && new) - { - /* - * We should check whether priority and TOS is identical as well, - * but we don't use these and default value is always equal to default value. :-) - */ - nl_send_route(p, new, 1); - } - else - { - if (old) - nl_send_route(p, old, 0); + if (old) + nl_send_route(p, old, 0); - if (new) - nl_send_route(p, new, 1); - } + if (new) + nl_send_route(p, new, 1); } static struct iface * |