fix events in samples

openziti · Jun 13, 2024 · c0cc330 · c0cc330
1 parent e09306d
commit c0cc330
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/programs/host-proxy/host-proxy.c b/programs/host-proxy/host-proxy.c
@@ -80,7 +80,7 @@ void on_ziti_event(ziti_context ztx, const ziti_event_t *event) {
     struct app_ctx *ctx = ziti_app_ctx(ztx);
 
     if (event->type == ZitiServiceEvent) {
-        const struct ziti_service_event *se = &event->event.service;
+        const struct ziti_service_event *se = &event->service;
         for (int i = 0; se->added[i] != NULL; i++) {
             ziti_service *s = se->added[i];
             if ((s->perm_flags & ZITI_CAN_BIND) == 0) {

diff --git a/programs/sample-bridge/ziti-ncat.c b/programs/sample-bridge/ziti-ncat.c
@@ -36,7 +36,7 @@ void on_connect(ziti_connection conn, int status) {
 }
 
 void on_ziti_event(ziti_context ztx, const ziti_event_t *ev) {
-    if (ev->type == ZitiContextEvent && ev->event.ctx.ctrl_status == ZITI_OK) {
+    if (ev->type == ZitiContextEvent && ev->ctx.ctrl_status == ZITI_OK) {
         zcat_opts *opts = ziti_app_ctx(ztx);
         ziti_connection zconn;
         ziti_conn_init(ztx, &zconn, NULL);

diff --git a/programs/sample-host/sample-host.c b/programs/sample-host/sample-host.c
@@ -158,10 +158,10 @@ static void on_signal(uv_signal_t *h, int signal) {
 static void on_ziti_init(ziti_context ztx, const ziti_event_t *ev) {
     if (ev->type != ZitiContextEvent) return;
 
-    if (ev->event.ctx.ctrl_status == ZITI_PARTIALLY_AUTHENTICATED) return;
+    if (ev->ctx.ctrl_status == ZITI_PARTIALLY_AUTHENTICATED) return;
 
-    if (ev->event.ctx.ctrl_status != ZITI_OK) {
-        DIE(ev->event.ctx.ctrl_status);
+    if (ev->ctx.ctrl_status != ZITI_OK) {
+        DIE(ev->ctx.ctrl_status);
         return;
     }
 

diff --git a/programs/sample_http_link/sample_http_link.c b/programs/sample_http_link/sample_http_link.c
@@ -59,7 +59,7 @@ void body_cb(tlsuv_http_req_t *req, char *body, ssize_t len) {
 
 void on_ziti_init(ziti_context ztx, const ziti_event_t *ev) {
 
-    DIE(ev->event.ctx.ctrl_status);
+    DIE(ev->ctx.ctrl_status);
 
     ziti = ztx;
     ziti_src_init(loop, &zs, "httpbin", ziti);

diff --git a/programs/sample_wttr/sample_wttr.c b/programs/sample_wttr/sample_wttr.c
@@ -74,7 +74,7 @@ void on_connect(ziti_connection conn, int status) {
 }
 
 void on_ziti_init(ziti_context ztx, const ziti_event_t *ev) {
-    DIE(ev->event.ctx.ctrl_status);
+    DIE(ev->ctx.ctrl_status);
     ziti = ztx;
 
     ziti_connection conn;

diff --git a/tests/integ/legacy-auth.cpp b/tests/integ/legacy-auth.cpp
@@ -230,7 +230,7 @@ TEST_CASE("ztx-legacy-auth", "[integ]") {
     opts.app_ctx = &test_context;
     opts.events = ZitiContextEvent;
     opts.event_cb = [](ziti_context ztx, const ziti_event_t *event){
-            printf("got event: %d => %s \n", event->type, event->event.ctx.err);
+            printf("got event: %d => %s \n", event->type, event->ctx.err);
             auto test_ctx = (test_context_s*)ziti_app_ctx(ztx);
             test_ctx->event = event->type;
         };

diff --git a/tests/ziti_src_tests.cpp b/tests/ziti_src_tests.cpp
@@ -45,7 +45,7 @@ TEST_CASE("httpbin.ziti:ziti_src", "[integ]") {
         auto t = (source_test*)ziti_app_ctx(ztx);
         switch (ev->type) {
             case ZitiContextEvent: {
-                auto ctx_ev = ev->event.ctx;
+                auto ctx_ev = ev->ctx;
                 t->ztx = ztx;
                 if (!t->done && ctx_ev.ctrl_status != ZITI_OK)
                     t->err = ctx_ev.ctrl_status;