diff options
| author | paul <paul> | 2005-09-12 16:58:52 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-09-12 16:58:52 +0000 |
| commit | ca16218df74a43491e34a577db5023c89a7e79c8 (patch) | |
| tree | 5aaee14da68863f7d7eb80fad46c83bebfc4fb8c /zebra/kernel_socket.c | |
| parent | 1f377b0202dfc4653f7717de964b628a369a9526 (diff) | |
2005-09-12 Paul Jakma <paul.jakma@sun.com>
* (general) RTM_CHANGE and implicit withdraw on RTM_NEWADDR
support.
* connected.c: (connected_withdraw) new function. withdraw a
connected subnet address set from zebra, and pass information
along to clients.
(connected_announce) similar, but to announce a new connected
subnet address set.
(connected_check_ipv4) renamed to connected_check, as its
AFI independent.
(connected_add_ipv{4,6}) Remove the connected address announce
stuff, use connected_announce instead.
If connected_check indicates address is already present,
treat it as an implicit withdraw of the existing address, ie
remove the old address details and replace with the new
details.
(connected_delete_ipv{4,6}) Use connected_withdraw.
(connected_check_ipv6) deleted in favour of connected_check.
* connected.h: Rename connected_check_ipv4 to connected_check.
delete connected_check_ipv6.
* interface.c: Use connected_check rather than the AFI specific
symbols.
* kernel_socket.c: (rtm_read) RTM_CHANGE support. Create a
rib delete event for the existing route, before adding route
again.
(kernel_read) we can handle RTM_CHANGE now.
Diffstat (limited to 'zebra/kernel_socket.c')
| -rw-r--r-- | zebra/kernel_socket.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index fe7411ee..f391d53a 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -623,8 +623,17 @@ rtm_read (struct rt_msghdr *rtm) p.prefixlen = IPV4_MAX_PREFIXLEN; else p.prefixlen = ip_masklen (mask.sin.sin_addr); - - if (rtm->rtm_type == RTM_GET || rtm->rtm_type == RTM_ADD) + + /* Change, delete the old prefix, we have no further information + * to specify the route really + */ + if (rtm->rtm_type == RTM_CHANGE) + rib_delete_ipv4 (ZEBRA_ROUTE_KERNEL, zebra_flags, &p, + NULL, 0, 0); + + if (rtm->rtm_type == RTM_GET + || rtm->rtm_type == RTM_ADD + || rtm->rtm_type == RTM_CHANGE) rib_add_ipv4 (ZEBRA_ROUTE_KERNEL, zebra_flags, &p, &gate.sin.sin_addr, 0, 0, 0, 0); else @@ -652,7 +661,16 @@ rtm_read (struct rt_msghdr *rtm) } #endif /* KAME */ - if (rtm->rtm_type == RTM_GET || rtm->rtm_type == RTM_ADD) + /* CHANGE: delete the old prefix, we have no further information + * to specify the route really + */ + if (rtm->rtm_type == RTM_CHANGE) + rib_delete_ipv4 (ZEBRA_ROUTE_KERNEL, zebra_flags, &p, + NULL, 0, 0); + + if (rtm->rtm_type == RTM_GET + || rtm->rtm_type == RTM_ADD + || rtm->rtm_type == RTM_CHANGE) rib_add_ipv6 (ZEBRA_ROUTE_KERNEL, zebra_flags, &p, &gate.sin6.sin6_addr, ifindex, 0, 0, 0); else @@ -920,6 +938,7 @@ kernel_read (struct thread *thread) { case RTM_ADD: case RTM_DELETE: + case RTM_CHANGE: rtm_read (rtm); break; case RTM_IFINFO: |