diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-06-04 14:49:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-06-12 14:27:53 -0400 |
| commit | 1e709c79d12b2366d4e1c1ea517e313cc29ee3cd (patch) | |
| tree | bc87d6e2a8da346a061f387174487bdead78b6b0 /src/or/connection_edge.c | |
| parent | 33b1d714e779a714c2d55e5da09d0e3c682f273a (diff) | |
| download | tor-1e709c79d12b2366d4e1c1ea517e313cc29ee3cd.tar.gz tor-1e709c79d12b2366d4e1c1ea517e313cc29ee3cd.zip | |
Isolate Libevent API dependency to just main.c and dns.c in src/or.
The rest of the code was only including event.h so that it could see
EV_READ and EV_WRITE, which we were using as part of the
connection_watch_events interface for no very good reason.
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 6207ad3178..944b68e367 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -334,7 +334,7 @@ connection_edge_finished_connecting(edge_connection_t *edge_conn) safe_str(fmt_addr(&conn->addr))); conn->state = EXIT_CONN_STATE_OPEN; - connection_watch_events(conn, EV_READ); /* stop writing, continue reading */ + connection_watch_events(conn, READ_EVENT);/* stop writing, continue reading */ if (connection_wants_to_flush(conn)) /* in case there are any queued relay * cells */ connection_start_writing(conn); @@ -2727,7 +2727,7 @@ connection_exit_connect(edge_connection_t *edge_conn) case 0: conn->state = EXIT_CONN_STATE_CONNECTING; - connection_watch_events(conn, EV_WRITE | EV_READ); + connection_watch_events(conn, READ_EVENT | WRITE_EVENT); /* writable indicates finish; * readable/error indicates broken link in windows-land. */ return; @@ -2740,7 +2740,7 @@ connection_exit_connect(edge_connection_t *edge_conn) log_warn(LD_BUG,"newly connected conn had data waiting!"); // connection_start_writing(conn); } - connection_watch_events(conn, EV_READ); + connection_watch_events(conn, READ_EVENT); /* also, deliver a 'connected' cell back through the circuit. */ if (connection_edge_is_rendezvous_stream(edge_conn)) { |