Index: net/tools/quic/quic_server_bin.cc |
diff --git a/net/quic/quic_server_bin.cc b/net/tools/quic/quic_server_bin.cc |
similarity index 90% |
copy from net/quic/quic_server_bin.cc |
copy to net/tools/quic/quic_server_bin.cc |
index 8d6f47a1e1c05ac874828f1fe8807f2382fcf368..d4124bb39e8629f150f8b64cd359f4ba62c7dfe3 100644 |
--- a/net/quic/quic_server_bin.cc |
+++ b/net/tools/quic/quic_server_bin.cc |
@@ -15,8 +15,8 @@ |
#include "base/strings/string_number_conversions.h" |
#include "net/base/ip_endpoint.h" |
#include "net/quic/quic_protocol.h" |
-#include "net/quic/quic_server.h" |
#include "net/tools/quic/quic_in_memory_cache.h" |
+#include "net/tools/quic/quic_server.h" |
// The port the quic server will listen on. |
int32 FLAGS_port = 6121; |
@@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { |
if (line->HasSwitch("quic_in_memory_cache_dir")) { |
net::tools::QuicInMemoryCache::GetInstance()->InitializeFromDirectory( |
- line->GetSwitchValueNative("quic_in_memory_cache_dir")); |
+ line->GetSwitchValueASCII("quic_in_memory_cache_dir")); |
} |
if (line->HasSwitch("port")) { |
@@ -61,14 +61,14 @@ int main(int argc, char *argv[]) { |
CHECK(net::ParseIPLiteralToNumber("::", &ip)); |
net::QuicConfig config; |
- net::QuicServer server(config, net::QuicSupportedVersions()); |
+ net::tools::QuicServer server(config, net::QuicSupportedVersions()); |
int rc = server.Listen(net::IPEndPoint(ip, FLAGS_port)); |
if (rc < 0) { |
return 1; |
} |
- base::RunLoop().Run(); |
- |
- return 0; |
+ while (1) { |
+ server.WaitForEvents(); |
+ } |
} |