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

fix uv_getsockname for listening socket

Browse Source
This commit is contained in:
Henry Rawas 2011-07-12 10:32:15 -07:00 committed by Ben Noordhuis
parent 6b32ebc54f
commit 6a67b51b4c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/uv-win.c
View File

@ -1385,11 +1385,6 @@ int uv_tcp_connect6(uv_req_t* req, struct sockaddr_in6 addr) {
int uv_getsockname(uv_tcp_t* handle, struct sockaddr* name, int* namelen) { int uv_getsockname(uv_tcp_t* handle, struct sockaddr* name, int* namelen) {
int result; int result;
if (!(handle->flags & UV_HANDLE_CONNECTION)) {
uv_set_sys_error(WSAEINVAL);
return -1;
}
if (handle->flags & UV_HANDLE_SHUTTING) { if (handle->flags & UV_HANDLE_SHUTTING) {
uv_set_sys_error(WSAESHUTDOWN); uv_set_sys_error(WSAESHUTDOWN);
return -1; return -1;

13
test/test-getsockname.c
View File

@ -91,7 +91,7 @@ static void on_connection(uv_handle_t* server, int status) {
status = uv_getsockname((uv_tcp_t*)handle, &sockname, &namelen); status = uv_getsockname((uv_tcp_t*)handle, &sockname, &namelen);
if (status != 0) { if (status != 0) {
fprintf(stderr, "uv_getsockname error (listener) %d\n", uv_last_error().code); fprintf(stderr, "uv_getsockname error (accepted) %d\n", uv_last_error().code);
} }
ASSERT(status == 0); ASSERT(status == 0);
@ -122,6 +122,8 @@ static void* on_connect(void* req) {
static int tcp_listener(int port) { static int tcp_listener(int port) {
struct sockaddr_in addr = uv_ip4_addr("0.0.0.0", port); struct sockaddr_in addr = uv_ip4_addr("0.0.0.0", port);
struct sockaddr sockname;
int namelen = sizeof(sockname);
int r; int r;
r = uv_tcp_init(&tcpServer); r = uv_tcp_init(&tcpServer);
@ -142,6 +144,13 @@ static int tcp_listener(int port) {
return 1; return 1;
} }
r = uv_getsockname(&tcpServer, &sockname, &namelen);
if (r != 0) {
fprintf(stderr, "uv_getsockname error (listening) %d\n", uv_last_error().code);
}
ASSERT(r == 0);
getsocknamecount++;
return 0; return 0;
} }
@ -171,7 +180,7 @@ TEST_IMPL(getsockname) {
uv_run(); uv_run();
ASSERT(getsocknamecount == 2); ASSERT(getsocknamecount == 3);
return 0; return 0;
} }