From owner-svn-src-projects@freebsd.org Tue Nov 22 15:28:22 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 46125C4FBBD for ; Tue, 22 Nov 2016 15:28:22 +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 F2D759E; Tue, 22 Nov 2016 15:28:21 +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 uAMFSLIT002643; Tue, 22 Nov 2016 15:28:21 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAMFSLaa002642; Tue, 22 Nov 2016 15:28:21 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201611221528.uAMFSLaa002642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 22 Nov 2016 15:28:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r309005 - 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, 22 Nov 2016 15:28:22 -0000 Author: ae Date: Tue Nov 22 15:28:20 2016 New Revision: 309005 URL: https://svnweb.freebsd.org/changeset/base/309005 Log: Modify key_setdumpsa() to read liftime counters from PCPU counters. Also do some style changes. Modified: projects/ipsec/sys/netipsec/key.c Modified: projects/ipsec/sys/netipsec/key.c ============================================================================== --- projects/ipsec/sys/netipsec/key.c Tue Nov 22 14:31:49 2016 (r309004) +++ projects/ipsec/sys/netipsec/key.c Tue Nov 22 15:28:20 2016 (r309005) @@ -3123,18 +3123,19 @@ fail: * subroutine for SADB_GET and SADB_DUMP. */ static struct mbuf * -key_setdumpsa(struct secasvar *sav, u_int8_t type, u_int8_t satype, - u_int32_t seq, u_int32_t pid) +key_setdumpsa(struct secasvar *sav, uint8_t type, uint8_t satype, + uint32_t seq, uint32_t pid) { + struct seclifetime lft_c; struct mbuf *result = NULL, *tres = NULL, *m; - int i; - int dumporder[] = { + int i, dumporder[] = { SADB_EXT_SA, SADB_X_EXT_SA2, SADB_EXT_LIFETIME_HARD, SADB_EXT_LIFETIME_SOFT, SADB_EXT_LIFETIME_CURRENT, SADB_EXT_ADDRESS_SRC, - SADB_EXT_ADDRESS_DST, SADB_EXT_ADDRESS_PROXY, SADB_EXT_KEY_AUTH, - SADB_EXT_KEY_ENCRYPT, SADB_EXT_IDENTITY_SRC, - SADB_EXT_IDENTITY_DST, SADB_EXT_SENSITIVITY, + SADB_EXT_ADDRESS_DST, SADB_EXT_ADDRESS_PROXY, + SADB_EXT_KEY_AUTH, SADB_EXT_KEY_ENCRYPT, + SADB_EXT_IDENTITY_SRC, SADB_EXT_IDENTITY_DST, + SADB_EXT_SENSITIVITY, #ifdef IPSEC_NAT_T SADB_X_EXT_NAT_T_TYPE, SADB_X_EXT_NAT_T_SPORT, SADB_X_EXT_NAT_T_DPORT, @@ -3198,10 +3199,12 @@ key_setdumpsa(struct secasvar *sav, u_in break; case SADB_EXT_LIFETIME_CURRENT: - if (!sav->lft_c) - continue; - m = key_setlifetime(sav->lft_c, - SADB_EXT_LIFETIME_CURRENT); + lft_c.addtime = sav->created; + lft_c.allocations = (uint32_t)counter_u64_fetch( + sav->lft_c_allocations); + lft_c.bytes = counter_u64_fetch(sav->lft_c_bytes); + lft_c.usetime = sav->firstused; + m = key_setlifetime(&lft_c, SADB_EXT_LIFETIME_CURRENT); if (!m) goto fail; break; @@ -3231,10 +3234,10 @@ key_setdumpsa(struct secasvar *sav, u_in if (!m) goto fail; break; - + case SADB_X_EXT_NAT_T_DPORT: m = key_setsadbxport( - KEY_PORTFROMSADDR(&sav->sah->saidx.dst), + key_portfromsaddr(&sav->sah->saidx.dst.sa), SADB_X_EXT_NAT_T_DPORT); if (!m) goto fail; @@ -3242,7 +3245,7 @@ key_setdumpsa(struct secasvar *sav, u_in case SADB_X_EXT_NAT_T_SPORT: m = key_setsadbxport( - KEY_PORTFROMSADDR(&sav->sah->saidx.src), + key_portfromsaddr(&sav->sah->saidx.src.sa), SADB_X_EXT_NAT_T_SPORT); if (!m) goto fail; @@ -3269,7 +3272,6 @@ key_setdumpsa(struct secasvar *sav, u_in if (tres) m_cat(m, tres); tres = m; - } m_cat(result, tres);