mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 20:33:31 +01:00
parent
f5820a1bf1
commit
d25e77f2c3
@ -941,7 +941,7 @@ connection_listener_new(const struct sockaddr *listensockaddr,
|
|||||||
{
|
{
|
||||||
listener_connection_t *lis_conn;
|
listener_connection_t *lis_conn;
|
||||||
connection_t *conn;
|
connection_t *conn;
|
||||||
tor_socket_t s; /* the socket we're going to make */
|
tor_socket_t s = TOR_INVALID_SOCKET; /* the socket we're going to make */
|
||||||
or_options_t const *options = get_options();
|
or_options_t const *options = get_options();
|
||||||
#if defined(HAVE_PWD_H) && defined(HAVE_SYS_UN_H)
|
#if defined(HAVE_PWD_H) && defined(HAVE_SYS_UN_H)
|
||||||
struct passwd *pw = NULL;
|
struct passwd *pw = NULL;
|
||||||
@ -1005,7 +1005,6 @@ connection_listener_new(const struct sockaddr *listensockaddr,
|
|||||||
helpfulhint = ". Is Tor already running?";
|
helpfulhint = ". Is Tor already running?";
|
||||||
log_warn(LD_NET, "Could not bind to %s:%u: %s%s", address, usePort,
|
log_warn(LD_NET, "Could not bind to %s:%u: %s%s", address, usePort,
|
||||||
tor_socket_strerror(e), helpfulhint);
|
tor_socket_strerror(e), helpfulhint);
|
||||||
tor_close_socket(s);
|
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1013,7 +1012,6 @@ connection_listener_new(const struct sockaddr *listensockaddr,
|
|||||||
if (listen(s,SOMAXCONN) < 0) {
|
if (listen(s,SOMAXCONN) < 0) {
|
||||||
log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort,
|
log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort,
|
||||||
tor_socket_strerror(tor_socket_errno(s)));
|
tor_socket_strerror(tor_socket_errno(s)));
|
||||||
tor_close_socket(s);
|
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1062,7 +1060,6 @@ connection_listener_new(const struct sockaddr *listensockaddr,
|
|||||||
if (bind(s, listensockaddr, (socklen_t)sizeof(struct sockaddr_un)) == -1) {
|
if (bind(s, listensockaddr, (socklen_t)sizeof(struct sockaddr_un)) == -1) {
|
||||||
log_warn(LD_NET,"Bind to %s failed: %s.", address,
|
log_warn(LD_NET,"Bind to %s failed: %s.", address,
|
||||||
tor_socket_strerror(tor_socket_errno(s)));
|
tor_socket_strerror(tor_socket_errno(s)));
|
||||||
tor_close_socket(s);
|
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
#ifdef HAVE_PWD_H
|
#ifdef HAVE_PWD_H
|
||||||
@ -1071,12 +1068,10 @@ connection_listener_new(const struct sockaddr *listensockaddr,
|
|||||||
if (pw == NULL) {
|
if (pw == NULL) {
|
||||||
log_warn(LD_NET,"Unable to chown() %s socket: user %s not found.",
|
log_warn(LD_NET,"Unable to chown() %s socket: user %s not found.",
|
||||||
address, options->User);
|
address, options->User);
|
||||||
tor_close_socket(s);
|
|
||||||
goto err;
|
goto err;
|
||||||
} else if (chown(address, pw->pw_uid, pw->pw_gid) < 0) {
|
} else if (chown(address, pw->pw_uid, pw->pw_gid) < 0) {
|
||||||
log_warn(LD_NET,"Unable to chown() %s socket: %s.",
|
log_warn(LD_NET,"Unable to chown() %s socket: %s.",
|
||||||
address, strerror(errno));
|
address, strerror(errno));
|
||||||
tor_close_socket(s);
|
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1086,7 +1081,6 @@ connection_listener_new(const struct sockaddr *listensockaddr,
|
|||||||
* platforms. */
|
* platforms. */
|
||||||
if (chmod(address, 0660) < 0) {
|
if (chmod(address, 0660) < 0) {
|
||||||
log_warn(LD_FS,"Unable to make %s group-writable.", address);
|
log_warn(LD_FS,"Unable to make %s group-writable.", address);
|
||||||
tor_close_socket(s);
|
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1094,7 +1088,6 @@ connection_listener_new(const struct sockaddr *listensockaddr,
|
|||||||
if (listen(s, SOMAXCONN) < 0) {
|
if (listen(s, SOMAXCONN) < 0) {
|
||||||
log_warn(LD_NET, "Could not listen on %s: %s", address,
|
log_warn(LD_NET, "Could not listen on %s: %s", address,
|
||||||
tor_socket_strerror(tor_socket_errno(s)));
|
tor_socket_strerror(tor_socket_errno(s)));
|
||||||
tor_close_socket(s);
|
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
@ -1106,10 +1099,8 @@ connection_listener_new(const struct sockaddr *listensockaddr,
|
|||||||
tor_assert(0);
|
tor_assert(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (set_socket_nonblocking(s) == -1) {
|
if (set_socket_nonblocking(s) == -1)
|
||||||
tor_close_socket(s);
|
|
||||||
goto err;
|
goto err;
|
||||||
}
|
|
||||||
|
|
||||||
lis_conn = listener_connection_new(type, listensockaddr->sa_family);
|
lis_conn = listener_connection_new(type, listensockaddr->sa_family);
|
||||||
conn = TO_CONN(lis_conn);
|
conn = TO_CONN(lis_conn);
|
||||||
@ -1169,6 +1160,8 @@ connection_listener_new(const struct sockaddr *listensockaddr,
|
|||||||
return conn;
|
return conn;
|
||||||
|
|
||||||
err:
|
err:
|
||||||
|
if (SOCKET_OK(s))
|
||||||
|
tor_close_socket(s);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user