From owner-svn-src-projects@freebsd.org Mon Nov 21 07:16:34 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 16B2FC4C96C for ; Mon, 21 Nov 2016 07:16:34 +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 BAAC7FA3; Mon, 21 Nov 2016 07:16:33 +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 uAL7GW1w019192; Mon, 21 Nov 2016 07:16:32 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAL7GWEG019189; Mon, 21 Nov 2016 07:16:32 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201611210716.uAL7GWEG019189@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Mon, 21 Nov 2016 07:16:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r308911 - in projects/ipsec/sys: netinet netinet6 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: Mon, 21 Nov 2016 07:16:34 -0000 Author: ae Date: Mon Nov 21 07:16:32 2016 New Revision: 308911 URL: https://svnweb.freebsd.org/changeset/base/308911 Log: Modify comments to reflect the reality. Modified: projects/ipsec/sys/netinet/ip_ipsec.c projects/ipsec/sys/netinet6/ip6_ipsec.c Modified: projects/ipsec/sys/netinet/ip_ipsec.c ============================================================================== --- projects/ipsec/sys/netinet/ip_ipsec.c Mon Nov 21 06:47:57 2016 (r308910) +++ projects/ipsec/sys/netinet/ip_ipsec.c Mon Nov 21 07:16:32 2016 (r308911) @@ -195,8 +195,11 @@ ip_ipsec_output(struct mbuf *m, struct i /* * Hack: -EINVAL is used to signal that a packet * should be silently discarded. This is typically - * because we asked key management for an SA and - * it was delayed (e.g. kicked up to IKE). + * because we have DISCARD policy or asked key + * management for an SP and it was delayed (e.g. + * kicked up to IKE). + * XXX: maybe return EACCES to the caller would + * be more useful? */ if (*error == -EINVAL) *error = 0; @@ -270,8 +273,11 @@ ip_ipsec_forward(struct mbuf *m, int *er /* * Hack: -EINVAL is used to signal that a packet * should be silently discarded. This is typically - * because we asked key management for an SA and - * it was delayed (e.g. kicked up to IKE). + * because we have DISCARD policy or asked key + * management for an SP and it was delayed (e.g. + * kicked up to IKE). + * XXX: maybe return EACCES to the caller would + * be more useful? */ if (*error == -EINVAL) *error = 0; Modified: projects/ipsec/sys/netinet6/ip6_ipsec.c ============================================================================== --- projects/ipsec/sys/netinet6/ip6_ipsec.c Mon Nov 21 06:47:57 2016 (r308910) +++ projects/ipsec/sys/netinet6/ip6_ipsec.c Mon Nov 21 07:16:32 2016 (r308911) @@ -195,8 +195,11 @@ ip6_ipsec_output(struct mbuf *m, struct /* * Hack: -EINVAL is used to signal that a packet * should be silently discarded. This is typically - * because we asked key management for an SA and - * it was delayed (e.g. kicked up to IKE). + * because we have DISCARD policy or asked key + * management for an SP and it was delayed (e.g. + * kicked up to IKE). + * XXX: maybe return EACCES to the caller would + * be more useful? */ if (*error == -EINVAL) *error = 0; @@ -277,8 +280,11 @@ ip6_ipsec_forward(struct mbuf *m, int *e /* * Hack: -EINVAL is used to signal that a packet * should be silently discarded. This is typically - * because we asked key management for an SA and - * it was delayed (e.g. kicked up to IKE). + * because we have DISCARD policy or asked key + * management for an SP and it was delayed (e.g. + * kicked up to IKE). + * XXX: maybe return EACCES to the caller would + * be more useful? */ if (*error == -EINVAL) *error = 0;