From 9a4eb423e52f3b634bbe5289ce4d7ddd52d27ad9 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Fri, 28 Jun 2024 10:53:15 -0400 Subject: [PATCH] pass ctx to client cb as const --- includes/ziti/ziti.h | 4 ++-- library/zitilib.c | 2 +- programs/host-proxy/host-proxy.c | 2 +- programs/sample-host/sample-host.c | 2 +- programs/ziti-prox-c/proxy.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/ziti/ziti.h b/includes/ziti/ziti.h index 38586525..e4086508 100644 --- a/includes/ziti/ziti.h +++ b/includes/ziti/ziti.h @@ -269,7 +269,7 @@ typedef struct ziti_dial_opts_s { typedef struct ziti_client_ctx_s { char *caller_id; - uint8_t *app_data; + const uint8_t *app_data; size_t app_data_sz; } ziti_client_ctx; @@ -339,7 +339,7 @@ typedef void (*ziti_conn_cb)(ziti_connection conn, int status); * * @see ziti_listen(), ZITI_ERRORS */ -typedef void (*ziti_client_cb)(ziti_connection serv, ziti_connection client, int status, ziti_client_ctx *ctx); +typedef void (*ziti_client_cb)(ziti_connection serv, ziti_connection client, int status, const ziti_client_ctx *ctx); /** * @brief Defines the ziti_listen_cb. diff --git a/library/zitilib.c b/library/zitilib.c index 2f2fad03..95298f71 100644 --- a/library/zitilib.c +++ b/library/zitilib.c @@ -775,7 +775,7 @@ static void on_ziti_accept(ziti_connection client, int status) { free(pending); } -static void on_ziti_client(ziti_connection server, ziti_connection client, int status, ziti_client_ctx *clt_ctx) { +static void on_ziti_client(ziti_connection server, ziti_connection client, int status, const ziti_client_ctx *clt_ctx) { ziti_sock_t *server_sock = ziti_conn_data(server); if (status != ZITI_OK) { diff --git a/programs/host-proxy/host-proxy.c b/programs/host-proxy/host-proxy.c index b4fd7c9c..338b6569 100644 --- a/programs/host-proxy/host-proxy.c +++ b/programs/host-proxy/host-proxy.c @@ -211,7 +211,7 @@ static void listen_cb(ziti_connection server, int status) { } } -static void on_client(ziti_connection server, ziti_connection conn, int status, ziti_client_ctx *clt_ctx) { +static void on_client(ziti_connection server, ziti_connection conn, int status, const ziti_client_ctx *clt_ctx) { if (status == ZITI_OK) { host_binding *binding = ziti_conn_data(server); struct app_ctx *app = binding->app; diff --git a/programs/sample-host/sample-host.c b/programs/sample-host/sample-host.c index 4175dada..a33978b5 100644 --- a/programs/sample-host/sample-host.c +++ b/programs/sample-host/sample-host.c @@ -59,7 +59,7 @@ static void on_client_connect(ziti_connection clt, int status) { } } -static void on_client(ziti_connection serv, ziti_connection client, int status, ziti_client_ctx *clt_ctx) { +static void on_client(ziti_connection serv, ziti_connection client, int status, const ziti_client_ctx *clt_ctx) { if (status == ZITI_OK) { const char *source_identity = clt_ctx->caller_id; if (source_identity != NULL) { diff --git a/programs/ziti-prox-c/proxy.c b/programs/ziti-prox-c/proxy.c index d848c5f5..ca9c65e5 100644 --- a/programs/ziti-prox-c/proxy.c +++ b/programs/ziti-prox-c/proxy.c @@ -360,7 +360,7 @@ static void on_tcp_connect(uv_connect_t *conn_req, int status) { free(conn_req); } -static void binding_client_cb(ziti_connection srv, ziti_connection clt, int status, ziti_client_ctx *clt_ctx) { +static void binding_client_cb(ziti_connection srv, ziti_connection clt, int status, const ziti_client_ctx *clt_ctx) { struct binding *b = ziti_conn_data(srv); if (status == ZITI_OK) {