diff mbox series

[FFmpeg-devel,v2] avformat/icecast: Add option to use TLS connection

Message ID 20200613223158.63585-1-epirat07@gmail.com
State Superseded
Headers show
Series [FFmpeg-devel,v2] avformat/icecast: Add option to use TLS connection | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Marvin Scholz June 13, 2020, 10:31 p.m. UTC 
---
 doc/protocols.texi    | 3 +++
 libavformat/icecast.c | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

Comments

Carl Eugen Hoyos June 13, 2020, 10:36 p.m. UTC | #1 
Am So., 14. Juni 2020 um 00:32 Uhr schrieb Marvin Scholz <epirat07@gmail.com>:

> +    // Check which underlying protocol should be used
> +    real_proto = (s->tls) ? "https" : "http";

Both comment and parentheses are useless.

Carl Eugen
Marvin Scholz June 13, 2020, 10:53 p.m. UTC | #2 
On 14 Jun 2020, at 0:36, Carl Eugen Hoyos wrote:

> Am So., 14. Juni 2020 um 00:32 Uhr schrieb Marvin Scholz 
> <epirat07@gmail.com>:
>
>> +    // Check which underlying protocol should be used
>> +    real_proto = (s->tls) ? "https" : "http";
>
> Both comment and parentheses are useless.
>

Sent new version that gets rid of the intermediate variable,
comment and parentheses.

> Carl Eugen
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 7aa758541c..32c829d2a3 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -520,6 +520,9 @@  audio/mpeg.
 This enables support for Icecast versions < 2.4.0, that do not support the
 HTTP PUT method but the SOURCE method.
 
+@item tls
+Establish a TLS (HTTPS) connection to Icecast.
+
 @end table
 
 @example
diff --git a/libavformat/icecast.c b/libavformat/icecast.c
index 38af16b99e..cd70d3d337 100644
--- a/libavformat/icecast.c
+++ b/libavformat/icecast.c
@@ -43,6 +43,7 @@  typedef struct IcecastContext {
     int public;
     char *url;
     char *user_agent;
+    int tls;
 } IcecastContext;
 
 #define DEFAULT_ICE_USER "source"
@@ -62,6 +63,7 @@  static const AVOption options[] = {
     { "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 }
 };
 
@@ -89,6 +91,7 @@  static int icecast_open(URLContext *h, const char *uri, int flags)
     // URI part variables
     char h_url[1024], host[1024], auth[1024], path[1024];
     char *headers, *user = NULL;
+    const char *real_proto;
     int port, ret;
     AVBPrint bp;
 
@@ -161,8 +164,11 @@  static int icecast_open(URLContext *h, const char *uri, int flags)
         goto cleanup;
     }
 
+    // Check which underlying protocol should be used
+    real_proto = (s->tls) ? "https" : "http";
+
     // 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), real_proto, 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);