diff --git a/src/shrpx_connection.cc b/src/shrpx_connection.cc index 95e1c320..bc64f1a0 100644 --- a/src/shrpx_connection.cc +++ b/src/shrpx_connection.cc @@ -61,9 +61,6 @@ Connection::Connection(struct ev_loop *loop, int fd, SSL *ssl, : tls{DefaultMemchunks(mcpool), DefaultPeekMemchunks(mcpool)}, wlimit(loop, &wev, write_limit.rate, write_limit.burst), rlimit(loop, &rev, read_limit.rate, read_limit.burst, this), - writecb(writecb), - readcb(readcb), - timeoutcb(timeoutcb), loop(loop), data(data), fd(fd), diff --git a/src/shrpx_connection.h b/src/shrpx_connection.h index a361e15e..8ce5aa24 100644 --- a/src/shrpx_connection.h +++ b/src/shrpx_connection.h @@ -125,9 +125,6 @@ struct Connection { ev_timer rt; RateLimit wlimit; RateLimit rlimit; - IOCb writecb; - IOCb readcb; - TimerCb timeoutcb; struct ev_loop *loop; void *data; int fd; diff --git a/src/shrpx_http_downstream_connection.cc b/src/shrpx_http_downstream_connection.cc index 6dd55595..1a62227a 100644 --- a/src/shrpx_http_downstream_connection.cc +++ b/src/shrpx_http_downstream_connection.cc @@ -957,7 +957,8 @@ int HttpDownstreamConnection::tls_handshake() { connect_blocker->on_success(); - conn_.timeoutcb = timeoutcb; + ev_set_cb(&conn_.rt, timeoutcb); + ev_set_cb(&conn_.wt, timeoutcb); do_read_ = &HttpDownstreamConnection::read_tls; do_write_ = &HttpDownstreamConnection::write_tls; @@ -1136,7 +1137,8 @@ int HttpDownstreamConnection::connected() { connect_blocker->on_success(); - conn_.timeoutcb = timeoutcb; + ev_set_cb(&conn_.rt, timeoutcb); + ev_set_cb(&conn_.wt, timeoutcb); do_read_ = &HttpDownstreamConnection::read_clear; do_write_ = &HttpDownstreamConnection::write_clear;