virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/rtsp: add TLS options

Browse Source 
Add TLS options to RTSP for when TLS is used for the lower protocol.

Signed-off-by: Marvin Scholz <epirat07@gmail.com>
Co-authored-by: Marvin Scholz <epirat07@gmail.com>
This commit is contained in:
Daniel N Pettersson
2021-07-21 11:20:33 +02:00
committed by Marvin Scholz
parent ba9817df9d
commit e1ef33d361
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/rtsp.c
View File

@@ -53,6 +53,7 @@
#include "rtpdec_formats.h"
#include "rtpenc_chain.h"
#include "url.h"
#include "tls.h"
#include "rtpenc.h"
#include "mpegts.h"
#include "version.h"
@@ -103,6 +104,9 @@ const AVOption ff_rtsp_options[] = {
{ "timeout", "set timeout (in microseconds) of socket I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT64, {.i64 = 0}, INT_MIN, INT64_MAX, DEC },
COMMON_OPTS(),
{ "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC },
// TLS options
FF_TLS_CLIENT_OPTIONS(RTSPState, tls_opts),
{ NULL },
};
@@ -139,6 +143,18 @@ static AVDictionary *map_to_opts(RTSPState *rt)
return opts;
}
/**
* Add the TLS options of the given RTSPState to the dict
*/
static void copy_tls_opts_dict(RTSPState *rt, AVDictionary **dict)
{
av_dict_set_int(dict, "tls_verify", rt->tls_opts.verify, 0);
av_dict_set(dict, "ca_file", rt->tls_opts.ca_file, 0);
av_dict_set(dict, "cert_file", rt->tls_opts.cert_file, 0);
av_dict_set(dict, "key_file", rt->tls_opts.key_file, 0);
av_dict_set(dict, "verifyhost", rt->tls_opts.host, 0);
}
static void get_word_until_chars(char *buf, int buf_size,
const char *sep, const char **pp)
{
@@ -1821,6 +1837,8 @@ redirect:
AVDictionary *options = NULL;
av_dict_set_int(&options, "timeout", rt->stimeout, 0);
if (https_tunnel)
copy_tls_opts_dict(rt, &options);
ff_url_join(httpname, sizeof(httpname), https_tunnel ? "https" : "http", auth, host, port, "%s", path);
snprintf(sessioncookie, sizeof(sessioncookie), "%08x%08x",
@@ -1905,14 +1923,20 @@ redirect:
} else {
int ret;
/* open the tcp connection */
AVDictionary *proto_opts = NULL;
if (strcmp("tls", lower_rtsp_proto) == 0)
copy_tls_opts_dict(rt, &proto_opts);
ff_url_join(tcpname, sizeof(tcpname), lower_rtsp_proto, NULL,
host, port,
"?timeout=%"PRId64, rt->stimeout);
if ((ret = ffurl_open_whitelist(&rt->rtsp_hd, tcpname, AVIO_FLAG_READ_WRITE,
&s->interrupt_callback, NULL, s->protocol_whitelist, s->protocol_blacklist, NULL)) < 0) {
&s->interrupt_callback, &proto_opts, s->protocol_whitelist, s->protocol_blacklist, NULL)) < 0) {
av_dict_free(&proto_opts);
err = ret;
goto fail;
}
av_dict_free(&proto_opts);
rt->rtsp_hd_out = rt->rtsp_hd;
}
rt->seq = 0;

11
libavformat/rtsp.h
View File

@@ -419,6 +419,17 @@ typedef struct RTSPState {
int buffer_size;
int pkt_size;
char *localaddr;
/**
* Options used for TLS based RTSP streams.
*/
struct {
char *ca_file;
int verify;
char *cert_file;
char *key_file;
char *host;
} tls_opts;
} RTSPState;
#define RTSP_FLAG_FILTER_SRC 0x1 /**< Filter incoming UDP packets -