aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-10-23 14:58:00 -0700
committerSebastian Hahn <sebastian@torproject.org>2011-10-26 23:21:11 +0200
commitc05bb53508f5fe3e570a285e6c9ead452ded0e43 (patch)
tree76eef9be5a2025f71988b27e2464ac2ec77e9a94 /src/or
parentaf12c39d6de5bbcd24915db3c4cc9404f102ac02 (diff)
downloadtor-c05bb53508f5fe3e570a285e6c9ead452ded0e43.tar
tor-c05bb53508f5fe3e570a285e6c9ead452ded0e43.tar.gz
Mark which OR connections are outgoing
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection_or.c2
-rw-r--r--src/or/or.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 35f6da921..f019c79ed 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -776,6 +776,8 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port,
conn->_base.state = OR_CONN_STATE_CONNECTING;
control_event_or_conn_status(conn, OR_CONN_EVENT_LAUNCHED, 0);
+ conn->is_outgoing = 1;
+
if (options->HttpsProxy) {
/* we shouldn't connect directly. use the https proxy instead. */
tor_addr_from_ipv4h(&addr, options->HttpsProxyAddr);
diff --git a/src/or/or.h b/src/or/or.h
index 72e4c639a..edbb73cca 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1035,6 +1035,8 @@ typedef struct or_connection_t {
* is a client. Connections with this flag set should never be used
* to satisfy an EXTEND request. */
unsigned int is_connection_with_client:1;
+ /** True iff this is an outgoing connection. */
+ unsigned int is_outgoing:1;
uint8_t link_proto; /**< What protocol version are we using? 0 for
* "none negotiated yet." */
circid_t next_circ_id; /**< Which circ_id do we try to use next on