romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 21:13:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

urldata: introduce data->mid, a unique identifier inside a multi

Browse source 
`data->id` is unique in *most* situations, but not in all. If a libcurl
application uses more than one connection cache, they will overlap. This
is a rare situations, but libcurl apps do crazy things. However, for
informative things, like tracing, `data->id` is superior, since it
assigns new ids in curl's serial curl_easy_perform() use.

Introduce `data->mid` which is a unique identifer inside one multi
instance, assigned on multi_add_handle() and cleared on
multi_remove_handle().

Use the `mid` in DoH operations and also in h2/h3 stream hashes.

Reported-by: 罗朝辉
Fixes #14414
Closes #14499
This commit is contained in:
Stefan Eissing 2024-08-12 11:28:19 +02:00 • committed by Daniel Stenberg
parent ad6320b8a5
commit 22d292b3ec
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
13 changed files with 133 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/http2.c
View file

@ -136,7 +136,7 @@ struct cf_h2_ctx {
struct bufc_pool stream_bufcp; /* spares for stream buffers */
struct dynbuf scratch; /* scratch buffer for temp use */
struct Curl_hash streams; /* hash of `data->id` to `h2_stream_ctx` */
struct Curl_hash streams; /* hash of `data->mid` to `h2_stream_ctx` */
size_t drain_total; /* sum of all stream's UrlState drain */
uint32_t max_concurrent_streams;
uint32_t goaway_error; /* goaway error code from server */
@ -224,7 +224,7 @@ struct h2_stream_ctx {
};
#define H2_STREAM_CTX(ctx,data) ((struct h2_stream_ctx *)(\
data? Curl_hash_offt_get(&(ctx)->streams, (data)->id) : NULL))
data? Curl_hash_offt_get(&(ctx)->streams, (data)->mid) : NULL))
static struct h2_stream_ctx *h2_stream_ctx_create(struct cf_h2_ctx *ctx)
{
@ -387,7 +387,7 @@ static CURLcode http2_data_setup(struct Curl_cfilter *cf,
if(!stream)
return CURLE_OUT_OF_MEMORY;
if(!Curl_hash_offt_set(&ctx->streams, data->id, stream)) {
if(!Curl_hash_offt_set(&ctx->streams, data->mid, stream)) {
h2_stream_ctx_free(stream);
return CURLE_OUT_OF_MEMORY;
}
@ -425,7 +425,7 @@ static void http2_data_done(struct Curl_cfilter *cf, struct Curl_easy *data)
nghttp2_session_send(ctx->h2);
}
Curl_hash_offt_remove(&ctx->streams, data->id);
Curl_hash_offt_remove(&ctx->streams, data->mid);
}
static int h2_client_new(struct Curl_cfilter *cf,
@ -2010,9 +2010,8 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
* (unlikely) or the transfer has been done, cleaned up its resources, but
* a read() is called anyway. It is not clear what the calling sequence
* is for such a case. */
failf(data, "[%zd-%zd], http/2 recv on a transfer never opened "
"or already cleared", (ssize_t)data->id,
(ssize_t)cf->conn->connection_id);
failf(data, "http/2 recv on a transfer never opened "
"or already cleared, mid=%" CURL_FORMAT_CURL_OFF_T, data->mid);
*err = CURLE_HTTP2;
return -1;
}