rename http/2 settings WT_MAX_SESSIONS => WT_ENABLED

Summary:
as per http/2 wt RFC: https://datatracker.ietf.org/doc/draft-ietf-webtrans-http2/
WT_MAX_SESSIONS is no longer the correct naming, it's now referred to as WT_ENABLED

the existing WT_ENABLED is renamed to H3_WT_ENABLED to disambiguate

Reviewed By: sharmafb

Differential Revision: D112803356

fbshipit-source-id: b3cd3212dad1072654a7781c3d1fab91ab945199

Author: hanidamlaj

third-party/proxygen/src/proxygen/lib/http/codec/HQUtils.cpp

@@ -97,7 +97,7 @@ folly::Optional<hq::SettingId> httpToHqSettingsId(proxygen::SettingsId id) {
       return hq::SettingId::H3_WT_MAX_SESSIONS;
     case proxygen::SettingsId::WT_INITIAL_MAX_DATA:
       return hq::SettingId::WT_INITIAL_MAX_DATA;
-    case proxygen::SettingsId::WT_ENABLED:
+    case proxygen::SettingsId::H3_WT_ENABLED:
       return hq::SettingId::WT_ENABLED;
     default:
       return folly::none; // this setting has no meaning in HQ
@@ -125,7 +125,7 @@ folly::Optional<proxygen::SettingsId> hqToHttpSettingsId(hq::SettingId id) {
     case hq::SettingId::WT_INITIAL_MAX_DATA:
       return proxygen::SettingsId::WT_INITIAL_MAX_DATA;
     case hq::SettingId::WT_ENABLED:
-      return proxygen::SettingsId::WT_ENABLED;
+      return proxygen::SettingsId::H3_WT_ENABLED;
   }
   return folly::none;
 }

third-party/proxygen/src/proxygen/lib/http/codec/HTTP2Codec.cpp

@@ -817,7 +817,7 @@ ErrorCode HTTP2Codec::handleSettings(const std::deque<SettingPair>& settings) {
           return ErrorCode::PROTOCOL_ERROR;
         }
         break;
-      case SettingsId::WT_MAX_SESSIONS:
+      case SettingsId::WT_ENABLED:
       case SettingsId::_HQ_QPACK_BLOCKED_STREAMS:
       case SettingsId::_HQ_DATAGRAM:
       case SettingsId::_HQ_DATAGRAM_RFC:
@@ -1451,7 +1451,7 @@ size_t HTTP2Codec::generateSettings(folly::IOBufQueue& writeBuf) {
           continue;
         }
         break;
-      case SettingsId::WT_MAX_SESSIONS:
+      case SettingsId::WT_ENABLED:
       case SettingsId::_HQ_QPACK_BLOCKED_STREAMS:
       case SettingsId::_HQ_DATAGRAM:
       case SettingsId::_HQ_DATAGRAM_RFC:

third-party/proxygen/src/proxygen/lib/http/codec/SettingsId.h

