revive_proxy.patch の差分部分を最新化

shiguredo-webrtc-build · Oct 6, 2024 · 05d5983 · 05d5983
1 parent 363b679
commit 05d5983
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/patches/revive_proxy.patch b/patches/revive_proxy.patch
@@ -1,17 +1,17 @@
 diff --git a/api/packet_socket_factory.h b/api/packet_socket_factory.h
-index 0785888a81..f311b8adf3 100644
+index a73d3deaff..15b69b1aec 100644
 --- a/api/packet_socket_factory.h
 +++ b/api/packet_socket_factory.h
-@@ -19,6 +19,8 @@
- #include "rtc_base/async_packet_socket.h"
+@@ -21,6 +21,8 @@
+ #include "rtc_base/socket_address.h"
  #include "rtc_base/system/rtc_export.h"
 
 +#include "rtc_base/proxy_info_revive.h"
 +
  namespace rtc {
 
  class SSLCertificateVerifier;
-@@ -66,6 +68,8 @@ class RTC_EXPORT PacketSocketFactory {
+@@ -68,6 +70,8 @@ class RTC_EXPORT PacketSocketFactory {
    virtual AsyncPacketSocket* CreateClientTcpSocket(
        const SocketAddress& local_address,
        const SocketAddress& remote_address,
@@ -69,7 +69,7 @@ index b172d34db6..4f8f98cb98 100644
 
    std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
 diff --git a/p2p/base/port.h b/p2p/base/port.h
-index 2df1d35b8e..091a0573b0 100644
+index f4c87c6bba..3b07c8d321 100644
 --- a/p2p/base/port.h
 +++ b/p2p/base/port.h
 @@ -60,6 +60,8 @@
@@ -83,7 +83,7 @@ index 2df1d35b8e..091a0573b0 100644
  // RFC 6544, TCP candidate encoding rules.
 @@ -365,6 +367,17 @@ class RTC_EXPORT Port : public PortInterface, public sigslot::has_slots<> {
 
-   void GetStunStats(absl::optional<StunStats>* stats) override {}
+   void GetStunStats(std::optional<StunStats>* stats) override {}
 
 +  void set_proxy(absl::string_view user_agent, const rtc::revive::ProxyInfo& proxy) {
 +    revived_user_agent_ = user_agent;
@@ -100,10 +100,10 @@ index 2df1d35b8e..091a0573b0 100644
    void UpdateNetworkCost() override;
 
 diff --git a/p2p/base/port_allocator.h b/p2p/base/port_allocator.h
-index 0ae2182c39..851d79b83a 100644
+index 880d3ae15b..61e0fbea55 100644
 --- a/p2p/base/port_allocator.h
 +++ b/p2p/base/port_allocator.h
-@@ -35,6 +35,8 @@
+@@ -34,6 +34,8 @@
  #include "rtc_base/third_party/sigslot/sigslot.h"
  #include "rtc_base/thread.h"
 
@@ -112,7 +112,7 @@ index 0ae2182c39..851d79b83a 100644
  namespace webrtc {
  class TurnCustomizer;
  }  // namespace webrtc
-@@ -462,6 +464,26 @@ class RTC_EXPORT PortAllocator : public sigslot::has_slots<> {
+@@ -461,6 +463,26 @@ class RTC_EXPORT PortAllocator : public sigslot::has_slots<> {
      flags_ = flags;
    }
 
@@ -140,7 +140,7 @@ index 0ae2182c39..851d79b83a 100644
    int min_port() const {
      CheckRunOnValidThreadIfInitialized();
 diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h
-index 34f835d138..9d12664280 100644
+index 0d89a9e8c8..89322f3f9b 100644
 --- a/p2p/base/port_interface.h
 +++ b/p2p/base/port_interface.h
 @@ -27,6 +27,8 @@
@@ -163,10 +163,10 @@ index 34f835d138..9d12664280 100644
    PortInterface();
    virtual void UpdateNetworkCost() = 0;
 diff --git a/p2p/base/tcp_port.cc b/p2p/base/tcp_port.cc
-index 78c6e4799e..5c7b0bcc0a 100644
+index 305db0e73c..ac62217b48 100644
 --- a/p2p/base/tcp_port.cc
 +++ b/p2p/base/tcp_port.cc
-@@ -583,7 +583,9 @@ void TCPConnection::CreateOutgoingTcpSocket() {
+@@ -586,7 +586,9 @@ void TCPConnection::CreateOutgoingTcpSocket() {
    tcp_opts.opts = opts;
    socket_.reset(port()->socket_factory()->CreateClientTcpSocket(
        rtc::SocketAddress(port()->Network()->GetBestIP(), 0),
@@ -178,10 +178,10 @@ index 78c6e4799e..5c7b0bcc0a 100644
      RTC_LOG(LS_VERBOSE) << ToString() << ": Connecting from "
                          << socket_->GetLocalAddress().ToSensitiveString()
 diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc
-index 71deb693c1..a67703ba6c 100644
+index f52e1f2916..df46ccd35e 100644
 --- a/p2p/base/turn_port.cc
 +++ b/p2p/base/turn_port.cc
-@@ -474,6 +474,7 @@ bool TurnPort::CreateTurnClientSocket() {
+@@ -478,6 +478,7 @@ bool TurnPort::CreateTurnClientSocket() {
      tcp_options.tls_cert_verifier = tls_cert_verifier_;
      socket_ = socket_factory()->CreateClientTcpSocket(
          rtc::SocketAddress(Network()->GetBestIP(), 0), server_address_.address,
@@ -190,7 +190,7 @@ index 71deb693c1..a67703ba6c 100644
    }
 
 diff --git a/p2p/client/basic_port_allocator.cc b/p2p/client/basic_port_allocator.cc
-index c8b293a290..566f39278a 100644
+index 3e8ddf4b69..32e64a56bf 100644
 --- a/p2p/client/basic_port_allocator.cc
 +++ b/p2p/client/basic_port_allocator.cc
 @@ -39,6 +39,8 @@
@@ -212,10 +212,10 @@ index c8b293a290..566f39278a 100644
        (flags() & PORTALLOCATOR_ENABLE_STUN_RETRANSMIT_ATTRIBUTE) != 0);
 
 diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
-index 85ec8edb9b..7b1d1eb538 100644
+index e1282d7293..931efd7d9d 100644
 --- a/rtc_base/BUILD.gn
 +++ b/rtc_base/BUILD.gn
-@@ -1262,6 +1262,8 @@ rtc_library("socket_adapters") {
+@@ -1243,6 +1243,8 @@ rtc_library("socket_adapters") {
    sources = [
      "socket_adapters.cc",
      "socket_adapters.h",
@@ -224,15 +224,15 @@ index 85ec8edb9b..7b1d1eb538 100644
    ]
    deps = [
      ":async_socket",
-@@ -1274,6 +1276,7 @@ rtc_library("socket_adapters") {
+@@ -1255,6 +1257,7 @@ rtc_library("socket_adapters") {
      "../api:array_view",
      "//third_party/abseil-cpp/absl/strings",
      "//third_party/abseil-cpp/absl/strings:string_view",
 +    ":proxy_info",
    ]
  }
 
-@@ -1382,6 +1385,20 @@ rtc_library("dscp") {
+@@ -1362,6 +1365,20 @@ rtc_library("dscp") {
    sources = [ "dscp.h" ]
  }
 
@@ -253,7 +253,7 @@ index 85ec8edb9b..7b1d1eb538 100644
  rtc_library("file_rotating_stream") {
    sources = [
      "file_rotating_stream.cc",
-@@ -1662,6 +1679,13 @@ rtc_library("ssl_adapter") {
+@@ -1629,6 +1646,13 @@ rtc_library("ssl_adapter") {
    }
  }