From nobody Thu Nov 05 15:12:22 2026 X-Original-To: dev-commits-src-all@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 4jL5QG4D88z709rS for ; Thu, 05 Nov 2026 15:12:22 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jL5QG29bMz4Cdc for ; Thu, 05 Nov 2026 15:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891542; 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=SxOoJODJLnLLMoWvCUMouoYLp7znTP7gypOMsgOVfYU=; b=xWHoPLNad5ILj6bPD4EKgAxCrXxDwjzfXRXnIYETKIgjL+fO1qpyO3E660DLuY1WaIHq2o Tzr5LPFBx88HBwncpXSXSGw+Ocfoazoh2zLWoFnOqVDsKqfjP9P2pPaEKcuGiDO4vzaJn2 aFY6W8kvixzSuDVm82k39dPJpo7VD5h/sanEuCC7J3wnuAzGL46rC4Bgbkhm8Dco33+ZqH hlbpgZqYdOI9X37XLjKucDkxKiGE20dyrC5N6Xjl2VaqPl8iaikSYlQeEGNMqyceqDyc+1 R/0VFJueOkWlf7vD4uk6t6+PEO2n9ic9v1SoVzTxoI1QHY6izIJ77LIKbMJ94A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793891542; b=CyYPS11R3yYSj6UE8VxrIZgciGeNQicnslsG5MiAdoOS2O/khGf3meIFI/d/bqUrd+dz1c qJtCcup8oujYAxkSHY2veLxMk7QHf0WuN0tyvJX5LMjPS7tEPO0BoH0H4hClysybN58Xxp m2+5zAbdtPYhhk6I6xklq4QObJPEHBRoTEATIUTOA+HJGhQqvYNjuGr+hIKYR4fXS4bZE8 3I2cbYK0oApDvBrEN2v531rKEd2vmBjgEAy2e76ketgH6QF3J9Xg6VjGJV3jqDMa5NbhnE O4tsPeIGzEsHkTXiUyFgX6IA+eU5ehxz3zJoXr1unetgwGcraHw+pEmbNIR+EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891542; 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=SxOoJODJLnLLMoWvCUMouoYLp7znTP7gypOMsgOVfYU=; b=dzJXRWTgc3RJAxB+dhwpReaouTzVhe8s3idm8I7jkOGEq7ozQqHxOhA1l1+juKtMj+Z26W 5HMYY3QCCfc22jPGGMC2cyLw1BYhH6dKLEfWlc1BcQiFTvii/vP4DR2FU7C7w+3nmxwWaL 550xGSHNduhwtUNoh2httGvPUj3l+Qt76kxpLnaQ+voU7Xt7chUAYjIxouWdaebuE3OEuO DhoISCEldx5L81W8t+AHSQvZobf7PQ6dtXeHXR83lFY8LMEy2Eq5xfE8gf71Rze3nfbZ5g 9rw6cxmeeED/aWRGRXa4l4H7dfJn9JV0Pk4dE+YLk1/2HM+HQj9groek6hmqzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jL5QG0jt1zvr1 for ; Thu, 05 Nov 2026 15:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24911 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:12:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b831d9a1f330 - stable/15 - hastd: Use void pointers for opaque data List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b831d9a1f3302c4c407011e0cbd329bf2485ff2b Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:12:22 +0000 Message-Id: <6aec9cd6.24911.454881a7@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b831d9a1f3302c4c407011e0cbd329bf2485ff2b commit b831d9a1f3302c4c407011e0cbd329bf2485ff2b Author: Dag-Erling Smørgrav AuthorDate: 2026-10-20 13:28:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:11:53 +0000 hastd: Use void pointers for opaque data Use void, not char, for pointers to opaque data in our send and receive functions. Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D60729 (cherry picked from commit a5e6bee5a0bff9e9c12037e0b2c76c4f2ab5e046) hastd: Fix build failure Fixes: a5e6bee5a0bf ("hastd: Use void pointers for opaque data") Reported by: garga@ (cherry picked from commit dff56e8118985248678e1a6916cdefd708a9d85f) --- sbin/hastd/proto_common.c | 6 +++--- sbin/hastd/proto_impl.h | 8 ++++---- sbin/hastd/proto_socketpair.c | 4 ++-- sbin/hastd/proto_tcp.c | 4 ++-- sbin/hastd/proto_uds.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sbin/hastd/proto_common.c b/sbin/hastd/proto_common.c index 39ef696f5b69..f8c6d849d1c8 100644 --- a/sbin/hastd/proto_common.c +++ b/sbin/hastd/proto_common.c @@ -89,7 +89,7 @@ proto_descriptor_send(int sock, int fd) } int -proto_common_send(int sock, const unsigned char *data, size_t size, int fd) +proto_common_send(int sock, const void *data, size_t size, int fd) { ssize_t done; size_t sendsize; @@ -145,7 +145,7 @@ proto_common_send(int sock, const unsigned char *data, size_t size, int fd) errno = ETIMEDOUT; return (errno); } - data += done; + data = (const char *)data + done; size -= done; } while (size > 0); if (errcount > 0) { @@ -190,7 +190,7 @@ proto_descriptor_recv(int sock, int *fdp) } int -proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp) +proto_common_recv(int sock, void *data, size_t size, int *fdp) { ssize_t done; diff --git a/sbin/hastd/proto_impl.h b/sbin/hastd/proto_impl.h index 181a4cd4a17d..449ab4097397 100644 --- a/sbin/hastd/proto_impl.h +++ b/sbin/hastd/proto_impl.h @@ -44,8 +44,8 @@ typedef int prt_connect_wait_t(void *, int); typedef int prt_server_t(const char *, void **); typedef int prt_accept_t(void *, void **); typedef int prt_wrap_t(int, bool, void **); -typedef int prt_send_t(void *, const unsigned char *, size_t, int); -typedef int prt_recv_t(void *, unsigned char *, size_t, int *); +typedef int prt_send_t(void *, const void *, size_t, int); +typedef int prt_recv_t(void *, void *, size_t, int *); typedef int prt_descriptor_t(const void *); typedef bool prt_address_match_t(const void *, const char *); typedef void prt_local_address_t(const void *, char *, size_t); @@ -72,7 +72,7 @@ struct proto { void proto_register(struct proto *proto, bool isdefault); -int proto_common_send(int sock, const unsigned char *data, size_t size, int fd); -int proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp); +int proto_common_send(int sock, const void *data, size_t size, int fd); +int proto_common_recv(int sock, void *data, size_t size, int *fdp); #endif /* !_PROTO_IMPL_H_ */ diff --git a/sbin/hastd/proto_socketpair.c b/sbin/hastd/proto_socketpair.c index 31b657f17c32..a5f47acc7272 100644 --- a/sbin/hastd/proto_socketpair.c +++ b/sbin/hastd/proto_socketpair.c @@ -82,7 +82,7 @@ sp_client(const char *srcaddr, const char *dstaddr, void **ctxp) } static int -sp_send(void *ctx, const unsigned char *data, size_t size, int fd) +sp_send(void *ctx, const void *data, size_t size, int fd) { struct sp_ctx *spctx = ctx; int sock; @@ -121,7 +121,7 @@ sp_send(void *ctx, const unsigned char *data, size_t size, int fd) } static int -sp_recv(void *ctx, unsigned char *data, size_t size, int *fdp) +sp_recv(void *ctx, void *data, size_t size, int *fdp) { struct sp_ctx *spctx = ctx; int fd; diff --git a/sbin/hastd/proto_tcp.c b/sbin/hastd/proto_tcp.c index aeec887433f8..be1205ba3733 100644 --- a/sbin/hastd/proto_tcp.c +++ b/sbin/hastd/proto_tcp.c @@ -479,7 +479,7 @@ tcp_wrap(int fd, bool client, void **ctxp) } static int -tcp_send(void *ctx, const unsigned char *data, size_t size, int fd) +tcp_send(void *ctx, const void *data, size_t size, int fd) { struct tcp_ctx *tctx = ctx; @@ -492,7 +492,7 @@ tcp_send(void *ctx, const unsigned char *data, size_t size, int fd) } static int -tcp_recv(void *ctx, unsigned char *data, size_t size, int *fdp) +tcp_recv(void *ctx, void *data, size_t size, int *fdp) { struct tcp_ctx *tctx = ctx; diff --git a/sbin/hastd/proto_uds.c b/sbin/hastd/proto_uds.c index acb61a360180..5a14eb353c30 100644 --- a/sbin/hastd/proto_uds.c +++ b/sbin/hastd/proto_uds.c @@ -227,7 +227,7 @@ uds_accept(void *ctx, void **newctxp) } static int -uds_send(void *ctx, const unsigned char *data, size_t size, int fd) +uds_send(void *ctx, const void *data, size_t size, int fd) { struct uds_ctx *uctx = ctx; @@ -239,7 +239,7 @@ uds_send(void *ctx, const unsigned char *data, size_t size, int fd) } static int -uds_recv(void *ctx, unsigned char *data, size_t size, int *fdp) +uds_recv(void *ctx, void *data, size_t size, int *fdp) { struct uds_ctx *uctx = ctx;