Skip to content

network: Handle baraketed ipv6 addresses #11676

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
edsiper merged 2 commits into from
Apr 11, 2026
Merged

network: Handle baraketed ipv6 addresses #11676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b2be4c
network: Handle bracketed IPv6 addresses
cosmo0920 Apr 6, 2026
88795b1
tests: Add a test case for handling bracketed address
cosmo0920 Apr 6, 2026
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
54 changes: 51 additions & 3 deletions src/flb_network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1648,18 +1648,38 @@ flb_sockfd_t flb_net_server(const char *port, const char *listen_addr,
{
flb_sockfd_t fd = -1;
int ret;
size_t listen_addr_len;
struct addrinfo hints;
struct addrinfo *res, *rp;
const char *normalized_listen_addr;
char *listen_addr_copy;

listen_addr_copy = NULL;
normalized_listen_addr = listen_addr;

if (listen_addr != NULL && listen_addr[0] == '[') {
listen_addr_len = strlen(listen_addr);

if (listen_addr_len >= 3 && listen_addr[listen_addr_len - 1] == ']') {
listen_addr_copy = flb_strndup(listen_addr + 1, listen_addr_len - 2);
if (listen_addr_copy != NULL) {
normalized_listen_addr = listen_addr_copy;
}
}
}

memset(&hints, 0, sizeof hints);
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_PASSIVE;

ret = getaddrinfo(listen_addr, port, &hints, &res);
ret = getaddrinfo(normalized_listen_addr, port, &hints, &res);
if (ret != 0) {
flb_warn("net_server: getaddrinfo(listen='%s:%s'): %s",
listen_addr, port, gai_strerror(ret));
if (listen_addr_copy != NULL) {
flb_free(listen_addr_copy);
}
return -1;
}

Expand Down Expand Up @@ -1687,6 +1707,10 @@ flb_sockfd_t flb_net_server(const char *port, const char *listen_addr,
}
freeaddrinfo(res);

if (listen_addr_copy != NULL) {
flb_free(listen_addr_copy);
}

if (rp == NULL) {
return -1;
}
Expand All @@ -1698,18 +1722,38 @@ flb_sockfd_t flb_net_server_udp(const char *port, const char *listen_addr, int s
{
flb_sockfd_t fd = -1;
int ret;
size_t listen_addr_len;
struct addrinfo hints;
struct addrinfo *res, *rp;
const char *normalized_listen_addr;
char *listen_addr_copy;

listen_addr_copy = NULL;
normalized_listen_addr = listen_addr;

if (listen_addr != NULL && listen_addr[0] == '[') {
listen_addr_len = strlen(listen_addr);

if (listen_addr_len >= 3 && listen_addr[listen_addr_len - 1] == ']') {
listen_addr_copy = flb_strndup(listen_addr + 1, listen_addr_len - 2);
if (listen_addr_copy != NULL) {
normalized_listen_addr = listen_addr_copy;
}
}
}

memset(&hints, 0, sizeof hints);
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM;
hints.ai_flags = AI_PASSIVE;

ret = getaddrinfo(listen_addr, port, &hints, &res);
ret = getaddrinfo(normalized_listen_addr, port, &hints, &res);
if (ret != 0) {
flb_warn("net_server_udp: getaddrinfo(listen='%s:%s'): %s",
listen_addr, port, gai_strerror(ret));
if (listen_addr_copy != NULL) {
flb_free(listen_addr_copy);
}
return -1;
}

Expand All @@ -1734,6 +1778,10 @@ flb_sockfd_t flb_net_server_udp(const char *port, const char *listen_addr, int s
}
freeaddrinfo(res);

if (listen_addr_copy != NULL) {
flb_free(listen_addr_copy);
}

if (rp == NULL) {
return -1;
}
Expand Down Expand Up @@ -2344,4 +2392,4 @@ uint64_t flb_net_htonll(uint64_t value)
#else
return value;
#endif
}
}
23 changes: 23 additions & 0 deletions tests/internal/network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#define TEST_HOSTv4 "127.0.0.1"
#define TEST_HOSTv6 "::1"
#define TEST_HOSTv6_BRACKETED "[::1]"
#define TEST_PORT "41322"

#define TEST_EV_CLIENT MK_EVENT_NOTIFICATION
Expand Down Expand Up @@ -159,8 +160,30 @@ void test_ipv6_client_server()
test_client_server(FLB_TRUE);
}

void test_ipv6_bracketed_listen()
{
flb_sockfd_t fd_server;

errno = 0;
fd_server = flb_net_server(TEST_PORT, TEST_HOSTv6_BRACKETED,
FLB_NETWORK_DEFAULT_BACKLOG_SIZE,
FLB_FALSE);

if (fd_server == -1 && errno == EAFNOSUPPORT) {
TEST_MSG("This protocol is not supported in this platform");
return;
}

TEST_CHECK(fd_server != -1);

if (fd_server != -1) {
flb_socket_close(fd_server);
}
}

TEST_LIST = {
{ "ipv4_client_server", test_ipv4_client_server},
{ "ipv6_client_server", test_ipv6_client_server},
{ "ipv6_bracketed_listen", test_ipv6_bracketed_listen},
{ 0 }
};
Loading