Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A server side dispatcher which dispatches a given client's data to their
 // stream.
 
 #ifndef NET_TOOLS_QUIC_QUIC_DISPATCHER_H_
 #define NET_TOOLS_QUIC_QUIC_DISPATCHER_H_
 
@@ skipping 68 matching lines @@
   virtual void OnCanWrite();
 
   // Returns true if there's anything in the blocked writer list.
   virtual bool HasPendingWrites() const;
 
   // Sends ConnectionClose frames to all connected clients.
   void Shutdown();
 
   // QuicServerSessionVisitor interface implementation:
   // Ensure that the closed connection is cleaned up asynchronously.
-  virtual void OnConnectionClosed(QuicGuid guid, QuicErrorCode error) OVERRIDE;
+  virtual void OnConnectionClosed(QuicConnectionId connection_id,
+                                  QuicErrorCode error) OVERRIDE;
 
   // Queues the blocked writer for later resumption.
   virtual void OnWriteBlocked(QuicBlockedWriterInterface* writer) OVERRIDE;
 
-  typedef base::hash_map<QuicGuid, QuicSession*> SessionMap;
+  typedef base::hash_map<QuicConnectionId, QuicSession*> SessionMap;
 
   // Deletes all sessions on the closed session list and clears the list.
   void DeleteSessions();
 
   const SessionMap& session_map() const { return session_map_; }
 
   WriteBlockedList* write_blocked_list() { return &write_blocked_list_; }
 
  protected:
   // Instantiates a new low-level packet writer. Caller takes ownership of the
   // returned object.
   QuicPacketWriter* CreateWriter(int fd);
 
   // Instantiates a new top-level writer wrapper. Takes ownership of |writer|.
   // Caller takes ownership of the returned object.
   virtual QuicPacketWriterWrapper* CreateWriterWrapper(
       QuicPacketWriter* writer);
 
-  virtual QuicSession* CreateQuicSession(QuicGuid guid,
+  virtual QuicSession* CreateQuicSession(QuicConnectionId connection_id,
                                          const IPEndPoint& server_address,
                                          const IPEndPoint& client_address);
 
-  QuicConnection* CreateQuicConnection(QuicGuid guid,
+  QuicConnection* CreateQuicConnection(QuicConnectionId connection_id,
                                        const IPEndPoint& server_address,
                                        const IPEndPoint& client_address);
 
   // Replaces the packet writer with |writer|. Takes ownership of |writer|.
   void set_writer(QuicPacketWriter* writer);
 
   QuicTimeWaitListManager* time_wait_list_manager() {
     return time_wait_list_manager_.get();
   }
 
@@ skipping 25 matching lines @@
 
  private:
   class QuicFramerVisitor;
   friend class net::tools::test::QuicDispatcherPeer;
 
   // Called by |framer_visitor_| when the private header has been parsed
   // of a data packet that is destined for the time wait manager.
   void OnUnauthenticatedHeader(const QuicPacketHeader& header);
 
   // Removes the session from the session map and write blocked list, and
-  // adds the GUID to the time-wait list.
+  // adds the ConnectionId to the time-wait list.
   void CleanUpSession(SessionMap::iterator it);
 
   bool HandlePacketForTimeWait(const QuicPacketPublicHeader& header);
 
   const QuicConfig& config_;
 
   const QuicCryptoServerConfig& crypto_config_;
 
   // The list of connections waiting to write.
   WriteBlockedList write_blocked_list_;
 
   SessionMap session_map_;
 
-  // Entity that manages guids in time wait state.
+  // Entity that manages connection_ids in time wait state.
   scoped_ptr<QuicTimeWaitListManager> time_wait_list_manager_;
 
   // An alarm which deletes closed sessions.
   scoped_ptr<DeleteSessionsAlarm> delete_sessions_alarm_;
 
   // The list of closed but not-yet-deleted sessions.
   std::list<QuicSession*> closed_session_list_;
 
   EpollServer* epoll_server_;  // Owned by the server.
 
@@ skipping 19 matching lines @@
   QuicFramer framer_;
   scoped_ptr<QuicFramerVisitor> framer_visitor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicDispatcher);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_DISPATCHER_H_