diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-20 11:02:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-20 14:14:21 -0400 |
| commit | cd3709a2b093122b8d80f21690edeb0dc69837ff (patch) | |
| tree | 0f0434458cac479e97bc1b1c9bc43558f5117f2a | |
| parent | 6e923ed8cdbdcf45902cb64dd921d63dea310d1d (diff) | |
| download | tor-cd3709a2b093122b8d80f21690edeb0dc69837ff.tar.gz tor-cd3709a2b093122b8d80f21690edeb0dc69837ff.zip | |
For accuracy, s/exit_allows_optimistic_data/may_use_optimistic_data/
| -rw-r--r-- | src/or/circuituse.c | 8 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 9fbe5fed65..acfdc237e0 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -739,7 +739,7 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) tor_assert(conn); conn->cpath_layer = NULL; /* make sure we don't keep a stale pointer */ - conn->exit_allows_optimistic_data = 0; + conn->may_use_optimistic_data = 0; conn->on_circuit = NULL; if (CIRCUIT_IS_ORIGIN(circ)) { @@ -1597,13 +1597,13 @@ link_apconn_to_circ(edge_connection_t *apconn, origin_circuit_t *circ, if (optimistic_data_enabled() && circ->_base.purpose == CIRCUIT_PURPOSE_C_GENERAL && exitnode->rs->version_supports_optimistic_data) - apconn->exit_allows_optimistic_data = 1; + apconn->may_use_optimistic_data = 1; else - apconn->exit_allows_optimistic_data = 0; + apconn->may_use_optimistic_data = 0; log_info(LD_APP, "Looks like completed circuit to %s %s allow " "optimistic data for connection to %s", safe_str_client(node_describe(exitnode)), - apconn->exit_allows_optimistic_data ? "does" : "doesn't", + apconn->may_use_optimistic_data ? "does" : "doesn't", safe_str_client(apconn->socks_request->address)); } } diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 72394e8777..a7e3c1656b 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2372,7 +2372,7 @@ connection_ap_supports_optimistic_data(const edge_connection_t *conn) conn->on_circuit->purpose != CIRCUIT_PURPOSE_C_GENERAL) return 0; - return conn->exit_allows_optimistic_data; + return conn->may_use_optimistic_data; } /** Write a relay begin cell, using destaddr and destport from ap_conn's diff --git a/src/or/or.h b/src/or/or.h index c518b4cd8f..d6d8c7a050 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1269,9 +1269,10 @@ typedef struct edge_connection_t { unsigned int is_transparent_ap:1; /** For AP connections only: Set if this connection's target exit node - * allows optimistic data. (That is, data sent on this stream before - * the exit has sent a CONNECTED cell.)*/ - unsigned int exit_allows_optimistic_data : 1; + * allows optimistic data (that is, data sent on this stream before + * the exit has sent a CONNECTED cell) and we have chosen to use it. + */ + unsigned int may_use_optimistic_data : 1; /** For AP connections only: buffer for data that we have sent * optimistically, which we might need to re-send if we have to |