@@ -26,7 +26,7 @@ enum class SettingsId : uint64_t {
 
   ENABLE_CONNECT_PROTOCOL = 8,
 
-  WT_MAX_SESSIONS = 0x2b60,
+  WT_ENABLED = 0x2b60,
   WT_INITIAL_MAX_DATA = 0x2b61,
   WT_INITIAL_MAX_STREAM_DATA_UNI = 0x2b62,
   WT_INITIAL_MAX_STREAM_DATA_BIDI = 0x2b63,
@@ -42,7 +42,7 @@ enum class SettingsId : uint64_t {
   _HQ_DATAGRAM_RFC = HQ_SETTINGS_MASK | 0x33,
   ENABLE_WEBTRANSPORT = 0x2b603742,
   H3_WT_MAX_SESSIONS = 0x14e9cd29,
-  WT_ENABLED = 0x2c7cf000,
+  H3_WT_ENABLED = 0x2c7cf000,
 };
 
 using SettingPair = std::pair<SettingsId, uint32_t>;

third-party/proxygen/src/proxygen/lib/http/codec/test/HTTP2CodecTest.cpp

@@ -2597,11 +2597,11 @@ TEST_F(HTTP2CodecTest, GenerateHeadersWithEmptyRequest) {
 
 TEST_F(HTTP2CodecTest, SetIfNotPresent) {
   auto* egressSettings = CHECK_NOTNULL(downstreamCodec_.getEgressSettings());
-  // WT_MAX_SESSIONS not currently present
-  EXPECT_TRUE(egressSettings->setIfNotPresent(SettingsId::WT_MAX_SESSIONS, 1));
+  // WT_ENABLED not currently present
+  EXPECT_TRUE(egressSettings->setIfNotPresent(SettingsId::WT_ENABLED, 1));
   // no-op since added above
-  EXPECT_FALSE(egressSettings->setIfNotPresent(SettingsId::WT_MAX_SESSIONS, 2));
+  EXPECT_FALSE(egressSettings->setIfNotPresent(SettingsId::WT_ENABLED, 2));
   // expected value is 1
-  auto* wtMaxSessions = egressSettings->getSetting(SettingsId::WT_MAX_SESSIONS);
-  EXPECT_TRUE(wtMaxSessions && wtMaxSessions->value == 1);
+  auto* wtEnabled = egressSettings->getSetting(SettingsId::WT_ENABLED);
+  EXPECT_TRUE(wtEnabled && wtEnabled->value == 1);
 }

third-party/proxygen/src/proxygen/lib/http/session/test/HQSessionTestCommon.h

@@ -129,7 +129,7 @@ class HQSessionTest
       egressSettings_.setSetting(proxygen::SettingsId::ENABLE_CONNECT_PROTOCOL,
                                  1);
       egressSettings_.setSetting(proxygen::SettingsId::ENABLE_WEBTRANSPORT, 1);
-      egressSettings_.setSetting(proxygen::SettingsId::WT_ENABLED, 1);
+      egressSettings_.setSetting(proxygen::SettingsId::H3_WT_ENABLED, 1);
       egressSettings_.setSetting(proxygen::SettingsId::WT_INITIAL_MAX_DATA,
                                  65536);
     }

third-party/proxygen/src/proxygen/lib/http/webtransport/WtUtils.cpp

@@ -86,7 +86,7 @@ void setEgressWtH3Settings(HTTPSettings& settings) noexcept {
   const bool supportsWt =
       settings.getSetting(SettingsId::ENABLE_CONNECT_PROTOCOL,
                           /*defaultVal=*/0) &&
-      settings.getSetting(SettingsId::WT_ENABLED, /*defaultVal=*/0);
+      settings.getSetting(SettingsId::H3_WT_ENABLED, /*defaultVal=*/0);
   if (supportsWt) {
     settings.setIfNotPresent(SettingsId::WT_INITIAL_MAX_DATA, kWtInitMaxData);
     settings.setIfNotPresent(SettingsId::WT_INITIAL_MAX_STREAMS_UNI,
@@ -155,11 +155,11 @@ WtStreamManager::WtConfig getH3WtConfig(const HTTPSettings* ingress,
 bool supportsH2Wt(
     std::initializer_list<const HTTPSettings*> settings) noexcept {
   constexpr auto kEnableConnectProto = SettingsId::ENABLE_CONNECT_PROTOCOL;
-  constexpr auto kEnableWtMaxSess = SettingsId::WT_MAX_SESSIONS;
+  constexpr auto kWtEnabled = SettingsId::WT_ENABLED;
   return std::all_of(settings.begin(), settings.end(), [](auto* settings) {
     return settings &&
            settings->getSetting(kEnableConnectProto, /*defaultVal=*/0) &&
-           settings->getSetting(kEnableWtMaxSess, /*defaultVal=*/0);
+           settings->getSetting(kWtEnabled, /*defaultVal=*/0);
   });
 }
 
@@ -169,7 +169,7 @@ bool supportsH3Wt(TransportDirection dir,
   const HTTPSettings* server = isUpstream(dir) ? ingress : egress;
   const HTTPSettings* client = isUpstream(dir) ? egress : ingress;
   bool serverOk = server &&
-                  server->getSetting(SettingsId::WT_ENABLED,
+                  server->getSetting(SettingsId::H3_WT_ENABLED,
                                      /*defaultVal=*/0) &&
                   server->getSetting(SettingsId::ENABLE_CONNECT_PROTOCOL,
                                      /*defaultVal=*/0) &&

third-party/proxygen/src/proxygen/lib/http/webtransport/test/Mocks.h

@@ -192,7 +192,7 @@ struct DummyWtHandler : public WebTransportHandler {
 
 // test utils
 static constexpr auto kWtSettings = {SettingsId::ENABLE_CONNECT_PROTOCOL,
-                                     SettingsId::WT_MAX_SESSIONS};
+                                     SettingsId::WT_ENABLED};
 
 // hack to enable/disable wt on codec for tests
 inline void setCodecWtSettings(HTTPCodec& codec, bool enabled) noexcept {