summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-11-17 03:34:58 +0000
committerNick Mathewson <nickm@torproject.org>2006-11-17 03:34:58 +0000
commite2abc727e5ee08037eb79615ca81d52f6d14ef07 (patch)
tree1fe26481a4c26bda3437a36214bf169d18611cc8 /src/or/or.h
parentd125c61e02743d5420567f954a176baeaa4f76a9 (diff)
downloadtor-e2abc727e5ee08037eb79615ca81d52f6d14ef07.tar.gz
tor-e2abc727e5ee08037eb79615ca81d52f6d14ef07.zip
r9561@Kushana: nickm | 2006-11-16 22:32:54 -0500
Tweaks to test-connection patch: use ".noconnect" instead of ".test" (since there are lots of ways to test things). Use a regular sequence of STREAM events (NEW followed by CLOSED) instead of a new event type. Make the function that checks the address be static and use const and strcasecmpend properly. svn:r8959
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h
index afe91a8326..07baf6b294 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -473,6 +473,8 @@ typedef enum {
* everywhere. */
#define END_STREAM_REASON_FIXME_XXXX 0
+/* Reasons why we (or a remote OR) might close a stream. See tor-spec.txt for
+ * documentation of these. */
#define END_STREAM_REASON_MISC 1
#define END_STREAM_REASON_RESOLVEFAILED 2
#define END_STREAM_REASON_CONNECTREFUSED 3
@@ -514,6 +516,8 @@ typedef enum {
#define END_CIRC_REASON_NOPATH -2
#define END_CIRC_AT_ORIGIN -1
+/* Reasons why we (or a remote OR) might close a circuit. See tor-spec.txt for
+ * documentation of these. */
#define _END_CIRC_REASON_MIN 0
#define END_CIRC_REASON_NONE 0
#define END_CIRC_REASON_TORPROTOCOL 1
@@ -2034,7 +2038,6 @@ typedef enum hostname_type_t {
NORMAL_HOSTNAME, ONION_HOSTNAME, EXIT_HOSTNAME, BAD_HOSTNAME
} hostname_type_t;
hostname_type_t parse_extended_hostname(char *address);
-int hostname_is_a_test_address(char *address);
/********************************* connection_or.c ***************************/
@@ -2142,7 +2145,6 @@ int control_event_client_status(int severity, const char *format, ...)
CHECK_PRINTF(2,3);
int control_event_server_status(int severity, const char *format, ...)
CHECK_PRINTF(2,3);
-int control_event_teststream(edge_connection_t *conn);
int init_cookie_authentication(int enabled);
int decode_hashed_password(char *buf, const char *hashed);