Commit 2b5a0356 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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"
parent b7015603

changes/bug4535

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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".

src/common/compat.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

src/common/compat.h

+1 −1
Original line number Diff line number Diff line
@@ -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);