Change curl_size_cb to curl_header_cb, as what the function is really
doing. Fix the registering, CURLOPT_WRITEFUNCTION is apparently wrong,
should be CURLOPT_HEADERFUNCTION.
Parsing size from header is not necessary as we're using
curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d)
The validity of d is version dependant per man 3 curl_easy_getinfo:
...
CURLINFO_CONTENT_LENGTH_DOWNLOAD
Pass a pointer to a double to receive the content-length of the
download. This is the value read from the Content-Length: field.
Since 7.19.4, this returns -1 if the size isn't known.
...
And Accept-Ranges is essential for curl to fetch right data from
http/https servers, so we check for this in the header and fail the open
if it's not supported.
Signed-off-by: Fam Zheng <f...@redhat.com>
---
block/curl.c | 42 ++++++++++++++++++++++++++++++------------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index 9a8019d..f47796b 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -90,6 +90,8 @@ typedef struct BDRVCURLState {
QLIST_HEAD(, CURLSockInfo) socks;
char *url;
size_t readahead_size;
+ /* Whether http server accept range in header */
+ bool accept_range;
} BDRVCURLState;
static void curl_clean_state(CURLState *s);
@@ -134,14 +136,14 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int
action,
return 0;
}
-static size_t curl_size_cb(void *ptr, size_t size, size_t nmemb, void *opaque)
+static size_t curl_header_cb(void *ptr, size_t size, size_t nmemb, void
*opaque)
{
- CURLState *s = ((CURLState*)opaque);
+ BDRVCURLState *s = (BDRVCURLState *)opaque;
size_t realsize = size * nmemb;
- size_t fsize;
+ const char *accept_line = "Accept-Ranges: bytes";
- if(sscanf(ptr, "Content-Length: %zd", &fsize) == 1) {
- s->s->len = fsize;
+ if (strncmp((char *)ptr, accept_line, strlen(accept_line)) == 0) {
+ s->accept_range = true;
}
return realsize;
@@ -429,6 +431,7 @@ static int curl_open(BlockDriverState *bs, QDict *options,
int flags)
Error *local_err = NULL;
const char *file;
double d;
+ int running;
static int inited = 0;
@@ -468,16 +471,27 @@ static int curl_open(BlockDriverState *bs, QDict
*options, int flags)
// Get file size
curl_easy_setopt(state->curl, CURLOPT_NOBODY, 1);
- curl_easy_setopt(state->curl, CURLOPT_WRITEFUNCTION, (void *)curl_size_cb);
- if (curl_easy_perform(state->curl))
+ curl_easy_setopt(state->curl, CURLOPT_HEADERFUNCTION,
+ curl_header_cb);
+ curl_easy_setopt(state->curl, CURLOPT_HEADERDATA, s);
+ if (curl_easy_perform(state->curl)) {
goto out;
+ }
curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d);
- curl_easy_setopt(state->curl, CURLOPT_WRITEFUNCTION, (void *)curl_read_cb);
curl_easy_setopt(state->curl, CURLOPT_NOBODY, 0);
- if (d)
+#if LIBCURL_VERSION_NUM > 0x071304
+ if (d != -1) {
+#else
+ if (d) {
+#endif
s->len = (size_t)d;
- else if(!s->len)
+ } else if (!s->len) {
+ goto out;
+ }
+ if (!strncmp(s->url, "http://";, strlen("http://";)) && !s->accept_range) {
+ strncpy(state->errmsg, "Server not supporting range.",
CURL_ERROR_SIZE);
goto out;
+ }
DPRINTF("CURL: Size = %zd\n", s->len);
curl_clean_state(state);
@@ -486,10 +500,13 @@ static int curl_open(BlockDriverState *bs, QDict
*options, int flags)
// Now we know the file exists and its size, so let's
// initialize the multi interface!
-
s->multi = curl_multi_init();
+ if (!s->multi) {
+ goto out_noclean;
+ }
curl_multi_setopt(s->multi, CURLMOPT_SOCKETDATA, s);
curl_multi_setopt(s->multi, CURLMOPT_SOCKETFUNCTION, curl_sock_cb);
+ curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);
qemu_opts_del(opts);
return 0;
@@ -499,8 +516,9 @@ out:
curl_easy_cleanup(state->curl);
state->curl = NULL;
out_noclean:
- g_free(s->url);
qemu_opts_del(opts);
+ g_free(s->url);
+ s->url = NULL;
return -EINVAL;
}
--
1.8.1.4
