diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-02-02 17:49:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 14:22:18 -0400 |
| commit | 98ec959c9c1d2b0a872926a3cafe42742520397a (patch) | |
| tree | ab49b76a5c04d9a748667a304bda10c87e64c823 | |
| parent | 0c9b64d449a725dc2f9f043d174b581e3a5d9cb2 (diff) | |
| download | tor-98ec959c9c1d2b0a872926a3cafe42742520397a.tar tor-98ec959c9c1d2b0a872926a3cafe42742520397a.tar.gz | |
Fix a couple of bufferevent incompatibilities that snuck in.
| -rw-r--r-- | src/or/connection.c | 4 | ||||
| -rw-r--r-- | src/or/main.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index b5496d72d..2944a0d4b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -331,13 +331,13 @@ connection_init(time_t now, connection_t *conn, int type, int socket_family) conn->type = type; conn->socket_family = socket_family; +#ifndef USE_BUFFEREVENTS if (!connection_is_listener(conn)) { /* listeners never use their buf */ - /* XXX and bufferevents don't either, but for now we leave this here - * so that linked connections can still work. */ conn->inbuf = buf_new(); conn->outbuf = buf_new(); } +#endif conn->timestamp_created = now; conn->timestamp_lastread = now; diff --git a/src/or/main.c b/src/or/main.c index 263103662..f6f26b05f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -925,7 +925,11 @@ run_connection_housekeeping(int i, time_t now) the connection or send a keepalive, depending. */ or_conn = TO_OR_CONN(conn); +#ifdef USE_BUFFEREVENTS + tor_assert(conn->bufev); +#else tor_assert(conn->outbuf); +#endif if (or_conn->is_bad_for_new_circs && !or_conn->n_circuits) { /* It's bad for new circuits, and has no unmarked circuits on it: |