@@ -430,7 +430,7 @@ class FrameCryptor {
430
430
.toDart as JSArrayBuffer ;
431
431
432
432
logger.finer (
433
- 'encodeFunction, buffer: ${srcFrame .buffer .length }, cipherText: ${cipherText .toDart .asUint8List ().length }' );
433
+ 'encodeFunction: encrypted buffer: ${srcFrame .buffer .length }, cipherText: ${cipherText .toDart .asUint8List ().length }' );
434
434
var finalBuffer = BytesBuilder ();
435
435
436
436
finalBuffer
@@ -440,8 +440,6 @@ class FrameCryptor {
440
440
finalBuffer.add (frameTrailer.buffer.asUint8List ());
441
441
442
442
enqueueFrame (frameObj, controller, finalBuffer);
443
- logger.finer (
444
- 'encodeFunction: ssrc ${srcFrame .ssrc } buffer length ${srcFrame .buffer .length }, encrypted: ${finalBuffer .length }, headerLength $headerLength cipherText ${cipherText .toDart .asUint8List ().length } iv ${iv .length } frameTrailer ${frameTrailer .buffer .asUint8List ().length }' );
445
443
446
444
if (lastError != CryptorError .kOk) {
447
445
lastError = CryptorError .kOk;
@@ -457,7 +455,7 @@ class FrameCryptor {
457
455
}
458
456
459
457
logger.finer (
460
- 'encrypto kind $kind ,codec $codec headerLength: $headerLength , timestamp: ${srcFrame .timestamp }, ssrc: ${srcFrame .ssrc }, data length: ${srcFrame .buffer .length }, encrypted length: ${finalBuffer .toBytes ().length }, iv $iv ' );
458
+ 'encodeFunction[CryptorError.kOk]: frame enqueued kind $kind ,codec $codec headerLength: $headerLength , timestamp: ${srcFrame .timestamp }, ssrc: ${srcFrame .ssrc }, data length: ${srcFrame .buffer .length }, encrypted length: ${finalBuffer .toBytes ().length }, iv $iv ' );
461
459
} catch (e) {
462
460
logger.warning ('encodeFunction encrypt: e ${e .toString ()}' );
463
461
if (lastError != CryptorError .kEncryptError) {
@@ -482,7 +480,7 @@ class FrameCryptor {
482
480
var srcFrame = readFrameInfo (frameObj);
483
481
var ratchetCount = 0 ;
484
482
485
- logger.fine ('decodeFunction: frame ${srcFrame .buffer .length }' );
483
+ logger.fine ('decodeFunction: frame lenght ${srcFrame .buffer .length }' );
486
484
487
485
ByteBuffer ? decrypted;
488
486
KeySet ? initialKeySet;
@@ -512,17 +510,18 @@ class FrameCryptor {
512
510
if (sifGuard.isSifAllowed ()) {
513
511
var frameType =
514
512
srcFrame.buffer.sublist (srcFrame.buffer.length - 1 )[0 ];
515
- logger.finer ('skip uncrypted frame, type $frameType ' );
513
+ logger
514
+ .finer ('ecodeFunction: skip uncrypted frame, type $frameType ' );
516
515
var finalBuffer = BytesBuilder ();
517
516
finalBuffer.add (Uint8List .fromList (srcFrame.buffer
518
517
.sublist (0 , srcFrame.buffer.length - (magicBytes.length + 1 ))));
519
518
enqueueFrame (frameObj, controller, finalBuffer);
520
- logger.fine ('enqueing silent frame' );
519
+ logger.fine ('ecodeFunction: enqueing silent frame' );
521
520
controller.enqueue (frameObj);
522
521
} else {
523
- logger.finer ('SIF limit reached, dropping frame' );
522
+ logger.finer ('ecodeFunction: SIF limit reached, dropping frame' );
524
523
}
525
- logger.finer ('enqueing silent frame' );
524
+ logger.finer ('ecodeFunction: enqueing silent frame' );
526
525
controller.enqueue (frameObj);
527
526
return ;
528
527
} else {
@@ -547,9 +546,6 @@ class FrameCryptor {
547
546
logger.finer (
548
547
'decodeFunction: start decrypting frame headerLength $headerLength ${srcFrame .buffer .length } frameTrailer $frameTrailer , ivLength $ivLength , keyIndex $keyIndex , iv $iv ' );
549
548
550
- logger.finer (
551
- 'decodeFunction: ssrc ${srcFrame .ssrc } buffer length ${srcFrame .buffer .length }, encrypted: ${srcFrame .buffer .length }, headerLength $headerLength cipherText ${srcFrame .buffer .sublist (headerLength , srcFrame .buffer .length - ivLength - 2 ).length } iv ${iv .length } frameTrailer ${frameTrailer .buffer .asUint8List ().length }' );
552
-
553
549
/// missingKey flow:
554
550
/// tries to decrypt once, fails, tries to ratchet once and decrypt again,
555
551
/// fails (does not save ratcheted key), bumps _decryptionFailureCount,
@@ -591,15 +587,16 @@ class FrameCryptor {
591
587
.toDart) as JSArrayBuffer )
592
588
.toDart;
593
589
logger.finer (
594
- 'decodeFunction: decryptFrameInternal: decrypted: ${decrypted !.asUint8List ().length }' );
590
+ 'decodeFunction:: decryptFrameInternal: decrypted: ${decrypted !.asUint8List ().length }' );
595
591
596
592
if (decrypted == null ) {
597
593
throw Exception ('[decryptFrameInternal] could not decrypt' );
598
594
}
599
595
logger.finer (
600
- 'decryptFrameInternal: decrypted: ${decrypted !.asUint8List ().length }' );
596
+ 'decodeFunction:: decryptFrameInternal: decrypted: ${decrypted !.asUint8List ().length }' );
601
597
if (currentkeySet != initialKeySet) {
602
- logger.fine ('ratchetKey: decryption ok, newState: kKeyRatcheted' );
598
+ logger.fine (
599
+ 'decodeFunction::decryptFrameInternal: ratchetKey: decryption ok, newState: kKeyRatcheted' );
603
600
await keyHandler.setKeySetFromMaterial (
604
601
currentkeySet, initialKeyIndex);
605
602
}
@@ -608,9 +605,9 @@ class FrameCryptor {
608
605
lastError != CryptorError .kKeyRatcheted &&
609
606
ratchetCount > 0 ) {
610
607
logger.finer (
611
- 'KeyRatcheted: ssrc ${srcFrame .ssrc } timestamp ${srcFrame .timestamp } ratchetCount $ratchetCount participantId: $participantIdentity ' );
608
+ 'decodeFunction::decryptFrameInternal: KeyRatcheted: ssrc ${srcFrame .ssrc } timestamp ${srcFrame .timestamp } ratchetCount $ratchetCount participantId: $participantIdentity ' );
612
609
logger.finer (
613
- 'ratchetKey: lastError != CryptorError.kKeyRatcheted, reset state to kKeyRatcheted' );
610
+ 'decodeFunction::decryptFrameInternal: ratchetKey: lastError != CryptorError.kKeyRatcheted, reset state to kKeyRatcheted' );
614
611
615
612
lastError = CryptorError .kKeyRatcheted;
616
613
postMessage ({
@@ -661,7 +658,7 @@ class FrameCryptor {
661
658
keyHandler.decryptionSuccess ();
662
659
663
660
logger.finer (
664
- 'decodeFunction: buffer length ${srcFrame .buffer .length }, decrypted: ${decrypted !.asUint8List ().length }' );
661
+ 'decodeFunction: decryption success, buffer length ${srcFrame .buffer .length }, decrypted: ${decrypted !.asUint8List ().length }' );
665
662
666
663
var finalBuffer = BytesBuilder ();
667
664
@@ -684,7 +681,7 @@ class FrameCryptor {
684
681
}
685
682
686
683
logger.fine (
687
- 'decrypt kind $kind , headerLength: $headerLength , timestamp: ${srcFrame .timestamp }, ssrc: ${srcFrame .ssrc }, data length: ${srcFrame .buffer .length }, decrypted length: ${finalBuffer .toBytes ().length }, keyindex $keyIndex iv $iv ' );
684
+ '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 ' );
688
685
} catch (e) {
689
686
if (lastError != CryptorError .kDecryptError) {
690
687
lastError = CryptorError .kDecryptError;
0 commit comments