walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Rename confusing names in HttpDownstreamConnection

This commit is contained in:
Tatsuhiro Tsujikawa 2017-01-08 23:09:00 +09:00
parent ac399e41ac
commit e8b2508036
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/shrpx_http_downstream_connection.cc
View File

@ -189,9 +189,9 @@ HttpDownstreamConnection::HttpDownstreamConnection(
readcb, connect_timeoutcb, this, readcb, connect_timeoutcb, this,
get_config()->tls.dyn_rec.warmup_threshold, get_config()->tls.dyn_rec.warmup_threshold,
get_config()->tls.dyn_rec.idle_timeout, PROTO_HTTP1), get_config()->tls.dyn_rec.idle_timeout, PROTO_HTTP1),
do_read_(&HttpDownstreamConnection::noop), on_read_(&HttpDownstreamConnection::noop),
do_write_(&HttpDownstreamConnection::noop), on_write_(&HttpDownstreamConnection::noop),
do_signal_write_(&HttpDownstreamConnection::noop), signal_write_(&HttpDownstreamConnection::noop),
worker_(worker), worker_(worker),
ssl_ctx_(worker->get_cl_ssl_ctx()), ssl_ctx_(worker->get_cl_ssl_ctx()),
group_(group), group_(group),
@ -454,7 +454,7 @@ int HttpDownstreamConnection::initiate_connection() {
ev_set_cb(&conn_.rev, readcb); ev_set_cb(&conn_.rev, readcb);
do_write_ = &HttpDownstreamConnection::write_reuse_first; on_write_ = &HttpDownstreamConnection::write_reuse_first;
reuse_first_write_done_ = false; reuse_first_write_done_ = false;
} }
@ -1096,9 +1096,9 @@ int HttpDownstreamConnection::write_reuse_first() {
} }
if (conn_.tls.ssl) { if (conn_.tls.ssl) {
do_write_ = &HttpDownstreamConnection::write_tls; on_write_ = &HttpDownstreamConnection::write_tls;
} else { } else {
do_write_ = &HttpDownstreamConnection::write_clear; on_write_ = &HttpDownstreamConnection::write_clear;
} }
reuse_first_write_done_ = true; reuse_first_write_done_ = true;
@ -1158,7 +1158,7 @@ int HttpDownstreamConnection::write_clear() {
// part of response body. So keep reading. Invoke read event // part of response body. So keep reading. Invoke read event
// to get read(2) error just in case. // to get read(2) error just in case.
ev_feed_event(conn_.loop, &conn_.rev, EV_READ); ev_feed_event(conn_.loop, &conn_.rev, EV_READ);
do_write_ = &HttpDownstreamConnection::noop; on_write_ = &HttpDownstreamConnection::noop;
reusable_ = false; reusable_ = false;
break; break;
} }
@ -1216,15 +1216,15 @@ int HttpDownstreamConnection::tls_handshake() {
auto &connect_blocker = addr_->connect_blocker; auto &connect_blocker = addr_->connect_blocker;
do_signal_write_ = &HttpDownstreamConnection::actual_signal_write; signal_write_ = &HttpDownstreamConnection::actual_signal_write;
connect_blocker->on_success(); connect_blocker->on_success();
ev_set_cb(&conn_.rt, timeoutcb); ev_set_cb(&conn_.rt, timeoutcb);
ev_set_cb(&conn_.wt, timeoutcb); ev_set_cb(&conn_.wt, timeoutcb);
do_read_ = &HttpDownstreamConnection::read_tls; on_read_ = &HttpDownstreamConnection::read_tls;
do_write_ = &HttpDownstreamConnection::write_tls; on_write_ = &HttpDownstreamConnection::write_tls;
// TODO Check negotiated ALPN // TODO Check negotiated ALPN
@ -1287,7 +1287,7 @@ int HttpDownstreamConnection::write_tls() {
// part of response body. So keep reading. Invoke read event // part of response body. So keep reading. Invoke read event
// to get read(2) error just in case. // to get read(2) error just in case.
ev_feed_event(conn_.loop, &conn_.rev, EV_READ); ev_feed_event(conn_.loop, &conn_.rev, EV_READ);
do_write_ = &HttpDownstreamConnection::noop; on_write_ = &HttpDownstreamConnection::noop;
reusable_ = false; reusable_ = false;
break; break;
} }
@ -1407,32 +1407,32 @@ int HttpDownstreamConnection::connected() {
ev_set_cb(&conn_.wev, writecb); ev_set_cb(&conn_.wev, writecb);
if (conn_.tls.ssl) { if (conn_.tls.ssl) {
do_read_ = &HttpDownstreamConnection::tls_handshake; on_read_ = &HttpDownstreamConnection::tls_handshake;
do_write_ = &HttpDownstreamConnection::tls_handshake; on_write_ = &HttpDownstreamConnection::tls_handshake;
return 0; return 0;
} }
do_signal_write_ = &HttpDownstreamConnection::actual_signal_write; signal_write_ = &HttpDownstreamConnection::actual_signal_write;
connect_blocker->on_success(); connect_blocker->on_success();
ev_set_cb(&conn_.rt, timeoutcb); ev_set_cb(&conn_.rt, timeoutcb);
ev_set_cb(&conn_.wt, timeoutcb); ev_set_cb(&conn_.wt, timeoutcb);
do_read_ = &HttpDownstreamConnection::read_clear; on_read_ = &HttpDownstreamConnection::read_clear;
do_write_ = &HttpDownstreamConnection::write_clear; on_write_ = &HttpDownstreamConnection::write_clear;
return 0; return 0;
} }
int HttpDownstreamConnection::on_read() { return do_read_(*this); } int HttpDownstreamConnection::on_read() { return on_read_(*this); }
int HttpDownstreamConnection::on_write() { return do_write_(*this); } int HttpDownstreamConnection::on_write() { return on_write_(*this); }
void HttpDownstreamConnection::on_upstream_change(Upstream *upstream) {} void HttpDownstreamConnection::on_upstream_change(Upstream *upstream) {}
void HttpDownstreamConnection::signal_write() { do_signal_write_(*this); } void HttpDownstreamConnection::signal_write() { signal_write_(*this); }
int HttpDownstreamConnection::actual_signal_write() { int HttpDownstreamConnection::actual_signal_write() {
ev_feed_event(conn_.loop, &conn_.wev, EV_WRITE); ev_feed_event(conn_.loop, &conn_.wev, EV_WRITE);

4
src/shrpx_http_downstream_connection.h
View File

@ -91,8 +91,8 @@ public:
private: private:
Connection conn_; Connection conn_;
std::function<int(HttpDownstreamConnection &)> do_read_, do_write_, std::function<int(HttpDownstreamConnection &)> on_read_, on_write_,
do_signal_write_; signal_write_;
Worker *worker_; Worker *worker_;
// nullptr if TLS is not used. // nullptr if TLS is not used.
SSL_CTX *ssl_ctx_; SSL_CTX *ssl_ctx_;