nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace cleanup

Browse Source
This commit is contained in:
Nick Mathewson 2012-10-31 22:46:07 -04:00
parent 0487c0d579
commit 25cf286fb1
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/config.c
View File

@ -4743,7 +4743,6 @@ parse_port_config(smartlist_t *out,
if (!strcasecmpend(elt, "s")) if (!strcasecmpend(elt, "s"))
elt[strlen(elt)-1] = '\0'; /* kill plurals. */ elt[strlen(elt)-1] = '\0'; /* kill plurals. */
if (!strcasecmp(elt, "IsolateDestPort")) { if (!strcasecmp(elt, "IsolateDestPort")) {
isoflag = ISO_DESTPORT; isoflag = ISO_DESTPORT;
} else if (!strcasecmp(elt, "IsolateDestAddr")) { } else if (!strcasecmp(elt, "IsolateDestAddr")) {
@ -5019,7 +5018,8 @@ check_server_ports(const smartlist_t *ports,
if (! port->no_advertise) { if (! port->no_advertise) {
++n_orport_advertised; ++n_orport_advertised;
if (tor_addr_family(&port->addr) == AF_INET || 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; ++n_orport_advertised_ipv4;
} }
if (! port->no_listen) if (! port->no_listen)

2
src/or/connection_edge.c
View File

@ -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 /** Check if <b>conn</b> is using a dangerous port. Then warn and/or
* reject depending on our config options. */ * reject depending on our config options. */
static int static int
@ -2209,7 +2208,6 @@ begin_cell_parse(const cell_t *cell, begin_cell_t *bcell,
return 0; return 0;
} }
/** A relay 'begin' or 'begin_dir' cell has arrived, and either we are /** 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 * an exit hop for the circuit, or we are the origin and it is a
* rendezvous begin. * rendezvous begin.

1
src/or/connection_edge.h
View File

@ -111,6 +111,5 @@ int begin_cell_parse(const cell_t *cell, begin_cell_t *bcell,
#endif #endif
#endif #endif

3
src/or/relay.c
View File

@ -1063,7 +1063,8 @@ connection_edge_process_relay_cell_not_open(
-1); -1);
if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) { if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) {
tor_addr_t addr; 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); remap_event_helper(entry_conn, &addr);
} else if (answer_type == RESOLVED_TYPE_IPV6 && answer_len == 16) { } else if (answer_type == RESOLVED_TYPE_IPV6 && answer_len == 16) {
tor_addr_t addr; tor_addr_t addr;