luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win: allow setting udp socket options before bind

Browse Source 
Unix allows socket options to be set prior to binding. This
commit aligns Windows with this behavior.

Refs: https://github.com/joyent/libuv/issues/1205
Refs: https://github.com/joyent/libuv/pull/1270
Fixes: https://github.com/libuv/libuv/issues/1842
PR-URL: https://github.com/libuv/libuv/pull/1861
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
This commit is contained in:
cjihrig 2018-06-02 23:08:10 -04:00
parent a4623c7392
commit 0c28363059
No known key found for this signature in database
GPG Key ID: 7434390BDBE9B9C5
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/win/udp.c
View File

@ -741,7 +741,7 @@ int uv_udp_set_multicast_interface(uv_udp_t* handle, const char* interface_addr)
return UV_EINVAL;
}
if (!(handle->flags & UV_HANDLE_BOUND))
if (handle->socket == INVALID_SOCKET)
return UV_EBADF;
if (addr_st.ss_family == AF_INET) {
@ -772,7 +772,7 @@ int uv_udp_set_multicast_interface(uv_udp_t* handle, const char* interface_addr)
int uv_udp_set_broadcast(uv_udp_t* handle, int value) {
BOOL optval = (BOOL) value;
if (!(handle->flags & UV_HANDLE_BOUND))
if (handle->socket == INVALID_SOCKET)
return UV_EBADF;
if (setsockopt(handle->socket,
@ -818,7 +818,7 @@ int uv_udp_open(uv_udp_t* handle, uv_os_sock_t sock) {
return UV_EINVAL; \
} \
\
if (!(handle->flags & UV_HANDLE_BOUND)) \
if (handle->socket == INVALID_SOCKET) \
return UV_EBADF; \
\
if (!(handle->flags & UV_HANDLE_IPV6)) { \

19
test/test-udp-options.c
View File

@ -114,9 +114,11 @@ TEST_IMPL(udp_options6) {
TEST_IMPL(udp_no_autobind) {
uv_loop_t* loop;
uv_udp_t h;
uv_udp_t h2;
loop = uv_default_loop();
/* Test a lazy initialized socket. */
ASSERT(0 == uv_udp_init(loop, &h));
ASSERT(UV_EBADF == uv_udp_set_multicast_ttl(&h, 32));
ASSERT(UV_EBADF == uv_udp_set_broadcast(&h, 1));
@ -130,6 +132,23 @@ TEST_IMPL(udp_no_autobind) {
uv_close((uv_handle_t*) &h, NULL);
/* Test a non-lazily initialized socket. */
ASSERT(0 == uv_udp_init_ex(loop, &h2, AF_INET));
ASSERT(0 == uv_udp_set_multicast_ttl(&h2, 32));
ASSERT(0 == uv_udp_set_broadcast(&h2, 1));
#if defined(__MVS__)
/* zOS only supports setting ttl for IPv6 sockets. */
ASSERT(UV_ENOTSUP == uv_udp_set_ttl(&h2, 1));
#else
ASSERT(0 == uv_udp_set_ttl(&h2, 1));
#endif
ASSERT(0 == uv_udp_set_multicast_loop(&h2, 1));
ASSERT(0 == uv_udp_set_multicast_interface(&h2, "0.0.0.0"));
uv_close((uv_handle_t*) &h2, NULL);
ASSERT(0 == uv_run(loop, UV_RUN_DEFAULT));
MAKE_VALGRIND_HAPPY();