Skip to content

f-stack socket options #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfb8856606 merged 1 commit into from
Sep 16, 2025
Merged

f-stack socket options #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions app/nginx-1.25.2/src/event/ngx_event_connect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,31 +386,22 @@ ngx_event_connect_set_transparent(ngx_peer_connection_t *pc, ngx_socket_t s)

case AF_INET:

#if defined(NGX_HAVE_FSTACK)
/****
FreeBSD define IP_BINDANY in freebsd/netinet/in.h
Fstack should only support IP_BINDANY.
****/
if(is_fstack_fd(s)){
optname = IP_BINDANY;
} else {
optname = IP_TRANSPARENT;
}

if (setsockopt(s, IPPROTO_IP, optname,
#if defined(IP_TRANSPARENT)
if (setsockopt(s, IPPROTO_IP, IP_TRANSPARENT,
(const void *) &value, sizeof(int)) == -1)
{
ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
"setsockopt(IP_BINDANY/IP_TRANSPARENT) failed");
"setsockopt(IP_TRANSPARENT) failed");
return NGX_ERROR;
}

#elif defined(IP_TRANSPARENT)
if (setsockopt(s, IPPROTO_IP, IP_TRANSPARENT,
#elif defined(IP_BINDANY)

if (setsockopt(s, IPPROTO_IP, IP_BINDANY,
(const void *) &value, sizeof(int)) == -1)
{
ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
"setsockopt(IP_TRANSPARENT) failed");
"setsockopt(IP_BINDANY) failed");
return NGX_ERROR;
}

Expand Down
23 changes: 7 additions & 16 deletions app/nginx-1.28.0/src/event/ngx_event_connect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,31 +386,22 @@ ngx_event_connect_set_transparent(ngx_peer_connection_t *pc, ngx_socket_t s)

case AF_INET:

#if defined(NGX_HAVE_FSTACK)
/****
FreeBSD define IP_BINDANY in freebsd/netinet/in.h
Fstack should only support IP_BINDANY.
****/
if(is_fstack_fd(s)){
optname = IP_BINDANY;
} else {
optname = IP_TRANSPARENT;
}

if (setsockopt(s, IPPROTO_IP, optname,
#if defined(IP_TRANSPARENT)
if (setsockopt(s, IPPROTO_IP, IP_TRANSPARENT,
(const void *) &value, sizeof(int)) == -1)
{
ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
"setsockopt(IP_BINDANY/IP_TRANSPARENT) failed");
"setsockopt(IP_TRANSPARENT) failed");
return NGX_ERROR;
}

#elif defined(IP_TRANSPARENT)
if (setsockopt(s, IPPROTO_IP, IP_TRANSPARENT,
#elif defined(IP_BINDANY)

if (setsockopt(s, IPPROTO_IP, IP_BINDANY,
(const void *) &value, sizeof(int)) == -1)
{
ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
"setsockopt(IP_TRANSPARENT) failed");
"setsockopt(IP_BINDANY) failed");
return NGX_ERROR;
}

Expand Down
12 changes: 12 additions & 0 deletions lib/ff_syscall_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@

#define LINUX_IPV6_V6ONLY 26
#define LINUX_IPV6_RECVPKTINFO 49
#define LINUX_IPV6_PKTINFO 50
#define LINUX_IPV6_TRANSPARENT 75

#define LINUX_TCP_NODELAY 1
Expand Down Expand Up @@ -807,6 +808,17 @@ linux2freebsd_cmsg(const struct linux_msghdr *linux_msg, struct msghdr *freebsd_
break;
}

break;
case IPPROTO_IPV6:
switch (linux_cmsg->cmsg_type) {
case LINUX_IPV6_PKTINFO:
freebsd_cmsg->cmsg_type = IPV6_PKTINFO;
*freebsd_optval = *(struct in6_pktinfo *)linux_optval;
break;
default:
memcpy(freebsd_optval, linux_optval, linux_cmsg->cmsg_len - sizeof(struct linux_cmsghdr));
break;
}
break;
default:
memcpy(freebsd_optval, linux_optval, linux_cmsg->cmsg_len - sizeof(struct linux_cmsghdr));
Expand Down
Loading