From owner-svn-src-projects@freebsd.org Tue Dec 6 11:14:32 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B274C6AF86 for ; Tue, 6 Dec 2016 11:14:32 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B228D40; Tue, 6 Dec 2016 11:14:31 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB6BEVt0033044; Tue, 6 Dec 2016 11:14:31 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB6BEVA4033043; Tue, 6 Dec 2016 11:14:31 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201612061114.uB6BEVA4033043@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 6 Dec 2016 11:14:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r309611 - projects/ipsec/sys/netipsec X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Dec 2016 11:14:32 -0000 Author: ae Date: Tue Dec 6 11:14:31 2016 New Revision: 309611 URL: https://svnweb.freebsd.org/changeset/base/309611 Log: Do not notify PF_KEY consumers about VTI security policies. It looks like IKEd do not track policies that they don't own. Modified: projects/ipsec/sys/netipsec/key.c Modified: projects/ipsec/sys/netipsec/key.c ============================================================================== --- projects/ipsec/sys/netipsec/key.c Tue Dec 6 10:55:50 2016 (r309610) +++ projects/ipsec/sys/netipsec/key.c Tue Dec 6 11:14:31 2016 (r309611) @@ -1079,7 +1079,6 @@ done: int key_register_ifnet(struct secpolicy **spp, u_int count) { - struct mbuf *m; u_int i; SPTREE_WLOCK(); @@ -1107,26 +1106,14 @@ key_register_ifnet(struct secpolicy **sp */ LIST_INSERT_HEAD(SPHASH_HASH(spp[i]->id), spp[i], idhash); spp[i]->state = IPSEC_SPSTATE_IFNET; - /* Acquire extra reference to send SPDADD message */ - SP_ADDREF(spp[i]); } SPTREE_WUNLOCK(); - /* - * Notify user processes about new SP. - */ - for (i = 0; i < count; i++) { - m = key_setdumpsp(spp[i], SADB_X_SPDADD, 0, 0); - key_freesp(&spp[i]); - if (m != NULL) - key_sendup_mbuf(NULL, m, KEY_SENDUP_ALL); - } return (0); } void key_unregister_ifnet(struct secpolicy **spp, u_int count) { - struct mbuf *m; u_int i; SPTREE_WLOCK(); @@ -1143,13 +1130,6 @@ key_unregister_ifnet(struct secpolicy ** LIST_REMOVE(spp[i], idhash); } SPTREE_WUNLOCK(); - - for (i = 0; i < count; i++) { - m = key_setdumpsp(spp[i], SADB_X_SPDDELETE, 0, 0); - key_freesp(&spp[i]); - if (m != NULL) - key_sendup_mbuf(NULL, m, KEY_SENDUP_ALL); - } } /*