Merge branch 'master' into clean-up-multipath

Author: huitema

CMakeLists.txt

@@ -8,7 +8,7 @@ else()
 endif()
 
 project(picoquic
-        VERSION 1.1.19.8
+        VERSION 1.1.19.9
         DESCRIPTION "picoquic library"
         LANGUAGES C CXX)
 
@@ -209,7 +209,7 @@ if(PICOQUIC_FETCH_PTLS)
     include(FetchContent)
     FetchContent_Declare(picotls
         GIT_REPOSITORY      https://github.com/h2o/picotls.git
-        GIT_TAG             af66fc4aa8853b0725fcb2c18a702e8f1c656cf1)
+        GIT_TAG             5a4461d8a3948d9d26bf861e7d90cb80d8093515)
     FetchContent_MakeAvailable(picotls)
 endif()
 

ci/build_picotls.ps1

@@ -1,5 +1,5 @@
 # Build at a known-good commit
-$COMMIT_ID=" af66fc4aa8853b0725fcb2c18a702e8f1c656cf1"
+$COMMIT_ID=" 5a4461d8a3948d9d26bf861e7d90cb80d8093515"
 
 # Match expectations of picotlsvs project.
 mkdir $dir\include\

ci/build_picotls.sh

@@ -2,7 +2,7 @@
 #build last picotls master (for Travis)
 
 # Build at a known-good commit
-COMMIT_ID= af66fc4aa8853b0725fcb2c18a702e8f1c656cf1
+COMMIT_ID= 5a4461d8a3948d9d26bf861e7d90cb80d8093515
 
 cd ..
 # git clone --branch master --single-branch --shallow-submodules --recurse-submodules --no-tags https://github.com/h2o/picotls

picoquic/bbr.c

@@ -1517,11 +1517,10 @@ static uint64_t BBRTargetInflight(picoquic_bbr_state_t* bbr_state, picoquic_path
 #ifdef RTTJitterBufferProbe
 static int BBRCheckPathSaturated(picoquic_bbr_state_t* bbr_state, picoquic_path_t* path_x, bbr_per_ack_state_t * rs, uint64_t current_time)
 {
-    if (!rs->is_app_limited &&
-        bbr_state->state != picoquic_bbr_alg_drain &&
+    if (IsInAProbeBWState(bbr_state) &&
+        rs->rtt_sample > 2*bbr_state->min_rtt &&
         bbr_state->rounds_since_bw_probe >= 1 &&
         bbr_state->pacing_rate > 3 * rs->delivery_rate &&
-        rs->rtt_sample > 2*bbr_state->min_rtt &&
         bbr_state->wifi_shadow_rtt == 0) {
         bbr_state->prior_cwnd = rs->delivered;
         bbr_state->probe_rtt_done_stamp = 0;

picoquic/picoquic.h

@@ -40,7 +40,7 @@
 extern "C" {
 #endif
 
-#define PICOQUIC_VERSION "1.1.19.8"
+#define PICOQUIC_VERSION "1.1.19.9"
 #define PICOQUIC_ERROR_CLASS 0x400
 #define PICOQUIC_ERROR_DUPLICATE (PICOQUIC_ERROR_CLASS + 1)
 #define PICOQUIC_ERROR_AEAD_CHECK (PICOQUIC_ERROR_CLASS + 3)

picoquic/quicctx.c

@@ -3782,11 +3782,9 @@ picoquic_cnx_t* picoquic_create_cnx(picoquic_quic_t* quic,
 
             cnx->cnx_state = picoquic_state_client_init;
 
-            if (!quic->is_cert_store_not_empty || sni == NULL) {
-                /* This is a hack. The open SSL certifier crashes if no name is specified,
-                 * and always fails if no certificate is stored, so we just use a NULL verifier */
-                picoquic_log_app_message(cnx, "%s -- certificate will not be verified.\n",
-                    (sni == NULL) ? "No server name specified" : "No root crt list specified");
+            if (!quic->is_cert_store_not_empty) {
+                /* The open SSL certifier always fails if no certificate is stored, so we just use a NULL verifier */
+                picoquic_log_app_message(cnx, "No root crt list specified -- certificate will not be verified.\n");
 
                 picoquic_set_null_verifier(quic);
             }

picoquic/tls_api.c

@@ -155,12 +155,12 @@ static int tls_api_is_init = 0;
 void picoquic_tls_api_init_providers(int unload)
 {
     if ((tls_api_init_flags & TLS_API_INIT_FLAGS_NO_MINICRYPTO) == 0) {
-        DBG_PRINTF("%s", "%s minicrypto", (unload)?"Unloading":"Loading");
+        DBG_PRINTF("%s minicrypto", (unload)?"Unloading":"Loading");
         picoquic_ptls_minicrypto_load(unload);
     }
 #ifndef PTLS_WITHOUT_OPENSSL
     if ((tls_api_init_flags & TLS_API_INIT_FLAGS_NO_OPENSSL) == 0) {
-        DBG_PRINTF("%s", "%s openssl", (unload)?"Unloading":"Loading");
+        DBG_PRINTF("%s openssl", (unload)?"Unloading":"Loading");
         picoquic_ptls_openssl_load(unload);
     }
 #else

picoquictest/mediatest.c

@@ -1326,7 +1326,7 @@ int mediatest_video2_down_test()
     spec.do_video2 = 1;
     spec.do_audio = 1;
     spec.data_size = 0;
-    spec.latency_average = 110000;
+    spec.latency_average = 100000;
     spec.latency_max = 600000;
     spec.do_not_check_video2 = 1;
     ret = mediatest_one(mediatest_video2_down, &spec);
@@ -1344,8 +1344,8 @@ int mediatest_video2_back_test()
     spec.do_video2 = 1;
     spec.do_audio = 1;
     spec.data_size = 0;
-    spec.latency_average = 110000;
-    spec.latency_max = 600000;
+    spec.latency_average = 50000;
+    spec.latency_max = 450000;
     spec.do_not_check_video2 = 1;
     ret = mediatest_one(mediatest_video2_back, &spec);
 
@@ -1376,8 +1376,8 @@ int mediatest_wifi_test()
     spec.do_video2 = 1;
     spec.do_audio = 1;
     spec.data_size = 0;
-    spec.latency_average = 45000;
-    spec.latency_max = 240000;
+    spec.latency_average = 50000;
+    spec.latency_max = 300000;
     spec.do_not_check_video2 = 1;
     ret = mediatest_one(mediatest_wifi, &spec);
 

picoquictest/tls_api_test.c

@@ -2176,9 +2176,6 @@ static int tls_api_test_with_loss(uint64_t* loss_mask, uint32_t proposed_version
     {
         DBG_PRINTF("Could not create the QUIC test contexts for V=%x\n", proposed_version);
     }
-    else if (sni == NULL) {
-        picoquic_set_null_verifier(test_ctx->qclient);
-    }
 
     if (ret == 0) {
         ret = tls_api_connection_loop(test_ctx, loss_mask, 0, &simulated_time);