Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(582)

Side by Side Diff: net/socket/socket_test_util.h

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed location of enable_connect_job_waiting_ and added documentation. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_SOCKET_SOCKET_TEST_UTIL_H_ 5 #ifndef NET_SOCKET_SOCKET_TEST_UTIL_H_
6 #define NET_SOCKET_SOCKET_TEST_UTIL_H_ 6 #define NET_SOCKET_SOCKET_TEST_UTIL_H_
7 7
8 #include <cstring> 8 #include <cstring>
9 #include <deque> 9 #include <deque>
10 #include <string> 10 #include <string>
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 std::string next_proto; 328 std::string next_proto;
329 std::string server_protos; 329 std::string server_protos;
330 bool was_npn_negotiated; 330 bool was_npn_negotiated;
331 NextProto protocol_negotiated; 331 NextProto protocol_negotiated;
332 bool client_cert_sent; 332 bool client_cert_sent;
333 SSLCertRequestInfo* cert_request_info; 333 SSLCertRequestInfo* cert_request_info;
334 scoped_refptr<X509Certificate> cert; 334 scoped_refptr<X509Certificate> cert;
335 bool channel_id_sent; 335 bool channel_id_sent;
336 ServerBoundCertService* server_bound_cert_service; 336 ServerBoundCertService* server_bound_cert_service;
337 int connection_status; 337 int connection_status;
338
339 // Denotes that this job may have pending jobs dependant upon its connection.
340 bool is_leader_;
338 }; 341 };
339 342
340 // A DataProvider where the client must write a request before the reads (e.g. 343 // A DataProvider where the client must write a request before the reads (e.g.
341 // the response) will complete. 344 // the response) will complete.
342 class DelayedSocketData : public StaticSocketDataProvider { 345 class DelayedSocketData : public StaticSocketDataProvider {
343 public: 346 public:
344 // |write_delay| the number of MockWrites to complete before allowing 347 // |write_delay| the number of MockWrites to complete before allowing
345 // a MockRead to complete. 348 // a MockRead to complete.
346 // |reads| the list of MockRead completions. 349 // |reads| the list of MockRead completions.
347 // |writes| the list of MockWrite completions. 350 // |writes| the list of MockWrite completions.
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 // socket types. 630 // socket types.
628 class MockClientSocketFactory : public ClientSocketFactory { 631 class MockClientSocketFactory : public ClientSocketFactory {
629 public: 632 public:
630 MockClientSocketFactory(); 633 MockClientSocketFactory();
631 virtual ~MockClientSocketFactory(); 634 virtual ~MockClientSocketFactory();
632 635
633 void AddSocketDataProvider(SocketDataProvider* socket); 636 void AddSocketDataProvider(SocketDataProvider* socket);
634 void AddSSLSocketDataProvider(SSLSocketDataProvider* socket); 637 void AddSSLSocketDataProvider(SSLSocketDataProvider* socket);
635 void ResetNextMockIndexes(); 638 void ResetNextMockIndexes();
636 639
640 // Tells the client socket factory that the leading job has connected.
641 static void SetLeaderConnected();
642
643 // Returns |leader_connected_|.
644 static bool IsLeaderConnected();
645
637 SocketDataProviderArray<SocketDataProvider>& mock_data() { 646 SocketDataProviderArray<SocketDataProvider>& mock_data() {
638 return mock_data_; 647 return mock_data_;
639 } 648 }
640 649
641 // ClientSocketFactory 650 // ClientSocketFactory
642 virtual scoped_ptr<DatagramClientSocket> CreateDatagramClientSocket( 651 virtual scoped_ptr<DatagramClientSocket> CreateDatagramClientSocket(
643 DatagramSocket::BindType bind_type, 652 DatagramSocket::BindType bind_type,
644 const RandIntCallback& rand_int_cb, 653 const RandIntCallback& rand_int_cb,
645 NetLog* net_log, 654 NetLog* net_log,
646 const NetLog::Source& source) OVERRIDE; 655 const NetLog::Source& source) OVERRIDE;
647 virtual scoped_ptr<StreamSocket> CreateTransportClientSocket( 656 virtual scoped_ptr<StreamSocket> CreateTransportClientSocket(
648 const AddressList& addresses, 657 const AddressList& addresses,
649 NetLog* net_log, 658 NetLog* net_log,
650 const NetLog::Source& source) OVERRIDE; 659 const NetLog::Source& source) OVERRIDE;
651 virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket( 660 virtual scoped_ptr<SSLClientSocket> CreateSSLClientSocket(
652 scoped_ptr<ClientSocketHandle> transport_socket, 661 scoped_ptr<ClientSocketHandle> transport_socket,
653 const HostPortPair& host_and_port, 662 const HostPortPair& host_and_port,
654 const SSLConfig& ssl_config, 663 const SSLConfig& ssl_config,
655 const SSLClientSocketContext& context) OVERRIDE; 664 const SSLClientSocketContext& context) OVERRIDE;
656 virtual void ClearSSLSessionCache() OVERRIDE; 665 virtual void ClearSSLSessionCache() OVERRIDE;
666 virtual std::vector<MockSSLClientSocket*> GetSSLClientSockets();
657 667
658 private: 668 private:
659 SocketDataProviderArray<SocketDataProvider> mock_data_; 669 SocketDataProviderArray<SocketDataProvider> mock_data_;
660 SocketDataProviderArray<SSLSocketDataProvider> mock_ssl_data_; 670 SocketDataProviderArray<SSLSocketDataProvider> mock_ssl_data_;
671 static bool leader_connected_;
672 std::vector<MockSSLClientSocket*> ssl_client_sockets_;
661 }; 673 };
662 674
663 class MockClientSocket : public SSLClientSocket { 675 class MockClientSocket : public SSLClientSocket {
664 public: 676 public:
665 // Value returned by GetTLSUniqueChannelBinding(). 677 // Value returned by GetTLSUniqueChannelBinding().
666 static const char kTlsUnique[]; 678 static const char kTlsUnique[];
667 679
668 // The BoundNetLog is needed to test LoadTimingInfo, which uses NetLog IDs as 680 // The BoundNetLog is needed to test LoadTimingInfo, which uses NetLog IDs as
669 // unique socket IDs. 681 // unique socket IDs.
670 explicit MockClientSocket(const BoundNetLog& net_log); 682 explicit MockClientSocket(const BoundNetLog& net_log);
(...skipping 13 matching lines...) Expand all
684 virtual void Disconnect() OVERRIDE; 696 virtual void Disconnect() OVERRIDE;
685 virtual bool IsConnected() const OVERRIDE; 697 virtual bool IsConnected() const OVERRIDE;
686 virtual bool IsConnectedAndIdle() const OVERRIDE; 698 virtual bool IsConnectedAndIdle() const OVERRIDE;
687 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; 699 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
688 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; 700 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
689 virtual const BoundNetLog& NetLog() const OVERRIDE; 701 virtual const BoundNetLog& NetLog() const OVERRIDE;
690 virtual void SetSubresourceSpeculation() OVERRIDE {} 702 virtual void SetSubresourceSpeculation() OVERRIDE {}
691 virtual void SetOmniboxSpeculation() OVERRIDE {} 703 virtual void SetOmniboxSpeculation() OVERRIDE {}
692 704
693 // SSLClientSocket implementation. 705 // SSLClientSocket implementation.
706 virtual bool InSessionCache() const OVERRIDE;
707 virtual void WatchSessionForCompletion(const base::Closure& cb) OVERRIDE;
708 virtual void SetSocketFailureCallback(const base::Closure& cb) OVERRIDE;
709 virtual void OnSocketFailure() OVERRIDE;
710 virtual void SetIsLeader() OVERRIDE;
694 virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) 711 virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info)
695 OVERRIDE; 712 OVERRIDE;
696 virtual int ExportKeyingMaterial(const base::StringPiece& label, 713 virtual int ExportKeyingMaterial(const base::StringPiece& label,
697 bool has_context, 714 bool has_context,
698 const base::StringPiece& context, 715 const base::StringPiece& context,
699 unsigned char* out, 716 unsigned char* out,
700 unsigned int outlen) OVERRIDE; 717 unsigned int outlen) OVERRIDE;
701 virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE; 718 virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE;
702 virtual NextProtoStatus GetNextProto(std::string* proto, 719 virtual NextProtoStatus GetNextProto(std::string* proto,
703 std::string* server_protos) OVERRIDE; 720 std::string* server_protos) OVERRIDE;
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
943 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 960 virtual int Connect(const CompletionCallback& callback) OVERRIDE;
944 virtual void Disconnect() OVERRIDE; 961 virtual void Disconnect() OVERRIDE;
945 virtual bool IsConnected() const OVERRIDE; 962 virtual bool IsConnected() const OVERRIDE;
946 virtual bool WasEverUsed() const OVERRIDE; 963 virtual bool WasEverUsed() const OVERRIDE;
947 virtual bool UsingTCPFastOpen() const OVERRIDE; 964 virtual bool UsingTCPFastOpen() const OVERRIDE;
948 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; 965 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
949 virtual bool WasNpnNegotiated() const OVERRIDE; 966 virtual bool WasNpnNegotiated() const OVERRIDE;
950 virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; 967 virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
951 968
952 // SSLClientSocket implementation. 969 // SSLClientSocket implementation.
970 virtual bool InSessionCache() const OVERRIDE;
971 virtual void WatchSessionForCompletion(const base::Closure& cb) OVERRIDE;
972 virtual void SetSocketFailureCallback(const base::Closure& cb) OVERRIDE;
973 virtual void OnSocketFailure() OVERRIDE;
953 virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) 974 virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info)
954 OVERRIDE; 975 OVERRIDE;
955 virtual NextProtoStatus GetNextProto(std::string* proto, 976 virtual NextProtoStatus GetNextProto(std::string* proto,
956 std::string* server_protos) OVERRIDE; 977 std::string* server_protos) OVERRIDE;
957 virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE; 978 virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE;
958 virtual void set_protocol_negotiated(NextProto protocol_negotiated) OVERRIDE; 979 virtual void set_protocol_negotiated(NextProto protocol_negotiated) OVERRIDE;
959 virtual NextProto GetNegotiatedProtocol() const OVERRIDE; 980 virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
960 981
961 // This MockSocket does not implement the manual async IO feature. 982 // This MockSocket does not implement the manual async IO feature.
962 virtual void OnReadComplete(const MockRead& data) OVERRIDE; 983 virtual void OnReadComplete(const MockRead& data) OVERRIDE;
963 virtual void OnConnectComplete(const MockConnect& data) OVERRIDE; 984 virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
964 985
965 virtual bool WasChannelIDSent() const OVERRIDE; 986 virtual bool WasChannelIDSent() const OVERRIDE;
966 virtual void set_channel_id_sent(bool channel_id_sent) OVERRIDE; 987 virtual void set_channel_id_sent(bool channel_id_sent) OVERRIDE;
967 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE; 988 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
968 989
990 // Returns a bool indicating whether or not the socket connected at
991 // the correct time relative to other sockets with the same host/port pair.
992 //
993 // If |is_leader_| is true, the socket should connect before all other
994 // sockets.
995 // If |is_leader_| is false, the socket should not connect until the leading
996 // socket has connected.
997 bool IsGoodOrdering() const;
998
969 private: 999 private:
970 static void ConnectCallback(MockSSLClientSocket* ssl_client_socket, 1000 static void ConnectCallback(MockSSLClientSocket* ssl_client_socket,
971 const CompletionCallback& callback, 1001 const CompletionCallback& callback,
972 int rv); 1002 int rv);
973 1003
1004 base::Closure process_pending_jobs_callback_;
1005
974 scoped_ptr<ClientSocketHandle> transport_; 1006 scoped_ptr<ClientSocketHandle> transport_;
975 SSLSocketDataProvider* data_; 1007 SSLSocketDataProvider* data_;
976 bool is_npn_state_set_; 1008 bool is_npn_state_set_;
977 bool new_npn_value_; 1009 bool new_npn_value_;
978 bool is_protocol_negotiated_set_; 1010 bool is_protocol_negotiated_set_;
979 NextProto protocol_negotiated_; 1011 NextProto protocol_negotiated_;
1012 bool good_ordering_;
980 1013
981 DISALLOW_COPY_AND_ASSIGN(MockSSLClientSocket); 1014 DISALLOW_COPY_AND_ASSIGN(MockSSLClientSocket);
982 }; 1015 };
983 1016
984 class MockUDPClientSocket : public DatagramClientSocket, public AsyncSocket { 1017 class MockUDPClientSocket : public DatagramClientSocket, public AsyncSocket {
985 public: 1018 public:
986 MockUDPClientSocket(SocketDataProvider* data, net::NetLog* net_log); 1019 MockUDPClientSocket(SocketDataProvider* data, net::NetLog* net_log);
987 virtual ~MockUDPClientSocket(); 1020 virtual ~MockUDPClientSocket();
988 1021
989 // Socket implementation. 1022 // Socket implementation.
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1285 1318
1286 extern const char kSOCKS5OkRequest[]; 1319 extern const char kSOCKS5OkRequest[];
1287 extern const int kSOCKS5OkRequestLength; 1320 extern const int kSOCKS5OkRequestLength;
1288 1321
1289 extern const char kSOCKS5OkResponse[]; 1322 extern const char kSOCKS5OkResponse[];
1290 extern const int kSOCKS5OkResponseLength; 1323 extern const int kSOCKS5OkResponseLength;
1291 1324
1292 } // namespace net 1325 } // namespace net
1293 1326
1294 #endif // NET_SOCKET_SOCKET_TEST_UTIL_H_ 1327 #endif // NET_SOCKET_SOCKET_TEST_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698