Skip to content
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

Jump to bottom

Fallback to IPv4 when creating socket if IPv6 is not available (#1208) #1265

Merged
merged 1 commit into from
Aug 5, 2023
Merged

Fallback to IPv4 when creating socket if IPv6 is not available (#1208) #1265

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
46 changes: 27 additions & 19 deletions src/utils/fluid_sys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,12 +1606,12 @@ fluid_server_socket_t *
new_fluid_server_socket(int port, fluid_server_func_t func, void *data)
{
fluid_server_socket_t *server_socket;
struct sockaddr_in addr4;
#ifdef IPV6_SUPPORT
struct sockaddr_in6 addr;
#else
struct sockaddr_in addr;
struct sockaddr_in6 addr6;
#endif

const struct sockaddr *addr;
size_t addr_size;
fluid_socket_t sock;

fluid_return_val_if_fail(func != NULL, NULL);
Expand All @@ -1621,23 +1621,37 @@ new_fluid_server_socket(int port, fluid_server_func_t func, void *data)
return NULL;
}

FLUID_MEMSET(&addr4, 0, sizeof(addr4));
addr4.sin_family = AF_INET;
addr4.sin_port = htons((uint16_t)port);
addr4.sin_addr.s_addr = htonl(INADDR_ANY);

#ifdef IPV6_SUPPORT
FLUID_MEMSET(&addr6, 0, sizeof(addr6));
addr6.sin6_family = AF_INET6;
addr6.sin6_port = htons((uint16_t)port);
addr6.sin6_addr = in6addr_any;
#endif

#ifdef IPV6_SUPPORT
sock = socket(AF_INET6, SOCK_STREAM, 0);
addr = (const struct sockaddr *) &addr6;
addr_size = sizeof(addr6);

if(sock == INVALID_SOCKET)
{
FLUID_LOG(FLUID_ERR, "Failed to create server socket: %d", fluid_socket_get_error());
fluid_socket_cleanup();
return NULL;
FLUID_LOG(FLUID_WARN, "Failed to create IPv6 server socket: %d (will try with IPv4)", fluid_socket_get_error());

sock = socket(AF_INET, SOCK_STREAM, 0);
addr = (const struct sockaddr *) &addr4;
addr_size = sizeof(addr4);
}

FLUID_MEMSET(&addr, 0, sizeof(addr));
addr.sin6_family = AF_INET6;
addr.sin6_port = htons((uint16_t)port);
addr.sin6_addr = in6addr_any;
#else

sock = socket(AF_INET, SOCK_STREAM, 0);
addr = (const struct sockaddr *) &addr4;
addr_size = sizeof(addr4);
#endif

if(sock == INVALID_SOCKET)
{
Expand All @@ -1646,13 +1660,7 @@ new_fluid_server_socket(int port, fluid_server_func_t func, void *data)
return NULL;
}

FLUID_MEMSET(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_port = htons((uint16_t)port);
addr.sin_addr.s_addr = htonl(INADDR_ANY);
#endif

if(bind(sock, (const struct sockaddr *) &addr, sizeof(addr)) == SOCKET_ERROR)
if(bind(sock, addr, addr_size) == SOCKET_ERROR)
{
FLUID_LOG(FLUID_ERR, "Failed to bind server socket: %d", fluid_socket_get_error());
fluid_socket_close(sock);
Expand Down
Loading