| 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..d8c453bc29aeda7af02d98b0dfa5fd1aa9a2b091 100644
|
| --- a/net/tools/quic/quic_server_bin.cc
|
| +++ b/net/tools/quic/quic_server_bin.cc
|
| @@ -11,13 +11,16 @@
|
| #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.
|
| +const uint32 kServerInitialFlowControlWindow = 100 * net::kMaxPacketSize;
|
|
|
| +// The port the quic server will listen on.
|
| int32 FLAGS_port = 6121;
|
|
|
| int main(int argc, char *argv[]) {
|
| @@ -42,8 +45,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 +58,24 @@ 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(),
|
| + kServerInitialFlowControlWindow);
|
|
|
| - while (1) {
|
| - server.WaitForEvents();
|
| + int rc = server.Listen(net::IPEndPoint(ip, FLAGS_port));
|
| + if (rc < 0) {
|
| + return -rc;
|
| }
|
|
|
| + base::RunLoop().Run();
|
| +
|
| return 0;
|
| }
|
|
|