HQSession treat WT_ENABLED as ENABLE_WEBTRANSPORT

Summary:
wt_enabled is the terminology seen in the draft currently
i'll be removing the latter soon, but going ahead and making these two semantically equivalent until then

Reviewed By: joanna-jo

Differential Revision: D101231118

fbshipit-source-id: 4d6e9875f34c883a76930bf6a6c54904b2438d2d

Author: hanidamlaj

proxygen/lib/http/session/HQSession.cpp

@@ -804,11 +804,11 @@ size_t HQSession::sendSettings() {
         case hq::SettingId::H3_DATAGRAM_RFC:
         case hq::SettingId::H3_WT_MAX_SESSIONS:
         case hq::SettingId::WT_INITIAL_MAX_DATA:
-        case hq::SettingId::WT_ENABLED:
           break;
+        case hq::SettingId::WT_ENABLED:
         case hq::SettingId::ENABLE_WEBTRANSPORT:
           if (setting.value) {
-            VLOG(4) << "enable_webtransport sess=" << *this;
+            VLOG(4) << "wt enabled sess=" << *this;
             supportsWebTransport_.set(
                 folly::to_underlying(SettingEnabled::SELF));
           }
@@ -1574,8 +1574,9 @@ void HQSession::applySettings(const SettingsList& settings) {
         case hq::SettingId::H3_DATAGRAM_RFC:
           datagram = static_cast<bool>(setting.value);
           break;
+        case hq::SettingId::WT_ENABLED:
         case hq::SettingId::ENABLE_WEBTRANSPORT:
-          VLOG(3) << "Peer sent ENABLE_WEBTRANSPORT=" << setting.value;
+          VLOG(3) << "Peer sent WT_ENABLED=" << setting.value;
           supportsWebTransport_.set(folly::to_underlying(SettingEnabled::PEER));
           break;
         case hq::SettingId::H3_WT_MAX_SESSIONS:
@@ -1586,11 +1587,6 @@ void HQSession::applySettings(const SettingsList& settings) {
           VLOG(3) << "Peer sent WT_INITIAL_MAX_DATA=" << setting.value;
           wtInitialSendWindow_ = setting.value;
           break;
-        case hq::SettingId::WT_ENABLED:
-          // TODO: This part of the code needs a larger refactor. We shouldn't
-          // be setting supportsWebTransport_ unless: 1) WT_ENABLED =
-          // ENABLE_CONNECT_PROTOCOL = H3_DATAGRAM == 1 or 2) H3_DATAGRAM == 1
-          break;
       }
     }
   }

proxygen/lib/http/session/test/HQSessionTestCommon.h

@@ -126,6 +126,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::WT_INITIAL_MAX_DATA,
                                  65536);
     }