zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-06-25 06:59:00 +02:00
Code Issues Projects Releases Wiki Activity

fixed ipv6 compildation

Browse source
This commit is contained in:
Roman Arutyunyan 2012-04-28 18:48:05 +04:00
parent 8c9e3ad36f
commit 51f7d3012d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ngx_rtmp_access_module.c
View file

@ -165,7 +165,7 @@ ngx_rtmp_access_inet(ngx_rtmp_session_t *s,
static ngx_int_t
ngx_rtmp_access_inet6(ngx_rtmp_session_t *s,
ngx_rtmp_app_conf_t *ascf,
ngx_rtmp_access_app_conf_t *ascf,
u_char *p, ngx_uint_t flag)
{
ngx_uint_t n;
@ -198,7 +198,7 @@ ngx_rtmp_access_inet6(ngx_rtmp_session_t *s,
}
if (flag & rule6[i].flags) {
return ngx_rtmp_access_found(r, rule6[i].deny);
return ngx_rtmp_access_found(s, rule6[i].deny);
}
next:
@ -251,11 +251,11 @@ ngx_rtmp_access(ngx_rtmp_session_t *s, ngx_uint_t flag)
addr += p[13] << 16;
addr += p[14] << 8;
addr += p[15];
return ngx_rtmp_access_inet(r, ascf, htonl(addr), flag);
return ngx_rtmp_access_inet(s, ascf, htonl(addr), flag);
}
if (ascf->rules6) {
return ngx_rtmp_access_inet6(r, ascf, p, flag);
return ngx_rtmp_access_inet6(s, ascf, p, flag);
}
#endif
@ -342,15 +342,15 @@ ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
case AF_INET6:
case 0: /* all */
if (cscf->rules6 == NULL) {
cscf->rules6 = ngx_array_create(cf->pool, 4,
if (ascf->rules6 == NULL) {
ascf->rules6 = ngx_array_create(cf->pool, 4,
sizeof(ngx_rtmp_access_rule6_t));
if (cscf->rules6 == NULL) {
if (ascf->rules6 == NULL) {
return NGX_CONF_ERROR;
}
}
rule6 = ngx_array_push(cscf->rules6);
rule6 = ngx_array_push(ascf->rules6);
if (rule6 == NULL) {
return NGX_CONF_ERROR;
}