diff options
| author | melifaro <melifaro@FreeBSD.org> | 2014-05-08 20:41:39 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2014-05-08 20:41:39 +0000 |
| commit | 5ca6003c5c59fcbccde099c4a5acae82537f80d9 (patch) | |
| tree | bb8f2e278e828d67030223454dae78d3f19d19dc /sys/net/rtsock.c | |
| parent | d42ec49fe7376d5d77807fe648fe0af085a8b7ac (diff) | |
| download | FreeBSD-src-5ca6003c5c59fcbccde099c4a5acae82537f80d9.zip FreeBSD-src-5ca6003c5c59fcbccde099c4a5acae82537f80d9.tar.gz | |
Merge r260379, r260460.
r260379:
Partially fix IPv4 interface routes deletion in RADIX_MPATH.
Noticed by: Nikolay Denev <ndenev at gmail.com>
r260460:
Constanly use RT_ALL_FIBS everywhere instead of -1.
Diffstat (limited to 'sys/net/rtsock.c')
| -rw-r--r-- | sys/net/rtsock.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index af51ac6..798ed43 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -161,7 +161,6 @@ int (*carp_get_vhid_p)(struct ifaddr *); * notification to a socket bound to a particular FIB. */ #define RTS_FILTER_FIB M_PROTO8 -#define RTS_ALLFIBS -1 static struct { int ip_count; /* attached w/ AF_INET */ @@ -1281,7 +1280,7 @@ rt_missmsg_fib(int type, struct rt_addrinfo *rtinfo, int flags, int error, if (m == NULL) return; - if (fibnum != RTS_ALLFIBS) { + if (fibnum != RT_ALL_FIBS) { KASSERT(fibnum >= 0 && fibnum < rt_numfibs, ("%s: fibnum out " "of range 0 <= %d < %d", __func__, fibnum, rt_numfibs)); M_SETFIB(m, fibnum); @@ -1299,7 +1298,7 @@ void rt_missmsg(int type, struct rt_addrinfo *rtinfo, int flags, int error) { - rt_missmsg_fib(type, rtinfo, flags, error, RTS_ALLFIBS); + rt_missmsg_fib(type, rtinfo, flags, error, RT_ALL_FIBS); } /* @@ -1395,7 +1394,7 @@ rt_newaddrmsg_fib(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt, rtm->rtm_errno = error; rtm->rtm_addrs = info.rti_addrs; } - if (fibnum != RTS_ALLFIBS) { + if (fibnum != RT_ALL_FIBS) { KASSERT(fibnum >= 0 && fibnum < rt_numfibs, ("%s: " "fibnum out of range 0 <= %d < %d", __func__, fibnum, rt_numfibs)); @@ -1410,7 +1409,7 @@ void rt_newaddrmsg(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt) { - rt_newaddrmsg_fib(cmd, ifa, error, rt, RTS_ALLFIBS); + rt_newaddrmsg_fib(cmd, ifa, error, rt, RT_ALL_FIBS); } /* @@ -1907,7 +1906,7 @@ sysctl_rtsock(SYSCTL_HANDLER_ARGS) if (namelen == 3) fib = req->td->td_proc->p_fibnum; else if (namelen == 4) - fib = (name[3] == -1) ? + fib = (name[3] == RT_ALL_FIBS) ? req->td->td_proc->p_fibnum : name[3]; else return ((namelen < 3) ? EISDIR : ENOTDIR); |
