From 7ecdebcbe29360fe502b239cc66acea041bf0201 Mon Sep 17 00:00:00 2001
From: huitema <huitema@huitema.net>
Date: Sat, 8 Dec 2018 11:14:04 -0800
Subject: [PATCH] Fixes for Linux compile
---
picoquictest/tls_api_test.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/picoquictest/tls_api_test.c b/picoquictest/tls_api_test.c
index 4edb2031..b7c37034 100644
--- a/picoquictest/tls_api_test.c
+++ b/picoquictest/tls_api_test.c
@@ -1247,10 +1247,13 @@ int tls_api_one_scenario_init(
(proposed_version == 0) ? PICOQUIC_INTERNAL_TEST_VERSION_1 : proposed_version,
PICOQUIC_TEST_SNI, PICOQUIC_TEST_ALPN, simulated_time, NULL, 0, 1, 0);
- if (ret != 0)
- {
+ if (ret != 0) {
DBG_PRINTF("Could not create the QUIC test contexts for V=%x\n", proposed_version);
}
+ else if (*p_test_ctx == NULL || (*p_test_ctx)->cnx_client == NULL || (*p_test_ctx)->qserver == NULL) {
+ DBG_PRINTF("%s", "Connections where not properly created!\n");
+ ret = -1;
+ }
if (ret == 0 && client_params != NULL) {
picoquic_set_transport_parameters((*p_test_ctx)->cnx_client, client_params);
@@ -4887,7 +4890,6 @@ int stream_id_max_test()
int padding_test()
{
uint64_t simulated_time = 0;
- uint64_t loss_mask = 0;
picoquic_test_tls_api_ctx_t* test_ctx = NULL;
int ret = tls_api_init_ctx(&test_ctx, PICOQUIC_INTERNAL_TEST_VERSION_1, PICOQUIC_TEST_SNI, PICOQUIC_TEST_ALPN, &simulated_time, NULL, 0, 1, 0);
@@ -4938,7 +4940,6 @@ static char const* packet_trace_test_ref = "picoquictest/packet_trace_ref.txt";
int packet_trace_test()
{
uint64_t simulated_time = 0;
- uint64_t loss_mask = 0;
picoquic_test_tls_api_ctx_t* test_ctx = NULL;
int ret = tls_api_init_ctx(&test_ctx, PICOQUIC_INTERNAL_TEST_VERSION_1, PICOQUIC_TEST_SNI, PICOQUIC_TEST_ALPN, &simulated_time, NULL, 0, 1, 0);
char trace_file_name[512];
@@ -4973,7 +4974,7 @@ int packet_trace_test()
#ifdef _WINDOWS
ret = sprintf_s(&trace_file_name[2*i], sizeof(trace_file_name) - 2*i, "%02x", test_ctx->cnx_server->initial_cnxid.id[i]) <= 0;
#else
- ret = sprintf(&trace_file_name[2*i], "%02x", test_ctx->cnx_server->initial_cnxid.id[i]) > 0;
+ ret = sprintf(&trace_file_name[2*i], "%02x", test_ctx->cnx_server->initial_cnxid.id[i]) <= 0;
#endif
if (ret != 0) {
DBG_PRINTF("Cannot format the file name, i=%d, icid len=%d\n", i, test_ctx->cnx_server->initial_cnxid.id_len);
--
GitLab