From d51c0491a91e9783cca7b4f8a82615d183693ac2 Mon Sep 17 00:00:00 2001 From: Shawn Carey Date: Wed, 18 Dec 2024 12:02:59 -0500 Subject: [PATCH] drop instance->config_path --- lib/ziti-tunnel-cbs/include/ziti/ziti_tunnel_cbs.h | 1 - lib/ziti-tunnel-cbs/ziti_tunnel_ctrl.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/ziti-tunnel-cbs/include/ziti/ziti_tunnel_cbs.h b/lib/ziti-tunnel-cbs/include/ziti/ziti_tunnel_cbs.h index a5b815a5..cb7479c2 100644 --- a/lib/ziti-tunnel-cbs/include/ziti/ziti_tunnel_cbs.h +++ b/lib/ziti-tunnel-cbs/include/ziti/ziti_tunnel_cbs.h @@ -322,7 +322,6 @@ struct add_identity_request_s { struct ziti_instance_s { char *identifier; - char *config_path; command_cb load_cb; void *load_ctx; diff --git a/lib/ziti-tunnel-cbs/ziti_tunnel_ctrl.c b/lib/ziti-tunnel-cbs/ziti_tunnel_ctrl.c index e7c28753..c1770695 100644 --- a/lib/ziti-tunnel-cbs/ziti_tunnel_ctrl.c +++ b/lib/ziti-tunnel-cbs/ziti_tunnel_ctrl.c @@ -948,7 +948,7 @@ static void on_ziti_event(ziti_context ztx, const ziti_event_t *event) { case ZitiAPIEvent: { if (event->event.api.new_ctrl_address || event->event.api.new_ca_bundle) { - if (instance->config_path) { + if (instance->identifier) { api_update_req *req = calloc(1, sizeof(api_update_req)); req->wr.data = req; req->ztx = ztx; @@ -1337,7 +1337,7 @@ goto DONE; \ static void update_config(uv_work_t *wr) { api_update_req *req = wr->data; struct ziti_instance_s *inst = ziti_app_ctx(req->ztx); - const char *config_file = inst->config_path; + const char *config_file = inst->identifier; size_t cfg_len; char *cfg_buf = NULL; uv_file f;