diff options
| author | David Lamparter <equinox@diac24.net> | 2019-05-15 21:32:50 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-05-15 21:32:50 +0200 |
| commit | cd4f050587c444509ec286247f95606fe6f7f756 (patch) | |
| tree | db21369925a50a674b5fa2426737c45209a031d5 /zebra/kernel_socket.c | |
| parent | 0189e6d73cdbabf2b320b40248d75db1791d7424 (diff) | |
| parent | 33e56da60666cd26ca18787104e721b9df9ed4a2 (diff) | |
Merge tag 'frr-6.0.3' into debian/master
FRRouting Release 6.0.3
Diffstat (limited to 'zebra/kernel_socket.c')
| -rw-r--r-- | zebra/kernel_socket.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index ff035fb353..25007d6c8c 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -194,7 +194,9 @@ const struct message rtm_type_str[] = {{RTM_ADD, "RTM_ADD"}, {RTM_LOSING, "RTM_LOSING"}, {RTM_REDIRECT, "RTM_REDIRECT"}, {RTM_MISS, "RTM_MISS"}, +#ifdef RTM_LOCK {RTM_LOCK, "RTM_LOCK"}, +#endif /* RTM_LOCK */ #ifdef OLDADD {RTM_OLDADD, "RTM_OLDADD"}, #endif /* RTM_OLDADD */ @@ -759,7 +761,8 @@ int ifam_read(struct ifa_msghdr *ifam) connected_add_ipv4(ifp, flags, &addr.sin.sin_addr, ip_masklen(mask.sin.sin_addr), &brd.sin.sin_addr, - (isalias ? ifname : NULL)); + (isalias ? ifname : NULL), + METRIC_MAX); else connected_delete_ipv4(ifp, flags, &addr.sin.sin_addr, ip_masklen(mask.sin.sin_addr), @@ -776,7 +779,8 @@ int ifam_read(struct ifa_msghdr *ifam) connected_add_ipv6(ifp, flags, &addr.sin6.sin6_addr, NULL, ip6_masklen(mask.sin6.sin6_addr), - (isalias ? ifname : NULL)); + (isalias ? ifname : NULL), + METRIC_MAX); else connected_delete_ipv6(ifp, &addr.sin6.sin6_addr, NULL, ip6_masklen(mask.sin6.sin6_addr)); |