virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

RTSP: Resolve and use the actual IP address of the peer we're connected to,

Browse Source 
instead of using the original host name, since the RTP (and UDP) protocols
may choose another IP address if the host name resolves into several different
addresses.

Originally committed as revision 22398 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-03-09 14:59:40 +00:00
parent 0c8cc2c4d8
commit 03f8fc0897
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/rtsp.c
View File

@ -1381,10 +1381,12 @@ int ff_rtsp_connect(AVFormatContext *s)
char host[1024], path[1024], tcpname[1024], cmd[2048], auth[128];
char *option_list, *option, *filename;
URLContext *rtsp_hd;
int port, err;
int port, err, tcp_fd;
RTSPMessageHeader reply1, *reply = &reply1;
int lower_transport_mask = 0;
char real_challenge[64];
struct sockaddr_storage peer;
socklen_t peer_len = sizeof(peer);
if (!ff_network_init())
return AVERROR(EIO);
@ -1455,6 +1457,12 @@ redirect:
rt->rtsp_hd = rtsp_hd;
rt->seq = 0;
tcp_fd = url_get_file_handle(rtsp_hd);
if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host),
NULL, 0, NI_NUMERICHOST);
}
/* request options supported by the server; this also detects server
* type */
av_strlcpy(rt->control_uri, s->filename,