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

Side by Side Diff: net/quic/chromium/quic_stream_factory.h

Issue 2277953002: Fixes use-after-free with Server Migration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@home
Patch Set: Removed DVLOG Created 4 years, 3 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
« no previous file with comments | « no previous file | net/quic/chromium/quic_stream_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_QUIC_QUIC_STREAM_FACTORY_H_ 5 #ifndef NET_QUIC_QUIC_STREAM_FACTORY_H_
6 #define NET_QUIC_QUIC_STREAM_FACTORY_H_ 6 #define NET_QUIC_QUIC_STREAM_FACTORY_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 class CertVerifierJob; 384 class CertVerifierJob;
385 friend class test::QuicStreamFactoryPeer; 385 friend class test::QuicStreamFactoryPeer;
386 FRIEND_TEST_ALL_PREFIXES(HttpStreamFactoryTest, QuicLossyProxyMarkedAsBad); 386 FRIEND_TEST_ALL_PREFIXES(HttpStreamFactoryTest, QuicLossyProxyMarkedAsBad);
387 387
388 typedef std::map<QuicServerId, QuicChromiumClientSession*> SessionMap; 388 typedef std::map<QuicServerId, QuicChromiumClientSession*> SessionMap;
389 typedef std::map<QuicChromiumClientSession*, QuicSessionKey> SessionIdMap; 389 typedef std::map<QuicChromiumClientSession*, QuicSessionKey> SessionIdMap;
390 typedef std::set<QuicSessionKey> AliasSet; 390 typedef std::set<QuicSessionKey> AliasSet;
391 typedef std::map<QuicChromiumClientSession*, AliasSet> SessionAliasMap; 391 typedef std::map<QuicChromiumClientSession*, AliasSet> SessionAliasMap;
392 typedef std::set<QuicChromiumClientSession*> SessionSet; 392 typedef std::set<QuicChromiumClientSession*> SessionSet;
393 typedef std::map<IPEndPoint, SessionSet> IPAliasMap; 393 typedef std::map<IPEndPoint, SessionSet> IPAliasMap;
394 typedef std::map<QuicChromiumClientSession*, IPEndPoint> SessionPeerIPMap;
394 typedef std::set<Job*> JobSet; 395 typedef std::set<Job*> JobSet;
395 typedef std::map<QuicServerId, JobSet> JobMap; 396 typedef std::map<QuicServerId, JobSet> JobMap;
396 typedef std::map<QuicStreamRequest*, QuicServerId> RequestMap; 397 typedef std::map<QuicStreamRequest*, QuicServerId> RequestMap;
397 typedef std::set<QuicStreamRequest*> RequestSet; 398 typedef std::set<QuicStreamRequest*> RequestSet;
398 typedef std::map<QuicServerId, RequestSet> ServerIDRequestsMap; 399 typedef std::map<QuicServerId, RequestSet> ServerIDRequestsMap;
399 typedef std::deque<enum QuicChromiumClientSession::QuicDisabledReason> 400 typedef std::deque<enum QuicChromiumClientSession::QuicDisabledReason>
400 DisabledReasonsQueue; 401 DisabledReasonsQueue;
401 typedef std::map<QuicServerId, std::unique_ptr<CertVerifierJob>> 402 typedef std::map<QuicServerId, std::unique_ptr<CertVerifierJob>>
402 CertVerifierJobMap; 403 CertVerifierJobMap;
403 404
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 511
511 // Contains owning pointers to all sessions that currently exist. 512 // Contains owning pointers to all sessions that currently exist.
512 SessionIdMap all_sessions_; 513 SessionIdMap all_sessions_;
513 // Contains non-owning pointers to currently active session 514 // Contains non-owning pointers to currently active session
514 // (not going away session, once they're implemented). 515 // (not going away session, once they're implemented).
515 SessionMap active_sessions_; 516 SessionMap active_sessions_;
516 // Map from session to set of aliases that this session is known by. 517 // Map from session to set of aliases that this session is known by.
517 SessionAliasMap session_aliases_; 518 SessionAliasMap session_aliases_;
518 // Map from IP address to sessions which are connected to this address. 519 // Map from IP address to sessions which are connected to this address.
519 IPAliasMap ip_aliases_; 520 IPAliasMap ip_aliases_;
521 // Map from session to its original peer IP address.
522 SessionPeerIPMap session_peer_ip_;
520 523
521 // Origins which have gone away recently. 524 // Origins which have gone away recently.
522 AliasSet gone_away_aliases_; 525 AliasSet gone_away_aliases_;
523 526
524 const QuicConfig config_; 527 const QuicConfig config_;
525 QuicCryptoClientConfig crypto_config_; 528 QuicCryptoClientConfig crypto_config_;
526 529
527 JobMap active_jobs_; 530 JobMap active_jobs_;
528 ServerIDRequestsMap job_requests_map_; 531 ServerIDRequestsMap job_requests_map_;
529 RequestMap active_requests_; 532 RequestMap active_requests_;
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 const scoped_refptr<SSLConfigService> ssl_config_service_; 653 const scoped_refptr<SSLConfigService> ssl_config_service_;
651 654
652 base::WeakPtrFactory<QuicStreamFactory> weak_factory_; 655 base::WeakPtrFactory<QuicStreamFactory> weak_factory_;
653 656
654 DISALLOW_COPY_AND_ASSIGN(QuicStreamFactory); 657 DISALLOW_COPY_AND_ASSIGN(QuicStreamFactory);
655 }; 658 };
656 659
657 } // namespace net 660 } // namespace net
658 661
659 #endif // NET_QUIC_QUIC_STREAM_FACTORY_H_ 662 #endif // NET_QUIC_QUIC_STREAM_FACTORY_H_
OLDNEW
« no previous file with comments | « no previous file | net/quic/chromium/quic_stream_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698