From owner-svn-src-projects@freebsd.org Sun Jul 12 15:57:30 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1C7E836677D for ; Sun, 12 Jul 2020 15:57:30 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B4Wd571Mwz4gB1; Sun, 12 Jul 2020 15:57:29 +0000 (UTC) (envelope-from rmacklem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF59126E18; Sun, 12 Jul 2020 15:57:29 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06CFvT6Z050445; Sun, 12 Jul 2020 15:57:29 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06CFvTpD050444; Sun, 12 Jul 2020 15:57:29 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202007121557.06CFvTpD050444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 12 Jul 2020 15:57:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363131 - projects/nfs-over-tls/sys/rpc X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/rpc X-SVN-Commit-Revision: 363131 X-SVN-Commit-Repository: base 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.33 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: Sun, 12 Jul 2020 15:57:30 -0000 Author: rmacklem Date: Sun Jul 12 15:57:29 2020 New Revision: 363131 URL: https://svnweb.freebsd.org/changeset/base/363131 Log: Slight code cleanup in svc_vc_destroy_common(). No change in semantics. Modified: projects/nfs-over-tls/sys/rpc/svc_vc.c Modified: projects/nfs-over-tls/sys/rpc/svc_vc.c ============================================================================== --- projects/nfs-over-tls/sys/rpc/svc_vc.c Sun Jul 12 14:57:29 2020 (r363130) +++ projects/nfs-over-tls/sys/rpc/svc_vc.c Sun Jul 12 15:57:29 2020 (r363131) @@ -456,27 +456,25 @@ svc_vc_destroy_common(SVCXPRT *xprt) if (xprt->xp_socket) { if ((xprt->xp_tls & (RPCTLS_FLAGS_HANDSHAKE | - RPCTLS_FLAGS_HANDSHFAIL)) == 0) - (void)soclose(xprt->xp_socket); - else if ((xprt->xp_tls & RPCTLS_FLAGS_HANDSHAKE) != 0) { - /* - * If the upcall fails, the socket has - * probably been closed via the rpctlssd - * daemon having crashed or been - * restarted, so just ignore returned stat. - */ - stat = rpctls_srv_disconnect(xprt->xp_sslsec, - xprt->xp_sslusec, xprt->xp_sslrefno, - &reterr); - } - if ((xprt->xp_tls & (RPCTLS_FLAGS_HANDSHAKE | RPCTLS_FLAGS_HANDSHFAIL)) != 0) { + if ((xprt->xp_tls & RPCTLS_FLAGS_HANDSHAKE) != 0) { + /* + * If the upcall fails, the socket has + * probably been closed via the rpctlssd + * daemon having crashed or been + * restarted, so just ignore returned stat. + */ + stat = rpctls_srv_disconnect(xprt->xp_sslsec, + xprt->xp_sslusec, xprt->xp_sslrefno, + &reterr); + } /* Must sorele() to get rid of reference. */ CURVNET_SET(xprt->xp_socket->so_vnet); SOCK_LOCK(xprt->xp_socket); sorele(xprt->xp_socket); CURVNET_RESTORE(); - } + } else + (void)soclose(xprt->xp_socket); } if (xprt->xp_netid)