Date: Fri, 25 Oct 2013 02:55:04 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r257091 - user/ae/inet6/sys/netinet Message-ID: <201310250255.r9P2t4Zj055678@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Fri Oct 25 02:55:04 2013 New Revision: 257091 URL: http://svnweb.freebsd.org/changeset/base/257091 Log: Refactor sysctl_drop(): * remove sa6_embedscope() calls, use sa6_checkzone() instead; * determine interface by zone id and pass it to in6_pcblookup. Modified: user/ae/inet6/sys/netinet/tcp_subr.c Modified: user/ae/inet6/sys/netinet/tcp_subr.c ============================================================================== --- user/ae/inet6/sys/netinet/tcp_subr.c Fri Oct 25 02:40:56 2013 (r257090) +++ user/ae/inet6/sys/netinet/tcp_subr.c Fri Oct 25 02:55:04 2013 (r257091) @@ -2189,7 +2189,9 @@ sysctl_drop(SYSCTL_HANDLER_ARGS) struct tcptw *tw; struct sockaddr_in *fin, *lin; #ifdef INET6 + struct ifnet *ifp; struct sockaddr_in6 *fin6, *lin6; + uint32_t zoneid; #endif int error; @@ -2227,12 +2229,26 @@ sysctl_drop(SYSCTL_HANDLER_ARGS) lin = (struct sockaddr_in *)&addrs[1]; break; } - error = sa6_embedscope(fin6, V_ip6_use_defzone); + error = sa6_checkzone(fin6); if (error) return (error); - error = sa6_embedscope(lin6, V_ip6_use_defzone); + error = sa6_checkzone(lin6); if (error) return (error); + ifp = NULL; + zoneid = 0; + if (fin6->sin6_scope_id != 0) + zoneid = fin6->sin6_scope_id; + if (lin6->sin6_scope_id != 0) { + if (zoneid != 0 && zoneid != lin6->sin6_scope_id) + return (EINVAL); + zoneid = lin6->sin6_scope_id; + } + if (zoneid != 0) { + ifp = in6_getlinkifnet(zoneid); + if (ifp == NULL) + return (ENOENT); + } break; #endif #ifdef INET @@ -2253,7 +2269,7 @@ sysctl_drop(SYSCTL_HANDLER_ARGS) case AF_INET6: inp = in6_pcblookup(&V_tcbinfo, &fin6->sin6_addr, fin6->sin6_port, &lin6->sin6_addr, lin6->sin6_port, - INPLOOKUP_WLOCKPCB, NULL); + INPLOOKUP_WLOCKPCB, ifp); break; #endif #ifdef INET
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310250255.r9P2t4Zj055678>