From ca7e49d6010c914731b603217094e93631e643d5 Mon Sep 17 00:00:00 2001 From: Jop Zitman Date: Fri, 21 Mar 2025 21:06:16 +0800 Subject: [PATCH] Get rid of token stuff --- include/slipstream.h | 2 -- src/slipstream_client.c | 12 +----------- src/slipstream_server.c | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/slipstream.h b/include/slipstream.h index b97f866..07dfab9 100644 --- a/include/slipstream.h +++ b/include/slipstream.h @@ -14,8 +14,6 @@ extern "C" { #define SLIPSTREAM_INTERNAL_ERROR 0x101 #define SLIPSTREAM_FILE_CANCEL_ERROR 0x105 -#define SLIPSTREAM_CLIENT_TICKET_STORE "sample_ticket_store.bin"; -#define SLIPSTREAM_CLIENT_TOKEN_STORE "sample_token_store.bin"; #define SLIPSTREAM_QLOG_DIR "./qlog"; #include diff --git a/src/slipstream_client.c b/src/slipstream_client.c index 801d91b..d1292a5 100644 --- a/src/slipstream_client.c +++ b/src/slipstream_client.c @@ -704,8 +704,6 @@ int picoquic_slipstream_client(int listen_port, char const* resolver_addresses_f /* Start: start the QUIC process */ int ret = 0; uint64_t current_time = 0; - char const* ticket_store_filename = SLIPSTREAM_CLIENT_TICKET_STORE; - char const* token_store_filename = SLIPSTREAM_CLIENT_TOKEN_STORE; client_domain_name = strdup(domain_name); client_domain_name_len = strlen(domain_name); @@ -732,7 +730,6 @@ int picoquic_slipstream_client(int listen_port, char const* resolver_addresses_f config.disable_port_blocking = 1; config.enable_sslkeylog = 1; config.alpn = SLIPSTREAM_ALPN; - config.token_file_name = token_store_filename; /* Create the QUIC context for the server */ current_time = picoquic_current_time(); @@ -745,7 +742,7 @@ int picoquic_slipstream_client(int listen_port, char const* resolver_addresses_f return -1; } - picoquic_set_cookie_mode(quic, 2); + picoquic_set_cookie_mode(quic, 0); picoquic_set_default_priority(quic, 2); #ifdef BUILD_LOGLIB picoquic_set_qlog(quic, config.qlog_dir); @@ -844,13 +841,6 @@ int picoquic_slipstream_client(int listen_port, char const* resolver_addresses_f /* And finish. */ printf("Client exit, ret = %d\n", ret); - /* Save tickets and tokens, and free the QUIC context */ - if (picoquic_save_session_tickets(quic, ticket_store_filename) != 0) { - fprintf(stderr, "Could not store the saved session tickets.\n"); - } - if (picoquic_save_retry_tokens(quic, token_store_filename) != 0) { - fprintf(stderr, "Could not save tokens to <%s>.\n", token_store_filename); - } picoquic_free(quic); return ret; diff --git a/src/slipstream_server.c b/src/slipstream_server.c index 01cd055..70b8af7 100644 --- a/src/slipstream_server.c +++ b/src/slipstream_server.c @@ -628,7 +628,7 @@ int picoquic_slipstream_server(int server_port, const char* server_cert, const c return -1; } - picoquic_set_cookie_mode(quic, 2); + picoquic_set_cookie_mode(quic, 0); picoquic_set_default_priority(quic, 2); #ifdef BUILD_LOGLIB picoquic_set_qlog(quic, config.qlog_dir);