Fix WebTransport test server and client. (#65)

Author: jianjunz

web_transport/sdk/impl/tests/web_transport_test_client.cc

@@ -14,13 +14,36 @@
 #include "net/third_party/quiche/src/quic/platform/api/quic_system_event_loop.h"
 #include "owt/quic/web_transport_factory.h"
 
+class WebTransportTestClientVisitor
+    : public owt::quic::WebTransportClientInterface::Visitor {
+  void OnConnected() override {
+    LOG(INFO) << "WebTransport client connected.";
+  }
+  // Called when the connection state changed from connecting to failed.
+  void OnConnectionFailed() override {
+    LOG(INFO) << "WebTransport client connection failed.";
+  }
+  // Called when an incoming stream is received.
+  void OnIncomingStream(owt::quic::WebTransportStreamInterface*) override {
+    LOG(INFO) << "WebTransport client received an incoming stream.";
+  }
+  // Called when datagram is processed.
+  void OnDatagramProcessed(owt::quic::MessageStatus) override {
+    LOG(INFO) << "WebTransport client processed datagram.";
+  }
+
+  void OnClosed(uint32_t code, const char* reason) override {
+    LOG(INFO) << "WebTransport client closed.";
+  }
+};
+
 DEFINE_QUIC_COMMAND_LINE_FLAG(std::string,
                               fingerprint,
                               "",
                               "Certificate fingerprint.");
 
 int main(int argc, char* argv[]) {
-  QuicSystemEventLoop event_loop("quic_client");
+  QuicSystemEventLoop event_loop("web_transport_test_client");
   const char* usage = "Usage: owt_web_transport_test_client [options] <url>";
 
   // All non-flag arguments should be interpreted as URLs to fetch.
@@ -38,13 +61,20 @@ int main(int argc, char* argv[]) {
     parameters.server_certificate_fingerprints_length = 0;
   } else {
     parameters.server_certificate_fingerprints_length = 1;
-    auto* fingerprints = new owt::quic::CertificateFingerprint[1];
-    fingerprints[0].fingerprint = fingerprint.c_str();
-    parameters.server_certificate_fingerprints = &fingerprints;
+    owt::quic::CertificateFingerprint** fingerprints =
+        new owt::quic::CertificateFingerprint*[1];
+    fingerprints[0] = new owt::quic::CertificateFingerprint();
+    fingerprints[0]->fingerprint = fingerprint.c_str();
+    parameters.server_certificate_fingerprints = fingerprints;
   }
   std::unique_ptr<owt::quic::WebTransportFactory> factory_(
       owt::quic::WebTransportFactory::CreateForTesting());
   std::unique_ptr<owt::quic::WebTransportClientInterface> client_(
       factory_->CreateWebTransportClient(urls[0].c_str(), parameters));
+  WebTransportTestClientVisitor client_visitor;
+  client_->SetVisitor(&client_visitor);
   client_->Connect();
+
+  base::RunLoop run_loop;
+  run_loop.Run();
 }

web_transport/sdk/impl/tests/web_transport_test_server.cc

@@ -7,6 +7,7 @@
 // Similar to net/tools/quic/quic_simple_server_bin.cc, it starts a WebTransport
 // echo server for testing.
 
+#include "base/test/bind.h"
 #include "base/threading/thread.h"
 #include "impl/tests/web_transport_echo_visitors.h"
 #include "impl/web_transport_owt_server_impl.h"
@@ -24,19 +25,28 @@ int main(int argc, char* argv[]) {
     exit(0);
   }
 
-  base::Thread::Options options;
-  options.message_pump_type = base::MessagePumpType::IO;
+  base::Thread::Options io_thread_options;
+  io_thread_options.message_pump_type = base::MessagePumpType::IO;
   base::Thread io_thread("web_transport_test_server_io_thread");
-  io_thread.StartWithOptions(options);
+  io_thread.StartWithOptions(std::move(io_thread_options));
+  base::Thread::Options event_thread_options;
+  event_thread_options.message_pump_type = base::MessagePumpType::IO;
   base::Thread event_thread("web_transport_test_server_event_thread");
-  event_thread.StartWithOptions(options);
+  event_thread.StartWithOptions(std::move(event_thread_options));
   auto proof_source = ::quic::CreateDefaultProofSource();
   auto server_visitor = std::make_unique<owt::quic::test::ServerEchoVisitor>();
-  owt::quic::WebTransportOwtServerImpl server(20001, std::vector<url::Origin>(),
-                                              std::move(proof_source),
-                                              &io_thread, &event_thread);
-  server.SetVisitor(server_visitor.get());
-  server.Start();
+  base::WaitableEvent event;
+  std::unique_ptr<owt::quic::WebTransportOwtServerImpl> server;
+  io_thread.task_runner()->PostTask(
+      FROM_HERE, base::BindLambdaForTesting([&]() {
+        server = std::make_unique<owt::quic::WebTransportOwtServerImpl>(
+            20001, std::vector<url::Origin>(), std::move(proof_source),
+            &io_thread, &event_thread);
+        event.Signal();
+      }));
+  event.Wait();
+  server->SetVisitor(server_visitor.get());
+  server->Start();
 
   base::RunLoop run_loop;
   run_loop.Run();