romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-02 05:00:30 +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

41
lib/multi.c
View file

@ -592,9 +592,16 @@ CURLMcode curl_multi_add_handle(struct Curl_multi *multi,
data->set.server_response_timeout;
data->state.conn_cache->closure_handle->set.no_signal =
data->set.no_signal;
/* the identifier inside the connection cache */
data->id = data->state.conn_cache->next_easy_id++;
if(data->state.conn_cache->next_easy_id <= 0)
data->state.conn_cache->next_easy_id = 0;
/* the identifier inside the multi instance */
data->mid = multi->next_easy_mid++;
if(multi->next_easy_mid <= 0)
multi->next_easy_mid = 0;
CONNCACHE_UNLOCK(data);
multi_warn_debug(multi, data);
@ -904,8 +911,6 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi *multi,
since we are not part of that multi handle anymore */
data->state.conn_cache = NULL;
data->multi = NULL; /* clear the association to this multi handle */
/* make sure there is no pending message in the queue sent from this easy
handle */
for(e = Curl_llist_head(&multi->msglist); e; e = Curl_node_next(e)) {
@ -918,6 +923,9 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi *multi,
}
}
data->multi = NULL; /* clear the association to this multi handle */
data->mid = -1;
/* NOTE NOTE NOTE
We do not touch the easy handle here! */
multi->num_easy--; /* one less to care about now */
@ -3891,3 +3899,32 @@ static void multi_xfer_bufs_free(struct Curl_multi *multi)
multi->xfer_ulbuf_len = 0;
multi->xfer_ulbuf_borrowed = FALSE;
}
struct Curl_easy *Curl_multi_get_handle(struct Curl_multi *multi,
curl_off_t mid)
{
if(mid >= 0) {
struct Curl_easy *data;
struct Curl_llist_node *e;
for(e = Curl_llist_head(&multi->process); e; e = Curl_node_next(e)) {
data = Curl_node_elem(e);
if(data->mid == mid)
return data;
}
/* may be in msgsent queue */
for(e = Curl_llist_head(&multi->msgsent); e; e = Curl_node_next(e)) {
data = Curl_node_elem(e);
if(data->mid == mid)
return data;
}
/* may be in pending queue */
for(e = Curl_llist_head(&multi->pending); e; e = Curl_node_next(e)) {
data = Curl_node_elem(e);
if(data->mid == mid)
return data;
}
}
return NULL;
}