mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-24 22:36:09 +03:00
Code Issues Projects Releases Wiki Activity

quic: Add support for HTTP/3 CONNECT Fast Open

Browse Source 
SpdyProxyClientSocket uses read_callback_ for both Connect() and
Read(), and its OnIOComplete() calls read_callback_, thus its fast
connect code checks read_callback_. The code was ported to
QuicProxyClientSocket without much change.

But QuicProxyClientSocket uses a separate connect_callback_ apart from
read_callback_, and its OnIOComplete() calls connect_callback_, thus
when headers are received after Connect() it doesn't need to check
read_callback_ and should always avoid calling connect_callback_.
This commit is contained in:
klzgrad 2019-01-17 05:47:20 -05:00
parent 76b33da6c0
commit 2303483bdb
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/net/quic/quic_proxy_client_socket.cc
View File

@ -36,6 +36,10 @@ QuicProxyClientSocket::QuicProxyClientSocket(
endpoint_(endpoint), endpoint_(endpoint),
auth_(auth_controller), auth_(auth_controller),
user_agent_(user_agent), user_agent_(user_agent),
// This is a hack to avoid messing up higer APIs.
// Should be false by default officially.
use_fastopen_(true),
read_headers_pending_(false),
net_log_(net_log), net_log_(net_log),
weak_factory_(this) { weak_factory_(this) {
DCHECK(stream_->IsOpen()); DCHECK(stream_->IsOpen());
@ -311,6 +315,16 @@ int QuicProxyClientSocket::DoLoop(int last_io_result) {
rv = DoReadReplyComplete(rv); rv = DoReadReplyComplete(rv);
net_log_.EndEventWithNetErrorCode( net_log_.EndEventWithNetErrorCode(
NetLogEventType::HTTP_TRANSACTION_TUNNEL_READ_HEADERS, rv); NetLogEventType::HTTP_TRANSACTION_TUNNEL_READ_HEADERS, rv);
if (use_fastopen_ && read_headers_pending_) {
read_headers_pending_ = false;
if (rv < 0) {
// read_callback_ will be called with this error and be reset.
// Further data after that will be ignored.
next_state_ = STATE_DISCONNECTED;
}
// Prevents calling connect_callback_.
rv = ERR_IO_PENDING;
}
break; break;
default: default:
NOTREACHED() << "bad state"; NOTREACHED() << "bad state";
@ -384,6 +398,11 @@ int QuicProxyClientSocket::DoReadReply() {
&response_header_block_, &response_header_block_,
base::Bind(&QuicProxyClientSocket::OnReadResponseHeadersComplete, base::Bind(&QuicProxyClientSocket::OnReadResponseHeadersComplete,
weak_factory_.GetWeakPtr())); weak_factory_.GetWeakPtr()));
if (use_fastopen_ && rv == ERR_IO_PENDING) {
read_headers_pending_ = true;
next_state_ = STATE_CONNECT_COMPLETE;
return OK;
}
if (rv == ERR_IO_PENDING) if (rv == ERR_IO_PENDING)
return ERR_IO_PENDING; return ERR_IO_PENDING;
if (rv < 0) if (rv < 0)
@ -423,6 +442,11 @@ int QuicProxyClientSocket::DoReadReplyComplete(int result) {
} }
void QuicProxyClientSocket::OnReadResponseHeadersComplete(int result) { void QuicProxyClientSocket::OnReadResponseHeadersComplete(int result) {
if (use_fastopen_ && read_headers_pending_ &&
next_state_ == STATE_CONNECT_COMPLETE) {
next_state_ = STATE_READ_REPLY_COMPLETE;
}
// Convert the now-populated spdy::SpdyHeaderBlock to HttpResponseInfo // Convert the now-populated spdy::SpdyHeaderBlock to HttpResponseInfo
if (result > 0) if (result > 0)
result = ProcessResponseHeaders(response_header_block_); result = ProcessResponseHeaders(response_header_block_);

3
src/net/quic/quic_proxy_client_socket.h
View File

@ -142,6 +142,9 @@ class NET_EXPORT_PRIVATE QuicProxyClientSocket : public ProxyClientSocket {
// Session connect timing info. // Session connect timing info.
LoadTimingInfo::ConnectTiming connect_timing_; LoadTimingInfo::ConnectTiming connect_timing_;
bool use_fastopen_;
bool read_headers_pending_;
const NetLogWithSource net_log_; const NetLogWithSource net_log_;
// The default weak pointer factory. // The default weak pointer factory.