From bf57093e5e499b708322a65f1da472689ac61238 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sat, 8 Dec 2018 00:52:08 -0500 Subject: [PATCH] socket: Add RawConnect method --- src/net/socket/client_socket_pool_manager.cc | 25 ++++++++++++++++++++ src/net/socket/client_socket_pool_manager.h | 15 ++++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/net/socket/client_socket_pool_manager.cc b/src/net/socket/client_socket_pool_manager.cc index cc5d796f68..c1edb8c66f 100644 --- a/src/net/socket/client_socket_pool_manager.cc +++ b/src/net/socket/client_socket_pool_manager.cc @@ -407,6 +407,31 @@ int InitSocketHandleForRawConnect( OnHostResolutionCallback(), std::move(callback), proxy_auth_callback); } +int InitSocketHandleForRawConnect2( + const HostPortPair& host_port_pair, + HttpNetworkSession* session, + int request_load_flags, + RequestPriority request_priority, + const ProxyInfo& proxy_info, + quic::QuicTransportVersion quic_version, + const SSLConfig& ssl_config_for_origin, + const SSLConfig& ssl_config_for_proxy, + PrivacyMode privacy_mode, + const NetLogWithSource& net_log, + ClientSocketHandle* socket_handle, + CompletionOnceCallback callback, + const ClientSocketPool::ProxyAuthCallback& proxy_auth_callback) { + DCHECK(socket_handle); + HttpRequestHeaders request_extra_headers; + return InitSocketPoolHelper( + ClientSocketPoolManager::NORMAL_GROUP, host_port_pair, + request_extra_headers, request_load_flags, request_priority, session, + proxy_info, quic_version, ssl_config_for_origin, ssl_config_for_proxy, + /*force_tunnel=*/true, privacy_mode, SocketTag(), net_log, 0, + socket_handle, HttpNetworkSession::NORMAL_SOCKET_POOL, + OnHostResolutionCallback(), std::move(callback), proxy_auth_callback); +} + int InitSocketHandleForTlsConnect( const HostPortPair& endpoint, HttpNetworkSession* session, diff --git a/src/net/socket/client_socket_pool_manager.h b/src/net/socket/client_socket_pool_manager.h index 8b589fccfa..2efdcf47d1 100644 --- a/src/net/socket/client_socket_pool_manager.h +++ b/src/net/socket/client_socket_pool_manager.h @@ -167,6 +167,21 @@ NET_EXPORT int InitSocketHandleForRawConnect( CompletionOnceCallback callback, const ClientSocketPool::ProxyAuthCallback& proxy_auth_callback); +NET_EXPORT int InitSocketHandleForRawConnect2( + const HostPortPair& host_port_pair, + HttpNetworkSession* session, + int request_load_flags, + RequestPriority request_priority, + const ProxyInfo& proxy_info, + quic::QuicTransportVersion quic_version, + const SSLConfig& ssl_config_for_origin, + const SSLConfig& ssl_config_for_proxy, + PrivacyMode privacy_mode, + const NetLogWithSource& net_log, + ClientSocketHandle* socket_handle, + CompletionOnceCallback callback, + const ClientSocketPool::ProxyAuthCallback& proxy_auth_callback); + // Deprecated: Please do not use this outside of //net and //services/network. // A helper method that uses the passed in proxy information to initialize a // ClientSocketHandle with the relevant socket pool. Use this method for