diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/include.am | 22 | ||||
| -rw-r--r-- | src/core/or/connection_edge.c | 4 | ||||
| -rw-r--r-- | src/core/or/relay.c | 6 | ||||
| -rw-r--r-- | src/core/or/sendme.c | 18 |
4 files changed, 25 insertions, 25 deletions
diff --git a/src/core/include.am b/src/core/include.am index b04c5db541..f722b70481 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -47,7 +47,7 @@ LIBTOR_APP_A_SOURCES = \ src/core/or/onion.c \ src/core/or/ocirc_event.c \ src/core/or/or_periodic.c \ - src/core/or/or_sys.c \ + src/core/or/or_sys.c \ src/core/or/orconn_event.c \ src/core/or/policies.c \ src/core/or/protover.c \ @@ -140,7 +140,7 @@ LIBTOR_APP_A_SOURCES = \ src/feature/relay/dns.c \ src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ - src/feature/relay/relay_periodic.c \ + src/feature/relay/relay_periodic.c \ src/feature/relay/relay_sys.c \ src/feature/relay/router.c \ src/feature/relay/routerkeys.c \ @@ -171,7 +171,7 @@ LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) # The Directory Authority module. MODULE_DIRAUTH_SOURCES = \ src/feature/dirauth/authmode.c \ - src/feature/dirauth/bridgeauth.c \ + src/feature/dirauth/bridgeauth.c \ src/feature/dirauth/bwauth.c \ src/feature/dirauth/dirauth_periodic.c \ src/feature/dirauth/dirauth_sys.c \ @@ -252,14 +252,14 @@ noinst_HEADERS += \ src/core/or/connection_edge.h \ src/core/or/connection_or.h \ src/core/or/connection_st.h \ - src/core/or/crypt_path.h \ + src/core/or/crypt_path.h \ src/core/or/cpath_build_state_st.h \ src/core/or/crypt_path_reference_st.h \ src/core/or/crypt_path_st.h \ src/core/or/destroy_cell_queue_st.h \ src/core/or/dos.h \ src/core/or/edge_connection_st.h \ - src/core/or/half_edge_st.h \ + src/core/or/half_edge_st.h \ src/core/or/entry_connection_st.h \ src/core/or/entry_port_cfg_st.h \ src/core/or/extend_info_st.h \ @@ -267,7 +267,7 @@ noinst_HEADERS += \ src/core/or/onion.h \ src/core/or/or.h \ src/core/or/or_periodic.h \ - src/core/or/or_sys.h \ + src/core/or/or_sys.h \ src/core/or/orconn_event.h \ src/core/or/orconn_event_sys.h \ src/core/or/or_circuit_st.h \ @@ -313,14 +313,14 @@ noinst_HEADERS += \ src/feature/control/control_cmd.h \ src/feature/control/control_cmd_args_st.h \ src/feature/control/control_connection_st.h \ - src/feature/control/control_events.h \ + src/feature/control/control_events.h \ src/feature/control/control_fmt.h \ src/feature/control/control_getinfo.h \ src/feature/control/control_proto.h \ src/feature/control/fmt_serverstatus.h \ src/feature/control/getinfo_geoip.h \ src/feature/dirauth/authmode.h \ - src/feature/dirauth/bridgeauth.h \ + src/feature/dirauth/bridgeauth.h \ src/feature/dirauth/bwauth.h \ src/feature/dirauth/dirauth_periodic.h \ src/feature/dirauth/dirauth_sys.h \ @@ -395,8 +395,8 @@ noinst_HEADERS += \ src/feature/nodelist/networkstatus_voter_info_st.h \ src/feature/nodelist/nickname.h \ src/feature/nodelist/node_st.h \ - src/feature/nodelist/nodefamily.h \ - src/feature/nodelist/nodefamily_st.h \ + src/feature/nodelist/nodefamily.h \ + src/feature/nodelist/nodefamily_st.h \ src/feature/nodelist/nodelist.h \ src/feature/nodelist/node_select.h \ src/feature/nodelist/routerinfo.h \ @@ -413,7 +413,7 @@ noinst_HEADERS += \ src/feature/relay/dns_structs.h \ src/feature/relay/ext_orport.h \ src/feature/relay/onion_queue.h \ - src/feature/relay/relay_periodic.h \ + src/feature/relay/relay_periodic.h \ src/feature/relay/relay_sys.h \ src/feature/relay/router.h \ src/feature/relay/routerkeys.h \ diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 8ed4034560..c08d2a9ff5 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2816,7 +2816,7 @@ static const char HTTP_CONNECT_IS_NOT_AN_HTTP_PROXY_MSG[] = "Content-Type: text/html; charset=iso-8859-1\r\n\r\n" "<html>\n" "<head>\n" - "<title>This is an HTTP CONNECT tunnel, not an full HTTP Proxy</title>\n" + "<title>This is an HTTP CONNECT tunnel, not a full HTTP Proxy</title>\n" "</head>\n" "<body>\n" "<h1>This is an HTTP CONNECT tunnel, not an HTTP proxy.</h1>\n" @@ -2826,7 +2826,7 @@ static const char HTTP_CONNECT_IS_NOT_AN_HTTP_PROXY_MSG[] = "</p><p>\n" "This is not correct: This port is configured as a CONNECT tunnel, not\n" "an HTTP proxy. Please configure your client accordingly. You can also\n" - "use HTTPS, then the client should automatically use HTTP CONNECT." + "use HTTPS; then the client should automatically use HTTP CONNECT." "</p>\n" "<p>\n" "See <a href=\"https://www.torproject.org/documentation.html\">" diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 8b3a1be18e..066ef19dbf 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -543,7 +543,7 @@ relay_command_to_string(uint8_t command) STATIC size_t get_pad_cell_offset(size_t data_len) { - /* This is never suppose to happen but in case it does, stop right away + /* This is never supposed to happen but in case it does, stop right away * because if tor is tricked somehow into not adding random bytes to the * payload with this function returning 0 for a bad data_len, the entire * authenticated SENDME design can be bypassed leading to bad denial of @@ -577,7 +577,7 @@ pad_cell_payload(uint8_t *cell_payload, size_t data_len) } /* Remember here that the cell_payload is the length of the header and - * payload size so we offset it using the full lenght of the cell. */ + * payload size so we offset it using the full length of the cell. */ pad_len = CELL_PAYLOAD_SIZE - pad_offset; crypto_fast_rng_getbytes(get_thread_fast_rng(), cell_payload + pad_offset, pad_len); @@ -1621,7 +1621,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, } } - /* Tell circpad that we've recieved a recognized cell */ + /* Tell circpad that we've received a recognized cell */ circpad_deliver_recognized_relay_cell_events(circ, rh.command, layer_hint); /* either conn is NULL, in which case we've got a control cell, or else diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c index e7c65d99e2..0743c48c32 100644 --- a/src/core/or/sendme.c +++ b/src/core/or/sendme.c @@ -157,7 +157,7 @@ cell_version_is_valid(uint8_t cell_version) * * This is the main critical function to make sure we can continue to * send/recv cells on a circuit. If the SENDME is invalid, the circuit should - * be mark for close. */ + * be marked for close by the caller. */ STATIC bool sendme_is_valid(const circuit_t *circ, const uint8_t *cell_payload, size_t cell_payload_len) @@ -396,11 +396,11 @@ sendme_circuit_consider_sending(circuit_t *circ, crypt_path_t *layer_hint) * the length of the SENDME cell payload (excluding the header). The * cell_payload is the payload. * - * Return 0 on success that is the SENDME is valid and the package window has - * been updated properly. + * Return 0 on success (the SENDME is valid and the package window has + * been updated properly). * - * On error, a negative value is returned which indicate that the circuit must - * be closed using the value as the reason for it. */ + * On error, a negative value is returned, which indicates that the + * circuit must be closed using the value as the reason for it. */ int sendme_process_circuit_level(crypt_path_t *layer_hint, circuit_t *circ, const uint8_t *cell_payload, @@ -462,11 +462,11 @@ sendme_process_circuit_level(crypt_path_t *layer_hint, * edge connection (stream) that the circuit circ is associated with. The * cell_body_len is the length of the payload (excluding the header). * - * Return 0 on success that is the SENDME is valid and the package window has - * been updated properly. + * Return 0 on success (the SENDME is valid and the package window has + * been updated properly). * - * On error, a negative value is returned which indicate that the circuit must - * be closed using the value as the reason for it. */ + * On error, a negative value is returned, which indicates that the + * circuit must be closed using the value as the reason for it. */ int sendme_process_stream_level(edge_connection_t *conn, circuit_t *circ, uint16_t cell_body_len) |