Merge pull request #1206 from openziti/fix.warnings

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.2" CACHE STRING "ziti-sdk-c version or branch to use")
+set(ZITI_SDK_VERSION "1.8.3" 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_tunnel_ctrl.c

@@ -191,8 +191,8 @@ static void ip_dump(const tunnel_ip_stats *stats, dump_writer writer, void *writ
     char local_addr[64];
     char remote_addr[64];
     for (i = 0; conns[i] != NULL; i++) {
-        snprintf(local_addr, sizeof(local_addr), "%s:%ld", conns[i]->local_ip, conns[i]->local_port);
-        snprintf(remote_addr, sizeof(remote_addr), "%s:%ld", conns[i]->remote_ip, conns[i]->remote_port);
+        snprintf(local_addr, sizeof(local_addr), "%s:%lld", conns[i]->local_ip, conns[i]->local_port);
+        snprintf(remote_addr, sizeof(remote_addr), "%s:%lld", conns[i]->remote_ip, conns[i]->remote_port);
         writer(writer_ctx, "%-12s%-40s%-40s%-16s%-24s\n",
                conns[i]->protocol, local_addr, remote_addr, conns[i]->state, conns[i]->service);
     }
@@ -404,7 +404,7 @@ static int process_cmd(const tunnel_command *cmd, command_cb cb, void *ctx) {
                 if (dump_path != NULL) {
                     uv_timeval64_t now;
                     uv_gettimeofday(&now);
-                    struct tm *tm = gmtime(&now.tv_sec);
+                    struct tm *tm = gmtime((time_t *) &now.tv_sec);
                     snprintf(dump_file, sizeof(dump_file), "%s/%04d-%02d-%02dT%02d:%02d:%02d.%03dZ.ip_dump", dump_path,
                              1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
                              tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000);

programs/ziti-edge-tunnel/ipc_cmd.c

@@ -197,6 +197,8 @@ static void on_command_resp(const tunnel_result* result, void *ctx) {
                     free_tunnel_on_off_identity(&on_off_id);
                     break;
                 }
+                default:
+                    ZITI_LOG(DEBUG, "ignoring command %s", TunnelCommands.name(tnl_res_cmd.command));
                 case TunnelCommand_Unknown: {
                     break;
                 }

programs/ziti-edge-tunnel/process_cmd.c

@@ -425,6 +425,9 @@ bool process_tunnel_commands(const tunnel_command *tnl_cmd, command_cb cb, void
 
             free_tunnel_status_change(&tunnel_status_change_opts);
         }
+#else
+        case TunnelCommand_ServiceControl:
+        case TunnelCommand_StatusChange:
 #endif
         case TunnelCommand_Unknown:
         case TunnelCommand_ZitiDump: