aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-29 17:06:09 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-29 17:08:29 -0500
commitaba25a6939a5907d40dbcff7433a8c130ffd12ad (patch)
tree5182d775e7e9e2fb1dea57d861cce7a22a7486db /src/or/or.h
parentb5a306e82c684bdd30b832fdfd9e2b55c06b54ae (diff)
downloadtor-aba25a6939a5907d40dbcff7433a8c130ffd12ad.tar
tor-aba25a6939a5907d40dbcff7433a8c130ffd12ad.tar.gz
Make pending libevent actions cancelable
This avoids a dangling pointer issue in the 3412 code, and should fix bug 4599.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 546fe17bf..185d20d42 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1272,6 +1272,8 @@ typedef struct or_connection_t {
unsigned active_circuit_pqueue_last_recalibrated;
struct or_connection_t *next_with_same_id; /**< Next connection with same
* identity digest as this one. */
+
+ tor_libevent_action_t *pending_action;
} or_connection_t;
/** Subtype of connection_t for an "edge connection" -- that is, an entry (ap)