cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IPv6: Nginx supportted ipv6, but not incloud bind to host.

This commit is contained in:
fengbojiang(姜凤波) 2019-08-09 17:48:41 +08:00
parent 35fdfcdb22
commit e064dbd16a
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/nginx-1.11.10/src/event/modules/ngx_ff_module.c
View File

@ -219,7 +219,7 @@ fstack_territory(int domain, int type, int protocol)
type &= ~SOCK_NONBLOCK; type &= ~SOCK_NONBLOCK;
type &= ~SOCK_FSTACK; type &= ~SOCK_FSTACK;
if ((AF_INET != domain) || (SOCK_STREAM != type && SOCK_DGRAM != type)) { if ((AF_INET != domain && AF_INET6 != domain) || (SOCK_STREAM != type && SOCK_DGRAM != type)) {
return 0; return 0;
} }
@ -231,14 +231,20 @@ socket(int domain, int type, int protocol)
{ {
int sock; int sock;
if (unlikely(inited == 0)) { if (unlikely(inited == 0)) {
if (AF_INET6 == domain)
domain = AF_INET6_LINUX;
return SYSCALL(socket)(domain, type, protocol); return SYSCALL(socket)(domain, type, protocol);
} }
if (unlikely(fstack_territory(domain, type, protocol) == 0)) { if (unlikely(fstack_territory(domain, type, protocol) == 0)) {
if (AF_INET6 == domain)
domain = AF_INET6_LINUX;
return SYSCALL(socket)(domain, type, protocol); return SYSCALL(socket)(domain, type, protocol);
} }
if (unlikely((type & SOCK_FSTACK) == 0)) { if (unlikely((type & SOCK_FSTACK) == 0)) {
if (AF_INET6 == domain)
domain = AF_INET6_LINUX;
return SYSCALL(socket)(domain, type, protocol); return SYSCALL(socket)(domain, type, protocol);
} }

8
app/nginx-1.16.0/src/event/modules/ngx_ff_module.c
View File

@ -219,7 +219,7 @@ fstack_territory(int domain, int type, int protocol)
type &= ~SOCK_NONBLOCK; type &= ~SOCK_NONBLOCK;
type &= ~SOCK_FSTACK; type &= ~SOCK_FSTACK;
if ((AF_INET != domain) || (SOCK_STREAM != type && SOCK_DGRAM != type)) { if ((AF_INET != domain && AF_INET6 != domain) || (SOCK_STREAM != type && SOCK_DGRAM != type)) {
return 0; return 0;
} }
@ -231,14 +231,20 @@ socket(int domain, int type, int protocol)
{ {
int sock; int sock;
if (unlikely(inited == 0)) { if (unlikely(inited == 0)) {
if (AF_INET6 == domain)
domain = AF_INET6_LINUX;
return SYSCALL(socket)(domain, type, protocol); return SYSCALL(socket)(domain, type, protocol);
} }
if (unlikely(fstack_territory(domain, type, protocol) == 0)) { if (unlikely(fstack_territory(domain, type, protocol) == 0)) {
if (AF_INET6 == domain)
domain = AF_INET6_LINUX;
return SYSCALL(socket)(domain, type, protocol); return SYSCALL(socket)(domain, type, protocol);
} }
if (unlikely((type & SOCK_FSTACK) == 0)) { if (unlikely((type & SOCK_FSTACK) == 0)) {
if (AF_INET6 == domain)
domain = AF_INET6_LINUX;
return SYSCALL(socket)(domain, type, protocol); return SYSCALL(socket)(domain, type, protocol);
} }