update [email protected] (#1209)

* fix warnings (errors on win32)

* update [email protected]

Author: scareything

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21)
 
 
 set(ZITI_SDK_DIR "" CACHE FILEPATH "developer option: use local ziti-sdk-c checkout")
-set(ZITI_SDK_VERSION "1.8.3" CACHE STRING "ziti-sdk-c version or branch to use")
+set(ZITI_SDK_VERSION "1.8.5" CACHE STRING "ziti-sdk-c version or branch to use")
 
 # if TUNNEL_SDK_ONLY then don't descend into programs/ziti-edge-tunnel
 option(TUNNEL_SDK_ONLY "build only ziti-tunnel-sdk (without ziti)" OFF)

lib/ziti-tunnel-cbs/ziti_hosting.c

@@ -390,7 +390,7 @@ static bool ziti_address_translate(ziti_address *dst_ip_inout, const ziti_addres
     }
     return true;
 }
-static ziti_address_translation *find_translation(const ziti_address *ip, const ziti_address_translation_array zats) {
+static ziti_address_translation *find_translation(const ziti_address *ip, ziti_address_translation_array zats) {
     char ip_str[64], from_str[64];
     ziti_address_print(ip_str, sizeof(ip_str), ip);
     for (int i = 0; zats != NULL && zats[i] != NULL; i++) {
@@ -577,7 +577,7 @@ static hosted_io_context hosted_io_context_new(struct hosted_service_ctx_s *serv
     io->computed_dst_ip_or_hn = dst_ip_or_hn;
     io->computed_dst_port = dst_port;
 
-    int socktype, uv_err = -1;
+    int socktype, uv_err;
     int protocol_number = get_protocol_id(dst_protocol);
     switch (protocol_number) {
         case IPPROTO_TCP:

programs/ziti-edge-tunnel/config-utils.c

@@ -65,7 +65,7 @@ static int update_file(const char *path, char *content, size_t content_len) {
     snprintf(backup, sizeof(backup), "%s.bak", path);
     CHECK_UV("create backup", uv_fs_rename(NULL, &fs_req, path, backup, NULL));
 
-    uv_os_fd_t f;
+    uv_file f;
     CHECK_UV("open new config", f = uv_fs_open(NULL, &fs_req, path, UV_FS_O_WRONLY | UV_FS_O_CREAT, (int) mode, NULL));
     uv_buf_t buf = uv_buf_init(content, content_len);
     CHECK_UV("write new config", uv_fs_write(NULL, &fs_req, f, &buf, 1, 0, NULL));

programs/ziti-edge-tunnel/windows-scripts.c

@@ -45,7 +45,7 @@ static bool is_buffer_available(size_t buf_len, size_t max_size, char* script) {
     return true;
 }
 
-static bool exec_process(uv_loop_t *ziti_loop, const char* program, const char* args[]) {
+static bool exec_process(uv_loop_t *ziti_loop, const char* program, char* args[]) {
     uv_process_t* process = calloc(1, sizeof(uv_process_t));
     uv_process_options_t options = {0};
     uv_stdio_container_t stdio[3];
@@ -169,7 +169,7 @@ void chunked_add_nrpt_rules(uv_loop_t *ziti_loop, hostname_list_t *hostnames, co
 
     ZITI_LOG(DEBUG, "Executing Add domains NRPT script :");
     ZITI_LOG(DEBUG, "%s", cmd);
-    const char* args[] = {"powershell", "-Command", script, NULL};
+    char* args[] = {"powershell", "-Command", script, NULL};
     bool result = exec_process(ziti_loop, args[0], args);
     if (!result) {
         ZITI_LOG(WARN, "Add domains NRPT script: %d(err=%lu)", result, GetLastError());
@@ -260,7 +260,7 @@ void chunked_remove_nrpt_rules(uv_loop_t *ziti_loop, hostname_list_t *hostnames)
 
     ZITI_LOG(DEBUG, "Executing Remove domains NRPT script: ");
     ZITI_LOG(DEBUG, "%s", cmd);
-    const char* args[] = {"powershell", "-Command", script, NULL};
+    char* args[] = {"powershell", "-Command", script, NULL};
     bool result = exec_process(ziti_loop, args[0], args);
     if (!result) {
         ZITI_LOG(WARN, "Remove domains NRPT script: %d(err=%lu)", result, GetLastError());
@@ -403,7 +403,7 @@ void chunked_remove_and_add_nrpt_rules(uv_loop_t *ziti_loop, hostname_list_t *ho
 
     ZITI_LOG(DEBUG, "Executing Remove and add domains NRPT script: ");
     ZITI_LOG(DEBUG, "%s", cmd);
-    const char* args[] = {"powershell", "-Command", script, NULL};
+    char* args[] = {"powershell", "-Command", script, NULL};
     bool result = exec_process(ziti_loop, args[0], args);
     if (!result) {
         ZITI_LOG(WARN, "Remove and add domains NRPT script: %d(err=%lu)", result, GetLastError());
@@ -512,7 +512,7 @@ void update_interface_metric(uv_loop_t *ziti_loop, const char *tun_name, int met
 
     ZITI_LOG(DEBUG, "Executing Update Interface metric script :");
     ZITI_LOG(DEBUG, "%s", cmd);
-    const char* args[] = {"powershell", "-Command", script, NULL};
+    char* args[] = {"powershell", "-Command", script, NULL};
     bool result = exec_process(ziti_loop, args[0], args);
     if (!result) {
         ZITI_LOG(WARN, "Update Interface metric script: %d(err=%lu)", result, GetLastError());