* HTTP protocol for ffmpeg client
* Copyright (c) 2000, 2001 Fabrice Bellard
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "http.h"
#include "os_support.h"
#include "httpauth.h"
-#include "libavcodec/opt.h"
+#include "url.h"
+#include "libavutil/opt.h"
/* XXX: POST protocol is not completely implemented because ffmpeg uses
only a subset of it. */
/* used for protocol handling */
#define BUFFER_SIZE 1024
-#define URL_SIZE 4096
#define MAX_REDIRECTS 8
typedef struct {
int http_code;
int64_t chunksize; /**< Used if "Transfer-Encoding: chunked" otherwise -1. */
int64_t off, filesize;
- char location[URL_SIZE];
+ char location[MAX_URL_SIZE];
HTTPAuthState auth_state;
unsigned char headers[BUFFER_SIZE];
int willclose; /**< Set if the server correctly handles Connection: close and will close the connection after feeding us the content. */
#define OFFSET(x) offsetof(HTTPContext, x)
static const AVOption options[] = {
-{"chunksize", "use chunked transfer-encoding for posts, -1 disables it, 0 enables it", OFFSET(chunksize), FF_OPT_TYPE_INT64, 0, -1, 0 }, /* Default to 0, for chunked POSTs */
+{"chunksize", "use chunked transfer-encoding for posts, -1 disables it, 0 enables it", OFFSET(chunksize), FF_OPT_TYPE_INT64, {.dbl = 0}, -1, 0 }, /* Default to 0, for chunked POSTs */
{NULL}
};
static const AVClass httpcontext_class = {
- "HTTP", av_default_item_name, options, LIBAVUTIL_VERSION_INT
+ .class_name = "HTTP",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
};
static int http_connect(URLContext *h, const char *path, const char *hoststr,
int len = strlen(headers);
if (len && strcmp("\r\n", headers + len - 2))
- av_log(NULL, AV_LOG_ERROR, "No trailing CRLF found in HTTP header.\n");
+ av_log(h, AV_LOG_ERROR, "No trailing CRLF found in HTTP header.\n");
av_strlcpy(s->headers, headers, sizeof(s->headers));
}
port = 80;
ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port, NULL);
- err = url_open(&hd, buf, URL_RDWR);
+ err = ffurl_open(&hd, buf, AVIO_FLAG_READ_WRITE);
if (err < 0)
goto fail;
goto fail;
if (s->http_code == 401) {
if (cur_auth_type == HTTP_AUTH_NONE && s->auth_state.auth_type != HTTP_AUTH_NONE) {
- url_close(hd);
+ ffurl_close(hd);
goto redo;
} else
goto fail;
}
- if ((s->http_code == 302 || s->http_code == 303) && location_changed == 1) {
+ if ((s->http_code == 301 || s->http_code == 302 || s->http_code == 303 || s->http_code == 307)
+ && location_changed == 1) {
/* url moved, get next */
- url_close(hd);
+ ffurl_close(hd);
if (redirects++ >= MAX_REDIRECTS)
return AVERROR(EIO);
location_changed = 0;
return 0;
fail:
if (hd)
- url_close(hd);
+ ffurl_close(hd);
s->hd = NULL;
return AVERROR(EIO);
}
h->is_streamed = 1;
s->filesize = -1;
- av_strlcpy(s->location, uri, URL_SIZE);
+ av_strlcpy(s->location, uri, sizeof(s->location));
return http_open_cnx(h);
}
{
int len;
if (s->buf_ptr >= s->buf_end) {
- len = url_read(s->hd, s->buffer, BUFFER_SIZE);
+ len = ffurl_read(s->hd, s->buffer, BUFFER_SIZE);
if (len < 0) {
return AVERROR(EIO);
} else if (len == 0) {
p++;
s->http_code = strtol(p, &end, 10);
- dprintf(NULL, "http_code=%d\n", s->http_code);
+ av_dlog(NULL, "http_code=%d\n", s->http_code);
/* error codes are 4xx and 5xx, but regard 401 as a success, so we
* don't abort until all headers have been parsed. */
if (s->http_code >= 400 && s->http_code < 600 && s->http_code != 401) {
end += strspn(end, SPACE_CHARS);
- av_log(NULL, AV_LOG_WARNING, "HTTP error %d %s\n",
+ av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n",
s->http_code, end);
return -1;
}
p++;
while (isspace(*p))
p++;
- if (!strcmp(tag, "Location")) {
+ if (!strcasecmp(tag, "Location")) {
strcpy(s->location, p);
*new_location = 1;
- } else if (!strcmp (tag, "Content-Length") && s->filesize == -1) {
+ } else if (!strcasecmp (tag, "Content-Length") && s->filesize == -1) {
s->filesize = atoll(p);
- } else if (!strcmp (tag, "Content-Range")) {
+ } else if (!strcasecmp (tag, "Content-Range")) {
/* "bytes $from-$to/$document_size" */
const char *slash;
if (!strncmp (p, "bytes ", 6)) {
s->filesize = atoll(slash+1);
}
h->is_streamed = 0; /* we _can_ in fact seek */
- } else if (!strcmp (tag, "Transfer-Encoding") && !strncasecmp(p, "chunked", 7)) {
+ } else if (!strcasecmp (tag, "Transfer-Encoding") && !strncasecmp(p, "chunked", 7)) {
s->filesize = -1;
s->chunksize = 0;
- } else if (!strcmp (tag, "WWW-Authenticate")) {
+ } else if (!strcasecmp (tag, "WWW-Authenticate")) {
ff_http_auth_handle_header(&s->auth_state, tag, p);
- } else if (!strcmp (tag, "Authentication-Info")) {
+ } else if (!strcasecmp (tag, "Authentication-Info")) {
ff_http_auth_handle_header(&s->auth_state, tag, p);
- } else if (!strcmp (tag, "Connection")) {
+ } else if (!strcasecmp (tag, "Connection")) {
if (!strcmp(p, "close"))
s->willclose = 1;
}
/* send http header */
- post = h->flags & URL_WRONLY;
+ post = h->flags & AVIO_FLAG_WRITE;
authstr = ff_http_auth_create_response(&s->auth_state, auth, path,
post ? "POST" : "GET");
authstr ? authstr : "");
av_freep(&authstr);
- if (url_write(s->hd, s->buffer, strlen(s->buffer)) < 0)
+ if (ffurl_write(s->hd, s->buffer, strlen(s->buffer)) < 0)
return AVERROR(EIO);
/* init input buffer */
if (http_get_line(s, line, sizeof(line)) < 0)
return AVERROR(EIO);
- dprintf(NULL, "header='%s'\n", line);
+ av_dlog(NULL, "header='%s'\n", line);
err = process_line(h, line, s->line_count, new_location);
if (err < 0)
s->chunksize = strtoll(line, NULL, 16);
- dprintf(NULL, "Chunked encoding data size: %"PRId64"'\n", s->chunksize);
+ av_dlog(NULL, "Chunked encoding data size: %"PRId64"'\n", s->chunksize);
if (!s->chunksize)
return 0;
} else {
if (!s->willclose && s->filesize >= 0 && s->off >= s->filesize)
return AVERROR_EOF;
- len = url_read(s->hd, buf, size);
+ len = ffurl_read(s->hd, buf, size);
}
if (len > 0) {
s->off += len;
if (s->chunksize == -1) {
/* non-chunked data is sent without any special encoding */
- return url_write(s->hd, buf, size);
+ return ffurl_write(s->hd, buf, size);
}
/* silently ignore zero-size data since chunk encoding that would
/* upload data using chunked encoding */
snprintf(temp, sizeof(temp), "%x\r\n", size);
- if ((ret = url_write(s->hd, temp, strlen(temp))) < 0 ||
- (ret = url_write(s->hd, buf, size)) < 0 ||
- (ret = url_write(s->hd, crlf, sizeof(crlf) - 1)) < 0)
+ if ((ret = ffurl_write(s->hd, temp, strlen(temp))) < 0 ||
+ (ret = ffurl_write(s->hd, buf, size)) < 0 ||
+ (ret = ffurl_write(s->hd, crlf, sizeof(crlf) - 1)) < 0)
return ret;
}
return size;
HTTPContext *s = h->priv_data;
/* signal end of chunked encoding if used */
- if ((h->flags & URL_WRONLY) && s->chunksize != -1) {
- ret = url_write(s->hd, footer, sizeof(footer) - 1);
+ if ((h->flags & AVIO_FLAG_WRITE) && s->chunksize != -1) {
+ ret = ffurl_write(s->hd, footer, sizeof(footer) - 1);
ret = ret > 0 ? 0 : ret;
}
if (s->hd)
- url_close(s->hd);
+ ffurl_close(s->hd);
return ret;
}
s->off = old_off;
return -1;
}
- url_close(old_hd);
+ ffurl_close(old_hd);
return off;
}
http_get_file_handle(URLContext *h)
{
HTTPContext *s = h->priv_data;
- return url_get_file_handle(s->hd);
+ return ffurl_get_file_handle(s->hd);
}
-URLProtocol http_protocol = {
- "http",
- http_open,
- http_read,
- http_write,
- http_seek,
- http_close,
+URLProtocol ff_http_protocol = {
+ .name = "http",
+ .url_open = http_open,
+ .url_read = http_read,
+ .url_write = http_write,
+ .url_seek = http_seek,
+ .url_close = http_close,
.url_get_file_handle = http_get_file_handle,
- .priv_data_size = sizeof(HTTPContext),
- .priv_data_class = &httpcontext_class,
+ .priv_data_size = sizeof(HTTPContext),
+ .priv_data_class = &httpcontext_class,
};
projects / ffmpeg / blobdiff