Browse Source

ffserver: drop error counting when parsing ACL row

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
tags/n3.0
Reynaldo H. Verdejo Pinochet 9 years ago
parent
commit
83411d7331
1 changed files with 6 additions and 7 deletions
  1. +6
    -7
      ffserver_config.c

+ 6
- 7
ffserver_config.c View File

@@ -118,7 +118,6 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
FFServerIPAddressACL acl;
FFServerIPAddressACL *nacl;
FFServerIPAddressACL **naclp;
int errors = 0;

ffserver_get_arg(arg, sizeof(arg), &p);
if (av_strcasecmp(arg, "allow") == 0)
@@ -128,7 +127,7 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
else {
fprintf(stderr, "%s:%d: ACL action '%s' should be ALLOW or DENY.\n",
filename, line_num, arg);
errors++;
goto bail;
}

ffserver_get_arg(arg, sizeof(arg), &p);
@@ -137,7 +136,7 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
fprintf(stderr,
"%s:%d: ACL refers to invalid host or IP address '%s'\n",
filename, line_num, arg);
errors++;
goto bail;
} else
acl.last = acl.first;

@@ -148,13 +147,10 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
fprintf(stderr,
"%s:%d: ACL refers to invalid host or IP address '%s'\n",
filename, line_num, arg);
errors++;
goto bail;
}
}

if (errors)
return;

nacl = av_mallocz(sizeof(*nacl));
naclp = 0;

@@ -179,6 +175,9 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
} else
av_free(nacl);

bail:
return;

}

/* add a codec and set the default parameters */


Loading…
Cancel
Save