edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 17:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8709 from Robyt3/Network-Socket-Init-Cleanup-Fix

Browse source 
Fix UDP socket creation/cleanup if opening IPv6 socket fails
This commit is contained in:
Dennis Felsing 2024-08-11 22:11:42 +00:00 committed by GitHub
parent afd1bd9cde 570c2c857a
commit c5ab4def3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/base/system.cpp
View file

@ -1548,24 +1548,21 @@ NETSOCKET net_udp_create(NETADDR bindaddr)
{ {
NETSOCKET sock = (NETSOCKET_INTERNAL *)malloc(sizeof(*sock)); NETSOCKET sock = (NETSOCKET_INTERNAL *)malloc(sizeof(*sock));
*sock = invalid_socket; *sock = invalid_socket;
NETADDR tmpbindaddr = bindaddr;
int broadcast = 1;
int socket = -1;
if(bindaddr.type & NETTYPE_IPV4) if(bindaddr.type & NETTYPE_IPV4)
{ {
struct sockaddr_in addr; struct sockaddr_in addr;
NETADDR tmpbindaddr = bindaddr;
/* bind, we should check for error */
tmpbindaddr.type = NETTYPE_IPV4; tmpbindaddr.type = NETTYPE_IPV4;
netaddr_to_sockaddr_in(&tmpbindaddr, &addr); netaddr_to_sockaddr_in(&tmpbindaddr, &addr);
socket = priv_net_create_socket(AF_INET, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr)); int socket = priv_net_create_socket(AF_INET, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr));
if(socket >= 0) if(socket >= 0)
{ {
sock->type |= NETTYPE_IPV4; sock->type |= NETTYPE_IPV4;
sock->ipv4sock = socket; sock->ipv4sock = socket;
/* set broadcast */ /* set broadcast */
int broadcast = 1;
if(setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (const char *)&broadcast, sizeof(broadcast)) != 0) if(setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (const char *)&broadcast, sizeof(broadcast)) != 0)
{ {
dbg_msg("socket", "Setting BROADCAST on ipv4 failed: %d", net_errno()); dbg_msg("socket", "Setting BROADCAST on ipv4 failed: %d", net_errno());
@ -1581,17 +1578,15 @@ NETSOCKET net_udp_create(NETADDR bindaddr)
} }
} }
} }
#if defined(CONF_WEBSOCKETS) #if defined(CONF_WEBSOCKETS)
if(bindaddr.type & NETTYPE_WEBSOCKET_IPV4) if(bindaddr.type & NETTYPE_WEBSOCKET_IPV4)
{ {
char addr_str[NETADDR_MAXSTRSIZE]; char addr_str[NETADDR_MAXSTRSIZE];
NETADDR tmpbindaddr = bindaddr;
/* bind, we should check for error */
tmpbindaddr.type = NETTYPE_WEBSOCKET_IPV4; tmpbindaddr.type = NETTYPE_WEBSOCKET_IPV4;
net_addr_str(&tmpbindaddr, addr_str, sizeof(addr_str), 0); net_addr_str(&tmpbindaddr, addr_str, sizeof(addr_str), 0);
socket = websocket_create(addr_str, tmpbindaddr.port); int socket = websocket_create(addr_str, tmpbindaddr.port);
if(socket >= 0) if(socket >= 0)
{ {
sock->type |= NETTYPE_WEBSOCKET_IPV4; sock->type |= NETTYPE_WEBSOCKET_IPV4;
@ -1603,17 +1598,17 @@ NETSOCKET net_udp_create(NETADDR bindaddr)
if(bindaddr.type & NETTYPE_IPV6) if(bindaddr.type & NETTYPE_IPV6)
{ {
struct sockaddr_in6 addr; struct sockaddr_in6 addr;
NETADDR tmpbindaddr = bindaddr;
/* bind, we should check for error */
tmpbindaddr.type = NETTYPE_IPV6; tmpbindaddr.type = NETTYPE_IPV6;
netaddr_to_sockaddr_in6(&tmpbindaddr, &addr); netaddr_to_sockaddr_in6(&tmpbindaddr, &addr);
socket = priv_net_create_socket(AF_INET6, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr)); int socket = priv_net_create_socket(AF_INET6, SOCK_DGRAM, (struct sockaddr *)&addr, sizeof(addr));
if(socket >= 0) if(socket >= 0)
{ {
sock->type |= NETTYPE_IPV6; sock->type |= NETTYPE_IPV6;
sock->ipv6sock = socket; sock->ipv6sock = socket;
/* set broadcast */ /* set broadcast */
int broadcast = 1;
if(setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (const char *)&broadcast, sizeof(broadcast)) != 0) if(setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (const char *)&broadcast, sizeof(broadcast)) != 0)
{ {
dbg_msg("socket", "Setting BROADCAST on ipv6 failed: %d", net_errno()); dbg_msg("socket", "Setting BROADCAST on ipv6 failed: %d", net_errno());
@ -1633,20 +1628,17 @@ NETSOCKET net_udp_create(NETADDR bindaddr)
} }
} }
if(socket < 0) if(sock->type == NETTYPE_INVALID)
{ {
free(sock); free(sock);
sock = nullptr; sock = nullptr;
} }
else else
{ {
/* set non-blocking */
net_set_non_blocking(sock); net_set_non_blocking(sock);
net_buffer_init(&sock->buffer); net_buffer_init(&sock->buffer);
} }
/* return */
return sock; return sock;
} }
@ -1862,17 +1854,14 @@ NETSOCKET net_tcp_create(NETADDR bindaddr)
{ {
NETSOCKET sock = (NETSOCKET_INTERNAL *)malloc(sizeof(*sock)); NETSOCKET sock = (NETSOCKET_INTERNAL *)malloc(sizeof(*sock));
*sock = invalid_socket; *sock = invalid_socket;
NETADDR tmpbindaddr = bindaddr;
int socket4 = -1;
if(bindaddr.type & NETTYPE_IPV4) if(bindaddr.type & NETTYPE_IPV4)
{ {
struct sockaddr_in addr; struct sockaddr_in addr;
NETADDR tmpbindaddr = bindaddr;
/* bind, we should check for error */
tmpbindaddr.type = NETTYPE_IPV4; tmpbindaddr.type = NETTYPE_IPV4;
netaddr_to_sockaddr_in(&tmpbindaddr, &addr); netaddr_to_sockaddr_in(&tmpbindaddr, &addr);
socket4 = priv_net_create_socket(AF_INET, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr)); int socket4 = priv_net_create_socket(AF_INET, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr));
if(socket4 >= 0) if(socket4 >= 0)
{ {
sock->type |= NETTYPE_IPV4; sock->type |= NETTYPE_IPV4;
@ -1880,15 +1869,13 @@ NETSOCKET net_tcp_create(NETADDR bindaddr)
} }
} }
int socket6 = -1;
if(bindaddr.type & NETTYPE_IPV6) if(bindaddr.type & NETTYPE_IPV6)
{ {
struct sockaddr_in6 addr; struct sockaddr_in6 addr;
NETADDR tmpbindaddr = bindaddr;
/* bind, we should check for error */
tmpbindaddr.type = NETTYPE_IPV6; tmpbindaddr.type = NETTYPE_IPV6;
netaddr_to_sockaddr_in6(&tmpbindaddr, &addr); netaddr_to_sockaddr_in6(&tmpbindaddr, &addr);
socket6 = priv_net_create_socket(AF_INET6, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr)); int socket6 = priv_net_create_socket(AF_INET6, SOCK_STREAM, (struct sockaddr *)&addr, sizeof(addr));
if(socket6 >= 0) if(socket6 >= 0)
{ {
sock->type |= NETTYPE_IPV6; sock->type |= NETTYPE_IPV6;
@ -1896,13 +1883,12 @@ NETSOCKET net_tcp_create(NETADDR bindaddr)
} }
} }
if(socket4 < 0 && socket6 < 0) if(sock->type == NETTYPE_INVALID)
{ {
free(sock); free(sock);
sock = nullptr; sock = nullptr;
} }
/* return */
return sock; return sock;
} }