diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-31 22:46:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-14 23:16:24 -0500 |
| commit | 25cf286fb1b2a11f82b3e5a0e7800a2071ec6ed2 (patch) | |
| tree | f0f01f3be0a4c7fcac6ebf728254a0f324c4ea74 /src | |
| parent | 0487c0d5798ce125dcaf61f7c8fc8b879d377674 (diff) | |
| download | tor-25cf286fb1b2a11f82b3e5a0e7800a2071ec6ed2.tar.gz tor-25cf286fb1b2a11f82b3e5a0e7800a2071ec6ed2.zip | |
Whitespace cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 4 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 | ||||
| -rw-r--r-- | src/or/connection_edge.h | 1 | ||||
| -rw-r--r-- | src/or/relay.c | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c index 481b6f13b1..98fbb6e585 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4743,7 +4743,6 @@ parse_port_config(smartlist_t *out, if (!strcasecmpend(elt, "s")) elt[strlen(elt)-1] = '\0'; /* kill plurals. */ - if (!strcasecmp(elt, "IsolateDestPort")) { isoflag = ISO_DESTPORT; } else if (!strcasecmp(elt, "IsolateDestAddr")) { @@ -5019,7 +5018,8 @@ check_server_ports(const smartlist_t *ports, if (! port->no_advertise) { ++n_orport_advertised; if (tor_addr_family(&port->addr) == AF_INET || - (tor_addr_family(&port->addr) == AF_UNSPEC && !port->bind_ipv6_only)) + (tor_addr_family(&port->addr) == AF_UNSPEC && + !port->bind_ipv6_only)) ++n_orport_advertised_ipv4; } if (! port->no_listen) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index ead9c49efe..28cd42fee7 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -784,7 +784,6 @@ connection_ap_detach_retriable(entry_connection_t *conn, } } - /** Check if <b>conn</b> is using a dangerous port. Then warn and/or * reject depending on our config options. */ static int @@ -2209,7 +2208,6 @@ begin_cell_parse(const cell_t *cell, begin_cell_t *bcell, return 0; } - /** A relay 'begin' or 'begin_dir' cell has arrived, and either we are * an exit hop for the circuit, or we are the origin and it is a * rendezvous begin. diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 9c4318ccfe..354ab8f0b9 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -111,6 +111,5 @@ int begin_cell_parse(const cell_t *cell, begin_cell_t *bcell, #endif - #endif diff --git a/src/or/relay.c b/src/or/relay.c index e01d933f05..79eb919361 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1063,7 +1063,8 @@ connection_edge_process_relay_cell_not_open( -1); if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) { tor_addr_t addr; - tor_addr_from_ipv4n(&addr, get_uint32(cell->payload+RELAY_HEADER_SIZE+2)); + tor_addr_from_ipv4n(&addr, + get_uint32(cell->payload+RELAY_HEADER_SIZE+2)); remap_event_helper(entry_conn, &addr); } else if (answer_type == RESOLVED_TYPE_IPV6 && answer_len == 16) { tor_addr_t addr; |