Merge pull request #1642 from private-octopus/unique-multipath-nat

Fix two compile warnings
private-octopus · Feb 28, 2024 · ff867e8 · ff867e8
2 parents 69482d9 + edfc115
commit ff867e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ else()
 endif()
 
 project(picoquic
-        VERSION 1.1.19.2
+        VERSION 1.1.19.3
         DESCRIPTION "picoquic library"
         LANGUAGES C CXX)
 

diff --git a/picoquic/picoquic.h b/picoquic/picoquic.h
@@ -40,7 +40,7 @@
 extern "C" {
 #endif
 
-#define PICOQUIC_VERSION "1.1.19.2"
+#define PICOQUIC_VERSION "1.1.19.3"
 #define PICOQUIC_ERROR_CLASS 0x400
 #define PICOQUIC_ERROR_DUPLICATE (PICOQUIC_ERROR_CLASS + 1)
 #define PICOQUIC_ERROR_AEAD_CHECK (PICOQUIC_ERROR_CLASS + 3)

diff --git a/picoquic/picoquic_packet_loop.h b/picoquic/picoquic_packet_loop.h
@@ -96,7 +96,7 @@ typedef int (*picoquic_packet_loop_cb_fn)(picoquic_quic_t * quic, picoquic_packe
  * the "ready" callback. Application should set the flags corresponding to
  * the features that it supports */
 typedef struct st_picoquic_packet_loop_options_t {
-    int do_time_check : 1; /* App should be polled for next time before sock select */
+    unsigned int do_time_check : 1; /* App should be polled for next time before sock select */
 } picoquic_packet_loop_options_t;
 
 /* Version 2 of packet loop, works in progress.

diff --git a/picoquictest/tls_api_test.c b/picoquictest/tls_api_test.c
@@ -7061,11 +7061,14 @@ int not_before_cnxid_test()
         ret = tls_api_synch_to_empty_loop(test_ctx, &simulated_time, 2048, PICOQUIC_NB_PATH_TARGET, 0);
     }
 
-    /* find a plausible "not before" value,and apply it */
+    /* find a plausible "not before" value, and apply it */
     if (ret == 0) {
         not_before = test_ctx->cnx_server->first_local_cnxid_list->local_cnxid_sequence_next - 1;
         uint64_t transport_error = picoquic_remove_not_before_cid(test_ctx->cnx_client, 0, not_before, simulated_time);
-
+        if (transport_error != 0) {
+            DBG_PRINTF("picoquic_remove_not_before_cid returns 0x%" PRIx64, transport_error);
+            ret = -1;
+        }
     }
 
     /* run the loop again until no outstanding data */