support for hostnames instead ip addresses in ffserver conf (using resolve_host now)
authorAlex Beregszaszi <alex@rtfs.hu>
Wed, 25 Apr 2007 21:05:47 +0000 (21:05 +0000)
committerAlex Beregszaszi <alex@rtfs.hu>
Wed, 25 Apr 2007 21:05:47 +0000 (21:05 +0000)
Originally committed as revision 8815 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffserver.c

index 21292f954098533a797630bfdf59ba18f5dd5d39..2660f2993a43cfc908444b1f291a6fa0dfc64abe 100644 (file)
@@ -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);
             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++;
             }
                         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);
             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++;
             }
                         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) {
         } 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++;
                 }
                             filename, line_num, arg);
                     errors++;
                 }