aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-19 11:56:03 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-19 11:56:03 -0500
commit2e8b8c8698a326597a07020e2f29a79948094f0e (patch)
treef83bc1312909e0834d7ac87f6c07fb6044e9d888 /src/or/connection_edge.c
parentf92b01b9635eb2655a449529d6e7eb30a46bb29f (diff)
downloadtor-2e8b8c8698a326597a07020e2f29a79948094f0e.tar.gz
tor-2e8b8c8698a326597a07020e2f29a79948094f0e.zip
Make check-spaces happier.
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index a11b8e2810..9031edb8a6 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1378,7 +1378,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
log_warn(LD_NET, "Rejecting SOCKS4 request for an IPv6 address.");
connection_mark_unattached_ap(conn, END_STREAM_REASON_ENTRYPOLICY);
return -1;
- } else if (socks->socks_version == 4 && !conn->entry_cfg.ipv4_traffic) {
+ } else if (socks->socks_version == 4 &&
+ !conn->entry_cfg.ipv4_traffic) {
/* You can't do any kind of Socks4 request when IPv4 is forbidden.
*
* XXX raise this check outside the enclosing block? */
@@ -3282,7 +3283,8 @@ connection_edge_compatible_with_circuit(const entry_connection_t *conn,
if ((iso & ISO_CLIENTADDR) &&
!tor_addr_eq(&ENTRY_TO_CONN(conn)->addr, &circ->client_addr))
return 0;
- if ((iso & ISO_SESSIONGRP) && conn->entry_cfg.session_group != circ->session_group)
+ if ((iso & ISO_SESSIONGRP) &&
+ conn->entry_cfg.session_group != circ->session_group)
return 0;
if ((iso & ISO_NYM_EPOCH) && conn->nym_epoch != circ->nym_epoch)
return 0;