Revert D106696601: Add bridge conversions to dual-build consumers for SocketAddress migration

Differential Revision:
D106696601

Original commit changeset: bb47a9f5651f

Original Phabricator Diff: D106696601

fbshipit-source-id: fdc455a864f29d0f2a75eab76528a0761bcc46b9

Author: Erik Schembor

third-party/proxygen/src/proxygen/lib/http/CMakeLists.txt

@@ -90,7 +90,6 @@ proxygen_add_library(proxygen_http_hq_connector
   DEPS
     proxygen_http_codec_h3_early_data_handler
     proxygen_http_session_hq_session
-    mvfst::mvfst_common_address_quic_socket_address_bridge
     mvfst::mvfst_common_udpsocket_folly_async_udp_socket
     mvfst::mvfst_congestion_control_congestion_controller_factory
     mvfst::mvfst_fizz_client_handshake

third-party/proxygen/src/proxygen/lib/http/HQConnector.cpp

@@ -13,7 +13,6 @@
 #include <proxygen/lib/http/codec/H3EarlyDataHandler.h>
 #include <proxygen/lib/http/session/HQSession.h>
 #include <quic/api/QuicSocket.h>
-#include <quic/common/address/QuicSocketAddressBridge.h>
 #include <quic/common/events/FollyQuicEventBase.h>
 #include <quic/common/udpsocket/FollyQuicAsyncUDPSocket.h>
 #include <quic/congestion_control/CongestionControllerFactory.h>
@@ -91,11 +90,9 @@ void HQConnector::connect(
           .build(),
       useConnectionEndWithErrorCallback_);
   quicClient->setHostname(sni.value_or(connectAddr.getAddressStr()));
-  quicClient->addNewPeerAddress(
-      quic::fromFollySocketAddress<quic::SocketAddress>(connectAddr));
+  quicClient->addNewPeerAddress(connectAddr);
   if (localAddr.hasValue()) {
-    quicClient->setLocalAddress(
-        quic::fromFollySocketAddress<quic::SocketAddress>(*localAddr));
+    quicClient->setLocalAddress(*localAddr);
   }
   quicClient->setCongestionControllerFactory(
       std::make_shared<quic::DefaultCongestionControllerFactory>());

third-party/proxygen/src/proxygen/lib/http/coro/CMakeLists.txt

@@ -85,7 +85,6 @@ proxygen_add_library(proxygen_coro
     proxygen_http_priority_functions
     proxygen_http_session_stats
     proxygen_http_webtransport_httpwebtransport
-    mvfst::mvfst_common_address_quic_socket_address_bridge
     mvfst::mvfst_state_quic_stream_utilities
     Folly::folly_conv
   EXPORTED_DEPS

third-party/proxygen/src/proxygen/lib/http/coro/HTTPCoroSession.cpp

@@ -17,7 +17,6 @@
 #include <proxygen/lib/http/webtransport/HTTPWebTransport.h>
 
 #include <folly/logging/xlog.h>
-#include <quic/common/address/QuicSocketAddressBridge.h>
 #include <quic/priority/HTTPPriorityQueue.h>
 #include <quic/state/QuicStreamUtilities.h>
 #include <wangle/acceptor/ConnectionManager.h>
@@ -488,8 +487,8 @@ HTTPQuicCoroSession::HTTPQuicCoroSession(
     : HTTPCoroSession(sock->getEventBase()
                           ->getTypedEventBase<quic::FollyQuicEventBase>()
                           ->getBackingEventBase(),
-                      quic::toFollySocketAddress(sock->getLocalAddress()),
-                      quic::toFollySocketAddress(sock->getPeerAddress()),
+                      sock->getLocalAddress(),
+                      sock->getPeerAddress(),
                       std::move(codec),
                       std::move(tinfo),
                       std::move(handler)),

third-party/proxygen/src/proxygen/lib/http/coro/client/CMakeLists.txt

@@ -33,7 +33,6 @@ proxygen_add_library(proxygen_http_coro_client_http_connector
     proxygen_http_coro_util_cancellable_baton
     mvfst::mvfst_api_transport
     mvfst::mvfst_client
-    mvfst::mvfst_common_address_quic_socket_address_bridge
     mvfst::mvfst_common_events_folly_eventbase
     mvfst::mvfst_common_udpsocket_folly_async_udp_socket
     mvfst::mvfst_exception

third-party/proxygen/src/proxygen/lib/http/coro/client/HTTPCoroConnector.cpp

@@ -30,7 +30,6 @@
 #include <quic/QuicException.h>
 #include <quic/api/QuicSocket.h>
 #include <quic/client/QuicClientTransport.h>
-#include <quic/common/address/QuicSocketAddressBridge.h>
 #include <quic/common/events/FollyQuicEventBase.h>
 #include <quic/common/udpsocket/FollyQuicAsyncUDPSocket.h>
 #include <quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h>
@@ -446,11 +445,9 @@ folly::coro::Task<HTTPCoroSession*> connectQuic(
   auto hostname = connParams.serverName.empty() ? connectAddr.getAddressStr()
                                                 : connParams.serverName;
   quicClient->setHostname(std::move(hostname));
-  quicClient->addNewPeerAddress(
-      quic::fromFollySocketAddress<quic::SocketAddress>(connectAddr));
+  quicClient->addNewPeerAddress(connectAddr);
   if (connParams.bindAddr != folly::AsyncSocket::anyAddress()) {
-    quicClient->setLocalAddress(
-        quic::fromFollySocketAddress<quic::SocketAddress>(connParams.bindAddr));
+    quicClient->setLocalAddress(connParams.bindAddr);
   }
   if (connParams.ccFactory) {
     quicClient->setCongestionControllerFactory(connParams.ccFactory);

third-party/proxygen/src/proxygen/lib/http/coro/server/CMakeLists.txt

@@ -13,7 +13,6 @@ proxygen_add_library(proxygen_http_coro_server_coro_acceptor
     proxygen_coro
     proxygen_http_session_http_session_codec_factory
     mvfst::mvfst_api_transport
-    mvfst::mvfst_common_address_quic_socket_address_bridge
     mvfst::mvfst_common_events_folly_eventbase
     Folly::folly_logging_logging
   EXPORTED_DEPS
@@ -30,7 +29,6 @@ proxygen_add_library(proxygen_http_coro_server_coro_httpserver
     proxygen_http_coro_filter_factory_handler
     proxygen_utils_time_util
     mvfst::mvfst_common_events_folly_eventbase
-    mvfst::mvfst_config
     mvfst::mvfst_congestion_control_server_congestion_controller_factory
     mvfst::mvfst_logging_file_qlogger
     Folly::folly_fibers_batch_semaphore

third-party/proxygen/src/proxygen/lib/http/coro/server/HTTPCoroAcceptor.cpp

@@ -12,7 +12,6 @@
 
 #include <proxygen/lib/http/session/HTTPDefaultSessionCodecFactory.h>
 #include <quic/api/QuicSocket.h>
-#include <quic/common/address/QuicSocketAddressBridge.h>
 #include <quic/common/events/FollyQuicEventBase.h>
 
 namespace proxygen::coro {
@@ -131,7 +130,7 @@ HTTPCoroSession* HTTPCoroDownstreamSessionFactory::makeQuicSession(
                                           accConfig_->headerIndexingStrategy);
   applySettingsToCodec(*codec);
   XLOG(DBG4) << "Created new " << *tinfo.appProtocol << " session for peer "
-             << quic::toFollySocketAddress(quicSocket->getPeerAddress());
+             << quicSocket->getPeerAddress();
   HTTPCoroSession* session =
       HTTPCoroSession::makeDownstreamCoroSession(std::move(quicSocket),
                                                  std::move(handler),
@@ -194,7 +193,7 @@ void HTTPCoroAcceptor::onNewConnection(
     std::shared_ptr<quic::QuicSocket> quicSocket, wangle::TransportInfo tinfo) {
   if (newConnectionFilter_ && *newConnectionFilter_) {
     auto nextProtocol = quicSocket->getAppProtocol().value_or("");
-    auto peerAddr = quic::toFollySocketAddress(quicSocket->getPeerAddress());
+    auto peerAddr = quicSocket->getPeerAddress();
     auto pass = folly::makeTryWith([&] {
       return (*newConnectionFilter_)(&peerAddr,
                                      quicSocket->getPeerCertificate().get(),

third-party/proxygen/src/proxygen/lib/http/coro/server/HTTPServer.cpp

@@ -12,7 +12,6 @@
 #include <quic/common/events/FollyQuicEventBase.h>
 #include <quic/congestion_control/ServerCongestionControllerFactory.h>
 #include <quic/logging/FileQLogger.h>
-#include <quic/mvfst-config.h>
 #include <quic/server/QuicSharedUDPSocketFactory.h>
 
 #include <folly/fibers/BatchSemaphore.h>
@@ -32,7 +31,7 @@ class QuicAcceptorTransportFactory : public quic::QuicServerTransportFactory {
   quic::QuicServerTransport::Ptr make(
       folly::EventBase* evb,
       std::unique_ptr<quic::FollyAsyncUDPSocketAlias> socket,
-      const quic::SocketAddress& /* peerAddr */,
+      const folly::SocketAddress& /* peerAddr */,
       quic::QuicVersion,
       std::shared_ptr<const fizz::server::FizzServerContext> ctx) noexcept
       override {

third-party/proxygen/src/proxygen/lib/http/session/CMakeLists.txt

@@ -247,7 +247,6 @@ proxygen_add_library(proxygen_http_session_hq_session
     proxygen_utils_conditional_gate
     mvfst::mvfst_api_transport
     mvfst::mvfst_codec_types
-    mvfst::mvfst_common_address_quic_socket_address_bridge
     mvfst::mvfst_common_buf_util
     mvfst::mvfst_common_events_folly_eventbase
     mvfst::mvfst_constants