int public;
char *url;
char *user_agent;
+ int tls;
} IcecastContext;
#define DEFAULT_ICE_USER "source"
{ "password", "set password", OFFSET(pass), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
{ "content_type", "set content-type, MUST be set if not audio/mpeg", OFFSET(content_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
{ "legacy_icecast", "use legacy SOURCE method, for Icecast < v2.4", OFFSET(legacy_icecast), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
+ { "tls", "use a TLS connection", OFFSET(tls), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
{ NULL }
};
static int icecast_close(URLContext *h)
{
IcecastContext *s = h->priv_data;
- if (s->hd)
- ffurl_close(s->hd);
+ ffurl_closep(&s->hd);
return 0;
}
// URI part variables
char h_url[1024], host[1024], auth[1024], path[1024];
- char *headers = NULL, *user = NULL;
+ char *headers, *user = NULL;
int port, ret;
AVBPrint bp;
cat_header(&bp, "Ice-Genre", s->genre);
cat_header(&bp, "Ice-Public", s->public ? "1" : "0");
if (!av_bprint_is_complete(&bp)) {
- ret = AVERROR(ENOMEM);
- goto cleanup;
+ av_bprint_finalize(&bp, NULL);
+ return AVERROR(ENOMEM);
}
- av_bprint_finalize(&bp, &headers);
+ if ((ret = av_bprint_finalize(&bp, &headers)) < 0)
+ return ret;
// Set options
av_dict_set(&opt_dict, "method", s->legacy_icecast ? "SOURCE" : "PUT", 0);
av_dict_set(&opt_dict, "auth_type", "basic", 0);
- av_dict_set(&opt_dict, "headers", headers, 0);
+ av_dict_set(&opt_dict, "headers", headers, AV_DICT_DONT_STRDUP_VAL);
av_dict_set(&opt_dict, "chunked_post", "0", 0);
- av_dict_set(&opt_dict, "send_expect_100", s->legacy_icecast ? "0" : "1", 0);
+ av_dict_set(&opt_dict, "send_expect_100", s->legacy_icecast ? "-1" : "1", 0);
if (NOT_EMPTY(s->content_type))
av_dict_set(&opt_dict, "content_type", s->content_type, 0);
else
}
// Build new URI for passing to http protocol
- ff_url_join(h_url, sizeof(h_url), "http", auth, host, port, "%s", path);
+ ff_url_join(h_url, sizeof(h_url),
+ s->tls ? "https" : "http",
+ auth, host, port, "%s", path);
// Finally open http proto handler
ret = ffurl_open_whitelist(&s->hd, h_url, AVIO_FLAG_READ_WRITE, NULL,
&opt_dict, h->protocol_whitelist, h->protocol_blacklist, h);
cleanup:
av_freep(&user);
- av_freep(&headers);
av_dict_free(&opt_dict);
return ret;