lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update the return values of socket.listen, also return the real port bind to zero (#1638)"

Browse Source 
This reverts commit c1eeba215d.
This commit is contained in:
Cloud Wu
2022-09-03 22:03:11 +08:00
parent 6dda5f7f98
commit 800a3376d6
10 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
skynet-src/skynet_socket.c
View File

@@ -127,7 +127,7 @@ skynet_socket_sendbuffer_lowpriority(struct skynet_context *ctx, struct socket_s
}
int
skynet_socket_listen(struct skynet_context *ctx, const char *host, int *port, int backlog) {
skynet_socket_listen(struct skynet_context *ctx, const char *host, int port, int backlog) {
uint32_t source = skynet_context_handle(ctx);
return socket_server_listen(SOCKET_SERVER, source, host, port, backlog);
}

2
skynet-src/skynet_socket.h
View File

@@ -29,7 +29,7 @@ void skynet_socket_updatetime();
int skynet_socket_sendbuffer(struct skynet_context *ctx, struct socket_sendbuffer *buffer);
int skynet_socket_sendbuffer_lowpriority(struct skynet_context *ctx, struct socket_sendbuffer *buffer);
int skynet_socket_listen(struct skynet_context *ctx, const char *host, int *port, int backlog);
int skynet_socket_listen(struct skynet_context *ctx, const char *host, int port, int backlog);
int skynet_socket_connect(struct skynet_context *ctx, const char *host, int port);
int skynet_socket_bind(struct skynet_context *ctx, int fd);
void skynet_socket_close(struct skynet_context *ctx, int id);

19
skynet-src/socket_server.c
View File

@@ -1936,7 +1936,7 @@ socket_server_shutdown(struct socket_server *ss, uintptr_t opaque, int id) {
// return -1 means failed
// or return AF_INET or AF_INET6
static int
do_bind(const char *host, int *port, int protocol, int *family) {
do_bind(const char *host, int port, int protocol, int *family) {
int fd;
int status;
int reuse = 1;
@@ -1946,7 +1946,7 @@ do_bind(const char *host, int *port, int protocol, int *family) {
if (host == NULL || host[0] == 0) {
host = "0.0.0.0"; // INADDR_ANY
}
sprintf(portstr, "%d", *port);
sprintf(portstr, "%d", port);
memset( &ai_hints, 0, sizeof( ai_hints ) );
ai_hints.ai_family = AF_UNSPEC;
if (protocol == IPPROTO_TCP) {
@@ -1973,15 +1973,6 @@ do_bind(const char *host, int *port, int protocol, int *family) {
if (status != 0)
goto _failed;
if (*port == 0) {
union sockaddr_all sa;
socklen_t len = sizeof(sa);
if (getsockname(fd, (struct sockaddr *)&sa, &len) == 0) {
*port = ntohs((*family == AF_INET) ? sa.v4.sin_port : sa.v6.sin6_port);
}
}
freeaddrinfo( ai_list );
return fd;
_failed:
@@ -1992,7 +1983,7 @@ _failed_fd:
}
static int
do_listen(const char * host, int *port, int backlog) {
do_listen(const char * host, int port, int backlog) {
int family = 0;
int listen_fd = do_bind(host, port, IPPROTO_TCP, &family);
if (listen_fd < 0) {
@@ -2005,8 +1996,8 @@ do_listen(const char * host, int *port, int backlog) {
return listen_fd;
}
int
socket_server_listen(struct socket_server *ss, uintptr_t opaque, const char * addr, int *port, int backlog) {
int
socket_server_listen(struct socket_server *ss, uintptr_t opaque, const char * addr, int port, int backlog) {
int fd = do_listen(addr, port, backlog);
if (fd < 0) {
return -1;

2
skynet-src/socket_server.h
View File

@@ -43,7 +43,7 @@ int socket_server_send(struct socket_server *, struct socket_sendbuffer *buffer)
int socket_server_send_lowpriority(struct socket_server *, struct socket_sendbuffer *buffer);
// ctrl command below returns id
int socket_server_listen(struct socket_server *, uintptr_t opaque, const char * addr, int *port, int backlog);
int socket_server_listen(struct socket_server *, uintptr_t opaque, const char * addr, int port, int backlog);
int socket_server_connect(struct socket_server *, uintptr_t opaque, const char * addr, int port);
int socket_server_bind(struct socket_server *, uintptr_t opaque, int fd);