Pārlūkot izejas kodu

tor_accept_socket() should take tor_addr_t for listener arg

Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un"
Nick Mathewson 12 gadi atpakaļ
vecāks
revīzija
2b5a035604
3 mainītis faili ar 5 papildinājumiem un 2 dzēšanām
  1. 3 0
      changes/bug4535
  2. 1 1
      src/common/compat.c
  3. 1 1
      src/common/compat.h

+ 3 - 0
changes/bug4535

@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Use tor_socket_t type for listener argument to accept(). Fixes bug
+      4535; bugfix on 0.2.2.28-beta. Found by "troll_un".

+ 1 - 1
src/common/compat.c

@@ -934,7 +934,7 @@ tor_open_socket(int domain, int type, int protocol)
 
 /** As socket(), but counts the number of open sockets. */
 tor_socket_t
-tor_accept_socket(int sockfd, struct sockaddr *addr, socklen_t *len)
+tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len)
 {
   tor_socket_t s = accept(sockfd, addr, len);
   if (SOCKET_OK(s)) {

+ 1 - 1
src/common/compat.h

@@ -404,7 +404,7 @@ typedef int socklen_t;
 
 int tor_close_socket(tor_socket_t s);
 tor_socket_t tor_open_socket(int domain, int type, int protocol);
-tor_socket_t tor_accept_socket(int sockfd, struct sockaddr *addr,
+tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr,
                                   socklen_t *len);
 int get_n_open_sockets(void);