From nobody Sat Feb 01 09:02:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YlRbk2qk1z5mbdB; Sat, 01 Feb 2025 09:02:26 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YlRbj5vcMz41hD; Sat, 01 Feb 2025 09:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkEgJonVoWqN1LtttidmkCM7w66MjCA+jixFNjBa/cg=; b=yUZ8t+PZaYsRGmg7APUlJC3in7vNmN7YDT8m4GVo7hlnAhuOAxwpV5FskWFws+jD900tpa 2XE7Dh/dPwl0p+v5LTlZ2HCHWxwgO9sQuSGsBjFXqwausk0DMw4k5WYHAp1iiyeE0hEESE qSHGDwHMPJWSWxRD1xkrDCecev/g/xdugobwyxz0Kp21nBbnobztnHTcUigyN0L6aXgIhu 5A2CWRIDqmTzUSmTjUj2WfmpXBA0GrXvciiTh/gjNjGN3bgqJSYkqZaEGJ7OO32QVH7WRG Wqyx6rkadLy4bPCxCGneaNjdnEKrT3fX/e4b8G1LPto9QDJ5MVlJxka/tHW9tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738400545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkEgJonVoWqN1LtttidmkCM7w66MjCA+jixFNjBa/cg=; b=OAxGnBob1APPs65QXs/E5AxH/urbGhmbAdrErYtuokykulHW7FAVX9EZALXVc/r/fwD6sD X8JQXR0qarBtzDIuWEUBn/VUSO02XS/mRg/75x9bX0uDHmHhgIYh7yZkdhUgwZtPsgQYZU i0AXBu3pFEwTktPygnOIYSNDtn+YmrvthFd+yPq4zrgRNy/2OxIev3lrybowDBVImqkpqd h8xcUstvhCHusiH80BStygv9K6kSJe2tnz+Xyv6A7zl975wOxnxd+wDiy03Y3kPRCWx5q7 +xa+ZzgYSZDxH+U88L0onCBXELwXB4B53cAZxXs2I26/KoHYaG2fzkUiYSzs9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738400545; a=rsa-sha256; cv=none; b=UFGMxcjsNajJyqxK8XU05eTu0GA3xCHbhUEhLC5NrHOKC2KN2xdFWz0Iu+BVs1wgcUmf7T cf+8bZRlj+10/jd50yaZKmYNYwVP995ilIWPNiATaAaGNoVLYuKreJ221FZ+Vg2QjVKTWq 0VX8QnuDBsj3phIe2Nxm/FxCf65XbRS2z8ROaCH+5ohvdgzDRqAEBgvb/rfcrQNjmWd8Tw 6kK3gKhApSGdrLHV4r2+QqS4U5yoWY+8Zn9La2nDHpP5HHopmVjZBxz/E6ezQxoakyXi32 SN2i/xNYn93puqKPtrymMq9v3XIDva2/xk/9my2o/601anZdgdXEW2dFwqJ1tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YlRbj5THMzxnN; Sat, 01 Feb 2025 09:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51192PYB048419; Sat, 1 Feb 2025 09:02:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51192PCZ048416; Sat, 1 Feb 2025 09:02:25 GMT (envelope-from git) Date: Sat, 1 Feb 2025 09:02:25 GMT Message-Id: <202502010902.51192PCZ048416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 550e8e306a88 - main - rpc.tlsservd/rpc.tlsclntd: rename 'refno' field to 'cookie' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 550e8e306a8899ea8271454181d6a62b5545f546 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=550e8e306a8899ea8271454181d6a62b5545f546 commit 550e8e306a8899ea8271454181d6a62b5545f546 Author: Gleb Smirnoff AuthorDate: 2025-02-01 01:03:10 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-01 09:00:27 +0000 rpc.tlsservd/rpc.tlsclntd: rename 'refno' field to 'cookie' Since in the kernel and in the API this is now called socket cookie. No functional change. Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D48777 --- usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c | 6 +++--- usr.sbin/rpc.tlsservd/rpc.tlscommon.h | 4 ++-- usr.sbin/rpc.tlsservd/rpc.tlsservd.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c index fb8ad4a8f83f..e8df84a382b5 100644 --- a/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c +++ b/usr.sbin/rpc.tlsclntd/rpc.tlsclntd.c @@ -282,7 +282,7 @@ rpctlscd_connect_2_svc(struct rpctlscd_connect_arg *argp, /* Maintain list of all current SSL *'s */ newslp = malloc(sizeof(*newslp)); - newslp->refno = argp->socookie; + newslp->cookie = argp->socookie; newslp->s = s; newslp->shutoff = false; newslp->ssl = ssl; @@ -300,7 +300,7 @@ rpctlscd_handlerecord_2_svc(struct rpctlscd_handlerecord_arg *argp, char junk; LIST_FOREACH(slp, &rpctls_ssllist, next) - if (slp->refno == argp->socookie) + if (slp->cookie == argp->socookie) break; if (slp != NULL) { @@ -337,7 +337,7 @@ rpctlscd_disconnect_2_svc(struct rpctlscd_disconnect_arg *argp, int ret; LIST_FOREACH(slp, &rpctls_ssllist, next) - if (slp->refno == argp->socookie) + if (slp->cookie == argp->socookie) break; if (slp != NULL) { diff --git a/usr.sbin/rpc.tlsservd/rpc.tlscommon.h b/usr.sbin/rpc.tlsservd/rpc.tlscommon.h index 8ca9f45c2428..e6d38bb65aea 100644 --- a/usr.sbin/rpc.tlsservd/rpc.tlscommon.h +++ b/usr.sbin/rpc.tlsservd/rpc.tlscommon.h @@ -40,13 +40,13 @@ void rpctls_svc_run(void); /* * A linked list of all current "SSL *"s and socket "fd"s * for kernel RPC TLS connections is maintained. - * The "refno" field is a unique 64bit value used to + * The "cookie" field is a unique 64bit value used to * identify which entry a kernel RPC upcall refers to. */ LIST_HEAD(ssl_list, ssl_entry); struct ssl_entry { LIST_ENTRY(ssl_entry) next; - uint64_t refno; + uint64_t cookie; int s; bool shutoff; SSL *ssl; diff --git a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c index 9e8ec3430286..df7e221f2488 100644 --- a/usr.sbin/rpc.tlsservd/rpc.tlsservd.c +++ b/usr.sbin/rpc.tlsservd/rpc.tlsservd.c @@ -404,7 +404,7 @@ rpctlssd_connect_2_svc(struct rpctlssd_connect_arg *argp, newslp->ssl = ssl; newslp->s = s; newslp->shutoff = false; - newslp->refno = argp->socookie; + newslp->cookie = argp->socookie; newslp->cert = cert; LIST_INSERT_HEAD(&rpctls_ssllist, newslp, next); return (TRUE); @@ -419,7 +419,7 @@ rpctlssd_handlerecord_2_svc(struct rpctlssd_handlerecord_arg *argp, char junk; LIST_FOREACH(slp, &rpctls_ssllist, next) - if (slp->refno == argp->socookie) + if (slp->cookie == argp->socookie) break; if (slp != NULL) { @@ -456,7 +456,7 @@ rpctlssd_disconnect_2_svc(struct rpctlssd_disconnect_arg *argp, int ret; LIST_FOREACH(slp, &rpctls_ssllist, next) - if (slp->refno == argp->socookie) + if (slp->cookie == argp->socookie) break; if (slp != NULL) {