Make webrtcTransport.connect() also receive remote IceParameters

NOTE: Not working yet due to FBS issues.
versatica · Feb 16, 2024 · 39e3637 · 39e3637
1 parent bba4a78
commit 39e3637
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 16 deletions.
diff --git a/node/src/WebRtcTransport.ts b/node/src/WebRtcTransport.ts
@@ -157,8 +157,6 @@ export type IceCandidate = {
 export type DtlsParameters = {
 	role?: DtlsRole;
 	fingerprints: DtlsFingerprint[];
-	iceUfrag?: string;
-	icePwd?: string;
 };
 
 /**
@@ -479,14 +477,17 @@ export class WebRtcTransport<
 	 * @override
 	 */
 	async connect({
+		iceParameters,
 		dtlsParameters,
 	}: {
+		iceParameters?: IceParameters;
 		dtlsParameters: DtlsParameters;
 	}): Promise<void> {
 		logger.debug('connect()');
 
 		const requestOffset = createConnectRequest({
 			builder: this.channel.bufferBuilder,
+			iceParameters,
 			dtlsParameters,
 		});
 
@@ -837,19 +838,31 @@ export function parseWebRtcTransportDumpResponse(
 
 function createConnectRequest({
 	builder,
+	iceParameters,
 	dtlsParameters,
 }: {
 	builder: flatbuffers.Builder;
+	iceParameters?: IceParameters;
 	dtlsParameters: DtlsParameters;
 }): number {
+	// Serialize ICeParameters if given. This can throw.
+	const iceParametersOffset = iceParameters
+		? serializeIceParameters(builder, iceParameters)
+		: undefined;
+
 	// Serialize DtlsParameters. This can throw.
 	const dtlsParametersOffset = serializeDtlsParameters(builder, dtlsParameters);
 
+	const ConnectRequest = FbsWebRtcTransport.ConnectRequest;
+
 	// Create request.
-	return FbsWebRtcTransport.ConnectRequest.createConnectRequest(
-		builder,
-		dtlsParametersOffset
-	);
+	ConnectRequest.startConnectRequest(builder);
+	if (iceParametersOffset) {
+		ConnectRequest.addIceParameters(builder, iceParametersOffset);
+	}
+	ConnectRequest.addDtlsParameters(builder, dtlsParametersOffset);
+
+	return ConnectRequest.endConnectRequest(builder);
 }
 
 function parseGetStatsResponse(
@@ -918,6 +931,24 @@ function parseDtlsParameters(
 	};
 }
 
+function serializeIceParameters(
+	builder: flatbuffers.Builder,
+	iceParameters: IceParameters
+): number {
+	const usernameFragmentOffset = builder.createString(
+		iceParameters.usernameFragment ?? ''
+	);
+	const passwordOffset = builder.createString(iceParameters.password ?? '');
+	const iceLiteOffset = Boolean(iceParameters.iceLite);
+
+	return FbsWebRtcTransport.IceParameters.createIceParameters(
+		builder,
+		usernameFragmentOffset,
+		passwordOffset,
+		iceLiteOffset
+	);
+}
+
 function serializeDtlsParameters(
 	builder: flatbuffers.Builder,
 	dtlsParameters: DtlsParameters
@@ -942,9 +973,6 @@ function serializeDtlsParameters(
 			fingerprints
 		);
 
-	const iceUfragOffset = builder.createString(dtlsParameters.iceUfrag ?? '');
-	const icePwdOffset = builder.createString(dtlsParameters.icePwd ?? '');
-
 	const role =
 		dtlsParameters.role !== undefined
 			? dtlsRoleToFbs(dtlsParameters.role)
@@ -953,8 +981,6 @@ function serializeDtlsParameters(
 	return FbsWebRtcTransport.DtlsParameters.createDtlsParameters(
 		builder,
 		fingerprintsOffset,
-		role,
-		iceUfragOffset,
-		icePwdOffset
+		role
 	);
 }
diff --git a/worker/fbs/webRtcTransport.fbs b/worker/fbs/webRtcTransport.fbs
@@ -56,8 +56,6 @@ enum DtlsState: uint8 {
 table DtlsParameters {
     fingerprints: [Fingerprint] (required);
     role: DtlsRole = AUTO;
-    ice_ufrag: string;
-    ice_pwd: string;
 }
 
 table IceParameters {
@@ -97,6 +95,7 @@ table IceCandidate {
 }
 
 table ConnectRequest {
+    ice_parameters: IceParameters;
     dtls_parameters: DtlsParameters (required);
 }
 

diff --git a/worker/src/RTC/WebRtcTransport.cpp b/worker/src/RTC/WebRtcTransport.cpp
@@ -440,6 +440,7 @@ namespace RTC
 				}
 
 				const auto* body           = request->data->body_as<FBS::WebRtcTransport::ConnectRequest>();
+				const auto* iceParameters  = body->iceParameters();
 				const auto* dtlsParameters = body->dtlsParameters();
 
 				RTC::DtlsTransport::Fingerprint dtlsRemoteFingerprint;
@@ -463,8 +464,8 @@ namespace RTC
 
 				dtlsRemoteRole = RTC::DtlsTransport::RoleFromFbs(dtlsParameters->role());
 
-				const std::string iceUsernameFragment = dtlsParameters->iceUfrag()->str();
-				const std::string icePassword         = dtlsParameters->icePwd()->str();
+				const std::string iceUsernameFragment = iceParameters->usernameFragment()->str();
+				const std::string icePassword         = iceParameters->password()->str();
 
 				if (!iceUsernameFragment.empty() && !icePassword.empty())
 				{