From patchwork Mon May 20 07:03:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 244857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0239F2C00A1 for ; Mon, 20 May 2013 17:06:24 +1000 (EST) Received: from localhost ([::1]:41551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeKAn-00018z-KR for incoming@patchwork.ozlabs.org; Mon, 20 May 2013 03:06:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeK8e-0006Ql-IT for qemu-devel@nongnu.org; Mon, 20 May 2013 03:04:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UeK8b-0003iz-Gl for qemu-devel@nongnu.org; Mon, 20 May 2013 03:04:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22667) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UeK8b-0003it-8n for qemu-devel@nongnu.org; Mon, 20 May 2013 03:04:05 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4K7443B002398 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 20 May 2013 03:04:04 -0400 Received: from fam-laptop.nay.redhat.com ([10.66.7.14]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r4K73nLh026470; Mon, 20 May 2013 03:04:02 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 20 May 2013 15:03:38 +0800 Message-Id: <1369033424-14594-5-git-send-email-famz@redhat.com> In-Reply-To: <1369033424-14594-1-git-send-email-famz@redhat.com> References: <1369033424-14594-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, jcody@redhat.com, Fam Zheng , stefanha@redhat.com Subject: [Qemu-devel] [PATCH v3 04/10] curl: fix curl_open X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- block/curl.c | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/block/curl.c b/block/curl.c index dea325e..c77b917 100644 --- a/block/curl.c +++ b/block/curl.c @@ -89,6 +89,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); @@ -133,14 +135,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; @@ -428,6 +430,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; @@ -467,16 +470,29 @@ 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 (!strncasecmp(s->url, "http://", strlen("http://")) + && !strncasecmp(s->url, "https://", strlen("https://")) + && !s->accept_range) { + pstrcpy(state->errmsg, CURL_ERROR_SIZE, "Server not supporting range."); goto out; + } DPRINTF("CURL: Size = %zd\n", s->len); curl_clean_state(state); @@ -485,10 +501,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; @@ -498,8 +517,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; }