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

Unified Diff: net/quic/quic_server_bin.cc

Issue 340433002: Port QuicServer to Chrome network stack (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Indentation fix Created 6 years, 6 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/quic/quic_server_bin.cc
diff --git a/net/tools/quic/quic_server_bin.cc b/net/quic/quic_server_bin.cc
similarity index 77%
rename from net/tools/quic/quic_server_bin.cc
rename to net/quic/quic_server_bin.cc
index 2d349ac4792112764edcafb1c17976d6485f8d0b..e8e90fd61fda82571d25dccb0fab9b31dd356b12 100644
--- a/net/tools/quic/quic_server_bin.cc
+++ b/net/quic/quic_server_bin.cc
@@ -11,13 +11,14 @@
#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/logging.h"
+#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "net/base/ip_endpoint.h"
-#include "net/tools/quic/quic_in_memory_cache.h"
-#include "net/tools/quic/quic_server.h"
+#include "net/quic/quic_in_memory_cache.h"
+#include "net/quic/quic_protocol.h"
+#include "net/quic/quic_server.h"
// The port the quic server will listen on.
-
int32 FLAGS_port = 6121;
int main(int argc, char *argv[]) {
@@ -42,8 +43,8 @@ int main(int argc, char *argv[]) {
}
if (line->HasSwitch("quic_in_memory_cache_dir")) {
- net::tools::FLAGS_quic_in_memory_cache_dir =
- line->GetSwitchValueASCII("quic_in_memory_cache_dir");
+ net::g_quic_in_memory_cache_dir =
+ line->GetSwitchValueNative("quic_in_memory_cache_dir");
}
if (line->HasSwitch("port")) {
@@ -55,18 +56,22 @@ int main(int argc, char *argv[]) {
base::AtExitManager exit_manager;
+ base::MessageLoopForIO message_loop;
+
net::IPAddressNumber ip;
CHECK(net::ParseIPLiteralToNumber("::", &ip));
- net::tools::QuicServer server;
+ net::QuicConfig config;
+ config.SetDefaults();
- if (!server.Listen(net::IPEndPoint(ip, FLAGS_port))) {
+ net::QuicServer server(config, net::QuicSupportedVersions());
+
+ int rc = server.Listen(net::IPEndPoint(ip, FLAGS_port));
+ if (rc < 0) {
return 1;
}
- while (1) {
- server.WaitForEvents();
- }
+ base::RunLoop().Run();
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698