git: 9425f6eb9855 - stable/14 - auditdistd: Use void pointers for opaque data
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 05 Nov 2026 15:12:40 UTC
The branch stable/14 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=9425f6eb985539721c308645ef6b5047ec681f27
commit 9425f6eb985539721c308645ef6b5047ec681f27
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-10-20 13:28:37 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-11-05 15:11:58 +0000
auditdistd: 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.
Sponsored by: Qualys, Inc.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D60728
(cherry picked from commit 4f19e4aca4f4b7a3058be5d3bfc5aed66668b00f)
auditdistd: Fix build failure
Fixes: 4f19e4aca4f4 ("auditdistd: Use void pointers for opaque data")
Reported by: garga@
(cherry picked from commit 0ce9d6e240a14d5b7cd8eb45a83d0e429f4a3edf)
---
contrib/openbsm/bin/auditdistd/proto_common.c | 6 +++---
contrib/openbsm/bin/auditdistd/proto_impl.h | 8 ++++----
contrib/openbsm/bin/auditdistd/proto_socketpair.c | 4 ++--
contrib/openbsm/bin/auditdistd/proto_tcp.c | 4 ++--
contrib/openbsm/bin/auditdistd/proto_tls.c | 4 ++--
contrib/openbsm/bin/auditdistd/proto_uds.c | 4 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/contrib/openbsm/bin/auditdistd/proto_common.c b/contrib/openbsm/bin/auditdistd/proto_common.c
index acd2294e2d93..30db25dc9f91 100644
--- a/contrib/openbsm/bin/auditdistd/proto_common.c
+++ b/contrib/openbsm/bin/auditdistd/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/contrib/openbsm/bin/auditdistd/proto_impl.h b/contrib/openbsm/bin/auditdistd/proto_impl.h
index 7b6a273313c9..a6850b14611b 100644
--- a/contrib/openbsm/bin/auditdistd/proto_impl.h
+++ b/contrib/openbsm/bin/auditdistd/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);
@@ -76,7 +76,7 @@ void proto_register(struct proto *proto, bool isdefault);
int proto_wrap(const char *protoname, bool client, int fd,
struct proto_conn **newconnp);
-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/contrib/openbsm/bin/auditdistd/proto_socketpair.c b/contrib/openbsm/bin/auditdistd/proto_socketpair.c
index 96fc39ebed57..20f6db9d01ab 100644
--- a/contrib/openbsm/bin/auditdistd/proto_socketpair.c
+++ b/contrib/openbsm/bin/auditdistd/proto_socketpair.c
@@ -110,7 +110,7 @@ sp_wrap(int fd, bool client, 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;
@@ -149,7 +149,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 sock;
diff --git a/contrib/openbsm/bin/auditdistd/proto_tcp.c b/contrib/openbsm/bin/auditdistd/proto_tcp.c
index 465221dfe5cc..80d64b23cd1d 100644
--- a/contrib/openbsm/bin/auditdistd/proto_tcp.c
+++ b/contrib/openbsm/bin/auditdistd/proto_tcp.c
@@ -494,7 +494,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;
@@ -510,7 +510,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/contrib/openbsm/bin/auditdistd/proto_tls.c b/contrib/openbsm/bin/auditdistd/proto_tls.c
index 3143d72fe513..fe7c85df24ae 100644
--- a/contrib/openbsm/bin/auditdistd/proto_tls.c
+++ b/contrib/openbsm/bin/auditdistd/proto_tls.c
@@ -871,7 +871,7 @@ tls_wrap(int fd, bool client, void **ctxp)
}
static int
-tls_send(void *ctx, const unsigned char *data, size_t size, int fd)
+tls_send(void *ctx, const void *data, size_t size, int fd)
{
struct tls_ctx *tlsctx = ctx;
@@ -890,7 +890,7 @@ tls_send(void *ctx, const unsigned char *data, size_t size, int fd)
}
static int
-tls_recv(void *ctx, unsigned char *data, size_t size, int *fdp)
+tls_recv(void *ctx, void *data, size_t size, int *fdp)
{
struct tls_ctx *tlsctx = ctx;
diff --git a/contrib/openbsm/bin/auditdistd/proto_uds.c b/contrib/openbsm/bin/auditdistd/proto_uds.c
index 3168bbf890b6..51db85af8843 100644
--- a/contrib/openbsm/bin/auditdistd/proto_uds.c
+++ b/contrib/openbsm/bin/auditdistd/proto_uds.c
@@ -228,7 +228,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;
@@ -240,7 +240,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;