Skip to content

Sockets refactoring 2026 #21365

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
devnexen merged 5 commits into from
Mar 7, 2026
+6 −21
Merged

Sockets refactoring 2026 #21365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43b5948
ext/sockets: internal refactorings.
devnexen Mar 6, 2026
db9523e
simplify php_open_listen_sock.
devnexen Mar 6, 2026
3f21f7c
remove redundant memsets in conversions.
devnexen Mar 6, 2026
fe7061d
fix windows test, all pass on unixes.
devnexen Mar 6, 2026
8c75457
feedback.
devnexen Mar 7, 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
7 changes: 2 additions & 5 deletions ext/sockets/conversions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,6 @@ static void to_zval_read_sin_addr(const char *data, zval *zv, res_context *ctx)
const struct in_addr *addr = (const struct in_addr *)data;
socklen_t size = INET_ADDRSTRLEN;
zend_string *str = zend_string_alloc(size - 1, 0);
memset(ZSTR_VAL(str), '\0', size);

ZVAL_NEW_STR(zv, str);

Expand All @@ -581,7 +580,7 @@ static void to_zval_read_sin_addr(const char *data, zval *zv, res_context *ctx)
return;
}

Z_STRLEN_P(zv) = strlen(Z_STRVAL_P(zv));
Z_STR_P(zv) = zend_string_truncate(Z_STR_P(zv), strlen(Z_STRVAL_P(zv)), 0);
}
static const field_descriptor descriptors_sockaddr_in[] = {
{"family", sizeof("family"), false, offsetof(struct sockaddr_in, sin_family), from_zval_write_sa_family, to_zval_read_sa_family},
Expand Down Expand Up @@ -622,8 +621,6 @@ static void to_zval_read_sin6_addr(const char *data, zval *zv, res_context *ctx)
socklen_t size = INET6_ADDRSTRLEN;
zend_string *str = zend_string_alloc(size - 1, 0);

memset(ZSTR_VAL(str), '\0', size);

ZVAL_NEW_STR(zv, str);

if (inet_ntop(AF_INET6, addr, Z_STRVAL_P(zv), size) == NULL) {
Expand All @@ -632,7 +629,7 @@ static void to_zval_read_sin6_addr(const char *data, zval *zv, res_context *ctx)
return;
}

Z_STRLEN_P(zv) = strlen(Z_STRVAL_P(zv));
Z_STR_P(zv) = zend_string_truncate(Z_STR_P(zv), strlen(Z_STRVAL_P(zv)), 0);
}
static const field_descriptor descriptors_sockaddr_in6[] = {
{"family", sizeof("family"), false, offsetof(struct sockaddr_in6, sin6_family), from_zval_write_sa_family, to_zval_read_sa_family},
Expand Down
18 changes: 3 additions & 15 deletions ext/sockets/sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,18 +244,9 @@ ZEND_GET_MODULE(sockets)
static bool php_open_listen_sock(php_socket *sock, unsigned short port, int backlog) /* {{{ */
{
struct sockaddr_in la = {0};
struct hostent *hp;

#ifndef PHP_WIN32
if ((hp = php_network_gethostbyname("0.0.0.0")) == NULL) {
#else
if ((hp = php_network_gethostbyname("localhost")) == NULL) {
#endif
return false;
}

memcpy((char *) &la.sin_addr, hp->h_addr, hp->h_length);
la.sin_family = hp->h_addrtype;
la.sin_addr.s_addr = htonl(INADDR_ANY);
la.sin_family = AF_INET;
la.sin_port = htons(port);

sock->bsd_socket = socket(PF_INET, SOCK_STREAM, 0);
Expand Down Expand Up @@ -1249,8 +1240,6 @@ PHP_FUNCTION(socket_connect)
RETURN_THROWS();
}

memset(&sin6, 0, sizeof(struct sockaddr_in6));

sin6.sin6_family = AF_INET6;
sin6.sin6_port = htons((unsigned short int)port);

Expand Down Expand Up @@ -1629,7 +1618,6 @@ PHP_FUNCTION(socket_recvfrom)
ZSTR_LEN(recv_buf) = retval;
ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0';

memset(addrbuf, 0, INET6_ADDRSTRLEN);
inet_ntop(AF_INET6, &sin6.sin6_addr, addrbuf, sizeof(addrbuf));

ZEND_TRY_ASSIGN_REF_NEW_STR(arg2, recv_buf);
Expand Down Expand Up @@ -1732,7 +1720,7 @@ PHP_FUNCTION(socket_sendto)
}

s_un.sun_family = AF_UNIX;
snprintf(s_un.sun_path, sizeof(s_un.sun_path), "%s", ZSTR_VAL(addr));
memcpy(s_un.sun_path, ZSTR_VAL(addr), ZSTR_LEN(addr) + 1);

retval = sendto(php_sock->bsd_socket, buf, ((size_t)len > buf_len) ? buf_len : (size_t)len, flags, (struct sockaddr *) &s_un, SUN_LEN(&s_un));
break;
Expand Down
2 changes: 1 addition & 1 deletion ext/sockets/tests/socket_create_listen-win32.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ socket_getsockname($sock, $addr, $port);
var_dump($addr, $port);
?>
--EXPECT--
string(9) "127.0.0.1"
string(7) "0.0.0.0"
int(31338)
--CREDITS--
Till Klampaeckel, till@php.net
Expand Down
Loading