Display and control your Android device
Rename net_listen() parameter
Romain Vimontd19606eb0cd5
diff --git a/app/src/util/net.c b/app/src/util/net.cindex e5f84676..ed4882cd 100644--- a/app/src/util/net.c+++ b/app/src/util/net.c@@ -159,8 +159,8 @@ net_connect(sc_socket socket, uint32_t addr, uint16_t port) {}bool-net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog) {- sc_raw_socket raw_sock = unwrap(socket);+net_listen(sc_socket server_socket, uint32_t addr, uint16_t port, int backlog) {+ sc_raw_socket raw_sock = unwrap(server_socket);int reuse = 1;if (setsockopt(raw_sock, SOL_SOCKET, SO_REUSEADDR, (const void *) &reuse,diff --git a/app/src/util/net.h b/app/src/util/net.hindex 801bdeaf..21396882 100644--- a/app/src/util/net.h+++ b/app/src/util/net.h@@ -39,7 +39,7 @@ boolnet_connect(sc_socket socket, uint32_t addr, uint16_t port);bool-net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog);+net_listen(sc_socket server_socket, uint32_t addr, uint16_t port, int backlog);sc_socketnet_accept(sc_socket server_socket);diff --git a/app/src/util/net_intr.c b/app/src/util/net_intr.cindex bb70010b..55286af6 100644--- a/app/src/util/net_intr.c+++ b/app/src/util/net_intr.c@@ -15,14 +15,14 @@ net_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,}bool-net_listen_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,+net_listen_intr(struct sc_intr *intr, sc_socket server_socket, uint32_t addr,uint16_t port, int backlog) {- if (!sc_intr_set_socket(intr, socket)) {+ if (!sc_intr_set_socket(intr, server_socket)) {// Already interruptedreturn false;}- bool ret = net_listen(socket, addr, port, backlog);+ bool ret = net_listen(server_socket, addr, port, backlog);sc_intr_set_socket(intr, SC_SOCKET_NONE);return ret;diff --git a/app/src/util/net_intr.h b/app/src/util/net_intr.hindex a83fadda..dbef528d 100644--- a/app/src/util/net_intr.h+++ b/app/src/util/net_intr.h@@ -11,7 +11,7 @@ net_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,uint16_t port);bool-net_listen_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,+net_listen_intr(struct sc_intr *intr, sc_socket server_socket, uint32_t addr,uint16_t port, int backlog);sc_socket