diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-05 06:05:39 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-05 06:05:39 +0100 |
| commit | be8c228fad013d8488623dc6db46e28d4dfb72c2 (patch) | |
| tree | 5fe0e8943cafeb3b663a0895e757f33b66c7851e /zebra/rt_socket.c | |
| parent | e473267ee96f48514b879f5dcaba2db64f0de9d1 (diff) | |
| parent | 647e8e064d8e5316fc89587714a056b1240fa298 (diff) | |
| download | quagga-be8c228fad013d8488623dc6db46e28d4dfb72c2.tar.bz2 quagga-be8c228fad013d8488623dc6db46e28d4dfb72c2.tar.xz | |
Merge branch 'current' into dn42
Diffstat (limited to 'zebra/rt_socket.c')
| -rw-r--r-- | zebra/rt_socket.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index 1b8ded7e..4fadc7e9 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -163,7 +163,7 @@ kernel_rtm_ipv4 (int cmd, struct prefix *p, struct rib *rib, int family) (union sockunion *)mask, gate ? (union sockunion *)&sin_gate : NULL, ifindex, - rib->flags, + rib->flags | (rib->zflags << 8), rib->metric); if (IS_ZEBRA_DEBUG_RIB) @@ -286,7 +286,8 @@ sin6_masklen (struct in6_addr mask) return len; } -/* Interface between zebra message and rtm message. */ +/* Interface between zebra message and rtm message. + * only called by kernel_delete_ipv6_old by rib_bogus_ipv6 */ static int kernel_rtm_ipv6 (int message, struct prefix_ipv6 *dest, struct in6_addr *gate, int index, int flags) @@ -453,7 +454,7 @@ kernel_rtm_ipv6_multipath (int cmd, struct prefix *p, struct rib *rib, (union sockunion *) mask, gate ? (union sockunion *)&sin_gate : NULL, ifindex, - rib->flags, + rib->flags | (rib->zflags << 8), rib->metric); #if 0 |