CURL library API has changed, the current curl driver is not working with
current libcurl. It may or may not have worked with old libcurl, but currently,
when testing with apache http URL, it just hangs before fetching any data. The
problem is because the mismatch of our code and how libcurl wants to be used.
(man 3 curl_multi_socket_action, section 'TYPICAL USAGE')
- Step 3. We need timer to support libcurl timeout.
- Step 6. We'll call the right API function, replacing the deprecated.
- Step 5, 8. Manage socket properly (take actions on socket fd that are passed
into socket callback from libcurl)
This patch rewrites the use of API as well as the structure of internal states:
BDRVCURLState holds the pointer to curl multi interface (man 3
libcurl-multi), and 4 lists for internal states:
- CURLState holds state for libcurl connection (man 3 libcurl-easy)
- CURLSockInfo holds information for libcurl socket interface (man 3
curl_multi_socket_action).
- CURLDataCache holds the user data read from libcurl, it is in a list
ordered by access, the used cache is moved to list head on access, so
the tail element is freed first. BDRVCURLState.cache_quota is the
threshold to start freeing cache.
- CURLAIOCB holds ongoing aio information.
Changes from v5:
05: Rename bs to s for BDRVCURLState.
06: Use int64_t for offsets.
Fix printf format string.
Move introducing of use_count to 07.
07: Drop explicit cast.
Use int64_t for offsets.
Use_count moved here.
08: Remove duplicated.
Move s->url = NULL to separate patch.
09: Fix while(0);
12: Added:
curl: set s->url to NULL after free.
Changes from v4:
11: Added:
block/curl.c: Refuse to open the handle for writes.
Changes from v3:
01, 06, 07: Add QLIST_INIT in qemu_open to initialize each list.
07: Move clean up for s->acbs from later patch to here. Use qemu_aio_relase
instead of g_free on acb.
Fix use-after-free bug. [Rich]
Changes from v2:
00: Removed previous 09, since changes are included in previous
commits.
previous 09: curl: release everything on curl close.
01: Add commit message for introducing CURLSockInfo. Remove
unnecessary pointer type cast.
02: Use sizeof instead of macro for s->range len.
04: Use pstrcpy and strncasecmp.
06: Add commit message for why is there a cache in curl.c.
Changes from v1:
Split to multiple patches. The final status should be identical to v1.
Fam Zheng (11):
curl: introduce CURLSockInfo to BDRVCURLState.
curl: change magic number to sizeof
curl: change curl_multi_do to curl_fd_handler
curl: fix curl_open
curl: add timer to BDRVCURLState
curl: introduce CURLDataCache
curl: make use of CURLDataCache.
curl: use list to store CURLState
curl: add cache quota.
curl: introduce ssl_no_cert runtime option.
curl: set s->url to NULL after free.
Richard W.M. Jones (1):
block/curl.c: Refuse to open the handle for writes.
block/curl.c | 566 +++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 352 insertions(+), 214 deletions(-)
--
1.8.2.3
