Update WT_MAX_SESSIONS setting

Joanna Jo · meta-codesync[bot] · commit 3f0e2a819cbe · 2025-10-10T10:47:15.000-07:00
Summary:
Updated the `WT_MAX_SESSIONS` setting to match the drafts:
* Separated `WEBTRANSPORT_MAX_SESSIONS` into H2 (`H2_WT_MAX_SESSIONS`) and H3 (`H3_WT_MAX_SESSIONS`)
* Renamed `WEBTRANSPORT_MAX_SESSIONS` to more closely follow the draft naming scheme (`WT_MAX_SESSIONS`)
* Updated H3 setting value from draft 12 (`0xc671706a`) to 13 (`0x14e9cd29`)

Reviewed By: hanidamlaj

Differential Revision: D84180923

fbshipit-source-id: bdb42cbc5f2592efff3ca047da59405486034712
diff --git a/proxygen/lib/http/codec/HQControlCodec.cpp b/proxygen/lib/http/codec/HQControlCodec.cpp
@@ -97,7 +97,7 @@ ParseResult HQControlCodec::parseSettings(Cursor& cursor,
       case hq::SettingId::HEADER_TABLE_SIZE:
       case hq::SettingId::MAX_HEADER_LIST_SIZE:
       case hq::SettingId::QPACK_BLOCKED_STREAMS:
-      case hq::SettingId::WEBTRANSPORT_MAX_SESSIONS:
+      case hq::SettingId::H3_WT_MAX_SESSIONS:
       case hq::SettingId::WT_INITIAL_MAX_DATA:
         break;
       case hq::SettingId::ENABLE_CONNECT_PROTOCOL:
@@ -232,7 +232,7 @@ size_t HQControlCodec::generateSettings(folly::IOBufQueue& writeBuf) {
         case hq::SettingId::H3_DATAGRAM_DRAFT_8:
         case hq::SettingId::H3_DATAGRAM_RFC:
         case hq::SettingId::ENABLE_WEBTRANSPORT:
-        case hq::SettingId::WEBTRANSPORT_MAX_SESSIONS:
+        case hq::SettingId::H3_WT_MAX_SESSIONS:
         case hq::SettingId::WT_INITIAL_MAX_DATA:
           break;
       }
diff --git a/proxygen/lib/http/codec/HQFramer.cpp b/proxygen/lib/http/codec/HQFramer.cpp
@@ -100,7 +100,7 @@ decodeSettingValue(folly::io::Cursor& cursor,
     case SettingId::H3_DATAGRAM_DRAFT_8:
     case SettingId::H3_DATAGRAM_RFC:
     case SettingId::ENABLE_WEBTRANSPORT:
-    case SettingId::WEBTRANSPORT_MAX_SESSIONS:
+    case SettingId::H3_WT_MAX_SESSIONS:
     case SettingId::WT_INITIAL_MAX_DATA:
       return value;
   }
diff --git a/proxygen/lib/http/codec/HQFramer.h b/proxygen/lib/http/codec/HQFramer.h
@@ -102,7 +102,7 @@ enum class SettingId : uint64_t {
   H3_DATAGRAM_DRAFT_8 = 0xffd277,
   H3_DATAGRAM_RFC = 0x33,
   ENABLE_WEBTRANSPORT = 0x2b603742,
-  WEBTRANSPORT_MAX_SESSIONS = 0x2b603743,
+  H3_WT_MAX_SESSIONS = 0x14e9cd29,
   WT_INITIAL_MAX_DATA = 0x2b61,
 };
 
diff --git a/proxygen/lib/http/codec/HQUtils.cpp b/proxygen/lib/http/codec/HQUtils.cpp
@@ -97,8 +97,8 @@ folly::Optional<hq::SettingId> httpToHqSettingsId(proxygen::SettingsId id) {
       return hq::SettingId::H3_DATAGRAM_RFC;
     case proxygen::SettingsId::ENABLE_WEBTRANSPORT:
       return hq::SettingId::ENABLE_WEBTRANSPORT;
-    case proxygen::SettingsId::WEBTRANSPORT_MAX_SESSIONS:
-      return hq::SettingId::WEBTRANSPORT_MAX_SESSIONS;
+    case proxygen::SettingsId::H3_WT_MAX_SESSIONS:
+      return hq::SettingId::H3_WT_MAX_SESSIONS;
     case proxygen::SettingsId::WT_INITIAL_MAX_DATA:
       return hq::SettingId::WT_INITIAL_MAX_DATA;
     default:
@@ -124,8 +124,8 @@ folly::Optional<proxygen::SettingsId> hqToHttpSettingsId(hq::SettingId id) {
       return proxygen::SettingsId::_HQ_DATAGRAM_RFC;
     case hq::SettingId::ENABLE_WEBTRANSPORT:
       return proxygen::SettingsId::ENABLE_WEBTRANSPORT;
-    case hq::SettingId::WEBTRANSPORT_MAX_SESSIONS:
-      return proxygen::SettingsId::WEBTRANSPORT_MAX_SESSIONS;
+    case hq::SettingId::H3_WT_MAX_SESSIONS:
+      return proxygen::SettingsId::H3_WT_MAX_SESSIONS;
     case hq::SettingId::WT_INITIAL_MAX_DATA:
       return proxygen::SettingsId::WT_INITIAL_MAX_DATA;
   }
diff --git a/proxygen/lib/http/codec/SettingsId.h b/proxygen/lib/http/codec/SettingsId.h
@@ -35,6 +35,8 @@ enum class SettingsId : uint64_t {
   // For secondary authentication in HTTP/2
   SETTINGS_HTTP_CERT_AUTH = 0xff00,
 
+  H2_WT_MAX_SESSIONS = 0x2b60,
+
   // From HQ
   //_HQ_HEADER_TABLE_SIZE = HQ_SETTINGS_MASK | 1, -- use HEADER_TABLE_SIZE
   //_HQ_MAX_HEADER_LIST_SIZE = HQ_SETTINGS_MASK | 6, -- use MAX_HEADER_LIST_SIZE
@@ -43,7 +45,7 @@ enum class SettingsId : uint64_t {
   _HQ_DATAGRAM_DRAFT_8 = HQ_SETTINGS_MASK | 0xffd277,
   _HQ_DATAGRAM_RFC = HQ_SETTINGS_MASK | 0x33,
   ENABLE_WEBTRANSPORT = 0x2b603742,
-  WEBTRANSPORT_MAX_SESSIONS = 0xc671706a,
+  H3_WT_MAX_SESSIONS = 0x14e9cd29,
   WT_INITIAL_MAX_DATA = 0x2b61,
 };
 
diff --git a/proxygen/lib/http/coro/HTTPCoroSession.cpp b/proxygen/lib/http/coro/HTTPCoroSession.cpp
@@ -705,7 +705,7 @@ void HTTPQuicCoroSession::applyEgressSettings() {
         case hq::SettingId::H3_DATAGRAM_RFC:
           break;
         case hq::SettingId::ENABLE_WEBTRANSPORT:
-        case hq::SettingId::WEBTRANSPORT_MAX_SESSIONS:
+        case hq::SettingId::H3_WT_MAX_SESSIONS:
         case hq::SettingId::WT_INITIAL_MAX_DATA:
           // TODO
           break;
@@ -1538,7 +1538,7 @@ void HTTPQuicCoroSession::onSettings(const SettingsList& settings) {
           }
           break;
         case hq::SettingId::ENABLE_WEBTRANSPORT:
-        case hq::SettingId::WEBTRANSPORT_MAX_SESSIONS:
+        case hq::SettingId::H3_WT_MAX_SESSIONS:
         case hq::SettingId::WT_INITIAL_MAX_DATA:
           // TODO
           break;
@@ -3715,7 +3715,7 @@ using WtReqResult = HTTPCoroSession::WtReqResult;
  */
 bool supportsWt(std::initializer_list<const HTTPSettings*> settings) {
   constexpr auto kEnableConnectProto = SettingsId::ENABLE_CONNECT_PROTOCOL;
-  constexpr auto kEnableWtMaxSess = SettingsId::WEBTRANSPORT_MAX_SESSIONS;
+  constexpr auto kEnableWtMaxSess = SettingsId::H2_WT_MAX_SESSIONS;
   return std::all_of(settings.begin(), settings.end(), [](auto* settings) {
     return settings &&
            settings->getSetting(kEnableConnectProto, /*defaultVal=*/0) &&
diff --git a/proxygen/lib/http/coro/test/HttpWtUpstreamTests.cpp b/proxygen/lib/http/coro/test/HttpWtUpstreamTests.cpp
@@ -18,7 +18,7 @@ using folly::coro::co_awaitTry;
 namespace proxygen::coro::test {
 
 constexpr auto kWtSettings = {SettingsId::ENABLE_CONNECT_PROTOCOL,
-                              SettingsId::WEBTRANSPORT_MAX_SESSIONS};
+                              SettingsId::H2_WT_MAX_SESSIONS};
 
 class HttpWtUpstreamSessionTest : public HTTPCoroSessionTest {
  public:
diff --git a/proxygen/lib/http/session/HQSession.cpp b/proxygen/lib/http/session/HQSession.cpp
@@ -799,7 +799,7 @@ size_t HQSession::sendSettings() {
         case hq::SettingId::H3_DATAGRAM:
         case hq::SettingId::H3_DATAGRAM_DRAFT_8:
         case hq::SettingId::H3_DATAGRAM_RFC:
-        case hq::SettingId::WEBTRANSPORT_MAX_SESSIONS:
+        case hq::SettingId::H3_WT_MAX_SESSIONS:
         case hq::SettingId::WT_INITIAL_MAX_DATA:
           break;
         case hq::SettingId::ENABLE_WEBTRANSPORT:
@@ -1580,7 +1580,7 @@ void HQSession::applySettings(const SettingsList& settings) {
           VLOG(3) << "Peer sent ENABLE_WEBTRANSPORT: " << uint32_t(hasWT);
           supportsWebTransport_.set(folly::to_underlying(SettingEnabled::PEER));
           break;
-        case hq::SettingId::WEBTRANSPORT_MAX_SESSIONS:
+        case hq::SettingId::H3_WT_MAX_SESSIONS:
           hasWT = setting.value > 0;
           VLOG(3) << "Peer sent WEBTRANSPORT_MAX_SESSIONS: " << uint32_t(hasWT);
           supportsWebTransport_.set(folly::to_underlying(SettingEnabled::PEER));

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ decodeSettingValue(folly::io::Cursor& cursor,`
`100`	`100`	`case SettingId::H3_DATAGRAM_DRAFT_8:`
`101`	`101`	`case SettingId::H3_DATAGRAM_RFC:`
`102`	`102`	`case SettingId::ENABLE_WEBTRANSPORT:`
`103`		`- case SettingId::WEBTRANSPORT_MAX_SESSIONS:`
	`103`	`+ case SettingId::H3_WT_MAX_SESSIONS:`
`104`	`104`	`case SettingId::WT_INITIAL_MAX_DATA:`
`105`	`105`	`return value;`
`106`	`106`	`}`