On Wed, Nov 02, 2016 at 06:55:39PM +0100, Max Reitz wrote:
> Because TFTP does not support byte ranges, it was never usable with our
> curl block driver. Since apparently nobody has ever complained loudly
> enough for someone to take care of the issue until now, it seems
> reasonable to assume that nobody has ever actually used it.
>
> Therefore, it should be safe to just drop it from curl's protocol list.
>
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
> block/curl.c | 20 +-------------------
> 1 file changed, 1 insertion(+), 19 deletions(-)
>
> diff --git a/block/curl.c b/block/curl.c
> index e5eaa7b..ba8adae 100644
> --- a/block/curl.c
> +++ b/block/curl.c
> @@ -68,8 +68,7 @@ static CURLMcode __curl_multi_socket_action(CURLM
> *multi_handle,
> #endif
>
> #define PROTOCOLS (CURLPROTO_HTTP | CURLPROTO_HTTPS | \
> - CURLPROTO_FTP | CURLPROTO_FTPS | \
> - CURLPROTO_TFTP)
> + CURLPROTO_FTP | CURLPROTO_FTPS)
>
> #define CURL_NUM_STATES 8
> #define CURL_NUM_ACB 8
> @@ -886,29 +885,12 @@ static BlockDriver bdrv_ftps = {
> .bdrv_attach_aio_context = curl_attach_aio_context,
> };
>
> -static BlockDriver bdrv_tftp = {
> - .format_name = "tftp",
> - .protocol_name = "tftp",
> -
> - .instance_size = sizeof(BDRVCURLState),
> - .bdrv_parse_filename = curl_parse_filename,
> - .bdrv_file_open = curl_open,
> - .bdrv_close = curl_close,
> - .bdrv_getlength = curl_getlength,
> -
> - .bdrv_aio_readv = curl_aio_readv,
> -
> - .bdrv_detach_aio_context = curl_detach_aio_context,
> - .bdrv_attach_aio_context = curl_attach_aio_context,
> -};
> -
> static void curl_block_init(void)
> {
> bdrv_register(&bdrv_http);
> bdrv_register(&bdrv_https);
> bdrv_register(&bdrv_ftp);
> bdrv_register(&bdrv_ftps);
> - bdrv_register(&bdrv_tftp);
> }
>
> block_init(curl_block_init);
> --
> 2.10.2
>
Reviewed-by: Jeff Cody <jc...@redhat.com>
