Move core functionality to QuicTransportBaseLite [1/n]

Summary: See title

Reviewed By: mjoras

Differential Revision: D63860679

fbshipit-source-id: b7116792c2bf99a98f62d719febddd133cce94d5

quic/api/BUCK

@@ -34,6 +34,7 @@ mvfst_cpp_library(
  "IoBufQuicBatch.cpp",
  "QuicPacketScheduler.cpp",
  "QuicTransportBase.cpp",
+ "QuicTransportBaseLite.cpp",
  "QuicTransportFunctions.cpp",
  ],
  headers = [

quic/api/QuicSocket.h

@@ -37,157 +37,6 @@ class DSRPacketizationRequestSender;
 
 class QuicSocket : virtual public QuicSocketLite {
  public:
- /**
- * Callback for connection set up events.
- */
- class ConnectionSetupCallback {
- public:
- virtual ~ConnectionSetupCallback() = default;
-
- /**
- * Called after the transport successfully processes the received packet.
- */
- virtual void onFirstPeerPacketProcessed() noexcept {}
-
- /**
- * Invoked when the connection setup fails.
- */
- virtual void onConnectionSetupError(QuicError code) noexcept = 0;
-
- /**
- * Called when the transport is ready to send/receive data.
- * This can be potentially triggered immediately when using 0-RTT.
- */
- virtual void onTransportReady() noexcept {}
-
- /**
- * Client only.
- * Called when the transport becomes replay safe - both crypto keys derived.
- * Called after onTransportReady() and in case of 0-RTT, unlike
- * onTransportReady(), signifies full crypto handshake finished.
- */
- virtual void onReplaySafe() noexcept {}
-
- /**
- * Essentially Server only as clients have onReplaySafe.
- * Called after onTransportReady() and in case of 0-RTT, unlike
- * onTransportReady(), signifies full crypto handshake finished.
- */
- virtual void onFullHandshakeDone() noexcept {}
- };
-
- /**
- * Callback for connection level events once connection is set up.
- * The name is temporary until we phase out the old monolithic callback.
- */
- class ConnectionCallback {
- public:
- virtual ~ConnectionCallback() = default;
-
- /**
- * Invoked when stream id's flow control state changes. This is an edge
- * triggred API and will be only invoked at the point that the flow control
- * changes.
- */
- virtual void onFlowControlUpdate(StreamId /*id*/) noexcept {}
-
- /**
- * Invoked when the peer creates a new bidirectional stream. The most
- * common flow would be to set the ReadCallback from here
- */
- virtual void onNewBidirectionalStream(StreamId id) noexcept = 0;
-
- /**
- * Invoked when the peer creates a new bidirectional stream group.
- */
- virtual void onNewBidirectionalStreamGroup(StreamGroupId) noexcept {}
-
- /**
- * Invoked when the peer creates a new bidirectional stream in a specific
- * group.
- */
- virtual void onNewBidirectionalStreamInGroup(
- StreamId,
- StreamGroupId) noexcept {}
-
- /**
- * Invoked when the peer creates a new unidirectional stream. The most
- * common flow would be to set the ReadCallback from here
- */
- virtual void onNewUnidirectionalStream(StreamId id) noexcept = 0;
-
- /**
- * Invoked when the peer creates a new unidirectional stream group.
- */
- virtual void onNewUnidirectionalStreamGroup(StreamGroupId) noexcept {}
-
- /**
- * Invoked when the peer creates a new unidirectional stream in a specific
- * group.
- */
- virtual void onNewUnidirectionalStreamInGroup(
- StreamId,
- StreamGroupId) noexcept {}
-
- /**
- * Invoked when a given stream has been closed and its state is about to
- * be reaped by the transport. This is the last chance to do any final
- * state querying operations on the stream.
- */
- virtual void onStreamPreReaped(StreamId) noexcept {}
-
- /**
- * Invoked when a stream receives a StopSending frame from a peer.
- * The application should reset the stream as part of this callback.
- */
- virtual void onStopSending(
- StreamId id,
- ApplicationErrorCode error) noexcept = 0;
-
- /**
- * Invoked when the transport initiates close. No callbacks will
- * be delivered after this
- */
- virtual void onConnectionEnd() noexcept = 0;
-
- /**
- * Invoked when the connection closed in error
- */
- virtual void onConnectionError(QuicError code) noexcept = 0;
-
- /**
- * Invoked on transport closure. No callbacks will be delivered after this.
- * onConnectionEnd() and onConnectionError(QuicError code) will be
- * deprecated in favor of this new combined callback soon.
- */
- virtual void onConnectionEnd(QuicError /* error */) noexcept {}
-
- /**
- * Called when more bidirectional streams become available for creation
- * (max local bidirectional stream ID was increased).
- */
- virtual void onBidirectionalStreamsAvailable(
- uint64_t /*numStreamsAvailable*/) noexcept {}
-
- /**
- * Called when more unidirectional streams become available for creation
- * (max local unidirectional stream ID was increased).
- */
- virtual void onUnidirectionalStreamsAvailable(
- uint64_t /*numStreamsAvailable*/) noexcept {}
-
- /**
- * Invoked when transport is detected to be app rate limited.
- */
- virtual void onAppRateLimited() noexcept {}
-
- /**
- * Invoked when we receive a KnobFrame from the peer
- */
- virtual void
- onKnob(uint64_t /*knobSpace*/, uint64_t /*knobId*/, Buf /*knobBlob*/) {}
- };
-
  /**
  * Information about the transport, similar to what TCP has.
  */
@@ -284,20 +133,6 @@ class QuicSocket : virtual public QuicSocketLite {
  virtual Optional<std::vector<TransportParameter>> getPeerTransportParams()
  const = 0;
 
- /**
- * Sets connection setup callback. This callback must be set before using the
- * socket.
- */
- virtual void setConnectionSetupCallback(
- folly::MaybeManagedPtr<ConnectionSetupCallback> callback) = 0;
-
- /**
- * Sets connection streams callback. This callback must be set after
- * connection set up is finished and is ready for streams processing.
- */
- virtual void setConnectionCallback(
- folly::MaybeManagedPtr<ConnectionCallback> callback) = 0;
-
  /**
  * Sets the functions that mvfst will invoke to validate early data params
  * and encode early data params to NewSessionTicket.
@@ -347,7 +182,7 @@ class QuicSocket : virtual public QuicSocketLite {
  validator,
  folly::Function<Buf()> getter) = 0;
 
- virtual ~QuicSocket() = default;
+ virtual ~QuicSocket() override = default;
 
  /**
  * ===== Generic Socket Methods =====

quic/api/QuicSocketLite.h

@@ -7,8 +7,180 @@
 
 #pragma once
 
+#include <folly/MaybeManagedPtr.h>
+#include <quic/QuicException.h>
+#include <quic/codec/Types.h>
+
 namespace quic {
 
-class QuicSocketLite {};
+class QuicSocketLite {
+ public:
+ /**
+ * Callback for connection set up events.
+ */
+ class ConnectionSetupCallback {
+ public:
+ virtual ~ConnectionSetupCallback() = default;
+
+ /**
+ * Called after the transport successfully processes the received packet.
+ */
+ virtual void onFirstPeerPacketProcessed() noexcept {}
+
+ /**
+ * Invoked when the connection setup fails.
+ */
+ virtual void onConnectionSetupError(QuicError code) noexcept = 0;
+
+ /**
+ * Called when the transport is ready to send/receive data.
+ * This can be potentially triggered immediately when using 0-RTT.
+ */
+ virtual void onTransportReady() noexcept {}
+
+ /**
+ * Client only.
+ * Called when the transport becomes replay safe - both crypto keys derived.
+ * Called after onTransportReady() and in case of 0-RTT, unlike
+ * onTransportReady(), signifies full crypto handshake finished.
+ */
+ virtual void onReplaySafe() noexcept {}
+
+ /**
+ * Essentially Server only as clients have onReplaySafe.
+ * Called after onTransportReady() and in case of 0-RTT, unlike
+ * onTransportReady(), signifies full crypto handshake finished.
+ */
+ virtual void onFullHandshakeDone() noexcept {}
+ };
+
+ /**
+ * Callback for connection level events once connection is set up.
+ * The name is temporary until we phase out the old monolithic callback.
+ */
+ class ConnectionCallback {
+ public:
+ virtual ~ConnectionCallback() = default;
+
+ /**
+ * Invoked when stream id's flow control state changes. This is an edge
+ * triggred API and will be only invoked at the point that the flow control
+ * changes.
+ */
+ virtual void onFlowControlUpdate(StreamId /*id*/) noexcept {}
+
+ /**
+ * Invoked when the peer creates a new bidirectional stream. The most
+ * common flow would be to set the ReadCallback from here
+ */
+ virtual void onNewBidirectionalStream(StreamId id) noexcept = 0;
+
+ /**
+ * Invoked when the peer creates a new bidirectional stream group.
+ */
+ virtual void onNewBidirectionalStreamGroup(StreamGroupId) noexcept {}
+
+ /**
+ * Invoked when the peer creates a new bidirectional stream in a specific
+ * group.
+ */
+ virtual void onNewBidirectionalStreamInGroup(
+ StreamId,
+ StreamGroupId) noexcept {}
+
+ /**
+ * Invoked when the peer creates a new unidirectional stream. The most
+ * common flow would be to set the ReadCallback from here
+ */
+ virtual void onNewUnidirectionalStream(StreamId id) noexcept = 0;
+
+ /**
+ * Invoked when the peer creates a new unidirectional stream group.
+ */
+ virtual void onNewUnidirectionalStreamGroup(StreamGroupId) noexcept {}
+
+ /**
+ * Invoked when the peer creates a new unidirectional stream in a specific
+ * group.
+ */
+ virtual void onNewUnidirectionalStreamInGroup(
+ StreamId,
+ StreamGroupId) noexcept {}
+
+ /**
+ * Invoked when a given stream has been closed and its state is about to
+ * be reaped by the transport. This is the last chance to do any final
+ * state querying operations on the stream.
+ */
+ virtual void onStreamPreReaped(StreamId) noexcept {}
+
+ /**
+ * Invoked when a stream receives a StopSending frame from a peer.
+ * The application should reset the stream as part of this callback.
+ */
+ virtual void onStopSending(
+ StreamId id,
+ ApplicationErrorCode error) noexcept = 0;
+
+ /**
+ * Invoked when the transport initiates close. No callbacks will
+ * be delivered after this
+ */
+ virtual void onConnectionEnd() noexcept = 0;
+
+ /**
+ * Invoked when the connection closed in error
+ */
+ virtual void onConnectionError(QuicError code) noexcept = 0;
+
+ /**
+ * Invoked on transport closure. No callbacks will be delivered after this.
+ * onConnectionEnd() and onConnectionError(QuicError code) will be
+ * deprecated in favor of this new combined callback soon.
+ */
+ virtual void onConnectionEnd(QuicError /* error */) noexcept {}
+
+ /**
+ * Called when more bidirectional streams become available for creation
+ * (max local bidirectional stream ID was increased).
+ */
+ virtual void onBidirectionalStreamsAvailable(
+ uint64_t /*numStreamsAvailable*/) noexcept {}
+
+ /**
+ * Called when more unidirectional streams become available for creation
+ * (max local unidirectional stream ID was increased).
+ */
+ virtual void onUnidirectionalStreamsAvailable(
+ uint64_t /*numStreamsAvailable*/) noexcept {}
+
+ /**
+ * Invoked when transport is detected to be app rate limited.
+ */
+ virtual void onAppRateLimited() noexcept {}
+
+ /**
+ * Invoked when we receive a KnobFrame from the peer
+ */
+ virtual void
+ onKnob(uint64_t /*knobSpace*/, uint64_t /*knobId*/, Buf /*knobBlob*/) {}
+ };
+
+ /**
+ * Sets connection setup callback. This callback must be set before using the
+ * socket.
+ */
+ virtual void setConnectionSetupCallback(
+ folly::MaybeManagedPtr<ConnectionSetupCallback> callback) = 0;
+
+ /**
+ * Sets connection streams callback. This callback must be set after
+ * connection set up is finished and is ready for streams processing.
+ */
+ virtual void setConnectionCallback(
+ folly::MaybeManagedPtr<ConnectionCallback> callback) = 0;
+
+ virtual ~QuicSocketLite() = default;
+};
 
 } // namespace quic