Merge pull request #786 from openziti/fix-network-enroll

handle redirect before invoking response callback
openziti · Dec 6, 2024 · d2cc1aa · d2cc1aa
2 parents d32c419 + 2609659
commit d2cc1aa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/library/ziti_ctrl.c b/library/ziti_ctrl.c
@@ -233,9 +233,6 @@ static void ctrl_resp_cb(tlsuv_http_resp_t *r, void *data) {
 }
 
 static void ctrl_default_cb(void *s, const ziti_error *e, struct ctrl_resp *resp) {
-    if (resp->resp_cb) {
-        resp->resp_cb(s, e, resp->ctx);
-    }
     ziti_controller *ctrl = resp->ctrl;
     if (resp->new_address && strcmp(resp->new_address, ctrl->url) != 0) {
         CTRL_LOG(INFO, "controller supplied new address[%s]", resp->new_address);
@@ -250,6 +247,10 @@ static void ctrl_default_cb(void *s, const ziti_error *e, struct ctrl_resp *resp
         }
     }
 
+    if (resp->resp_cb) {
+        resp->resp_cb(s, e, resp->ctx);
+    }
+
     FREE(resp->new_address);
     if (resp->resp_json != NULL) {
         json_object_put(resp->resp_json);