Skip to content

Commit 9728dc7

Browse files
authored
fix: sif frame enqueing with e2ee (#822)
1 parent f59a2bb commit 9728dc7

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

web/e2ee.cryptor.dart

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ class FrameCryptor {
384384

385385
var srcFrame = readFrameInfo(frameObj);
386386

387-
logger.fine(
387+
logger.finer(
388388
'encodeFunction: buffer ${srcFrame.buffer.length}, synchronizationSource ${srcFrame.ssrc} frameType ${srcFrame.frameType}');
389389

390390
var secretKey = keyHandler.getKeySet(currentKeyIndex)?.encryptionKey;
@@ -479,7 +479,7 @@ class FrameCryptor {
479479
var srcFrame = readFrameInfo(frameObj);
480480
var ratchetCount = 0;
481481

482-
logger.fine('decodeFunction: frame lenght ${srcFrame.buffer.length}');
482+
logger.finer('decodeFunction: frame length ${srcFrame.buffer.length}');
483483

484484
ByteBuffer? decrypted;
485485
KeySet? initialKeySet;
@@ -490,9 +490,8 @@ class FrameCryptor {
490490
srcFrame.buffer.isEmpty) {
491491
sifGuard.recordUserFrame();
492492
if (keyOptions.discardFrameWhenCryptorNotReady) return;
493-
logger.fine('enqueing empty frame');
493+
logger.fine('enqueing empty dtx frame');
494494
controller.enqueue(frameObj);
495-
logger.finer('enqueing silent frame');
496495
return;
497496
}
498497

@@ -508,20 +507,19 @@ class FrameCryptor {
508507
if (sifGuard.isSifAllowed()) {
509508
var frameType =
510509
srcFrame.buffer.sublist(srcFrame.buffer.length - 1)[0];
511-
logger
512-
.finer('ecodeFunction: skip uncrypted frame, type $frameType');
510+
logger.finer(
511+
'encodeFunction: skip unencrypted frame, type $frameType');
513512
var finalBuffer = BytesBuilder();
514513
finalBuffer.add(Uint8List.fromList(srcFrame.buffer
515514
.sublist(0, srcFrame.buffer.length - (magicBytes.length + 1))));
515+
logger.fine(
516+
'encodeFunction: enqueing silent frame');
516517
enqueueFrame(frameObj, controller, finalBuffer);
517-
logger.fine('ecodeFunction: enqueing silent frame');
518-
controller.enqueue(frameObj);
518+
return;
519519
} else {
520-
logger.finer('ecodeFunction: SIF limit reached, dropping frame');
520+
logger.fine('encodeFunction: SIF limit reached, dropping frame');
521+
return;
521522
}
522-
logger.finer('ecodeFunction: enqueing silent frame');
523-
controller.enqueue(frameObj);
524-
return;
525523
} else {
526524
sifGuard.recordUserFrame();
527525
}
@@ -678,7 +676,7 @@ class FrameCryptor {
678676
});
679677
}
680678

681-
logger.fine(
679+
logger.finer(
682680
'decodeFunction[CryptorError.kOk]: decryption success kind $kind, headerLength: $headerLength, timestamp: ${srcFrame.timestamp}, ssrc: ${srcFrame.ssrc}, data length: ${srcFrame.buffer.length}, decrypted length: ${finalBuffer.toBytes().length}, keyindex $keyIndex iv $iv');
683681
} catch (e, s) {
684682
logger.info('decodeFunction[CryptorError.kDecryptError]: $e, $s');

0 commit comments

Comments
 (0)