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

Unified Diff: net/tools/quic/quic_dispatcher.cc

Issue 1031243002: Unify the QUIC dispatcher and make the QuicServer work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix iOS Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: net/tools/quic/quic_dispatcher.cc
diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc
index eb8f18a754ff5072343da8b022eacbf8e365d184..fab47490466db78eb5c6766a7e0779842f926bad 100644
--- a/net/tools/quic/quic_dispatcher.cc
+++ b/net/tools/quic/quic_dispatcher.cc
@@ -11,9 +11,6 @@
#include "net/quic/quic_blocked_writer_interface.h"
#include "net/quic/quic_flags.h"
#include "net/quic/quic_utils.h"
-#include "net/tools/epoll_server/epoll_server.h"
-#include "net/tools/quic/quic_default_packet_writer.h"
-#include "net/tools/quic/quic_epoll_connection_helper.h"
#include "net/tools/quic/quic_per_connection_packet_writer.h"
#include "net/tools/quic/quic_socket_utils.h"
#include "net/tools/quic/quic_time_wait_list_manager.h"
@@ -193,9 +190,9 @@ QuicDispatcher::~QuicDispatcher() {
STLDeleteElements(&closed_session_list_);
}
-void QuicDispatcher::Initialize(int fd) {
+void QuicDispatcher::InitializeWithWriter(QuicPacketWriter* writer) {
DCHECK(writer_ == nullptr);
- writer_.reset(CreateWriter(fd));
+ writer_.reset(writer);
time_wait_list_manager_.reset(CreateQuicTimeWaitListManager());
}
@@ -401,10 +398,6 @@ void QuicDispatcher::OnConnectionRemovedFromTimeWaitList(
DVLOG(1) << "Connection " << connection_id << " removed from time wait list.";
}
-QuicPacketWriter* QuicDispatcher::CreateWriter(int fd) {
- return new QuicDefaultPacketWriter(fd);
-}
-
QuicServerSession* QuicDispatcher::CreateQuicSession(
QuicConnectionId connection_id,
const IPEndPoint& server_address,

Powered by Google App Engine
This is Rietveld 408576698