diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2008-10-27 00:20:22 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2008-10-27 00:20:22 +0100 |
| commit | a98fbf0f12b5e83e25afa0f585ca6a4d4ac5f6bf (patch) | |
| tree | f6c215cd05ec9278696fae7b8814b5071a4b3c6a /sysdep/linux/netlink/netlink.c | |
| parent | a3b70dc499b64f41aa776b5b4afee5c7bfb8dfa6 (diff) | |
| parent | 1567edea8d3da7da08092eef15bb3bd4544c6464 (diff) | |
| download | bird-a98fbf0f12b5e83e25afa0f585ca6a4d4ac5f6bf.tar bird-a98fbf0f12b5e83e25afa0f585ca6a4d4ac5f6bf.zip | |
Merge branch 'dev' into out
Diffstat (limited to 'sysdep/linux/netlink/netlink.c')
| -rw-r--r-- | sysdep/linux/netlink/netlink.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c index 4784195..38d00af 100644 --- a/sysdep/linux/netlink/netlink.c +++ b/sysdep/linux/netlink/netlink.c @@ -499,6 +499,8 @@ nl_send_route(struct krt_proto *p, rte *e, int new) nl_add_attr_ipa(&r.h, sizeof(r), RTA_GATEWAY, a->gw); break; case RTD_DEVICE: + if (!a->iface) + return; r.r.rtm_type = RTN_UNICAST; nl_add_attr_u32(&r.h, sizeof(r), RTA_OIF, a->iface->index); break; @@ -532,11 +534,8 @@ krt_set_notify(struct krt_proto *p, net *n UNUSED, rte *new, rte *old) else { if (old) - { - if (!old->attrs->iface || (old->attrs->iface->flags & IF_UP)) - nl_send_route(p, old, 0); - /* else the kernel has already flushed it */ - } + nl_send_route(p, old, 0); + if (new) nl_send_route(p, new, 1); } |