videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

use resolve_host in acl handlign too, simplificates the code 

Originally committed as revision 8819 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2007-04-25 22:23:38 +00:00
parent 1840587402
commit 2bd8416e7c
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ffserver.c
View File

@ -1120,7 +1120,7 @@ static int validate_acl(FFStream *stream, HTTPContext *c)
enum IPAddressAction last_action = IP_DENY; enum IPAddressAction last_action = IP_DENY;
IPAddressACL *acl; IPAddressACL *acl;
struct in_addr *src = &c->from_addr.sin_addr; struct in_addr *src = &c->from_addr.sin_addr;
unsigned long src_addr = ntohl(src->s_addr); unsigned long src_addr = src->s_addr;
for (acl = stream->acl; acl; acl = acl->next) { for (acl = stream->acl; acl; acl = acl->next) {
if (src_addr >= acl->first.s_addr && src_addr <= acl->last.s_addr) { if (src_addr >= acl->first.s_addr && src_addr <= acl->last.s_addr) {
@ -4268,7 +4268,6 @@ static int parse_ffconfig(const char *filename)
audio_id = CODEC_ID_NONE; audio_id = CODEC_ID_NONE;
} else if (!strcasecmp(cmd, "ACL")) { } else if (!strcasecmp(cmd, "ACL")) {
IPAddressACL acl; IPAddressACL acl;
struct hostent *he;
get_arg(arg, sizeof(arg), &p); get_arg(arg, sizeof(arg), &p);
if (strcasecmp(arg, "allow") == 0) { if (strcasecmp(arg, "allow") == 0) {
@ -4282,29 +4281,22 @@ static int parse_ffconfig(const char *filename)
} }
get_arg(arg, sizeof(arg), &p); get_arg(arg, sizeof(arg), &p);
he = gethostbyname(arg); if (resolve_host(&acl.first, arg) != 0) {
if (!he) {
fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n", fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n",
filename, line_num, arg); filename, line_num, arg);
errors++; errors++;
} else { } else {
/* Only take the first */
acl.first.s_addr = ntohl(((struct in_addr *) he->h_addr_list[0])->s_addr);
acl.last = acl.first; acl.last = acl.first;
} }
get_arg(arg, sizeof(arg), &p); get_arg(arg, sizeof(arg), &p);
if (arg[0]) { if (arg[0]) {
he = gethostbyname(arg); if (resolve_host(&acl.last, arg) != 0) {
if (!he) {
fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n", fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n",
filename, line_num, arg); filename, line_num, arg);
errors++; errors++;
} else {
/* Only take the first */
acl.last.s_addr = ntohl(((struct in_addr *) he->h_addr_list[0])->s_addr);
} }
} }