diff options
author | Roger Dingledine <arma@torproject.org> | 2004-07-22 23:21:12 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2004-07-22 23:21:12 +0000 |
commit | a328aab316a1610b177ebd78ef106255be975e8b (patch) | |
tree | 20e89450b0451eb6fe62d051f091b919f8482be4 /src | |
parent | 3aaba3b16e22cbda968097d242b10d5b5f4e13d7 (diff) | |
download | tor-a328aab316a1610b177ebd78ef106255be975e8b.tar tor-a328aab316a1610b177ebd78ef106255be975e8b.tar.gz |
clean whitespace and tabs
svn:r2115
Diffstat (limited to 'src')
-rw-r--r-- | src/or/dirserv.c | 2 | ||||
-rw-r--r-- | src/or/main.c | 2 | ||||
-rw-r--r-- | src/or/relay.c | 22 | ||||
-rw-r--r-- | src/or/routerlist.c | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d74d4d0a0..5316fe900 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -603,7 +603,7 @@ dirserv_dump_directory_to_string(char *s, unsigned int maxlen, log_fn(LOG_WARN,"couldn't base64-encode signature"); return -1; } - + if (strlcat(s, "-----END SIGNATURE-----\n", maxlen) >= maxlen) goto truncated; diff --git a/src/or/main.c b/src/or/main.c index ffeeae5cf..67188167e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1081,7 +1081,7 @@ void nt_service_body(int argc, char **argv) fclose(f); service_status.dwServiceType = SERVICE_WIN32; service_status.dwCurrentState = SERVICE_START_PENDING; - service_status.dwControlsAccepted = + service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; service_status.dwWin32ExitCode = 0; diff --git a/src/or/relay.c b/src/or/relay.c index 36fd24c77..45c56f350 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -225,7 +225,7 @@ static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction, relay_header_t rh; tor_assert(circ && cell && recognized); - tor_assert(cell_direction == CELL_DIRECTION_IN || cell_direction == CELL_DIRECTION_OUT); + tor_assert(cell_direction == CELL_DIRECTION_IN || cell_direction == CELL_DIRECTION_OUT); if(cell_direction == CELL_DIRECTION_IN) { if(CIRCUIT_IS_ORIGIN(circ)) { /* We're at the beginning of the circuit. @@ -287,7 +287,7 @@ static int circuit_package_relay_cell(cell_t *cell, circuit_t *circ, int cell_direction, crypt_path_t *layer_hint) -{ +{ connection_t *conn; /* where to send the cell */ crypt_path_t *thishop; /* counter for repeated crypts */ @@ -575,9 +575,9 @@ connection_edge_process_relay_cell_not_open( return 0; } connection_ap_handshake_socks_resolved(conn, - cell->payload[RELAY_HEADER_SIZE], /*answer_type*/ - cell->payload[RELAY_HEADER_SIZE+1], /*answer_len*/ - cell->payload+RELAY_HEADER_SIZE+2); /* answer */ + cell->payload[RELAY_HEADER_SIZE], /*answer_type*/ + cell->payload[RELAY_HEADER_SIZE+1], /*answer_len*/ + cell->payload+RELAY_HEADER_SIZE+2); /* answer */ conn->socks_request->has_finished = 1; connection_mark_for_close(conn); return 0; @@ -767,14 +767,14 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, case RELAY_COMMAND_RESOLVE: if (layer_hint) { log_fn(LOG_WARN,"resolve request unsupported at AP; dropping."); - return 0; + return 0; } else if (conn) { - log_fn(LOG_WARN, "resolve request for known stream; dropping."); - return 0; + log_fn(LOG_WARN, "resolve request for known stream; dropping."); + return 0; } else if (circ->purpose != CIRCUIT_PURPOSE_OR) { - log_fn(LOG_WARN, "resolve request on circ with purpose %d; dropping", - circ->purpose); - return 0; + log_fn(LOG_WARN, "resolve request on circ with purpose %d; dropping", + circ->purpose); + return 0; } connection_exit_begin_resolve(cell, circ); return 0; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f269b5496..3d8751cf1 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -851,7 +851,7 @@ void router_update_status_from_smartlist(routerinfo_t *router, strlcat(cp, name, n); strlcat(cp, " ", n); } - log_fn(LOG_DEBUG, "Updating status of %s from list \"%s\"", + log_fn(LOG_DEBUG, "Updating status of %s from list \"%s\"", router->nickname, cp); tor_free(cp); #endif |