gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge c0b20f2a78 into e5f79e487b

Browse Source
This commit is contained in:
Alois Klink 2026-01-22 19:18:58 +00:00 committed by GitHub
commit d1d9a7e6a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/src/misc.rst
View File

@ -429,16 +429,20 @@ API
.. note::
Returns [0,0,0] on Windows (i.e., it's not implemented).
.. c:function:: int uv_ip4_addr(const char* ip, int port, struct sockaddr_in* addr)
.. c:function:: int uv_ip4_addr(const char* ip, unsigned short port, struct sockaddr_in* addr)
Convert a string containing an IPv4 addresses to a binary structure.
.. c:function:: int uv_ip6_addr(const char* ip, int port, struct sockaddr_in6* addr)
.. versionchanged:: 2.0.0 now `port` is a `unsigned short` instead
of an `int`.
.. c:function:: int uv_ip6_addr(const char* ip, unsigned short port, struct sockaddr_in6* addr)
Convert a string containing an IPv6 addresses to a binary structure.
.. versionchanged:: 2.0.0: :man:`if_nametoindex(3)` errors are no longer
ignored on Unix platforms.
`port` is a `unsigned short` instead of an `int`.
.. c:function:: int uv_ip4_name(const struct sockaddr_in* src, char* dst, size_t size)

4
include/uv.h
View File

@ -1854,8 +1854,8 @@ UV_EXTERN int uv_fs_event_getpath(uv_fs_event_t* handle,
char* buffer,
size_t* size);
UV_EXTERN int uv_ip4_addr(const char* ip, int port, struct sockaddr_in* addr);
UV_EXTERN int uv_ip6_addr(const char* ip, int port, struct sockaddr_in6* addr);
UV_EXTERN int uv_ip4_addr(const char* ip, unsigned short port, struct sockaddr_in* addr);
UV_EXTERN int uv_ip6_addr(const char* ip, unsigned short port, struct sockaddr_in6* addr);
UV_EXTERN int uv_ip4_name(const struct sockaddr_in* src, char* dst, size_t size);
UV_EXTERN int uv_ip6_name(const struct sockaddr_in6* src, char* dst, size_t size);

4
src/uv-common.c
View File

@ -252,7 +252,7 @@ const char* uv_strerror(int err) {
#undef UV_STRERROR_GEN
int uv_ip4_addr(const char* ip, int port, struct sockaddr_in* addr) {
int uv_ip4_addr(const char* ip, unsigned short port, struct sockaddr_in* addr) {
memset(addr, 0, sizeof(*addr));
addr->sin_family = AF_INET;
addr->sin_port = htons(port);
@ -263,7 +263,7 @@ int uv_ip4_addr(const char* ip, int port, struct sockaddr_in* addr) {
}
int uv_ip6_addr(const char* ip, int port, struct sockaddr_in6* addr) {
int uv_ip6_addr(const char* ip, unsigned short port, struct sockaddr_in6* addr) {
char address_part[40];
size_t address_part_size;
const char* zone_index;

6
test/echo-server.c
View File

@ -248,7 +248,7 @@ static void on_recv(uv_udp_t* handle,
ASSERT_LE(0, uv_udp_send(req, handle, &sndbuf, 1, addr, on_send));
}
static int tcp4_echo_start(int port) {
static int tcp4_echo_start(unsigned short port) {
struct sockaddr_in addr;
int r;
@ -282,7 +282,7 @@ static int tcp4_echo_start(int port) {
}
static int tcp6_echo_start(int port) {
static int tcp6_echo_start(unsigned short port) {
struct sockaddr_in6 addr6;
int r;
@ -317,7 +317,7 @@ static int tcp6_echo_start(int port) {
}
static int udp4_echo_start(int port) {
static int udp4_echo_start(unsigned short port) {
struct sockaddr_in addr;
int r;

2
test/test-getnameinfo.c
View File

@ -28,7 +28,7 @@
static const char* address_ip4 = "127.0.0.1";
static const char* address_ip6 = "::1";
static const int port = 80;
static const unsigned short port = 80;
static struct sockaddr_in addr4;
static struct sockaddr_in6 addr6;