From a3ebdd66104c52722251d281028351ba2fed6cef 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 | 21 ++++++++++++++++++++ src/net/socket/client_socket_pool_manager.h | 13 ++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/net/socket/client_socket_pool_manager.cc b/src/net/socket/client_socket_pool_manager.cc index a2eaa6faf7..e6f160e81a 100644 --- a/src/net/socket/client_socket_pool_manager.cc +++ b/src/net/socket/client_socket_pool_manager.cc @@ -283,6 +283,27 @@ int InitSocketHandleForWebSocketRequest( proxy_auth_callback); } +int InitSocketHandleForRawConnect2(const HostPortPair& endpoint, + HttpNetworkSession* session, + int request_load_flags, + RequestPriority request_priority, + const ProxyInfo& proxy_info, + const SSLConfig& ssl_config_for_origin, + const SSLConfig& ssl_config_for_proxy, + PrivacyMode privacy_mode, + const NetLogWithSource& net_log, + ClientSocketHandle* socket_handle, + CompletionOnceCallback callback) { + DCHECK(socket_handle); + return InitSocketPoolHelper( + ClientSocketPoolManager::NORMAL_GROUP, endpoint, request_load_flags, + request_priority, session, proxy_info, ssl_config_for_origin, + ssl_config_for_proxy, true /* is_for_websockets */, privacy_mode, + NetworkIsolationKey(), SocketTag(), net_log, 0, socket_handle, + HttpNetworkSession::NORMAL_SOCKET_POOL, std::move(callback), + ClientSocketPool::ProxyAuthCallback()); +} + int PreconnectSocketsForHttpRequest( ClientSocketPoolManager::SocketGroupType group_type, const HostPortPair& endpoint, diff --git a/src/net/socket/client_socket_pool_manager.h b/src/net/socket/client_socket_pool_manager.h index 3d92536f62..6244028397 100644 --- a/src/net/socket/client_socket_pool_manager.h +++ b/src/net/socket/client_socket_pool_manager.h @@ -138,6 +138,19 @@ int InitSocketHandleForWebSocketRequest( CompletionOnceCallback callback, const ClientSocketPool::ProxyAuthCallback& proxy_auth_callback); +NET_EXPORT int InitSocketHandleForRawConnect2( + const HostPortPair& endpoint, + HttpNetworkSession* session, + int request_load_flags, + RequestPriority request_priority, + const ProxyInfo& proxy_info, + const SSLConfig& ssl_config_for_origin, + const SSLConfig& ssl_config_for_proxy, + PrivacyMode privacy_mode, + const NetLogWithSource& net_log, + ClientSocketHandle* socket_handle, + CompletionOnceCallback callback); + // Similar to InitSocketHandleForHttpRequest except that it initiates the // desired number of preconnect streams from the relevant socket pool. int PreconnectSocketsForHttpRequest(