eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

avformat/tls: Moved the parsing of host uri into a separate function - ff_tls_parse_host()

Browse Source 
This makes the function reusable and modular

Signed-off-by: Aditya Banavi <adityabanavi@gmail.com>
This commit is contained in:
Aditya Banavi
2026-03-28 06:50:10 +00:00
committed by Jack Lau
parent 30595cbc5d
commit df3511db5b
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/tls.c
+22 -11
View File
@@ -32,12 +32,30 @@
#include "libavutil/mem.h"
#include "libavutil/parseutils.h"
int ff_tls_parse_host(TLSShared *s, char *hostname, int hostname_size, int *port_ptr, const char *uri)
{
struct addrinfo hints = { .ai_flags = AI_NUMERICHOST }, *ai;
if (!hostname || hostname_size <= 0)
return AVERROR(EINVAL);
av_url_split(NULL, 0, NULL, 0, hostname, hostname_size, port_ptr, NULL, 0, uri);
if (!getaddrinfo(hostname, NULL, &hints, &ai)) {
s->numerichost = 1;
freeaddrinfo(ai);
}
if (!s->host && !(s->host = av_strdup(hostname)))
return AVERROR(ENOMEM);
return 0;
}
int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options)
{
int port;
const char *p;
char buf[200], opts[50] = "";
struct addrinfo hints = { 0 }, *ai = NULL;
const char *proxy_path;
char *env_http_proxy, *env_no_proxy;
int use_proxy;
@@ -53,7 +71,9 @@ int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AV
if (c->listen && !c->is_dtls)
snprintf(opts, sizeof(opts), "?listen=1");
av_url_split(NULL, 0, NULL, 0, c->underlying_host, sizeof(c->underlying_host), &port, NULL, 0, uri);
ret = ff_tls_parse_host(c, c->underlying_host, sizeof(c->underlying_host), &port, uri);
if (ret < 0)
return ret;
if (!p) {
p = opts;
@@ -64,15 +84,6 @@ int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AV
ff_url_join(buf, sizeof(buf), c->is_dtls ? "udp" : "tcp", NULL, (c->is_dtls && c->listen) ? "" : c->underlying_host, port, "%s", p);
hints.ai_flags = AI_NUMERICHOST;
if (!getaddrinfo(c->underlying_host, NULL, &hints, &ai)) {
c->numerichost = 1;
freeaddrinfo(ai);
}
if (!c->host && !(c->host = av_strdup(c->underlying_host)))
return AVERROR(ENOMEM);
env_http_proxy = getenv_utf8("http_proxy");
proxy_path = c->http_proxy ? c->http_proxy : env_http_proxy;
libavformat/tls.h
+2
View File
@@ -115,6 +115,8 @@ typedef struct TLSShared {
{"key_pem", "Private key PEM string", offsetof(pstruct, options_field . key_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
FF_TLS_CLIENT_OPTIONS(pstruct, options_field)
int ff_tls_parse_host(TLSShared *s, char *hostname, int hostname_size, int *port_ptr, const char *uri);
int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options);
int ff_url_read_all(const char *url, AVBPrint *bp);