From nobody Thu Nov 05 15:12:45 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 4jL5Qj45GFz709ws for ; Thu, 05 Nov 2026 15:12:45 +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 4jL5Qj25CDz4D8J for ; Thu, 05 Nov 2026 15:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891565; 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=Yh2RPwMk0azSRVHzSKQ3OnZRoL5mY+18B9IKxYlb+Y4=; b=gIwSwygCH8sNqv1YeKn7nn+yk10730WhFviKwU3lDDAVehw0TE453mEdKXr/g10D+wZhlI wcqVtNxYtK6OKHDeS+n6JrG8gcnjcCTHU+Eb2yu5OOwMo0J4KVMh7OQo2563l5rV3jYSqE wC7Vz1Pl+GdNYfmYphrOTwv549wLh6nC0YDe5dteIvIxlF1/kuiNLKJ20aO5m843EkER8X PU5NMooYiM4dNO6IxC2J5mroORuW1IB6DOcA3WS7PAhBE/Eu/2Kr8cEffxyR3KKZXu5y+m FX+uDrKxpR2EPad5VfMTiacNlGH3steq0LWukKFl5+m+vLrSy48F66WPMmBg3w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793891565; b=PonORnork5TiuelROL89OJ8770yuOt0dDUdfNOY9Z76UFhjZLrnwkiTzWIYSDOJUOFxPC2 R2FtlzMIIOvvm1xkrfganaayYeqpaWzfQPUyOnrRofVqK0lTRKKMKqexWgSTrzn1Pamihs efkaK8uNhNb1PsWUehxMywF+YIcvXPQQf9BS9pIjOynOqb2JYJgcM13h9IhXUMGY0kbFXz W99dYCR4lIWIkqsdbY80g9oOIFdNn7J6VsQqJ2HidhXpqji5JHvyzkU1USD98rJ+jT5DKO eUzDST8BTBYcUxln0coH2cs2ISRyF3tVQhbsEY45jmZHuEDdzYaPhdEWkLCfoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891565; 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=Yh2RPwMk0azSRVHzSKQ3OnZRoL5mY+18B9IKxYlb+Y4=; b=WxlQzlZWLmcvQ7Z6+P+R7Aw481OzcggAzKm4Fzn5/mSSsYw8DHoA8mOSAJqwgY27poYQ4P 2HrTJSOWtmiGjb3IFV0dSDSVZb0v+f3XuV2G3J50CAfOQKw0QNRLYyqIXi6WPeMQV1Wmmb L8/xiGvRrdQpjzK54nc38JDYOTg+qSjTb9xuctUFYwJlGj8bb7/CcOs9CgG7VfLPYCBrjp 1NzUruXw2dlgvTbZ+TaNUNK99AOQqh4x2AG++wPUZ7uF/oPBrmRl68cFFf60cKT0OSuSHE 9Kw/9rPynwrAQ7NmNiCmCCzc9sj8MWscrNHLeMZhE326SeXlVAHWyPCFlr3rew== 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 4jL5Qj0q8pzwQF for ; Thu, 05 Nov 2026 15:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24a11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:12:45 +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: 14466e2b9616 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 14466e2b9616165bae4a34d554842a4a91c31aef Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:12:45 +0000 Message-Id: <6aec9ced.24a11.4ce08c14@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=14466e2b9616165bae4a34d554842a4a91c31aef commit 14466e2b9616165bae4a34d554842a4a91c31aef Author: Dag-Erling Smørgrav AuthorDate: 2026-10-20 13:28:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:11:58 +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 143b7666b7ca..9df6fd7a7ec7 100644 --- a/sbin/hastd/proto_common.c +++ b/sbin/hastd/proto_common.c @@ -90,7 +90,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; @@ -146,7 +146,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) { @@ -191,7 +191,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 ac0a86aacdd9..9badb708421d 100644 --- a/sbin/hastd/proto_socketpair.c +++ b/sbin/hastd/proto_socketpair.c @@ -83,7 +83,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; @@ -122,7 +122,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 dc5a23da7b23..adbdd82f33fe 100644 --- a/sbin/hastd/proto_tcp.c +++ b/sbin/hastd/proto_tcp.c @@ -480,7 +480,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; @@ -493,7 +493,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;