From owner-svn-src-user@FreeBSD.ORG Thu Oct 24 00:30:39 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3FF2FD7E; Thu, 24 Oct 2013 00:30:39 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2E0222B76; Thu, 24 Oct 2013 00:30:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9O0Ud59019200; Thu, 24 Oct 2013 00:30:39 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9O0UdqN019199; Thu, 24 Oct 2013 00:30:39 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201310240030.r9O0UdqN019199@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 24 Oct 2013 00:30:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r257028 - user/ae/inet6/sys/netinet6 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Oct 2013 00:30:39 -0000 Author: ae Date: Thu Oct 24 00:30:38 2013 New Revision: 257028 URL: http://svnweb.freebsd.org/changeset/base/257028 Log: Remove in6_clearscope() calls. Modified: user/ae/inet6/sys/netinet6/send.c Modified: user/ae/inet6/sys/netinet6/send.c ============================================================================== --- user/ae/inet6/sys/netinet6/send.c Thu Oct 24 00:28:51 2013 (r257027) +++ user/ae/inet6/sys/netinet6/send.c Thu Oct 24 00:30:38 2013 (r257028) @@ -259,7 +259,6 @@ send_close(struct socket *so) static int send_input(struct mbuf *m, struct ifnet *ifp, int direction, int msglen __unused) { - struct ip6_hdr *ip6; struct sockaddr_send sendsrc; SEND_LOCK(); @@ -268,15 +267,6 @@ send_input(struct mbuf *m, struct ifnet return (-1); } - /* - * Make sure to clear any possible internally embedded scope before - * passing the packet to user space for SeND cryptographic signature - * validation to succeed. - */ - ip6 = mtod(m, struct ip6_hdr *); - in6_clearscope(&ip6->ip6_src); - in6_clearscope(&ip6->ip6_dst); - bzero(&sendsrc, sizeof(sendsrc)); sendsrc.send_len = sizeof(sendsrc); sendsrc.send_family = AF_INET6;