++

Author: Zainullin Damir

src/plugins/process/quic/src/quic.cpp

@@ -190,7 +190,8 @@ void QUICPlugin::processInitial(
 	const QUICInitialHeaderView& initialHeaderView,
 	QUICData& pluginData) noexcept
 {
-	pluginData.processingState.initialConnectionId.assign(
+	pluginData.processingState.initialConnectionId = ConnectionId();
+	pluginData.processingState.initialConnectionId->assign(
 		initialHeaderView.destinationConnectionId.begin(),
 		initialHeaderView.destinationConnectionId.end());
 	if (quicDirection.has_value()
@@ -268,7 +269,8 @@ constexpr void QUICPlugin::parseRetry(
 	 */
 	// Additionally set token len
 	pluginData.retrySourceId.assign(sourceConnectionId.begin(), sourceConnectionId.end());
-	pluginData.processingState.initialConnectionId.assign(
+	pluginData.processingState.initialConnectionId = ConnectionId();
+	pluginData.processingState.initialConnectionId->assign(
 		destinationConnectionId.begin(),
 		destinationConnectionId.end());
 	pluginData.quicTokenLength = 16; // ?????????
@@ -406,8 +408,7 @@ PluginInitResult QUICPlugin::onInit(const FlowContext& flowContext, void* plugin
 	QUICParser quicParser;
 	const bool quicParsed = quicParser.parse(
 		getPayload(flowContext.packet),
-		// pluginData.processingState.initialConnectionId,
-		ConnectionId(), // TODO FIX
+		std::nullopt,
 		flowContext.flowRecord.flowKey.l4Protocol);
 	if (!quicParsed) {
 		return {

src/plugins/process/quic/src/quicData.hpp

@@ -60,7 +60,7 @@ struct QUICData {
 	struct {
 		QUICTemporalStorage temporalCIDStorage;
 		std::size_t retryPacketCount = 0;
-		ConnectionId initialConnectionId;
+		std::optional<ConnectionId> initialConnectionId;
 	} processingState;
 };
 

src/plugins/process/quic/src/quicParser.cpp

@@ -86,16 +86,20 @@ QUICParser::parseHandshake(std::span<const std::byte> payload) noexcept
 std::optional<std::size_t> QUICParser::parseInitial(
 	std::span<const std::byte> payload,
 	std::span<const uint8_t> currentDCID,
-	std::span<const uint8_t> initialDCID,
+	const std::optional<ConnectionId>& initialDCID,
 	const std::byte headerForm,
 	std::span<const std::byte> salt,
 	const QUICVersion version) noexcept
 {
 	initialHeaderView
 		= QUICInitialHeaderView::createFrom(payload, headerForm, salt, currentDCID, version);
-	if (!initialHeaderView.has_value()) {
-		initialHeaderView
-			= QUICInitialHeaderView::createFrom(payload, headerForm, salt, initialDCID, version);
+	if (!initialHeaderView.has_value() && initialDCID.has_value()) {
+		initialHeaderView = QUICInitialHeaderView::createFrom(
+			payload,
+			headerForm,
+			salt,
+			toSpan<const uint8_t>(*initialDCID),
+			version);
 		if (!initialHeaderView.has_value()) {
 			return std::nullopt;
 		}
@@ -115,7 +119,7 @@ std::optional<std::size_t> QUICParser::parseInitial(
 
 bool QUICParser::parse(
 	std::span<const std::byte> payload,
-	const ConnectionId& initialConnectionId,
+	const std::optional<ConnectionId>& initialConnectionId,
 	const uint8_t l4Protocol) noexcept
 {
 	// Handle coalesced packets
@@ -151,7 +155,7 @@ bool QUICParser::parse(
 			secondaryHeaderSize = parseInitial(
 				payload,
 				headerView->destinationConnectionId,
-				toSpan<const uint8_t>(initialConnectionId),
+				initialConnectionId,
 				headerView->headerForm,
 				*salt,
 				*headerView->version);

src/plugins/process/quic/src/quicParser.hpp

@@ -84,7 +84,7 @@ class QUICParser {
 
 	bool parse(
 		std::span<const std::byte> payload,
-		const ConnectionId& initialConnectionId,
+		const std::optional<ConnectionId>& initialConnectionId,
 		const uint8_t l4Protocol) noexcept;
 
 private:
@@ -97,8 +97,8 @@ class QUICParser {
 
 	std::optional<std::size_t> parseInitial(
 		std::span<const std::byte> payload,
-		std::span<const uint8_t> currentDCID,
-		std::span<const uint8_t> initialDCID,
+		const std::span<const uint8_t> currentDCID,
+		const std::optional<ConnectionId>& initialDCID,
 		const std::byte headerForm,
 		std::span<const std::byte> salt,
 		const QUICVersion version) noexcept;