git: 550e8e306a88 - main - rpc.tlsservd/rpc.tlsclntd: rename 'refno' field to 'cookie'
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 01 Feb 2025 09:02:25 UTC
The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=550e8e306a8899ea8271454181d6a62b5545f546 commit 550e8e306a8899ea8271454181d6a62b5545f546 Author: Gleb Smirnoff <glebius@FreeBSD.org> AuthorDate: 2025-02-01 01:03:10 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> 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) {