Port QuicServer to Chrome network stack

net/tools/quic/quic_server_bin.cc

Index: net/tools/quic/quic_server_bin.cc
diff --git a/net/tools/quic/quic_server_bin.cc b/net/tools/quic/quic_server_bin.cc
index 2d349ac4792112764edcafb1c17976d6485f8d0b..71ddc253dd7cb07d53148a4bbf78e0ea5028c633 100644
--- a/net/tools/quic/quic_server_bin.cc
+++ b/net/tools/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");

[wtc, 2014/06/20 21:40:50]

Why change GetSwitchValueASCII to GetSwitchValueNative?

[dmziegler, 2014/06/23 18:31:25]

Windows compatibility (wstring filenames).

   }
 
   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))) {
-    return 1;
-  }
+  net::QuicServer server(config, net::QuicSupportedVersions());
 
-  while (1) {
-    server.WaitForEvents();
+  int rc = server.Listen(net::IPEndPoint(ip, FLAGS_port));
+  if (rc < 0) {
+    return -rc;

[wtc, 2014/06/20 21:40:50]

IMPORTANT: the main() function can only return a value in the range [0, 255].
Our error code (the negated value) may be greater than 255. Can we just return
1?

This seems to be the only place where we call QuicServer::Listen. If we can't
really use the error code it returns, we can change QuicServer::Listen back to
returning a bool.

[dmziegler, 2014/06/23 18:31:25]

I'm leaving the error code for now in case it's useful if we use QuicServer in a
peer-to-peer context, but I'm returning 1.

   }
 
+  base::RunLoop().Run();
+
   return 0;
 }