xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-01-30 16:44:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RTSP basic authentication, patch originally by Philip Coombes

Browse Source 
(philip coombes zoneminder com), see "[PATCH]RTSP Basic Authentication"
thread on mailinglist.

Originally committed as revision 19905 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2009-09-17 21:47:11 +00:00
parent afcdf34236
commit f933789789
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/rtsp.c
View File

@ -22,6 +22,7 @@
/* needed by inet_aton() */ /* needed by inet_aton() */
#define _SVID_SOURCE #define _SVID_SOURCE
#include "libavutil/base64.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
@ -855,6 +856,10 @@ static void rtsp_send_cmd_async (AVFormatContext *s,
snprintf(buf1, sizeof(buf1), "Session: %s\r\n", rt->session_id); snprintf(buf1, sizeof(buf1), "Session: %s\r\n", rt->session_id);
av_strlcat(buf, buf1, sizeof(buf)); av_strlcat(buf, buf1, sizeof(buf));
} }
if (rt->auth_b64)
av_strlcatf(buf, sizeof(buf),
"Authorization: Basic %s\r\n",
rt->auth_b64);
av_strlcat(buf, "\r\n", sizeof(buf)); av_strlcat(buf, "\r\n", sizeof(buf));
dprintf(s, "Sending:\n%s--\n", buf); dprintf(s, "Sending:\n%s--\n", buf);
@ -899,6 +904,7 @@ static void rtsp_close_streams(RTSPState *rt)
av_close_input_stream (rt->asf_ctx); av_close_input_stream (rt->asf_ctx);
rt->asf_ctx = NULL; rt->asf_ctx = NULL;
} }
av_freep(&rt->auth_b64);
} }
static int static int
@ -1159,7 +1165,7 @@ static int rtsp_read_header(AVFormatContext *s,
AVFormatParameters *ap) AVFormatParameters *ap)
{ {
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
char host[1024], path[1024], tcpname[1024], cmd[2048], *option_list, *option; char host[1024], path[1024], tcpname[1024], cmd[2048], auth[128], *option_list, *option;
URLContext *rtsp_hd; URLContext *rtsp_hd;
int port, ret, err; int port, ret, err;
RTSPMessageHeader reply1, *reply = &reply1; RTSPMessageHeader reply1, *reply = &reply1;
@ -1168,8 +1174,18 @@ static int rtsp_read_header(AVFormatContext *s,
char real_challenge[64]; char real_challenge[64];
/* extract hostname and port */ /* extract hostname and port */
url_split(NULL, 0, NULL, 0, url_split(NULL, 0, auth, sizeof(auth),
host, sizeof(host), &port, path, sizeof(path), s->filename); host, sizeof(host), &port, path, sizeof(path), s->filename);
if (*auth) {
int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1;
if (!(rt->auth_b64 = av_malloc(b64_len)))
return AVERROR(ENOMEM);
if (!av_base64_encode(rt->auth_b64, b64_len, auth, auth_len)) {
err = AVERROR(EINVAL);
goto fail;
}
}
if (port < 0) if (port < 0)
port = RTSP_DEFAULT_PORT; port = RTSP_DEFAULT_PORT;
@ -1199,8 +1215,10 @@ static int rtsp_read_header(AVFormatContext *s,
/* open the tcp connexion */ /* open the tcp connexion */
snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port); snprintf(tcpname, sizeof(tcpname), "tcp://%s:%d", host, port);
if (url_open(&rtsp_hd, tcpname, URL_RDWR) < 0) if (url_open(&rtsp_hd, tcpname, URL_RDWR) < 0) {
return AVERROR(EIO); err = AVERROR(EIO);
goto fail;
}
rt->rtsp_hd = rtsp_hd; rt->rtsp_hd = rtsp_hd;
rt->seq = 0; rt->seq = 0;
@ -1305,6 +1323,7 @@ static int rtsp_read_header(AVFormatContext *s,
rtsp_close_streams(rt); rtsp_close_streams(rt);
av_freep(&content); av_freep(&content);
url_close(rt->rtsp_hd); url_close(rt->rtsp_hd);
av_freep(&rt->auth_b64);
return err; return err;
} }

3
libavformat/rtsp.h
View File

@ -228,6 +228,9 @@ typedef struct RTSPState {
* of RTSPMessageHeader->real_challenge */ * of RTSPMessageHeader->real_challenge */
enum RTSPServerType server_type; enum RTSPServerType server_type;
/** base64-encoded authorization lines (username:password) */
char *auth_b64;
/** The last reply of the server to a RTSP command */ /** The last reply of the server to a RTSP command */
char last_reply[2048]; /* XXX: allocate ? */ char last_reply[2048]; /* XXX: allocate ? */