[SCM] libav/experimental: support for hostnames instead ip addresses in ffserver conf (using resolve_host now)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:59:11 UTC 2013
The following commit has been merged in the experimental branch:
commit ad8b8abce401962932442a93d371d684004bf6b0
Author: Alex Beregszaszi <alex at rtfs.hu>
Date: Wed Apr 25 21:05:47 2007 +0000
support for hostnames instead ip addresses in ffserver conf (using resolve_host now)
Originally committed as revision 8815 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffserver.c b/ffserver.c
index 21292f9..2660f29 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3823,8 +3823,8 @@ static int parse_ffconfig(const char *filename)
my_http_addr.sin_port = htons(val);
} else if (!strcasecmp(cmd, "BindAddress")) {
get_arg(arg, sizeof(arg), &p);
- if (!inet_aton(arg, &my_http_addr.sin_addr)) {
- fprintf(stderr, "%s:%d: Invalid IP address: %s\n",
+ if (resolve_host(&my_http_addr.sin_addr, arg) != 0) {
+ fprintf(stderr, "%s:%d: Invalid host/IP address: %s\n",
filename, line_num, arg);
errors++;
}
@@ -3841,8 +3841,8 @@ static int parse_ffconfig(const char *filename)
my_rtsp_addr.sin_port = htons(atoi(arg));
} else if (!strcasecmp(cmd, "RTSPBindAddress")) {
get_arg(arg, sizeof(arg), &p);
- if (!inet_aton(arg, &my_rtsp_addr.sin_addr)) {
- fprintf(stderr, "%s:%d: Invalid IP address: %s\n",
+ if (resolve_host(&my_rtsp_addr.sin_addr, arg) != 0) {
+ fprintf(stderr, "%s:%d: Invalid host/IP address: %s\n",
filename, line_num, arg);
errors++;
}
@@ -4341,8 +4341,8 @@ static int parse_ffconfig(const char *filename)
} else if (!strcasecmp(cmd, "MulticastAddress")) {
get_arg(arg, sizeof(arg), &p);
if (stream) {
- if (!inet_aton(arg, &stream->multicast_ip)) {
- fprintf(stderr, "%s:%d: Invalid IP address: %s\n",
+ if (resolve_host(&stream->multicast_ip, arg) != 0) {
+ fprintf(stderr, "%s:%d: Invalid host/IP address: %s\n",
filename, line_num, arg);
errors++;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list