summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-02 17:49:42 -0500
committerNick Mathewson <nickm@torproject.org>2010-09-27 14:22:18 -0400
commit98ec959c9c1d2b0a872926a3cafe42742520397a (patch)
treeab49b76a5c04d9a748667a304bda10c87e64c823 /src/or/connection.c
parent0c9b64d449a725dc2f9f043d174b581e3a5d9cb2 (diff)
downloadtor-98ec959c9c1d2b0a872926a3cafe42742520397a.tar.gz
tor-98ec959c9c1d2b0a872926a3cafe42742520397a.zip
Fix a couple of bufferevent incompatibilities that snuck in.
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index b5496d72d5..2944a0d4bb 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;