From cd4963b0f9c68775372d91dc422c01d703122345 Mon Sep 17 00:00:00 2001
From: Guogang Li <guogang@google.com>
Date: Tue, 9 Jan 2024 11:05:02 -0800
Subject: [PATCH] Added write timeout for Wi-Fi LAN socket

PiperOrigin-RevId: 596987503
---
 .../implementation/windows/wifi_lan_socket.cc | 36 ++-----------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/internal/platform/implementation/windows/wifi_lan_socket.cc b/internal/platform/implementation/windows/wifi_lan_socket.cc
index 7ab1c4b8..20c71471 100644
--- a/internal/platform/implementation/windows/wifi_lan_socket.cc
+++ b/internal/platform/implementation/windows/wifi_lan_socket.cc
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,28 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <windows.h>
-
-#include <chrono>  // NOLINT(build/c++11)
 #include <cstdint>
 #include <cstring>
 #include <exception>
 
-#include "internal/platform/byte_array.h"
-#include "internal/platform/exception.h"
-#include "internal/platform/implementation/windows/generated/winrt/Windows.Foundation.h"
 #include "internal/platform/implementation/windows/wifi_lan.h"
-#include "internal/platform/input_stream.h"
 #include "internal/platform/logging.h"
-#include "internal/platform/output_stream.h"
 
 namespace nearby {
 namespace windows {
-namespace {
-using ::winrt::Windows::Foundation::TimeSpan;
-
-constexpr int kWriteTimeoutInSeconds = 10;
-}  // namespace
 
 WifiLanSocket::WifiLanSocket(StreamSocket socket) {
   stream_soket_ = socket;
@@ -161,26 +148,7 @@ Exception WifiLanSocket::SocketOutputStream::Write(const ByteArray& data) {
     Buffer buffer = Buffer(data.size());
     std::memcpy(buffer.data(), data.data(), data.size());
     buffer.Length(data.size());
-    uint32_t wrote_bytes = 0;
-    auto write_async = output_stream_.WriteAsync(buffer);
-
-    switch (write_async.wait_for(
-        TimeSpan(std::chrono::seconds(kWriteTimeoutInSeconds)))) {
-      case winrt::Windows::Foundation::AsyncStatus::Completed:
-        wrote_bytes = write_async.GetResults();
-        break;
-      case winrt::Windows::Foundation::AsyncStatus::Started:
-        NEARBY_LOGS(ERROR) << __func__
-                           << ": Failed to write socket data due to timeout.";
-        write_async.Cancel();
-        return {Exception::kIo};
-      default:
-        NEARBY_LOGS(ERROR)
-            << __func__
-            << ": Failed to write socket data due to unknown reasons.";
-        return {Exception::kIo};
-    }
-
+    uint32_t wrote_bytes = output_stream_.WriteAsync(buffer).get();
     if (wrote_bytes != data.size()) {
       NEARBY_LOGS(WARNING) << "Only wrote partial of data:[" << wrote_bytes
                            << "/" << data.size() << "].";