summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2013-06-27 17:50:56 +0300
committerNick Mathewson <nickm@torproject.org>2013-08-15 12:03:34 -0400
commitcb54e44587473782c2865c3ea4aca6e0666943a8 (patch)
treea99d97543a33d3fed4d5593cb07018aec412b193 /src/or/or.h
parent85c556a4c265f6ce9587c46d0040f57cb09618bc (diff)
downloadtor-cb54e44587473782c2865c3ea4aca6e0666943a8.tar.gz
tor-cb54e44587473782c2865c3ea4aca6e0666943a8.zip
Fix a number of issues with the #5040 code.
- Don't leak if a transport proxy sends us a TRANSPORT command more than once. - Don't use smartlist_string_isin() in geoip_get_transport_history(). (pointed out by Nick) - Use the 'join' argument of smartlist_join_strings() instead of trying to write the separator on our own. (pointed out by Nick) - Document 'ext_or_transport' a bit better. (pointed out by Nick) - Be a bit more consistent with the types of the values of 'transport_counts'. (pointed out by Nick)
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 7916c476ad..9b519a78ff 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1452,8 +1452,9 @@ typedef struct or_connection_t {
char *ext_or_conn_id;
/** Client hash of the Extended ORPort authentication scheme */
char *ext_or_auth_correct_client_hash;
- /** Name of the pluggable transport that is obfuscating this
- connection. If no pluggable transports are used, it's NULL. */
+ /** String carrying the name of the pluggable transport
+ * (e.g. "obfs2") that is obfuscating this connection. If no
+ * pluggable transports are used, it's NULL. */
char *ext_or_transport;
char *nickname; /**< Nickname of OR on other side (if any). */