diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-12-10 08:04:50 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-12-10 08:04:50 +0000 |
| commit | e206d222970cb781280e73871a627f712be691db (patch) | |
| tree | d880dd7bae405a4e0f5abcc75b21d021918a2f81 /src/or/circuituse.c | |
| parent | 733882315d1e6064b90a5f62f0c34fdc6628e99b (diff) | |
| download | tor-e206d222970cb781280e73871a627f712be691db.tar.gz tor-e206d222970cb781280e73871a627f712be691db.zip | |
some more cleanups and a bugfix on r9052
svn:r9062
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bc7d08736a..73e72f3e1e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -168,8 +168,6 @@ circuit_get_best(edge_connection_t *conn, int must_be_open, uint8_t purpose, purpose == CIRCUIT_PURPOSE_C_REND_JOINED); for (circ=global_circuitlist;circ;circ = circ->next) { - if (!CIRCUIT_IS_ORIGIN(circ)) - continue; if (!circuit_is_acceptable(circ,conn,must_be_open,purpose, need_uptime,need_internal,now)) continue; @@ -281,7 +279,8 @@ circuit_remove_handled_ports(smartlist_t *needed_ports) for (i = 0; i < smartlist_len(needed_ports); ++i) { port = smartlist_get(needed_ports, i); tor_assert(*port); - if (circuit_stream_is_being_handled(NULL, *port, 2)) { + if (circuit_stream_is_being_handled(NULL, *port, + MIN_CIRCUITS_HANDLING_STREAM)) { // log_debug(LD_CIRC,"Port %d is already being handled; removing.", port); smartlist_del(needed_ports, i--); tor_free(port); |