diff options
| author | Romain Fliedel <rfliedel@freebox.fr> | 2018-11-05 11:01:19 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-11-20 19:58:45 +0100 |
| commit | 6765e6d9e6a32bb4fc666d744cb57e2d55d4e13b (patch) | |
| tree | 4cef970f234a13fc1a75d28c93bda49a33226e74 /lib/multiif.h | |
| parent | 47ccb2d204eb9c1d3e98b3febd616af42d82c184 (diff) | |
| download | curl-6765e6d9e6a32bb4fc666d744cb57e2d55d4e13b.tar.gz | |
ares: remove fd from multi fd set when ares is about to close the fd
When using c-ares for asyn dns, the dns socket fd was silently closed
by c-ares without curl being aware. curl would then 'realize' the fd
has been removed at next call of Curl_resolver_getsock, and only then
notify the CURLMOPT_SOCKETFUNCTION to remove fd from its poll set with
CURL_POLL_REMOVE. At this point the fd is already closed.
By using ares socket state callback (ARES_OPT_SOCK_STATE_CB), this
patch allows curl to be notified that the fd is not longer needed
for neither for write nor read. At this point by calling
Curl_multi_closed we are able to notify multi with CURL_POLL_REMOVE
before the fd is actually closed by ares.
In asyn-ares.c Curl_resolver_duphandle we can't use ares_dup anymore
since it does not allow passing a different sock_state_cb_data
Closes #3238
Diffstat (limited to 'lib/multiif.h')
| -rw-r--r-- | lib/multiif.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/multiif.h b/lib/multiif.h index c8fb5ca0d..c50063dae 100644 --- a/lib/multiif.h +++ b/lib/multiif.h @@ -89,7 +89,7 @@ void Curl_multi_connchanged(struct Curl_multi *multi); * socket again and it gets the same file descriptor number. */ -void Curl_multi_closed(struct connectdata *conn, curl_socket_t s); +void Curl_multi_closed(struct Curl_easy *data, curl_socket_t s); /* * Add a handle and move it into PERFORM state at once. For pushed streams. |