aboutsummaryrefslogtreecommitdiff
path: root/src/core/or
diff options
context:
space:
mode:
authorSamanta Navarro <ferivoz@riseup.net>2020-11-11 11:38:19 +0000
committerDavid Goulet <dgoulet@torproject.org>2020-11-12 11:44:09 -0500
commit4a0cd79588d2a472ab81e4f1d0e1e1bf6f2b390c (patch)
tree482e652a53ead4b26e8d97a4854671cdc0df0d61 /src/core/or
parente2d3c9c5f82a1369385dd99765c31ba479ba8f23 (diff)
downloadtor-4a0cd79588d2a472ab81e4f1d0e1e1bf6f2b390c.tar.gz
tor-4a0cd79588d2a472ab81e4f1d0e1e1bf6f2b390c.zip
Fix typos.
Typos found with codespell. Please keep in mind that this should have impact on actual code and must be carefully evaluated: src/core/or/lttng_circuit.inc - ctf_enum_value("CONTROLER", CIRCUIT_PURPOSE_CONTROLLER) + ctf_enum_value("CONTROLLER", CIRCUIT_PURPOSE_CONTROLLER)
Diffstat (limited to 'src/core/or')
-rw-r--r--src/core/or/channel.c4
-rw-r--r--src/core/or/circuitbuild.c2
-rw-r--r--src/core/or/circuitmux.h2
-rw-r--r--src/core/or/circuitpadding.c10
-rw-r--r--src/core/or/circuitpadding_machines.c2
-rw-r--r--src/core/or/circuituse.c10
-rw-r--r--src/core/or/connection_edge.c12
-rw-r--r--src/core/or/lttng_circuit.inc4
-rw-r--r--src/core/or/onion.h2
-rw-r--r--src/core/or/or_connection_st.h4
-rw-r--r--src/core/or/origin_circuit_st.h2
-rw-r--r--src/core/or/policies.c2
-rw-r--r--src/core/or/sendme.c2
-rw-r--r--src/core/or/server_port_cfg_st.h2
14 files changed, 30 insertions, 30 deletions
diff --git a/src/core/or/channel.c b/src/core/or/channel.c
index 5300a07608..26c93d169f 100644
--- a/src/core/or/channel.c
+++ b/src/core/or/channel.c
@@ -32,7 +32,7 @@
*
* NOTE: For now, the separation between channels and specialized channels
* (like channeltls) is not that well defined. So the channeltls layer calls
- * channel_process_cell() which originally comes from the connection subsytem.
+ * channel_process_cell() which originally comes from the connection subsystem.
* This should be hopefully be fixed with #23993.
*
* For *outbound* cells, the entry point is: channel_write_packed_cell().
@@ -2387,7 +2387,7 @@ channel_is_better(channel_t *a, channel_t *b)
* Get a channel to extend a circuit.
*
* Given the desired relay identity, pick a suitable channel to extend a
- * circuit to the target IPv4 or IPv6 address requsted by the client. Search
+ * circuit to the target IPv4 or IPv6 address requested by the client. Search
* for an existing channel for the requested endpoint. Make sure the channel
* is usable for new circuits, and matches one of the target addresses.
*
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index af38014c69..ea32a5bc57 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -7,7 +7,7 @@
/**
* \file circuitbuild.c
*
- * \brief Implements the details of building circuits (by chosing paths,
+ * \brief Implements the details of building circuits (by choosing paths,
* constructing/sending create/extend cells, and so on).
*
* On the client side, this module handles launching circuits. Circuit
diff --git a/src/core/or/circuitmux.h b/src/core/or/circuitmux.h
index 191ca12e30..5e41ccc6ca 100644
--- a/src/core/or/circuitmux.h
+++ b/src/core/or/circuitmux.h
@@ -127,7 +127,7 @@ MOCK_DECL(unsigned int, circuitmux_num_cells, (circuitmux_t *cmux));
unsigned int circuitmux_num_circuits(circuitmux_t *cmux);
unsigned int circuitmux_num_active_circuits(circuitmux_t *cmux);
-/* Debuging interface - slow. */
+/* Debugging interface - slow. */
int64_t circuitmux_count_queued_destroy_cells(const channel_t *chan,
const circuitmux_t *cmux);
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index e6daba5469..6dfe94de01 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -1536,7 +1536,7 @@ circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
/**
* If the machine transitioned to the END state, we need
* to check to see if it wants us to shut it down immediately.
- * If it does, then we need to send the appropiate negotiation commands
+ * If it does, then we need to send the appropriate negotiation commands
* depending on which side it is.
*
* After this function is called, mi may point to freed memory. Do
@@ -2076,7 +2076,7 @@ circpad_machine_conditions_keep(origin_circuit_t *circ,
*
* The padding code only cares if the circuit is building,
* opened, used for streams, and/or still has relay early cells.
- * This returns a bitmask of all state properities that apply to
+ * This returns a bitmask of all state properties that apply to
* this circuit.
*/
static inline
@@ -2390,7 +2390,7 @@ circpad_deliver_unrecognized_cell_events(circuit_t *circ,
* Deliver circpad events for "recognized" relay cells.
*
* Recognized cells are destined for this hop, either client or middle.
- * Check if this is a padding cell or not, and send the appropiate
+ * Check if this is a padding cell or not, and send the appropriate
* received event.
*/
void
@@ -2682,7 +2682,7 @@ circpad_circ_responder_machine_init(void)
serialize this into the consensus or the torrc */
/* We transition to the burst state on padding receive and on non-padding
- * recieve */
+ * receive */
circ_responder_machine->states[CIRCPAD_STATE_START].
next_state[CIRCPAD_EVENT_PADDING_RECV] = CIRCPAD_STATE_BURST;
circ_responder_machine->states[CIRCPAD_STATE_START].
@@ -2711,7 +2711,7 @@ circpad_circ_responder_machine_init(void)
/* During burst state we wait forever for padding to arrive.
We are waiting for a padding cell from the client to come in, so that we
- respond, and we immitate how extend looks like */
+ respond, and we imitate how extend looks like */
circ_responder_machine->states[CIRCPAD_STATE_BURST].histogram[0] = 0;
// Only infinity bin:
circ_responder_machine->states[CIRCPAD_STATE_BURST].histogram[1] = 1;
diff --git a/src/core/or/circuitpadding_machines.c b/src/core/or/circuitpadding_machines.c
index 1e6b580f5b..f29a9be455 100644
--- a/src/core/or/circuitpadding_machines.c
+++ b/src/core/or/circuitpadding_machines.c
@@ -25,7 +25,7 @@
* Client-side introduction circuit hiding machine:
*
* This machine hides client-side introduction circuits by making their
- * circuit consruction sequence look like normal general circuits that
+ * circuit construction sequence look like normal general circuits that
* download directory information. Furthermore, the circuits are kept open
* until all the padding has been sent, since intro circuits are usually
* very short lived and this act as a distinguisher. For more info see
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
index ace68cea53..0f3fc29361 100644
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -1991,7 +1991,7 @@ circuit_purpose_is_hidden_service(uint8_t purpose)
return 0;
}
-/** Retrun true iff the given circuit is an HS client circuit. */
+/** Return true iff the given circuit is an HS client circuit. */
bool
circuit_purpose_is_hs_client(const uint8_t purpose)
{
@@ -1999,7 +1999,7 @@ circuit_purpose_is_hs_client(const uint8_t purpose)
purpose <= CIRCUIT_PURPOSE_C_HS_MAX_);
}
-/** Retrun true iff the given circuit is an HS service circuit. */
+/** Return true iff the given circuit is an HS service circuit. */
bool
circuit_purpose_is_hs_service(const uint8_t purpose)
{
@@ -2007,14 +2007,14 @@ circuit_purpose_is_hs_service(const uint8_t purpose)
purpose <= CIRCUIT_PURPOSE_S_HS_MAX_);
}
-/** Retrun true iff the given circuit is an HS Vanguards circuit. */
+/** Return true iff the given circuit is an HS Vanguards circuit. */
bool
circuit_purpose_is_hs_vanguards(const uint8_t purpose)
{
return (purpose == CIRCUIT_PURPOSE_HS_VANGUARDS);
}
-/** Retrun true iff the given circuit is an HS v2 circuit. */
+/** Return true iff the given circuit is an HS v2 circuit. */
bool
circuit_is_hs_v2(const circuit_t *circ)
{
@@ -2022,7 +2022,7 @@ circuit_is_hs_v2(const circuit_t *circ)
(CONST_TO_ORIGIN_CIRCUIT(circ)->rend_data != NULL));
}
-/** Retrun true iff the given circuit is an HS v3 circuit. */
+/** Return true iff the given circuit is an HS v3 circuit. */
bool
circuit_is_hs_v3(const circuit_t *circ)
{
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index f22c49d036..859ad1c6fc 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -19,7 +19,7 @@
* TCP application socket that has arrived via (e.g.) a SOCKS request, or an
* exit connection.
*
- * Not every instance of edge_connection_t truly represents an edge connction,
+ * Not every instance of edge_connection_t truly represents an edge connection,
* however. (Sorry!) We also create edge_connection_t objects for streams that
* we will not be handling with TCP. The types of these streams are:
* <ul>
@@ -578,8 +578,8 @@ connection_edge_end(edge_connection_t *conn, uint8_t reason)
/**
* Helper function for bsearch.
*
- * As per smartlist_bsearch, return < 0 if key preceeds member,
- * > 0 if member preceeds key, and 0 if they are equal.
+ * As per smartlist_bsearch, return < 0 if key precedes member,
+ * > 0 if member precedes key, and 0 if they are equal.
*
* This is equivalent to subtraction of the values of key - member
* (why does no one ever say that explicitly?).
@@ -2066,7 +2066,7 @@ connection_ap_handle_onion(entry_connection_t *conn,
log_info(LD_GENERAL, "Found %s descriptor in cache for %s. %s.",
(descriptor_is_usable) ? "usable" : "unusable",
safe_str_client(onion_address),
- (descriptor_is_usable) ? "Not fetching." : "Refecting.");
+ (descriptor_is_usable) ? "Not fetching." : "Refetching.");
} else {
rend_cache_lookup_result = -ENOENT;
}
@@ -2655,8 +2655,8 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req)
break;
#endif /* defined(TRANS_NETFILTER_IPV6) */
default:
- log_warn(LD_BUG,
- "Received transparent data from an unsuported socket family %d",
+ log_warn(LD_BUG, "Received transparent data from an unsupported "
+ "socket family %d",
ENTRY_TO_CONN(conn)->socket_family);
return -1;
}
diff --git a/src/core/or/lttng_circuit.inc b/src/core/or/lttng_circuit.inc
index fc3e175c8a..0ed29f8aaf 100644
--- a/src/core/or/lttng_circuit.inc
+++ b/src/core/or/lttng_circuit.inc
@@ -28,7 +28,7 @@
/*
* Circuit Purposes
*
- * The following defines an enumeration of all possible circuit purpose so
+ * The following defines an enumeration of all possible circuit purposes so
* they appear in the trace with the define name (first parameter of
* ctf_enum_value) instead of the numerical value.
*/
@@ -70,7 +70,7 @@ TRACEPOINT_ENUM(tor_circuit, purpose,
/* Misc. */
ctf_enum_value("TESTING", CIRCUIT_PURPOSE_TESTING)
- ctf_enum_value("CONTROLER", CIRCUIT_PURPOSE_CONTROLLER)
+ ctf_enum_value("CONTROLLER", CIRCUIT_PURPOSE_CONTROLLER)
ctf_enum_value("PATH_BIAS_TESTING", CIRCUIT_PURPOSE_PATH_BIAS_TESTING)
/* VanGuard */
diff --git a/src/core/or/onion.h b/src/core/or/onion.h
index 600e67c3cd..0dac21ab6b 100644
--- a/src/core/or/onion.h
+++ b/src/core/or/onion.h
@@ -50,7 +50,7 @@ typedef struct extend_cell_t {
tor_addr_port_t orport_ipv4;
/** An IPv6 address and port for the node we're connecting to. */
tor_addr_port_t orport_ipv6;
- /** Identity fingerprint of the node we're conecting to.*/
+ /** Identity fingerprint of the node we're connecting to.*/
uint8_t node_id[DIGEST_LEN];
/** Ed25519 public identity key. Zero if not set. */
struct ed25519_public_key_t ed_pubkey;
diff --git a/src/core/or/or_connection_st.h b/src/core/or/or_connection_st.h
index 253fe67020..d99aaaefad 100644
--- a/src/core/or/or_connection_st.h
+++ b/src/core/or/or_connection_st.h
@@ -31,7 +31,7 @@ struct or_connection_t {
/** This is the ClientHash value we expect to receive from the
* client during the Extended ORPort authentication protocol. We
* compute it upon receiving the ClientNoce from the client, and we
- * compare it with the acual ClientHash value sent by the
+ * compare it with the actual ClientHash value sent by the
* client. */
char *ext_or_auth_correct_client_hash;
/** String carrying the name of the pluggable transport
@@ -74,7 +74,7 @@ struct or_connection_t {
unsigned int is_outgoing:1;
unsigned int proxy_type:3; /**< One of PROXY_NONE...PROXY_HAPROXY */
unsigned int wide_circ_ids:1;
- /** True iff a failure on this connection indicates a posssible
+ /** True iff a failure on this connection indicates a possible
* bootstrapping problem. We set this as true if we notice that this
* connection could handle a pending origin circuit, or if we launch it to
* handle an origin circuit. */
diff --git a/src/core/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h
index 79e250cd59..a45a6573dc 100644
--- a/src/core/or/origin_circuit_st.h
+++ b/src/core/or/origin_circuit_st.h
@@ -54,7 +54,7 @@ enum path_state_t {
/** Did any SOCKS streams or hidserv introductions actually succeed on
* this circuit?
*
- * If any streams detatch/fail from this circuit, the code transitions
+ * If any streams detach/fail from this circuit, the code transitions
* the circuit back to PATH_STATE_USE_ATTEMPTED to ensure we probe. See
* pathbias_mark_use_rollback() for that.
*/
diff --git a/src/core/or/policies.c b/src/core/or/policies.c
index 24e9c0ce9f..5f578d9b1a 100644
--- a/src/core/or/policies.c
+++ b/src/core/or/policies.c
@@ -1849,7 +1849,7 @@ policies_log_first_redundant_entry(const smartlist_t *policy)
int found_ipv4_wildcard = 0, found_ipv6_wildcard = 0;
const int i = p_sl_idx;
- /* Look for accept/reject *[4|6|]:* entires */
+ /* Look for accept/reject *[4|6|]:* entries */
if (p->prt_min <= 1 && p->prt_max == 65535 && p->maskbits == 0) {
family = tor_addr_family(&p->addr);
/* accept/reject *:* may have already been expanded into
diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index 8ea9ef15d2..7b4595c1ac 100644
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -678,7 +678,7 @@ sendme_record_received_cell_digest(circuit_t *circ, crypt_path_t *cpath)
/* Record incoming digest. */
cpath_sendme_record_cell_digest(cpath, false);
} else {
- /* Record foward digest. */
+ /* Record forward digest. */
relay_crypto_record_sendme_digest(&TO_OR_CIRCUIT(circ)->crypto, true);
}
}
diff --git a/src/core/or/server_port_cfg_st.h b/src/core/or/server_port_cfg_st.h
index 9a005eccdf..69cdb29cbc 100644
--- a/src/core/or/server_port_cfg_st.h
+++ b/src/core/or/server_port_cfg_st.h
@@ -6,7 +6,7 @@
/**
* @file server_port_cfg_st.h
- * @brief Cnfiguration structure for server ports.
+ * @brief Configuration structure for server ports.
**/
#ifndef SERVER_PORT_CFG_ST_H