commit 652d3a5b665f8045374eb527494dd9d80ef98d13 Author: David Goulet dgoulet@torproject.org Date: Wed Feb 7 14:05:33 2018 -0500
Remove anything related to the old SocksSockets option
At this commit, the SocksSocketsGroupWritable option is renamed to UnixSocksGroupWritable. A deprecated warning is triggered if the old option is used and tor will use it properly.
Fixes #24343
Signed-off-by: David Goulet dgoulet@torproject.org --- changes/ticket24343 | 6 ++++++ doc/tor.1.txt | 8 ++++---- src/or/config.c | 5 +++-- src/or/connection.c | 2 -- src/or/main.c | 2 +- src/or/or.h | 5 +---- 6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/changes/ticket24343 b/changes/ticket24343 new file mode 100644 index 000000000..e62d65eb5 --- /dev/null +++ b/changes/ticket24343 @@ -0,0 +1,6 @@ + o Minor bugfixes (man page, SocksPort): + - Remove dead code about the old "SocksSockets" option. To do so, the + SocksSocketsGroupWritable option has been renamed to + UnixSockssGroupWritable which does the same exact thing. The old option + is still usable but will warn that it is deprecated. Fixes bug 24343; + bugfix on 0.2.6.3. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9a4e70c76..da5f79140 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -238,7 +238,7 @@ GENERAL OPTIONS [[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: If not 0, limit the maximum token bucket size (also known as the burst) for _relayed traffic_ to the given number of bytes in each direction. - They do not include directory fetches by the relay (from authority + They do not include directory fetches by the relay (from authority or other relays), because that is considered "client" activity. (Default: 0)
[[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: @@ -608,10 +608,10 @@ GENERAL OPTIONS in accordance to RFC 1929. Both username and password must be between 1 and 255 characters.
-[[SocksSocketsGroupWritable]] **SocksSocketsGroupWritable** **0**|**1**:: +[[UnixSocksGroupWritable]] **UnixSocksGroupWritable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read and - write unix sockets (e.g. SocksSocket). If the option is set to 1, make - the SocksSocket socket readable and writable by the default GID. (Default: 0) + write unix sockets (e.g. SocksPort unix:). If the option is set to 1, make + the Unix socket readable and writable by the default GID. (Default: 0)
[[KeepalivePeriod]] **KeepalivePeriod** __NUM__:: To keep firewalls from expiring connections, send a padding keepalive cell diff --git a/src/or/config.c b/src/or/config.c index c246bd00e..d76a53a37 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -171,6 +171,7 @@ static config_abbrev_t option_abbrevs_[] = { { "BridgeAuthoritativeDirectory", "BridgeAuthoritativeDir", 0, 0}, { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0}, { "VirtualAddrNetwork", "VirtualAddrNetworkIPv4", 0, 0}, + { "SocksSocketsGroupWritable", "UnixSocksGroupWritable", 0, 1}, { NULL, NULL, 0, 0}, };
@@ -284,7 +285,7 @@ static config_var_t option_vars_[] = { V(ControlPortWriteToFile, FILENAME, NULL), V(ControlSocket, LINELIST, NULL), V(ControlSocketsGroupWritable, BOOL, "0"), - V(SocksSocketsGroupWritable, BOOL, "0"), + V(UnixSocksGroupWritable, BOOL, "0"), V(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), V(CookieAuthFile, STRING, NULL), @@ -7356,7 +7357,7 @@ parse_ports(or_options_t *options, int validate_only,
*n_ports_out = 0;
- const unsigned gw_flag = options->SocksSocketsGroupWritable ? + const unsigned gw_flag = options->UnixSocksGroupWritable ? CL_PORT_DFLT_GROUP_WRITABLE : 0; if (parse_port_config(ports, options->SocksPort_lines, diff --git a/src/or/connection.c b/src/or/connection.c index fb87e5b05..2a6b10763 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -336,8 +336,6 @@ entry_connection_new(int type, int socket_family) entry_conn->entry_cfg.ipv4_traffic = 1; else if (socket_family == AF_INET6) entry_conn->entry_cfg.ipv6_traffic = 1; - else if (socket_family == AF_UNIX) - entry_conn->is_socks_socket = 1; return entry_conn; }
diff --git a/src/or/main.c b/src/or/main.c index 9ffc962d3..d1f004409 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -342,7 +342,7 @@ connection_remove(connection_t *conn) smartlist_len(connection_array));
if (conn->type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { - log_info(LD_NET, "Closing SOCKS SocksSocket connection"); + log_info(LD_NET, "Closing SOCKS Unix socket connection"); }
control_event_conn_bandwidth(conn); diff --git a/src/or/or.h b/src/or/or.h index 03efdd1d8..edf89be9a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1818,9 +1818,6 @@ typedef struct entry_connection_t { * the exit has sent a CONNECTED cell) and we have chosen to use it. */ unsigned int may_use_optimistic_data : 1; - - /** Are we a socks SocksSocket listener? */ - unsigned int is_socks_socket:1; } entry_connection_t;
/** Subtype of connection_t for an "directory connection" -- that is, an HTTP @@ -3794,7 +3791,7 @@ typedef struct { * for control connections. */
int ControlSocketsGroupWritable; /**< Boolean: Are control sockets g+rw? */ - int SocksSocketsGroupWritable; /**< Boolean: Are SOCKS sockets g+rw? */ + int UnixSocksGroupWritable; /**< Boolean: Are SOCKS Unix sockets g+rw? */ /** Ports to listen on for directory connections. */ config_line_t *DirPort_lines; config_line_t *DNSPort_lines; /**< Ports to listen on for DNS requests. */