QUIC FIFD

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19206)

diff --git a/doc/designs/quic-design/images/quic-overview.odg b/doc/designs/quic-design/images/quic-overview.odg
index a844a0deb7100e1267d6ff42d2c5d930123b848b..c8a055760bb2cdbde439d4814707405b584eb39f 100644 (file)
Binary files a/doc/designs/quic-design/images/quic-overview.odg and b/doc/designs/quic-design/images/quic-overview.odg differ

diff --git a/doc/designs/quic-design/images/quic-overview.svg b/doc/designs/quic-design/images/quic-overview.svg
index fbc81cc764c6a41eb95a5f301cc650eb6e12ad49..4bb82282a690d0c7918e9fe8012d9df9e015a52d 100644 (file)
--- a/doc/designs/quic-design/images/quic-overview.svg
+++ b/doc/designs/quic-design/images/quic-overview.svg
@@ -11,57 +11,58 @@
  </defs>
  <defs>
   <font id="EmbeddedFont_1" horiz-adv-x="2048">
-   <font-face font-family="DejaVu Sans embedded" units-per-em="2048" font-weight="normal" font-style="normal" ascent="1905" descent="476"/>
+   <font-face font-family="DejaVu Sans embedded" units-per-em="2048" font-weight="normal" font-style="normal" ascent="1879" descent="476"/>
    <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z"/>
-   <glyph unicode="z" horiz-adv-x="918" d="M 113,1120 L 987,1120 987,952 295,147 987,147 987,0 88,0 88,168 780,973 113,973 113,1120 Z"/>
+   <glyph unicode="z" horiz-adv-x="927" d="M 113,1120 L 987,1120 987,952 295,147 987,147 987,0 88,0 88,168 780,973 113,973 113,1120 Z"/>
    <glyph unicode="y" horiz-adv-x="1112" d="M 659,-104 C 607,-237 556,-324 507,-365 458,-406 392,-426 309,-426 L 162,-426 162,-272 270,-272 C 321,-272 360,-260 388,-236 416,-212 447,-155 481,-66 L 514,18 61,1120 256,1120 606,244 956,1120 1151,1120 659,-104 Z"/>
-   <glyph unicode="x" horiz-adv-x="1095" d="M 1124,1120 L 719,575 1145,0 928,0 602,440 276,0 59,0 494,586 96,1120 313,1120 610,721 907,1120 1124,1120 Z"/>
-   <glyph unicode="w" horiz-adv-x="1518" d="M 86,1120 L 270,1120 500,246 729,1120 946,1120 1176,246 1405,1120 1589,1120 1296,0 1079,0 838,918 596,0 379,0 86,1120 Z"/>
+   <glyph unicode="x" horiz-adv-x="1112" d="M 1124,1120 L 719,575 1145,0 928,0 602,440 276,0 59,0 494,586 96,1120 313,1120 610,721 907,1120 1124,1120 Z"/>
+   <glyph unicode="w" horiz-adv-x="1510" d="M 86,1120 L 270,1120 500,246 729,1120 946,1120 1176,246 1405,1120 1589,1120 1296,0 1079,0 838,918 596,0 379,0 86,1120 Z"/>
    <glyph unicode="v" horiz-adv-x="1112" d="M 61,1120 L 256,1120 606,180 956,1120 1151,1120 731,0 481,0 61,1120 Z"/>
    <glyph unicode="u" horiz-adv-x="953" d="M 174,442 L 174,1120 358,1120 358,449 C 358,343 379,264 420,211 461,158 523,131 606,131 705,131 784,163 842,226 899,289 928,376 928,485 L 928,1120 1112,1120 1112,0 928,0 928,172 C 883,104 832,54 773,21 714,-12 645,-29 567,-29 438,-29 341,11 274,91 207,171 174,288 174,442 Z "/>
-   <glyph unicode="t" horiz-adv-x="706" d="M 375,1438 L 375,1120 754,1120 754,977 375,977 375,369 C 375,278 388,219 413,193 438,167 488,154 565,154 L 754,154 754,0 565,0 C 423,0 325,27 271,80 217,133 190,229 190,369 L 190,977 55,977 55,1120 190,1120 190,1438 375,1438 Z"/>
-   <glyph unicode="s" horiz-adv-x="865" d="M 907,1087 L 907,913 C 855,940 801,960 745,973 689,986 631,993 571,993 480,993 411,979 366,951 320,923 297,881 297,825 297,782 313,749 346,725 379,700 444,677 543,655 L 606,641 C 737,613 830,574 885,523 940,472 967,400 967,309 967,205 926,123 844,62 761,1 648,-29 504,-29 444,-29 382,-23 317,-12 252,0 183,18 111,41 L 111,231 C 179,196 246,169 312,152 378,134 443,125 508,125 595,125 661,140 708,170 755,199 778,241 778,295 778,345 761,383 728,410 694,437 620,462 506,487 L 442,502 C 328,526 246,563 195,613 144,662 119,730 119,817 119,922 156,1004 231,1061 306,1118 412,1147 549,1147 617,1147 681,1142 741,1132 801,1122 856,1107 907,1087 Z"/>
-   <glyph unicode="r" horiz-adv-x="672" d="M 842,948 C 821,960 799,969 775,975 750,980 723,983 694,983 590,983 510,949 455,882 399,814 371,717 371,590 L 371,0 186,0 186,1120 371,1120 371,946 C 410,1014 460,1065 522,1098 584,1131 659,1147 748,1147 761,1147 775,1146 790,1145 805,1143 822,1140 841,1137 L 842,948 Z"/>
-   <glyph unicode="p" horiz-adv-x="1024" d="M 371,168 L 371,-426 186,-426 186,1120 371,1120 371,950 C 410,1017 459,1066 518,1099 577,1131 647,1147 729,1147 865,1147 976,1093 1061,985 1146,877 1188,735 1188,559 1188,383 1146,241 1061,133 976,25 865,-29 729,-29 647,-29 577,-13 518,20 459,52 410,101 371,168 Z M 997,559 C 997,694 969,801 914,878 858,955 781,993 684,993 587,993 510,955 455,878 399,801 371,694 371,559 371,424 399,318 455,241 510,164 587,125 684,125 781,125 858,164 914,241 969,318 997,424 997,559 Z"/>
-   <glyph unicode="o" horiz-adv-x="1042" d="M 627,991 C 528,991 450,953 393,876 336,799 307,693 307,559 307,425 336,320 393,243 450,166 528,127 627,127 725,127 803,166 860,243 917,320 946,426 946,559 946,692 917,797 860,875 803,952 725,991 627,991 Z M 627,1147 C 787,1147 913,1095 1004,991 1095,887 1141,743 1141,559 1141,376 1095,232 1004,128 913,23 787,-29 627,-29 466,-29 341,23 250,128 159,232 113,376 113,559 113,743 159,887 250,991 341,1095 466,1147 627,1147 Z"/>
+   <glyph unicode="t" horiz-adv-x="715" d="M 375,1438 L 375,1120 754,1120 754,977 375,977 375,369 C 375,278 388,219 413,193 438,167 488,154 565,154 L 754,154 754,0 565,0 C 423,0 325,27 271,80 217,133 190,229 190,369 L 190,977 55,977 55,1120 190,1120 190,1438 375,1438 Z"/>
+   <glyph unicode="s" horiz-adv-x="874" d="M 907,1087 L 907,913 C 855,940 801,960 745,973 689,986 631,993 571,993 480,993 411,979 366,951 320,923 297,881 297,825 297,782 313,749 346,725 379,700 444,677 543,655 L 606,641 C 737,613 830,574 885,523 940,472 967,400 967,309 967,205 926,123 844,62 761,1 648,-29 504,-29 444,-29 382,-23 317,-12 252,0 183,18 111,41 L 111,231 C 179,196 246,169 312,152 378,134 443,125 508,125 595,125 661,140 708,170 755,199 778,241 778,295 778,345 761,383 728,410 694,437 620,462 506,487 L 442,502 C 328,526 246,563 195,613 144,662 119,730 119,817 119,922 156,1004 231,1061 306,1118 412,1147 549,1147 617,1147 681,1142 741,1132 801,1122 856,1107 907,1087 Z"/>
+   <glyph unicode="r" horiz-adv-x="663" d="M 842,948 C 821,960 799,969 775,975 750,980 723,983 694,983 590,983 510,949 455,882 399,814 371,717 371,590 L 371,0 186,0 186,1120 371,1120 371,946 C 410,1014 460,1065 522,1098 584,1131 659,1147 748,1147 761,1147 775,1146 790,1145 805,1143 822,1140 841,1137 L 842,948 Z"/>
+   <glyph unicode="p" horiz-adv-x="1007" d="M 371,168 L 371,-426 186,-426 186,1120 371,1120 371,950 C 410,1017 459,1066 518,1099 577,1131 647,1147 729,1147 865,1147 976,1093 1061,985 1146,877 1188,735 1188,559 1188,383 1146,241 1061,133 976,25 865,-29 729,-29 647,-29 577,-13 518,20 459,52 410,101 371,168 Z M 997,559 C 997,694 969,801 914,878 858,955 781,993 684,993 587,993 510,955 455,878 399,801 371,694 371,559 371,424 399,318 455,241 510,164 587,125 684,125 781,125 858,164 914,241 969,318 997,424 997,559 Z"/>
+   <glyph unicode="o" horiz-adv-x="1033" d="M 627,991 C 528,991 450,953 393,876 336,799 307,693 307,559 307,425 336,320 393,243 450,166 528,127 627,127 725,127 803,166 860,243 917,320 946,426 946,559 946,692 917,797 860,875 803,952 725,991 627,991 Z M 627,1147 C 787,1147 913,1095 1004,991 1095,887 1141,743 1141,559 1141,376 1095,232 1004,128 913,23 787,-29 627,-29 466,-29 341,23 250,128 159,232 113,376 113,559 113,743 159,887 250,991 341,1095 466,1147 627,1147 Z"/>
    <glyph unicode="n" horiz-adv-x="954" d="M 1124,676 L 1124,0 940,0 940,670 C 940,776 919,855 878,908 837,961 775,987 692,987 593,987 514,955 457,892 400,829 371,742 371,633 L 371,0 186,0 186,1120 371,1120 371,946 C 415,1013 467,1064 527,1097 586,1130 655,1147 733,1147 862,1147 959,1107 1025,1028 1091,948 1124,831 1124,676 Z"/>
-   <glyph unicode="m" horiz-adv-x="1659" d="M 1065,905 C 1111,988 1166,1049 1230,1088 1294,1127 1369,1147 1456,1147 1573,1147 1663,1106 1726,1025 1789,943 1821,827 1821,676 L 1821,0 1636,0 1636,670 C 1636,777 1617,857 1579,909 1541,961 1483,987 1405,987 1310,987 1234,955 1179,892 1124,829 1096,742 1096,633 L 1096,0 911,0 911,670 C 911,778 892,858 854,910 816,961 757,987 678,987 584,987 509,955 454,892 399,828 371,742 371,633 L 371,0 186,0 186,1120 371,1120 371,946 C 413,1015 463,1065 522,1098 581,1131 650,1147 731,1147 812,1147 882,1126 939,1085 996,1044 1038,984 1065,905 Z"/>
+   <glyph unicode="m" horiz-adv-x="1642" d="M 1065,905 C 1111,988 1166,1049 1230,1088 1294,1127 1369,1147 1456,1147 1573,1147 1663,1106 1726,1025 1789,943 1821,827 1821,676 L 1821,0 1636,0 1636,670 C 1636,777 1617,857 1579,909 1541,961 1483,987 1405,987 1310,987 1234,955 1179,892 1124,829 1096,742 1096,633 L 1096,0 911,0 911,670 C 911,778 892,858 854,910 816,961 757,987 678,987 584,987 509,955 454,892 399,828 371,742 371,633 L 371,0 186,0 186,1120 371,1120 371,946 C 413,1015 463,1065 522,1098 581,1131 650,1147 731,1147 812,1147 882,1126 939,1085 996,1044 1038,984 1065,905 Z"/>
    <glyph unicode="l" horiz-adv-x="213" d="M 193,1556 L 377,1556 377,0 193,0 193,1556 Z"/>
    <glyph unicode="k" horiz-adv-x="1007" d="M 186,1556 L 371,1556 371,637 920,1120 1155,1120 561,596 1180,0 940,0 371,547 371,0 186,0 186,1556 Z"/>
    <glyph unicode="i" horiz-adv-x="213" d="M 193,1120 L 377,1120 377,0 193,0 193,1120 Z M 193,1556 L 377,1556 377,1323 193,1323 193,1556 Z"/>
    <glyph unicode="h" horiz-adv-x="954" d="M 1124,676 L 1124,0 940,0 940,670 C 940,776 919,855 878,908 837,961 775,987 692,987 593,987 514,955 457,892 400,829 371,742 371,633 L 371,0 186,0 186,1556 371,1556 371,946 C 415,1013 467,1064 527,1097 586,1130 655,1147 733,1147 862,1147 959,1107 1025,1028 1091,948 1124,831 1124,676 Z"/>
-   <glyph unicode="g" horiz-adv-x="1024" d="M 930,573 C 930,706 903,810 848,883 793,956 715,993 616,993 517,993 441,956 386,883 331,810 303,706 303,573 303,440 331,337 386,264 441,191 517,154 616,154 715,154 793,191 848,264 903,337 930,440 930,573 Z M 1114,139 C 1114,-52 1072,-193 987,-287 902,-379 773,-426 598,-426 533,-426 472,-421 415,-412 358,-402 302,-387 248,-367 L 248,-188 C 302,-217 355,-239 408,-253 461,-267 514,-274 569,-274 690,-274 780,-242 840,-180 900,-116 930,-21 930,106 L 930,197 C 892,131 843,82 784,49 725,16 654,0 571,0 434,0 323,52 239,157 155,262 113,400 113,573 113,746 155,885 239,990 323,1095 434,1147 571,1147 654,1147 725,1131 784,1098 843,1065 892,1016 930,950 L 930,1120 1114,1120 1114,139 Z"/>
+   <glyph unicode="g" horiz-adv-x="1006" d="M 930,573 C 930,706 903,810 848,883 793,956 715,993 616,993 517,993 441,956 386,883 331,810 303,706 303,573 303,440 331,337 386,264 441,191 517,154 616,154 715,154 793,191 848,264 903,337 930,440 930,573 Z M 1114,139 C 1114,-52 1072,-193 987,-287 902,-379 773,-426 598,-426 533,-426 472,-421 415,-412 358,-402 302,-387 248,-367 L 248,-188 C 302,-217 355,-239 408,-253 461,-267 514,-274 569,-274 690,-274 780,-242 840,-180 900,-116 930,-21 930,106 L 930,197 C 892,131 843,82 784,49 725,16 654,0 571,0 434,0 323,52 239,157 155,262 113,400 113,573 113,746 155,885 239,990 323,1095 434,1147 571,1147 654,1147 725,1131 784,1098 843,1065 892,1016 930,950 L 930,1120 1114,1120 1114,139 Z"/>
    <glyph unicode="f" horiz-adv-x="742" d="M 760,1556 L 760,1403 584,1403 C 518,1403 472,1390 447,1363 421,1336 408,1288 408,1219 L 408,1120 711,1120 711,977 408,977 408,0 223,0 223,977 47,977 47,1120 223,1120 223,1198 C 223,1323 252,1414 310,1471 368,1528 460,1556 586,1556 L 760,1556 Z"/>
    <glyph unicode="e" horiz-adv-x="1059" d="M 1151,606 L 1151,516 305,516 C 313,389 351,293 420,227 488,160 583,127 705,127 776,127 844,136 911,153 977,170 1043,196 1108,231 L 1108,57 C 1042,29 974,8 905,-7 836,-22 765,-29 694,-29 515,-29 374,23 270,127 165,231 113,372 113,549 113,732 163,878 262,986 361,1093 494,1147 662,1147 813,1147 932,1099 1020,1002 1107,905 1151,773 1151,606 Z M 967,659 C 966,760 938,841 883,901 828,961 755,991 664,991 561,991 479,962 418,904 356,846 320,764 311,659 L 967,659 Z"/>
-   <glyph unicode="d" horiz-adv-x="1024" d="M 930,950 L 930,1556 1114,1556 1114,0 930,0 930,168 C 891,101 843,52 784,20 725,-13 654,-29 571,-29 436,-29 326,25 241,133 156,241 113,383 113,559 113,735 156,877 241,985 326,1093 436,1147 571,1147 654,1147 725,1131 784,1099 843,1066 891,1017 930,950 Z M 303,559 C 303,424 331,318 387,241 442,164 519,125 616,125 713,125 790,164 846,241 902,318 930,424 930,559 930,694 902,801 846,878 790,955 713,993 616,993 519,993 442,955 387,878 331,801 303,694 303,559 Z"/>
+   <glyph unicode="d" horiz-adv-x="1006" d="M 930,950 L 930,1556 1114,1556 1114,0 930,0 930,168 C 891,101 843,52 784,20 725,-13 654,-29 571,-29 436,-29 326,25 241,133 156,241 113,383 113,559 113,735 156,877 241,985 326,1093 436,1147 571,1147 654,1147 725,1131 784,1099 843,1066 891,1017 930,950 Z M 303,559 C 303,424 331,318 387,241 442,164 519,125 616,125 713,125 790,164 846,241 902,318 930,424 930,559 930,694 902,801 846,878 790,955 713,993 616,993 519,993 442,955 387,878 331,801 303,694 303,559 Z"/>
    <glyph unicode="c" horiz-adv-x="900" d="M 999,1077 L 999,905 C 947,934 895,955 843,970 790,984 737,991 684,991 565,991 472,953 406,878 340,802 307,696 307,559 307,422 340,316 406,241 472,165 565,127 684,127 737,127 790,134 843,149 895,163 947,184 999,213 L 999,43 C 948,19 895,1 840,-11 785,-23 726,-29 664,-29 495,-29 361,24 262,130 163,236 113,379 113,559 113,742 163,885 264,990 364,1095 501,1147 676,1147 733,1147 788,1141 842,1130 896,1118 948,1100 999,1077 Z"/>
-   <glyph unicode="a" horiz-adv-x="971" d="M 702,563 C 553,563 450,546 393,512 336,478 307,420 307,338 307,273 329,221 372,183 415,144 473,125 547,125 649,125 731,161 793,234 854,306 885,402 885,522 L 885,563 702,563 Z M 1069,639 L 1069,0 885,0 885,170 C 843,102 791,52 728,20 665,-13 589,-29 498,-29 383,-29 292,3 225,68 157,132 123,218 123,326 123,452 165,547 250,611 334,675 460,707 627,707 L 885,707 885,725 C 885,810 857,875 802,922 746,968 668,991 567,991 503,991 441,983 380,968 319,953 261,930 205,899 L 205,1069 C 272,1095 338,1115 401,1128 464,1141 526,1147 586,1147 748,1147 869,1105 949,1021 1029,937 1069,810 1069,639 Z"/>
-   <glyph unicode="X" horiz-adv-x="1289" d="M 129,1493 L 346,1493 717,938 1090,1493 1307,1493 827,776 1339,0 1122,0 702,635 279,0 61,0 594,797 129,1493 Z"/>
+   <glyph unicode="a" horiz-adv-x="980" d="M 702,563 C 553,563 450,546 393,512 336,478 307,420 307,338 307,273 329,221 372,183 415,144 473,125 547,125 649,125 731,161 793,234 854,306 885,402 885,522 L 885,563 702,563 Z M 1069,639 L 1069,0 885,0 885,170 C 843,102 791,52 728,20 665,-13 589,-29 498,-29 383,-29 292,3 225,68 157,132 123,218 123,326 123,452 165,547 250,611 334,675 460,707 627,707 L 885,707 885,725 C 885,810 857,875 802,922 746,968 668,991 567,991 503,991 441,983 380,968 319,953 261,930 205,899 L 205,1069 C 272,1095 338,1115 401,1128 464,1141 526,1147 586,1147 748,1147 869,1105 949,1021 1029,937 1069,810 1069,639 Z"/>
+   <glyph unicode="X" horiz-adv-x="1297" d="M 129,1493 L 346,1493 717,938 1090,1493 1307,1493 827,776 1339,0 1122,0 702,635 279,0 61,0 594,797 129,1493 Z"/>
    <glyph unicode="W" horiz-adv-x="1906" d="M 68,1493 L 272,1493 586,231 899,1493 1126,1493 1440,231 1753,1493 1958,1493 1583,0 1329,0 1014,1296 696,0 442,0 68,1493 Z"/>
-   <glyph unicode="U" horiz-adv-x="1148" d="M 178,1493 L 381,1493 381,586 C 381,426 410,311 468,241 526,170 620,135 750,135 879,135 973,170 1031,241 1089,311 1118,426 1118,586 L 1118,1493 1321,1493 1321,561 C 1321,366 1273,219 1177,120 1080,21 938,-29 750,-29 561,-29 419,21 323,120 226,219 178,366 178,561 L 178,1493 Z"/>
-   <glyph unicode="T" horiz-adv-x="1289" d="M -6,1493 L 1257,1493 1257,1323 727,1323 727,0 524,0 524,1323 -6,1323 -6,1493 Z"/>
-   <glyph unicode="S" horiz-adv-x="1077" d="M 1096,1444 L 1096,1247 C 1019,1284 947,1311 879,1329 811,1347 745,1356 682,1356 572,1356 487,1335 428,1292 368,1249 338,1189 338,1110 338,1044 358,994 398,961 437,927 512,900 623,879 L 745,854 C 896,825 1007,775 1079,703 1150,630 1186,533 1186,412 1186,267 1138,158 1041,83 944,8 801,-29 614,-29 543,-29 468,-21 389,-5 309,11 226,35 141,66 L 141,274 C 223,228 303,193 382,170 461,147 538,135 614,135 729,135 818,158 881,203 944,248 975,313 975,397 975,470 953,528 908,569 863,610 789,641 686,662 L 563,686 C 412,716 303,763 236,827 169,891 135,980 135,1094 135,1226 182,1330 275,1406 368,1482 496,1520 659,1520 729,1520 800,1514 873,1501 946,1488 1020,1469 1096,1444 Z"/>
-   <glyph unicode="R" horiz-adv-x="1183" d="M 909,700 C 952,685 995,654 1036,606 1077,558 1118,492 1159,408 L 1364,0 1147,0 956,383 C 907,483 859,549 813,582 766,615 703,631 623,631 L 403,631 403,0 201,0 201,1493 657,1493 C 828,1493 955,1457 1039,1386 1123,1315 1165,1207 1165,1063 1165,969 1143,891 1100,829 1056,767 992,724 909,700 Z M 403,1327 L 403,797 657,797 C 754,797 828,820 878,865 927,910 952,976 952,1063 952,1150 927,1216 878,1261 828,1305 754,1327 657,1327 L 403,1327 Z"/>
-   <glyph unicode="Q" horiz-adv-x="1394" d="M 807,1356 C 660,1356 544,1301 458,1192 371,1083 328,934 328,745 328,557 371,408 458,299 544,190 660,135 807,135 954,135 1070,190 1156,299 1241,408 1284,557 1284,745 1284,934 1241,1083 1156,1192 1070,1301 954,1356 807,1356 Z M 1090,27 L 1356,-264 1112,-264 891,-25 C 869,-26 852,-27 841,-28 829,-29 818,-29 807,-29 597,-29 429,41 304,182 178,322 115,510 115,745 115,981 178,1169 304,1310 429,1450 597,1520 807,1520 1016,1520 1184,1450 1309,1310 1434,1169 1497,981 1497,745 1497,572 1462,423 1393,300 1323,177 1222,86 1090,27 Z"/>
-   <glyph unicode="P" horiz-adv-x="971" d="M 403,1327 L 403,766 657,766 C 751,766 824,790 875,839 926,888 952,957 952,1047 952,1136 926,1205 875,1254 824,1303 751,1327 657,1327 L 403,1327 Z M 201,1493 L 657,1493 C 824,1493 951,1455 1037,1380 1122,1304 1165,1193 1165,1047 1165,900 1122,788 1037,713 951,638 824,600 657,600 L 403,600 403,0 201,0 201,1493 Z"/>
-   <glyph unicode="O" horiz-adv-x="1394" d="M 807,1356 C 660,1356 544,1301 458,1192 371,1083 328,934 328,745 328,557 371,408 458,299 544,190 660,135 807,135 954,135 1070,190 1156,299 1241,408 1284,557 1284,745 1284,934 1241,1083 1156,1192 1070,1301 954,1356 807,1356 Z M 807,1520 C 1016,1520 1184,1450 1309,1310 1434,1169 1497,981 1497,745 1497,510 1434,322 1309,182 1184,41 1016,-29 807,-29 597,-29 429,41 304,181 178,321 115,509 115,745 115,981 178,1169 304,1310 429,1450 597,1520 807,1520 Z"/>
-   <glyph unicode="N" horiz-adv-x="1148" d="M 201,1493 L 473,1493 1135,244 1135,1493 1331,1493 1331,0 1059,0 397,1249 397,0 201,0 201,1493 Z"/>
+   <glyph unicode="U" horiz-adv-x="1165" d="M 178,1493 L 381,1493 381,586 C 381,426 410,311 468,241 526,170 620,135 750,135 879,135 973,170 1031,241 1089,311 1118,426 1118,586 L 1118,1493 1321,1493 1321,561 C 1321,366 1273,219 1177,120 1080,21 938,-29 750,-29 561,-29 419,21 323,120 226,219 178,366 178,561 L 178,1493 Z"/>
+   <glyph unicode="T" horiz-adv-x="1297" d="M -6,1493 L 1257,1493 1257,1323 727,1323 727,0 524,0 524,1323 -6,1323 -6,1493 Z"/>
+   <glyph unicode="S" horiz-adv-x="1060" d="M 1096,1444 L 1096,1247 C 1019,1284 947,1311 879,1329 811,1347 745,1356 682,1356 572,1356 487,1335 428,1292 368,1249 338,1189 338,1110 338,1044 358,994 398,961 437,927 512,900 623,879 L 745,854 C 896,825 1007,775 1079,703 1150,630 1186,533 1186,412 1186,267 1138,158 1041,83 944,8 801,-29 614,-29 543,-29 468,-21 389,-5 309,11 226,35 141,66 L 141,274 C 223,228 303,193 382,170 461,147 538,135 614,135 729,135 818,158 881,203 944,248 975,313 975,397 975,470 953,528 908,569 863,610 789,641 686,662 L 563,686 C 412,716 303,763 236,827 169,891 135,980 135,1094 135,1226 182,1330 275,1406 368,1482 496,1520 659,1520 729,1520 800,1514 873,1501 946,1488 1020,1469 1096,1444 Z"/>
+   <glyph unicode="R" horiz-adv-x="1192" d="M 909,700 C 952,685 995,654 1036,606 1077,558 1118,492 1159,408 L 1364,0 1147,0 956,383 C 907,483 859,549 813,582 766,615 703,631 623,631 L 403,631 403,0 201,0 201,1493 657,1493 C 828,1493 955,1457 1039,1386 1123,1315 1165,1207 1165,1063 1165,969 1143,891 1100,829 1056,767 992,724 909,700 Z M 403,1327 L 403,797 657,797 C 754,797 828,820 878,865 927,910 952,976 952,1063 952,1150 927,1216 878,1261 828,1305 754,1327 657,1327 L 403,1327 Z"/>
+   <glyph unicode="Q" horiz-adv-x="1403" d="M 807,1356 C 660,1356 544,1301 458,1192 371,1083 328,934 328,745 328,557 371,408 458,299 544,190 660,135 807,135 954,135 1070,190 1156,299 1241,408 1284,557 1284,745 1284,934 1241,1083 1156,1192 1070,1301 954,1356 807,1356 Z M 1090,27 L 1356,-264 1112,-264 891,-25 C 869,-26 852,-27 841,-28 829,-29 818,-29 807,-29 597,-29 429,41 304,182 178,322 115,510 115,745 115,981 178,1169 304,1310 429,1450 597,1520 807,1520 1016,1520 1184,1450 1309,1310 1434,1169 1497,981 1497,745 1497,572 1462,423 1393,300 1323,177 1222,86 1090,27 Z"/>
+   <glyph unicode="P" horiz-adv-x="980" d="M 403,1327 L 403,766 657,766 C 751,766 824,790 875,839 926,888 952,957 952,1047 952,1136 926,1205 875,1254 824,1303 751,1327 657,1327 L 403,1327 Z M 201,1493 L 657,1493 C 824,1493 951,1455 1037,1380 1122,1304 1165,1193 1165,1047 1165,900 1122,788 1037,713 951,638 824,600 657,600 L 403,600 403,0 201,0 201,1493 Z"/>
+   <glyph unicode="O" horiz-adv-x="1403" d="M 807,1356 C 660,1356 544,1301 458,1192 371,1083 328,934 328,745 328,557 371,408 458,299 544,190 660,135 807,135 954,135 1070,190 1156,299 1241,408 1284,557 1284,745 1284,934 1241,1083 1156,1192 1070,1301 954,1356 807,1356 Z M 807,1520 C 1016,1520 1184,1450 1309,1310 1434,1169 1497,981 1497,745 1497,510 1434,322 1309,182 1184,41 1016,-29 807,-29 597,-29 429,41 304,181 178,321 115,509 115,745 115,981 178,1169 304,1310 429,1450 597,1520 807,1520 Z"/>
+   <glyph unicode="N" horiz-adv-x="1165" d="M 201,1493 L 473,1493 1135,244 1135,1493 1331,1493 1331,0 1059,0 397,1249 397,0 201,0 201,1493 Z"/>
    <glyph unicode="M" horiz-adv-x="1377" d="M 201,1493 L 502,1493 883,477 1266,1493 1567,1493 1567,0 1370,0 1370,1311 985,287 782,287 397,1311 397,0 201,0 201,1493 Z"/>
-   <glyph unicode="L" horiz-adv-x="936" d="M 201,1493 L 403,1493 403,170 1130,170 1130,0 201,0 201,1493 Z"/>
-   <glyph unicode="K" horiz-adv-x="1200" d="M 201,1493 L 403,1493 403,862 1073,1493 1333,1493 592,797 1386,0 1120,0 403,719 403,0 201,0 201,1493 Z"/>
-   <glyph unicode="I" horiz-adv-x="213" d="M 201,1493 L 403,1493 403,0 201,0 201,1493 Z"/>
-   <glyph unicode="H" horiz-adv-x="1148" d="M 201,1493 L 403,1493 403,881 1137,881 1137,1493 1339,1493 1339,0 1137,0 1137,711 403,711 403,0 201,0 201,1493 Z"/>
-   <glyph unicode="F" horiz-adv-x="865" d="M 201,1493 L 1059,1493 1059,1323 403,1323 403,883 995,883 995,713 403,713 403,0 201,0 201,1493 Z"/>
-   <glyph unicode="E" horiz-adv-x="971" d="M 201,1493 L 1145,1493 1145,1323 403,1323 403,881 1114,881 1114,711 403,711 403,170 1163,170 1163,0 201,0 201,1493 Z"/>
+   <glyph unicode="L" horiz-adv-x="954" d="M 201,1493 L 403,1493 403,170 1130,170 1130,0 201,0 201,1493 Z"/>
+   <glyph unicode="K" horiz-adv-x="1218" d="M 201,1493 L 403,1493 403,862 1073,1493 1333,1493 592,797 1386,0 1120,0 403,719 403,0 201,0 201,1493 Z"/>
+   <glyph unicode="I" horiz-adv-x="239" d="M 201,1493 L 403,1493 403,0 201,0 201,1493 Z"/>
+   <glyph unicode="H" horiz-adv-x="1165" d="M 201,1493 L 403,1493 403,881 1137,881 1137,1493 1339,1493 1339,0 1137,0 1137,711 403,711 403,0 201,0 201,1493 Z"/>
+   <glyph unicode="F" horiz-adv-x="874" d="M 201,1493 L 1059,1493 1059,1323 403,1323 403,883 995,883 995,713 403,713 403,0 201,0 201,1493 Z"/>
+   <glyph unicode="E" horiz-adv-x="980" d="M 201,1493 L 1145,1493 1145,1323 403,1323 403,881 1114,881 1114,711 403,711 403,170 1163,170 1163,0 201,0 201,1493 Z"/>
    <glyph unicode="D" horiz-adv-x="1271" d="M 403,1327 L 403,166 647,166 C 853,166 1004,213 1100,306 1195,399 1243,547 1243,748 1243,948 1195,1095 1100,1188 1004,1281 853,1327 647,1327 L 403,1327 Z M 201,1493 L 616,1493 C 905,1493 1118,1433 1253,1313 1388,1192 1456,1004 1456,748 1456,491 1388,302 1252,181 1116,60 904,0 616,0 L 201,0 201,1493 Z"/>
    <glyph unicode="C" horiz-adv-x="1218" d="M 1319,1378 L 1319,1165 C 1251,1228 1179,1276 1102,1307 1025,1338 943,1354 856,1354 685,1354 555,1302 464,1198 373,1093 328,942 328,745 328,548 373,398 464,294 555,189 685,137 856,137 943,137 1025,153 1102,184 1179,215 1251,263 1319,326 L 1319,115 C 1248,67 1174,31 1095,7 1016,-17 932,-29 844,-29 618,-29 440,40 310,179 180,317 115,506 115,745 115,985 180,1174 310,1313 440,1451 618,1520 844,1520 933,1520 1018,1508 1097,1485 1176,1461 1250,1425 1319,1378 Z"/>
-   <glyph unicode="B" horiz-adv-x="1077" d="M 403,713 L 403,166 727,166 C 836,166 916,189 969,234 1021,279 1047,347 1047,440 1047,533 1021,602 969,647 916,691 836,713 727,713 L 403,713 Z M 403,1327 L 403,877 702,877 C 801,877 874,896 923,933 971,970 995,1026 995,1102 995,1177 971,1234 923,1271 874,1308 801,1327 702,1327 L 403,1327 Z M 201,1493 L 717,1493 C 871,1493 990,1461 1073,1397 1156,1333 1198,1242 1198,1124 1198,1033 1177,960 1134,906 1091,852 1029,818 946,805 1045,784 1123,739 1178,672 1233,604 1260,519 1260,418 1260,285 1215,182 1124,109 1033,36 904,0 737,0 L 201,0 201,1493 Z"/>
-   <glyph unicode="A" horiz-adv-x="1394" d="M 700,1294 L 426,551 975,551 700,1294 Z M 586,1493 L 815,1493 1384,0 1174,0 1038,383 365,383 229,0 16,0 586,1493 Z"/>
-   <glyph unicode=" " horiz-adv-x="653"/>
+   <glyph unicode="B" horiz-adv-x="1086" d="M 403,713 L 403,166 727,166 C 836,166 916,189 969,234 1021,279 1047,347 1047,440 1047,533 1021,602 969,647 916,691 836,713 727,713 L 403,713 Z M 403,1327 L 403,877 702,877 C 801,877 874,896 923,933 971,970 995,1026 995,1102 995,1177 971,1234 923,1271 874,1308 801,1327 702,1327 L 403,1327 Z M 201,1493 L 717,1493 C 871,1493 990,1461 1073,1397 1156,1333 1198,1242 1198,1124 1198,1033 1177,960 1134,906 1091,852 1029,818 946,805 1045,784 1123,739 1178,672 1233,604 1260,519 1260,418 1260,285 1215,182 1124,109 1033,36 904,0 737,0 L 201,0 201,1493 Z"/>
+   <glyph unicode="A" horiz-adv-x="1403" d="M 700,1294 L 426,551 975,551 700,1294 Z M 586,1493 L 815,1493 1384,0 1174,0 1038,383 365,383 229,0 16,0 586,1493 Z"/>
+   <glyph unicode="-" horiz-adv-x="583" d="M 100,643 L 639,643 639,479 100,479 100,643 Z"/>
+   <glyph unicode=" " horiz-adv-x="635"/>
   </font>
  </defs>
  <defs class="TextShapeIndex">
-  <g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 id42 id43 id44 id45 id46 id47 id48 id49 id50 id51 id52 id53 id54 id55 id56 id57 id58 id59 id60 id61 id62 id63 id64 id65 id66"/>
+  <g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 id15 id16 id17 id18 id19 id20 id21 id22 id23 id24 id25 id26 id27 id28 id29 id30 id31 id32 id33 id34 id35 id36 id37 id38 id39 id40 id41 id42 id43 id44 id45 id46 id47 id48 id49 id50 id51 id52 id53 id54 id55 id56 id57 id58 id59 id60 id61 id62 id63 id64 id65 id66 id67 id68 id69 id70"/>
  </defs>
  <defs class="EmbeddedBulletChars">
   <g id="bullet-char-template-57356" transform="scale(0.00048828125,-0.00048828125)">
@@ -126,7 +127,7 @@
          </defs>
          <path style="fill:url(#gradient1)" d="M 14811,19731 L 1317,19731 1317,16556 28305,16556 28305,19731 14811,19731 Z"/>
         </g>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2028" y="18327"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Kernel</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2028" y="18327"><tspan fill="rgb(0,0,0)" stroke="none">Kernel</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -134,7 +135,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="1634" y="1316" width="26673" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 14970,2905 L 1635,2905 1635,1317 28305,1317 28305,2905 14970,2905 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 14970,2905 L 1635,2905 1635,1317 28305,1317 28305,2905 14970,2905 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="14185" y="2294"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">SSL API</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="14185" y="2294"><tspan fill="rgb(0,0,0)" stroke="none">SSL API</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -142,7 +143,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="1633" y="4491" width="4130" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 3698,6080 L 1634,6080 1634,4492 5761,4492 5761,6080 3698,6080 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 3698,6080 L 1634,6080 1634,4492 5761,4492 5761,6080 3698,6080 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2934" y="5184"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Stream</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2277" y="5754"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Send Buffers </tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2934" y="5184"><tspan fill="rgb(0,0,0)" stroke="none">Stream</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2277" y="5754"><tspan fill="rgb(0,0,0)" stroke="none">Send Buffers </tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -150,15 +151,15 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="24176" y="4491" width="4131" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 26241,6080 L 24177,6080 24177,4492 28305,4492 28305,6080 26241,6080 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 26241,6080 L 24177,6080 24177,4492 28305,4492 28305,6080 26241,6080 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="25477" y="5184"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Stream</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="24889" y="5754"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Read Buffers</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="25477" y="5184"><tspan fill="rgb(0,0,0)" stroke="none">Stream</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="24889" y="5754"><tspan fill="rgb(0,0,0)" stroke="none">Read Buffers</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
        <g id="id8">
-        <rect class="BoundingBox" stroke="none" fill="none" x="9253" y="4491" width="4448" height="1591"/>
-        <path fill="rgb(128,203,196)" stroke="none" d="M 11477,6080 L 9254,6080 9254,4492 13699,4492 13699,6080 11477,6080 Z"/>
-        <path fill="none" stroke="rgb(66,66,66)" d="M 11477,6080 L 9254,6080 9254,4492 13699,4492 13699,6080 11477,6080 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="10281" y="5184"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Connection</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9965" y="5754"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">State Machine</tspan></tspan></tspan></text>
+        <rect class="BoundingBox" stroke="none" fill="none" x="11793" y="3856" width="4448" height="1591"/>
+        <path fill="rgb(128,203,196)" stroke="none" d="M 14017,5445 L 11794,5445 11794,3857 16239,3857 16239,5445 14017,5445 Z"/>
+        <path fill="none" stroke="rgb(66,66,66)" d="M 14017,5445 L 11794,5445 11794,3857 16239,3857 16239,5445 14017,5445 Z"/>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12821" y="4549"><tspan fill="rgb(0,0,0)" stroke="none">Connection</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12505" y="5119"><tspan fill="rgb(0,0,0)" stroke="none">State Machine</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -166,7 +167,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="15603" y="7031" width="4766" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 17986,8620 L 15604,8620 15604,7032 20367,7032 20367,8620 17986,8620 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 17986,8620 L 15604,8620 15604,7032 20367,7032 20367,8620 17986,8620 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="16364" y="7724"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">TLS Handshake</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="16597" y="8294"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Record Layer</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="16364" y="7724"><tspan fill="rgb(0,0,0)" stroke="none">TLS Handshake</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="16597" y="8294"><tspan fill="rgb(0,0,0)" stroke="none">Record Layer</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -174,7 +175,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="1633" y="7666" width="4130" height="2543"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 3698,10207 L 1634,10207 1634,7667 5761,7667 5761,10207 3698,10207 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 3698,10207 L 1634,10207 1634,7667 5761,7667 5761,10207 3698,10207 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2275" y="9120"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">TX Packetizer</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2275" y="9120"><tspan fill="rgb(0,0,0)" stroke="none">TX Packetizer</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -182,7 +183,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="24176" y="7666" width="4131" height="2543"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 26241,10207 L 24177,10207 24177,7667 28305,7667 28305,10207 26241,10207 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 26241,10207 L 24177,10207 24177,7667 28305,7667 28305,10207 26241,10207 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="24493" y="9120"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">RX Depacketizer</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="24493" y="9120"><tspan fill="rgb(0,0,0)" stroke="none">RX Depacketizer</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -190,7 +191,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="1633" y="11158" width="4130" height="1590"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 3698,12746 L 1634,12746 1634,11159 5761,11159 5761,12746 3698,12746 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 3698,12746 L 1634,12746 1634,11159 5761,11159 5761,12746 3698,12746 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2540" y="11851"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">QUIC Write</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2309" y="12421"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Record Layer</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2540" y="11851"><tspan fill="rgb(0,0,0)" stroke="none">QUIC Write</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2309" y="12421"><tspan fill="rgb(0,0,0)" stroke="none">Record Layer</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -198,7 +199,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="24176" y="11158" width="4131" height="1590"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 26241,12746 L 24177,12746 24177,11159 28305,11159 28305,12746 26241,12746 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 26241,12746 L 24177,12746 24177,11159 28305,11159 28305,12746 26241,12746 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="25111" y="11851"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">QUIC Read</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="24853" y="12421"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Record Layer</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="25111" y="11851"><tspan fill="rgb(0,0,0)" stroke="none">QUIC Read</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="24853" y="12421"><tspan fill="rgb(0,0,0)" stroke="none">Record Layer</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -206,7 +207,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="20048" y="4491" width="3178" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 21637,6080 L 20049,6080 20049,4492 23224,4492 23224,6080 21637,6080 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 21637,6080 L 20049,6080 20049,4492 23224,4492 23224,6080 21637,6080 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="20441" y="5184"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Connection</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="20686" y="5754"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">ID Cache</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="20441" y="5184"><tspan fill="rgb(0,0,0)" stroke="none">Connection</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="20686" y="5754"><tspan fill="rgb(0,0,0)" stroke="none">ID Cache</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -214,7 +215,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="8301" y="14016" width="2861" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 9731,15605 L 8302,15605 8302,14017 11160,14017 11160,15605 9731,15605 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 9731,15605 L 8302,15605 8302,14017 11160,14017 11160,15605 9731,15605 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="8673" y="14709"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Datagram</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9357" y="15279"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">BIO</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="8673" y="14709"><tspan fill="rgb(0,0,0)" stroke="none">Datagram</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9357" y="15279"><tspan fill="rgb(0,0,0)" stroke="none">BIO</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -222,7 +223,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="11794" y="14016" width="2861" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 13224,15605 L 11795,15605 11795,14017 14653,14017 14653,15605 13224,15605 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 13224,15605 L 11795,15605 11795,14017 14653,14017 14653,15605 13224,15605 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12166" y="14709"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Datagram</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12850" y="15279"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">BIO</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12166" y="14709"><tspan fill="rgb(0,0,0)" stroke="none">Datagram</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12850" y="15279"><tspan fill="rgb(0,0,0)" stroke="none">BIO</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -230,7 +231,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="15286" y="14016" width="2861" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 16716,15605 L 15287,15605 15287,14017 18145,14017 18145,15605 16716,15605 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 16716,15605 L 15287,15605 15287,14017 18145,14017 18145,15605 16716,15605 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="15658" y="14709"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Datagram</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="16342" y="15279"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">BIO</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="15658" y="14709"><tspan fill="rgb(0,0,0)" stroke="none">Datagram</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="16342" y="15279"><tspan fill="rgb(0,0,0)" stroke="none">BIO</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -238,7 +239,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="8301" y="16872" width="2861" height="956"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 9731,17826 L 8302,17826 8302,16873 11160,16873 11160,17826 9731,17826 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 9731,17826 L 8302,17826 8302,16873 11160,16873 11160,17826 9731,17826 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9287" y="17533"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">UDP</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9287" y="17533"><tspan fill="rgb(0,0,0)" stroke="none">UDP</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -246,7 +247,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="4228" y="18532" width="20958" height="955"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 14707,19485 L 4229,19485 4229,18533 25184,18533 25184,19485 14707,19485 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 14707,19485 L 4229,19485 4229,18533 25184,18533 25184,19485 14707,19485 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12563" y="19192"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Hardware Interfaces</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12563" y="19192"><tspan fill="rgb(0,0,0)" stroke="none">Hardware Interfaces</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -254,7 +255,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="11794" y="16873" width="2861" height="956"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 13224,17827 L 11795,17827 11795,16874 14653,16874 14653,17827 13224,17827 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 13224,17827 L 11795,17827 11795,16874 14653,16874 14653,17827 13224,17827 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12780" y="17534"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">UDP</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="12780" y="17534"><tspan fill="rgb(0,0,0)" stroke="none">UDP</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -262,7 +263,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="15286" y="16873" width="2861" height="956"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 16716,17827 L 15287,17827 15287,16874 18145,16874 18145,17827 16716,17827 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 16716,17827 L 15287,17827 15287,16874 18145,16874 18145,17827 16716,17827 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="16272" y="17534"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">UDP</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="16272" y="17534"><tspan fill="rgb(0,0,0)" stroke="none">UDP</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
@@ -294,7 +295,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="18779" y="14016" width="2861" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 20209,15605 L 18780,15605 18780,14017 21638,14017 21638,15605 20209,15605 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 20209,15605 L 18780,15605 18780,14017 21638,14017 21638,15605 20209,15605 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19151" y="14709"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Datagram</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19835" y="15279"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">BIO</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19151" y="14709"><tspan fill="rgb(0,0,0)" stroke="none">Datagram</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19835" y="15279"><tspan fill="rgb(0,0,0)" stroke="none">BIO</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -302,7 +303,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="18778" y="16888" width="2861" height="956"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 20208,17842 L 18779,17842 18779,16889 21637,16889 21637,17842 20208,17842 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 20208,17842 L 18779,17842 18779,16889 21637,16889 21637,17842 20208,17842 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19764" y="17549"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">UDP</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19764" y="17549"><tspan fill="rgb(0,0,0)" stroke="none">UDP</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
@@ -346,7 +347,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="19096" y="11158" width="4131" height="1590"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 21161,12746 L 19097,12746 19097,11159 23225,11159 23225,12746 21161,12746 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 21161,12746 L 19097,12746 19097,11159 23225,11159 23225,12746 21161,12746 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19608" y="11851"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Path And Conn</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19671" y="12421"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Demultiplexer</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19608" y="11851"><tspan fill="rgb(0,0,0)" stroke="none">Path And Conn</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="19671" y="12421"><tspan fill="rgb(0,0,0)" stroke="none">Demultiplexer</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
@@ -428,7 +429,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="1633" y="13381" width="4130" height="2543"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 3698,15922 L 1634,15922 1634,13382 5761,13382 5761,15922 3698,15922 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 3698,15922 L 1634,15922 1634,13382 5761,13382 5761,15922 3698,15922 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2508" y="13980"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Congestion</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2656" y="14550"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Controller</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2508" y="13980"><tspan fill="rgb(0,0,0)" stroke="none">Congestion</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2656" y="14550"><tspan fill="rgb(0,0,0)" stroke="none">Controller</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -436,7 +437,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="2268" y="14968" width="2860" height="638"/>
         <path fill="rgb(38,166,154)" stroke="none" d="M 3698,15604 L 2269,15604 2269,14969 5126,14969 5126,15604 3698,15604 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 3698,15604 L 2269,15604 2269,14969 5126,14969 5126,15604 3698,15604 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2635" y="15470"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">New Reno</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="2635" y="15470"><tspan fill="rgb(0,0,0)" stroke="none">New Reno</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
@@ -462,26 +463,26 @@
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
        <g id="id48">
-        <rect class="BoundingBox" stroke="none" fill="none" x="11377" y="2905" width="203" height="1588"/>
-        <path fill="none" stroke="rgb(0,0,0)" d="M 11479,3192 L 11477,4205"/>
-        <path fill="rgb(0,0,0)" stroke="none" d="M 11479,2905 L 11379,3205 11579,3205 11479,2905 Z"/>
-        <path fill="rgb(0,0,0)" stroke="none" d="M 11477,4492 L 11577,4192 11377,4192 11477,4492 Z"/>
+        <rect class="BoundingBox" stroke="none" fill="none" x="14017" y="2905" width="954" height="953"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 14767,3108 L 14220,3654"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 14970,2905 L 14687,3046 14828,3188 14970,2905 Z"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 14017,3857 L 14300,3716 14159,3574 14017,3857 Z"/>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
        <g id="id49">
-        <rect class="BoundingBox" stroke="none" fill="none" x="8618" y="7031" width="4766" height="1591"/>
-        <path fill="rgb(128,203,196)" stroke="none" d="M 11001,8620 L 8619,8620 8619,7032 13382,7032 13382,8620 11001,8620 Z"/>
-        <path fill="none" stroke="rgb(66,66,66)" d="M 11001,8620 L 8619,8620 8619,7032 13382,7032 13382,8620 11001,8620 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9917" y="7724"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Timer And</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9631" y="8294"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Event Queue</tspan></tspan></tspan></text>
+        <rect class="BoundingBox" stroke="none" fill="none" x="8935" y="7031" width="4766" height="1591"/>
+        <path fill="rgb(128,203,196)" stroke="none" d="M 11318,8620 L 8936,8620 8936,7032 13699,7032 13699,8620 11318,8620 Z"/>
+        <path fill="none" stroke="rgb(66,66,66)" d="M 11318,8620 L 8936,8620 8936,7032 13699,7032 13699,8620 11318,8620 Z"/>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="10234" y="7724"><tspan fill="rgb(0,0,0)" stroke="none">Timer And</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9948" y="8294"><tspan fill="rgb(0,0,0)" stroke="none">Event Queue</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
        <g id="id50">
-        <rect class="BoundingBox" stroke="none" fill="none" x="13383" y="7739" width="2156" height="2469"/>
-        <path fill="none" stroke="rgb(0,0,0)" d="M 13673,7839 C 14856,7946 15357,8523 15438,9919"/>
-        <path fill="rgb(0,0,0)" stroke="none" d="M 13383,7826 L 13678,7940 13687,7740 13383,7826 Z"/>
-        <path fill="rgb(0,0,0)" stroke="none" d="M 15446,10207 L 15537,9904 15337,9910 15446,10207 Z"/>
+        <rect class="BoundingBox" stroke="none" fill="none" x="13700" y="7745" width="1840" height="2463"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 13988,7844 C 14960,7969 15371,8523 15439,9918"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 13700,7826 L 13993,7945 14006,7745 13700,7826 Z"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 15446,10207 L 15539,9905 15339,9910 15446,10207 Z"/>
        </g>
       </g>
       <g class="com.sun.star.drawing.CustomShape">
@@ -489,7 +490,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="7031" y="10206" width="5083" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 9572,11795 L 7032,11795 7032,10207 12112,10207 12112,11795 9572,11795 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 9572,11795 L 7032,11795 7032,10207 12112,10207 12112,11795 9572,11795 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="7500" y="10899"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Flow Controller And</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="7597" y="11469"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Statistics Collector</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="7500" y="10899"><tspan fill="rgb(0,0,0)" stroke="none">Flow Controller And</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="7597" y="11469"><tspan fill="rgb(0,0,0)" stroke="none">Statistics Collector</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
@@ -512,7 +513,7 @@
         <rect class="BoundingBox" stroke="none" fill="none" x="13063" y="10206" width="4766" height="1591"/>
         <path fill="rgb(128,203,196)" stroke="none" d="M 15446,11795 L 13064,11795 13064,10207 17827,10207 17827,11795 15446,11795 Z"/>
         <path fill="none" stroke="rgb(66,66,66)" d="M 15446,11795 L 13064,11795 13064,10207 17827,10207 17827,11795 15446,11795 Z"/>
-        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="13530" y="10899"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">ACK Handling And</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="13992" y="11469"><tspan fill="rgb(0,0,0)" stroke="none" style="white-space: pre">Loss Detector</tspan></tspan></tspan></text>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="13530" y="10899"><tspan fill="rgb(0,0,0)" stroke="none">ACK Handling And</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="13992" y="11469"><tspan fill="rgb(0,0,0)" stroke="none">Loss Detector</tspan></tspan></tspan></text>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
@@ -524,9 +525,9 @@
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
        <g id="id56">
-        <rect class="BoundingBox" stroke="none" fill="none" x="13699" y="5186" width="6352" height="201"/>
-        <path fill="none" stroke="rgb(0,0,0)" d="M 13700,5286 L 19763,5286"/>
-        <path fill="rgb(0,0,0)" stroke="none" d="M 20050,5286 L 19750,5186 19750,5386 20050,5286 Z"/>
+        <rect class="BoundingBox" stroke="none" fill="none" x="16239" y="4650" width="3812" height="687"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 16240,4651 L 19767,5239"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 20050,5286 L 19771,5138 19738,5335 20050,5286 Z"/>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
@@ -566,18 +567,18 @@
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
        <g id="id62">
-        <rect class="BoundingBox" stroke="none" fill="none" x="13699" y="5662" width="4323" height="1371"/>
-        <path fill="none" stroke="rgb(0,0,0)" d="M 13995,5763 C 16656,5791 17640,6093 17930,6757"/>
-        <path fill="rgb(0,0,0)" stroke="none" d="M 13699,5761 L 13998,5863 14000,5663 13699,5761 Z"/>
-        <path fill="rgb(0,0,0)" stroke="none" d="M 17986,7032 L 18021,6718 17825,6760 17986,7032 Z"/>
+        <rect class="BoundingBox" stroke="none" fill="none" x="16239" y="5041" width="1837" height="1992"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 16527,5140 C 17500,5240 17891,5666 17975,6745"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 16239,5126 L 16533,5241 16544,5042 16239,5126 Z"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 17986,7032 L 18074,6728 17874,6736 17986,7032 Z"/>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
        <g id="id63">
-        <rect class="BoundingBox" stroke="none" fill="none" x="10947" y="6080" width="584" height="953"/>
-        <path fill="none" stroke="rgb(0,0,0)" d="M 11436,6366 C 11320,6660 11157,6451 11042,6749"/>
-        <path fill="rgb(0,0,0)" stroke="none" d="M 11477,6080 L 11332,6361 11530,6392 11477,6080 Z"/>
-        <path fill="rgb(0,0,0)" stroke="none" d="M 11001,7032 L 11145,6751 10948,6720 11001,7032 Z"/>
+        <rect class="BoundingBox" stroke="none" fill="none" x="11287" y="5445" width="2759" height="1588"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 13952,5727 C 13542,6507 11769,5966 11376,6763"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 14017,5445 L 13850,5713 14044,5760 14017,5445 Z"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 11318,7032 L 11482,6762 11287,6717 11318,7032 Z"/>
        </g>
       </g>
       <g class="com.sun.star.drawing.ConnectorShape">
@@ -603,6 +604,35 @@
         <path fill="rgb(0,0,0)" stroke="none" d="M 5762,14652 L 6070,14580 5965,14410 5762,14652 Z"/>
        </g>
       </g>
+      <g class="com.sun.star.drawing.CustomShape">
+       <g id="id67">
+        <rect class="BoundingBox" stroke="none" fill="none" x="6713" y="4491" width="4130" height="1591"/>
+        <path fill="rgb(128,203,196)" stroke="none" d="M 8778,6080 L 6714,6080 6714,4492 10841,4492 10841,6080 8778,6080 Z"/>
+        <path fill="none" stroke="rgb(66,66,66)" d="M 8778,6080 L 6714,6080 6714,4492 10841,4492 10841,6080 8778,6080 Z"/>
+        <text class="SVGTextShape"><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="7184" y="5184"><tspan fill="rgb(0,0,0)" stroke="none">Frame-in-Flight</tspan></tspan></tspan><tspan class="TextParagraph" font-family="DejaVu Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="7387" y="5754"><tspan fill="rgb(0,0,0)" stroke="none">Management</tspan></tspan></tspan></text>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.ConnectorShape">
+       <g id="id68">
+        <rect class="BoundingBox" stroke="none" fill="none" x="5762" y="5186" width="955" height="201"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 6715,5286 L 6049,5286"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 5762,5286 L 6062,5386 6062,5186 5762,5286 Z"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.ConnectorShape">
+       <g id="id69">
+        <rect class="BoundingBox" stroke="none" fill="none" x="5761" y="6080" width="3110" height="2859"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 5762,8937 C 7773,8937 8671,8081 8770,6368"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 8778,6080 L 8669,6377 8869,6383 8778,6080 Z"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.ConnectorShape">
+       <g id="id70">
+        <rect class="BoundingBox" stroke="none" fill="none" x="8777" y="6079" width="6763" height="4129"/>
+        <path fill="none" stroke="rgb(0,0,0)" d="M 8778,6080 C 8778,7032 15212,5041 15440,9935"/>
+        <path fill="rgb(0,0,0)" stroke="none" d="M 15446,10207 L 15539,9905 15339,9909 15446,10207 Z"/>
+       </g>
+      </g>
      </g>
     </g>
    </g>

diff --git a/doc/designs/quic-design/quic-fifm.md b/doc/designs/quic-design/quic-fifm.md
index 1de81318f3b8698f00fc423641407c3f8616d0f6..f03b5d7d36875df44334f1acdef5ac974378fc5b 100644 (file)
--- a/doc/designs/quic-design/quic-fifm.md
+++ b/doc/designs/quic-design/quic-fifm.md
@@ -133,7 +133,7 @@ metadata associated with it:
   to the `TX` state. If the packet it was sent in is subsequently lost,
   it is transitioned back to the `NEW` state.
 
-Packets in the `NEW` state participate in a priority queue (the NEW queue)
+Frames in the `NEW` state participate in a priority queue (the NEW queue)
 according to their priority and the CFQ's NEW queue can be iterated in priority
 order by callers.
 
@@ -304,9 +304,9 @@ allocation made per transmitted packet. The TX packetiser will obtain
 a `QUIC_TXPIM_PKT` structure from the TXPIM, fill in the structure including
 the ACK Manager data, and submit it via the FIFD which we introduce below.
 
-The TXPIM does not anything with the `QUIC_TXPIM_PKT` structure itself
-other than managing its allocation and manipulation. Constructive
-use of the data kept in the TXPIM is made by the FIFD.
+The TXPIM does do not anything with the `QUIC_TXPIM_PKT` structure itself other
+than managing its allocation and manipulation. Constructive use of the data kept
+in the TXPIM is made by the FIFD.
 
 ### API
 
@@ -328,10 +328,11 @@ typedef struct quic_txpim_pkt_st {
     QUIC_FIFD          *fifd;
 
     /* Regenerate-strategy frames. */
-    unsigned int        had_handshake_done      : 1;
-    unsigned int        had_max_data_frame      : 1;
-    unsigned int        had_max_streams_frame   : 1;
-    unsigned int        had_ack_frame           : 1;
+    unsigned int        had_handshake_done          : 1;
+    unsigned int        had_max_data_frame          : 1;
+    unsigned int        had_max_streams_bidi_frame  : 1;
+    unsigned int        had_max_streams_uni_frame   : 1;
+    unsigned int        had_ack_frame               : 1;
 
     /* Private data follows. */
 } QUIC_TXPIM_PKT;
@@ -392,6 +393,12 @@ const QUIC_TXPIM_CHUNK *ossl_quic_txpim_pkt_get_chunks(QUIC_TXPIM_PKT *fpkt);
  * ossl_quic_txpim_pkt_get_chunks().
  */
 size_t ossl_quic_txpim_pkt_get_num_chunks(QUIC_TXPIM_PKT *fpkt);
+
+/*
+ * Returns the number of QUIC_TXPIM_PKTs allocated by the given TXPIM that have
+ * yet to be returned to the TXPIM.
+ */
+size_t ossl_quic_txpim_get_in_use(QUIC_TXPIM *txpim);
 ```
 
 The Frame-in-Flight Dispatcher (FIFD)
@@ -432,7 +439,7 @@ simply glues all of these parts together.
 ### API
 
 ```c
-typedef struct quic_fifm_st {
+typedef struct quic_fifd_st {
   /* (internals) */
 } QUIC_FIFD;
 
@@ -476,9 +483,6 @@ Typical Intended TX Packetiser Usage
   all CFQ frames are considered of higher priority). For each such frame
   it places in a packet, it:
 
-  - informs the CFQ that the CFQ item has been transmitted, causing a
-    transition of the CFQ item to the `TX` state;
-
   - calls `ossl_quic_txpim_pkt_add_cfq_item()` on the TXPIM to log the CFQ item
     as having been transmitted in the given packet, so that the CFQ item can be
     released or requeued depending on the ultimate fate of the packet.
@@ -497,7 +501,9 @@ Typical Intended TX Packetiser Usage
 
 - TX Packetiser calls `ossl_quic_fifd_pkt_commit()`. The FIFD takes care
   of submitting the packet to the ACK Manager and provides its own callback
-  implementation.
+  implementation. It also takes care of informing the CFQ that any CFQ items
+  which were added via `ossl_quic_txpim_pkt_add_cfq_item()` have been
+  transmitted.
 
   In the event of packet loss, ACK or discard, the appropriate QUIC Send Stream,
   CFQ and regenerate callback calls are made. Regardless of the outcome, the

diff --git a/doc/designs/quic-design/quic-overview.md b/doc/designs/quic-design/quic-overview.md
index 141abcb9bcae82922ea3260a7f9148716ef199e9..2ef43cefc51e7dde15a251aa8368d76e299d5032 100644 (file)
--- a/doc/designs/quic-design/quic-overview.md
+++ b/doc/designs/quic-design/quic-overview.md
@@ -21,6 +21,13 @@ SSL_read and SSL_write functions.
 They will be bypassed with a single-copy API for read and write (_not
 for MVP_).
 
+Frame in Flight Manager
+-----------------------
+
+The frame in flight manager manages the queueing of frames which may need to be
+retransmitted if the packets in which they were transmitted were lost. It is
+[discussed in more detail here.](./quic-fifm.md)
+
 Connection State Machine
 ------------------------
 
@@ -65,12 +72,17 @@ either as data or as events to the subsequent modules based on the frame
 type. Flow Controller And Statistics Collector is consulted for decisions
 and to record the statistics of the received stream data.
 
-Flow Controller And Statistics Collector
-----------------------------------------
+Flow Controller
+---------------
+
+This module is consulted by the TX Packetizer and RX Frame Handler for flow
+control decisions at both the stream and connection levels.
+
+Statistics Collector
+--------------------
 
-This module collects various statistics about send and received
-stream data. It is also consulted by the TX Packetizer and RX Frame
-Handler for flow control decisions.
+This module maintains statistics about a connection, most notably the estimated
+round trip time to the remote peer.
 
 QUIC Write Record Layer
 -----------------------

diff --git a/include/internal/quic_fifd.h b/include/internal/quic_fifd.h
new file mode 100644 (file)
index 0000000..15952e4
--- /dev/null
+++ b/include/internal/quic_fifd.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_QUIC_FIFD_H
+# define OSSL_QUIC_FIFD_H
+
+# include <openssl/ssl.h>
+# include "internal/quic_types.h"
+# include "internal/quic_cfq.h"
+# include "internal/quic_ackm.h"
+# include "internal/quic_txpim.h"
+# include "internal/quic_stream.h"
+
+/*
+ * QUIC Frame-in-Flight Dispatcher (FIFD)
+ * ======================================
+ */
+struct quic_fifd_st {
+    /* Internal data; use the ossl_quic_fifd functions. */
+    QUIC_CFQ       *cfq;
+    OSSL_ACKM      *ackm;
+    QUIC_TXPIM     *txpim;
+    QUIC_SSTREAM *(*get_sstream_by_id)(uint64_t stream_id,
+                                       void *arg);
+    void           *get_sstream_by_id_arg;
+    void          (*regen_frame)(uint64_t frame_type,
+                                 uint64_t stream_id,
+                                 void *arg);
+    void           *regen_frame_arg;
+};
+
+int ossl_quic_fifd_init(QUIC_FIFD *fifd,
+                        QUIC_CFQ *cfq,
+                        OSSL_ACKM *ackm,
+                        QUIC_TXPIM *txpim,
+                        /* stream_id is UINT64_MAX for the crypto stream */
+                        QUIC_SSTREAM *(*get_sstream_by_id)(uint64_t stream_id,
+                                                           void *arg),
+                        void *get_sstream_by_id_arg,
+                        /* stream_id is UINT64_MAX if not applicable */
+                        void (*regen_frame)(uint64_t frame_type,
+                                            uint64_t stream_id,
+                                            void *arg),
+                        void *regen_frame_arg);
+
+void ossl_quic_fifd_cleanup(QUIC_FIFD *fifd); /* (no-op) */
+
+int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt);
+
+#endif

diff --git a/include/internal/quic_txpim.h b/include/internal/quic_txpim.h
index 623004e79da10b56d8aedf67306e76505c1fec9a..087d13363fb84588cd081b88958b36f245ef1bdf 100644 (file)
--- a/include/internal/quic_txpim.h
+++ b/include/internal/quic_txpim.h
@@ -35,7 +35,8 @@ typedef struct quic_txpim_pkt_st {
     /* Regenerate-strategy frames. */
     unsigned int        had_handshake_done_frame    : 1;
     unsigned int        had_max_data_frame          : 1;
-    unsigned int        had_max_streams_frame       : 1;
+    unsigned int        had_max_streams_bidi_frame  : 1;
+    unsigned int        had_max_streams_uni_frame   : 1;
     unsigned int        had_ack_frame               : 1;
 
     /* Private data follows. */
@@ -106,4 +107,10 @@ const QUIC_TXPIM_CHUNK *ossl_quic_txpim_pkt_get_chunks(QUIC_TXPIM_PKT *fpkt);
  */
 size_t ossl_quic_txpim_pkt_get_num_chunks(QUIC_TXPIM_PKT *fpkt);
 
+/*
+ * Returns the number of QUIC_TXPIM_PKTs allocated by the given TXPIM that have
+ * yet to be returned to the TXPIM.
+ */
+size_t ossl_quic_txpim_get_in_use(QUIC_TXPIM *txpim);
+
 #endif

diff --git a/ssl/quic/build.info b/ssl/quic/build.info
index 1f228cb6d74f87f7526654499ad56d981ac13a2b..45440384e11a45b34f60fe16085346ace9b7d589 100644 (file)
--- a/ssl/quic/build.info
+++ b/ssl/quic/build.info
@@ -5,4 +5,4 @@ SOURCE[$LIBSSL]=cc_dummy.c quic_demux.c quic_record_rx.c
 SOURCE[$LIBSSL]=quic_record_tx.c quic_record_util.c quic_record_shared.c quic_wire_pkt.c
 SOURCE[$LIBSSL]=quic_record_rx_wrap.c quic_rx_depack.c
 SOURCE[$LIBSSL]=quic_fc.c uint_set.c quic_stream.c
-SOURCE[$LIBSSL]=quic_cfq.c quic_txpim.c
+SOURCE[$LIBSSL]=quic_cfq.c quic_txpim.c quic_fifd.c

diff --git a/ssl/quic/quic_cfq.c b/ssl/quic/quic_cfq.c
index cdd621458c47c07443f302a92a7369e128d9e98a..0b0651289a52c32f50aa401eb26d04a2f898647f 100644 (file)
--- a/ssl/quic/quic_cfq.c
+++ b/ssl/quic/quic_cfq.c
@@ -320,6 +320,9 @@ QUIC_CFQ_ITEM *ossl_quic_cfq_get_priority_head(QUIC_CFQ *cfq, uint32_t pn_space)
 
     for (; item != NULL && item->pn_space != pn_space; item = item->next);
 
+    if (item == NULL)
+        return NULL; /* ubsan */
+
     return &item->public;
 }
 
@@ -335,5 +338,8 @@ QUIC_CFQ_ITEM *ossl_quic_cfq_item_get_priority_next(QUIC_CFQ_ITEM *item,
 
      for (; ex != NULL && ex->pn_space != pn_space; ex = ex->next);
 
+     if (ex == NULL)
+         return NULL; /* ubsan */
+
      return &ex->public;
 }

diff --git a/ssl/quic/quic_fifd.c b/ssl/quic/quic_fifd.c
new file mode 100644 (file)
index 0000000..8f54852
--- /dev/null
+++ b/ssl/quic/quic_fifd.c
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "internal/quic_fifd.h"
+#include "internal/quic_wire.h"
+
+int ossl_quic_fifd_init(QUIC_FIFD *fifd,
+                        QUIC_CFQ *cfq,
+                        OSSL_ACKM *ackm,
+                        QUIC_TXPIM *txpim,
+                        /* stream_id is UINT64_MAX for the crypto stream */
+                        QUIC_SSTREAM *(*get_sstream_by_id)(uint64_t stream_id,
+                                                           void *arg),
+                        void *get_sstream_by_id_arg,
+                        /* stream_id is UINT64_MAX if not applicable */
+                        void (*regen_frame)(uint64_t frame_type,
+                                            uint64_t stream_id,
+                                            void *arg),
+                        void *regen_frame_arg)
+{
+    if (cfq == NULL || ackm == NULL || txpim == NULL
+        || get_sstream_by_id == NULL || regen_frame == NULL)
+        return 0;
+
+    fifd->cfq                   = cfq;
+    fifd->ackm                  = ackm;
+    fifd->txpim                 = txpim;
+    fifd->get_sstream_by_id     = get_sstream_by_id;
+    fifd->get_sstream_by_id_arg = get_sstream_by_id_arg;
+    fifd->regen_frame           = regen_frame;
+    fifd->regen_frame_arg       = regen_frame_arg;
+    return 1;
+}
+
+void ossl_quic_fifd_cleanup(QUIC_FIFD *fifd)
+{
+    /* No-op. */
+}
+
+static void on_acked(void *arg)
+{
+    QUIC_TXPIM_PKT *pkt = arg;
+    QUIC_FIFD *fifd = pkt->fifd;
+    const QUIC_TXPIM_CHUNK *chunks = ossl_quic_txpim_pkt_get_chunks(pkt);
+    size_t i, num_chunks = ossl_quic_txpim_pkt_get_num_chunks(pkt);
+    QUIC_SSTREAM *sstream;
+    QUIC_CFQ_ITEM *cfq_item, *cfq_item_next;
+
+    /* STREAM and CRYPTO stream chunks, FINs and stream FC frames */
+    for (i = 0; i < num_chunks; ++i) {
+        sstream = fifd->get_sstream_by_id(chunks[i].stream_id,
+                                          fifd->get_sstream_by_id_arg);
+        if (sstream == NULL)
+            continue;
+
+        if (chunks[i].end >= chunks[i].start)
+            ossl_quic_sstream_mark_acked(sstream,
+                                         chunks[i].start, chunks[i].end);
+
+        if (chunks[i].has_fin && chunks[i].stream_id != UINT64_MAX)
+            ossl_quic_sstream_mark_acked_fin(sstream);
+    }
+
+    /* GCR */
+    for (cfq_item = pkt->retx_head; cfq_item != NULL; cfq_item = cfq_item_next) {
+        cfq_item_next = cfq_item->pkt_next;
+        ossl_quic_cfq_release(fifd->cfq, cfq_item);
+    }
+
+    ossl_quic_txpim_pkt_release(fifd->txpim, pkt);
+}
+
+static void on_lost(void *arg)
+{
+    QUIC_TXPIM_PKT *pkt = arg;
+    QUIC_FIFD *fifd = pkt->fifd;
+    const QUIC_TXPIM_CHUNK *chunks = ossl_quic_txpim_pkt_get_chunks(pkt);
+    size_t i, num_chunks = ossl_quic_txpim_pkt_get_num_chunks(pkt);
+    QUIC_SSTREAM *sstream;
+    QUIC_CFQ_ITEM *cfq_item, *cfq_item_next;
+
+    /* STREAM and CRYPTO stream chunks, FIN and stream FC frames */
+    for (i = 0; i < num_chunks; ++i) {
+        sstream = fifd->get_sstream_by_id(chunks[i].stream_id,
+                                          fifd->get_sstream_by_id_arg);
+        if (sstream == NULL)
+            continue;
+
+        if (chunks[i].end >= chunks[i].start)
+            ossl_quic_sstream_mark_lost(sstream,
+                                        chunks[i].start, chunks[i].end);
+
+        if (chunks[i].has_fin && chunks[i].stream_id != UINT64_MAX)
+            ossl_quic_sstream_mark_lost_fin(sstream);
+
+        /*
+         * Inform caller that stream needs an FC frame.
+         *
+         * Note: We could track whether an FC frame was sent originally for the
+         * stream to determine if it really needs to be regenerated or not.
+         * However, if loss has occurred, it's probably better to ensure the
+         * peer has up-to-date flow control data for the stream. Given that
+         * these frames are extremely small, we may as well always send it when
+         * handling loss.
+         */
+        fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA,
+                          chunks[i].stream_id,
+                          fifd->regen_frame_arg);
+    }
+
+    /* GCR */
+    for (cfq_item = pkt->retx_head; cfq_item != NULL; cfq_item = cfq_item_next) {
+        cfq_item_next = cfq_item->pkt_next;
+        ossl_quic_cfq_mark_lost(fifd->cfq, cfq_item, UINT32_MAX);
+    }
+
+    /* Regenerate flag frames */
+    if (pkt->had_handshake_done_frame)
+        fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE,
+                          UINT64_MAX,
+                          fifd->regen_frame_arg);
+
+    if (pkt->had_max_data_frame)
+        fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_MAX_DATA,
+                          UINT64_MAX,
+                          fifd->regen_frame_arg);
+
+    if (pkt->had_max_streams_bidi_frame)
+        fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI,
+                          UINT64_MAX,
+                          fifd->regen_frame_arg);
+
+    if (pkt->had_max_streams_uni_frame)
+        fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI,
+                          UINT64_MAX,
+                          fifd->regen_frame_arg);
+
+    if (pkt->had_ack_frame)
+        /*
+         * We always use the ACK_WITH_ECN frame type to represent the ACK frame
+         * type in our callback; we assume it is the caller's job to decide
+         * whether it wants to send ECN data or not.
+         */
+        fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN,
+                          UINT64_MAX,
+                          fifd->regen_frame_arg);
+
+    ossl_quic_txpim_pkt_release(fifd->txpim, pkt);
+}
+
+static void on_discarded(void *arg)
+{
+    QUIC_TXPIM_PKT *pkt = arg;
+    QUIC_FIFD *fifd = pkt->fifd;
+    QUIC_CFQ_ITEM *cfq_item, *cfq_item_next;
+
+    /*
+     * Don't need to do anything to SSTREAMs for STREAM and CRYPTO streams, as
+     * we assume caller will clean them up.
+     */
+
+    /* GCR */
+    for (cfq_item = pkt->retx_head; cfq_item != NULL; cfq_item = cfq_item_next) {
+        cfq_item_next = cfq_item->pkt_next;
+        ossl_quic_cfq_release(fifd->cfq, cfq_item);
+    }
+
+    ossl_quic_txpim_pkt_release(fifd->txpim, pkt);
+}
+
+int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt)
+{
+    QUIC_CFQ_ITEM *cfq_item;
+
+    pkt->fifd                   = fifd;
+
+    pkt->ackm_pkt.on_lost       = on_lost;
+    pkt->ackm_pkt.on_acked      = on_acked;
+    pkt->ackm_pkt.on_discarded  = on_discarded;
+    pkt->ackm_pkt.cb_arg        = pkt;
+
+    pkt->ackm_pkt.prev = pkt->ackm_pkt.next
+        = pkt->ackm_pkt.anext = pkt->ackm_pkt.lnext = NULL;
+
+    /*
+     * Mark the CFQ items which have been added to this packet as having been
+     * transmitted.
+     */
+    for (cfq_item = pkt->retx_head;
+         cfq_item != NULL;
+         cfq_item = cfq_item->pkt_next)
+        ossl_quic_cfq_mark_tx(fifd->cfq, cfq_item);
+
+    /* Inform the ACKM. */
+    return ossl_ackm_on_tx_packet(fifd->ackm, &pkt->ackm_pkt);
+}

diff --git a/ssl/quic/quic_txpim.c b/ssl/quic/quic_txpim.c
index 38b16a45619d27283933ded4257d6ddeb727c77a..9693758769995c20fb14de87581989d1ed835b85 100644 (file)
--- a/ssl/quic/quic_txpim.c
+++ b/ssl/quic/quic_txpim.c
@@ -111,7 +111,8 @@ static void txpim_clear(QUIC_TXPIM_PKT_EX *ex)
     ex->public.fifd                        = NULL;
     ex->public.had_handshake_done_frame    = 0;
     ex->public.had_max_data_frame          = 0;
-    ex->public.had_max_streams_frame       = 0;
+    ex->public.had_max_streams_bidi_frame  = 0;
+    ex->public.had_max_streams_uni_frame   = 0;
     ex->public.had_ack_frame               = 0;
 }
 
@@ -202,6 +203,10 @@ const QUIC_TXPIM_CHUNK *ossl_quic_txpim_pkt_get_chunks(QUIC_TXPIM_PKT *fpkt)
     QUIC_TXPIM_PKT_EX *ex = (QUIC_TXPIM_PKT_EX *)fpkt;
 
     if (ex->chunks_need_sort) {
+        /*
+         * List of chunks will generally be very small so there is no issue
+         * simply sorting here.
+         */
         qsort(ex->chunks, ex->num_chunks, sizeof(QUIC_TXPIM_CHUNK), compare);
         ex->chunks_need_sort = 0;
     }
@@ -215,3 +220,8 @@ size_t ossl_quic_txpim_pkt_get_num_chunks(QUIC_TXPIM_PKT *fpkt)
 
     return ex->num_chunks;
 }
+
+size_t ossl_quic_txpim_get_in_use(QUIC_TXPIM *txpim)
+{
+    return txpim->in_use;
+}

diff --git a/test/build.info b/test/build.info
index 728fc111667238861abd1f50fb7ad49f8e591600..370220806d4bd5be9d3b32e089de23ed10a99075 100644 (file)
--- a/test/build.info
+++ b/test/build.info
@@ -308,6 +308,10 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[quic_txpim_test]=../include ../apps/include
   DEPEND[quic_txpim_test]=../libcrypto.a ../libssl.a libtestutil.a
 
+  SOURCE[quic_fifd_test]=quic_fifd_test.c
+  INCLUDE[quic_fifd_test]=../include ../apps/include
+  DEPEND[quic_fifd_test]=../libcrypto.a ../libssl.a libtestutil.a
+
   SOURCE[asynctest]=asynctest.c
   INCLUDE[asynctest]=../include ../apps/include
   DEPEND[asynctest]=../libcrypto
@@ -1032,7 +1036,7 @@ ENDIF
   ENDIF
 
   IF[{- !$disabled{'quic'} -}]
-    PROGRAMS{noinst}=quicapitest quic_wire_test quic_ackm_test quic_record_test quic_fc_test quic_stream_test quic_cfq_test quic_txpim_test
+    PROGRAMS{noinst}=quicapitest quic_wire_test quic_ackm_test quic_record_test quic_fc_test quic_stream_test quic_cfq_test quic_txpim_test quic_fifd_test
   ENDIF
 
   SOURCE[quicapitest]=quicapitest.c helpers/ssltestlib.c

diff --git a/test/quic_fifd_test.c b/test/quic_fifd_test.c
new file mode 100644 (file)
index 0000000..47eb030
--- /dev/null
+++ b/test/quic_fifd_test.c
@@ -0,0 +1,358 @@
+/*
+ * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "internal/packet.h"
+#include "internal/quic_txpim.h"
+#include "internal/quic_fifd.h"
+#include "testutil.h"
+
+static OSSL_TIME cur_time;
+
+static OSSL_TIME fake_now(void *arg) {
+    return cur_time;
+}
+
+static void step_time(uint64_t ms) {
+    cur_time = ossl_time_add(cur_time, ossl_ms2time(ms));
+}
+
+static QUIC_SSTREAM *(*get_sstream_by_id_p)(uint64_t stream_id, void *arg);
+
+static QUIC_SSTREAM *get_sstream_by_id(uint64_t stream_id, void *arg)
+{
+    return get_sstream_by_id_p(stream_id, arg);
+}
+
+static void (*regen_frame_p)(uint64_t frame_type, uint64_t stream_id, void *arg);
+
+static void regen_frame(uint64_t frame_type, uint64_t stream_id, void *arg)
+{
+    regen_frame_p(frame_type, stream_id, arg);
+}
+
+typedef struct info_st {
+    QUIC_FIFD fifd;
+    OSSL_ACKM *ackm;
+    QUIC_CFQ *cfq;
+    QUIC_TXPIM *txpim;
+    OSSL_STATM statm;
+    OSSL_CC_DATA *ccdata;
+    QUIC_SSTREAM *sstream[4];
+} INFO;
+
+static INFO *cur_info;
+static int cb_fail;
+static int cfq_freed;
+
+/* ----------------------------------------------------------------------
+ * 1. Test that a submitted packet, on ack, acks all streams inside of it
+ *    Test that a submitted packet, on ack, calls the get by ID function
+ *      correctly
+ *    Test that a submitted packet, on ack, acks all fins inside it
+ *    Test that a submitted packet, on ack, releases the TXPIM packet
+ */
+static QUIC_SSTREAM *sstream_expect(uint64_t stream_id, void *arg)
+{
+    if (stream_id == 42 || stream_id == 43)
+        return cur_info->sstream[stream_id - 42];
+
+    cb_fail = 1;
+    return NULL;
+}
+
+static uint64_t regen_frame_type[16];
+static uint64_t regen_stream_id[16];
+static size_t regen_count;
+
+static void regen_expect(uint64_t frame_type, uint64_t stream_id, void *arg)
+{
+    regen_frame_type[regen_count] = frame_type;
+    regen_stream_id[regen_count] = stream_id;
+    ++regen_count;
+}
+
+static const unsigned char placeholder_data[] = "placeholder";
+
+static void cfq_free_cb_(unsigned char *buf, size_t buf_len, void *arg)
+{
+    if (buf == placeholder_data && buf_len == sizeof(placeholder_data))
+        cfq_freed = 1;
+}
+
+#define TEST_KIND_ACK       0
+#define TEST_KIND_LOSS      1
+#define TEST_KIND_DISCARD   2
+#define TEST_KIND_NUM       3
+
+static int test_generic(INFO *info, int kind)
+{
+    int testresult = 0;
+    size_t i, consumed = 0;
+    QUIC_TXPIM_PKT *pkt = NULL, *pkt2 = NULL;
+    OSSL_QUIC_FRAME_STREAM hdr = {0};
+    OSSL_QTX_IOVEC iov[2];
+    size_t num_iov;
+    QUIC_TXPIM_CHUNK chunk = {42, 0, 11, 0};
+    OSSL_QUIC_FRAME_ACK ack = {0};
+    OSSL_QUIC_ACK_RANGE ack_ranges[1] = {0};
+    QUIC_CFQ_ITEM *cfq_item = NULL;
+    uint32_t pn_space = (kind == TEST_KIND_DISCARD)
+        ? QUIC_PN_SPACE_HANDSHAKE : QUIC_PN_SPACE_APP;
+
+    cur_time            = ossl_seconds2time(1000);
+    regen_count         = 0;
+
+    get_sstream_by_id_p = sstream_expect;
+    regen_frame_p       = regen_expect;
+
+    if (!TEST_ptr(pkt = ossl_quic_txpim_pkt_alloc(info->txpim)))
+        goto err;
+
+    for (i = 0; i < 2; ++i) {
+        num_iov = OSSL_NELEM(iov);
+        if (!TEST_true(ossl_quic_sstream_append(info->sstream[i],
+                                                (unsigned char *)"Test message",
+                                                12, &consumed))
+            || !TEST_size_t_eq(consumed, 12))
+            goto err;
+
+        if (i == 1)
+            ossl_quic_sstream_fin(info->sstream[i]);
+
+        if (!TEST_true(ossl_quic_sstream_get_stream_frame(info->sstream[i], 0,
+                                                          &hdr, iov, &num_iov))
+            || !TEST_int_eq(hdr.is_fin, i == 1)
+            || !TEST_uint64_t_eq(hdr.offset, 0)
+            || !TEST_uint64_t_eq(hdr.len, 12)
+            || !TEST_size_t_eq(ossl_quic_sstream_get_buffer_used(info->sstream[i]), 12)
+            || !TEST_true(ossl_quic_sstream_mark_transmitted(info->sstream[i],
+                                                             hdr.offset,
+                                                             hdr.offset + hdr.len - 1)))
+            goto err;
+
+        if (i == 1 && !TEST_true(ossl_quic_sstream_mark_transmitted_fin(info->sstream[i],
+                                                                        hdr.offset + hdr.len)))
+            goto err;
+
+        chunk.has_fin   = hdr.is_fin;
+        chunk.stream_id = 42 + i;
+        if (!TEST_true(ossl_quic_txpim_pkt_append_chunk(pkt, &chunk)))
+            goto err;
+    }
+
+    cfq_freed = 0;
+    if (!TEST_ptr(cfq_item = ossl_quic_cfq_add_frame(info->cfq, 10,
+                                                     pn_space,
+                                                     OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
+                                                     placeholder_data,
+                                                     sizeof(placeholder_data),
+                                                     cfq_free_cb_, NULL))
+        || !TEST_ptr_eq(cfq_item, ossl_quic_cfq_get_priority_head(info->cfq, pn_space)))
+        goto err;
+
+    ossl_quic_txpim_pkt_add_cfq_item(pkt, cfq_item);
+
+    pkt->ackm_pkt.pkt_num           = 0;
+    pkt->ackm_pkt.pkt_space         = pn_space;
+    pkt->ackm_pkt.largest_acked     = QUIC_PN_INVALID;
+    pkt->ackm_pkt.num_bytes         = 50;
+    pkt->ackm_pkt.time              = cur_time;
+    pkt->ackm_pkt.is_inflight       = 1;
+    pkt->ackm_pkt.is_ack_eliciting  = 1;
+    if (kind == TEST_KIND_LOSS) {
+        pkt->had_handshake_done_frame   = 1;
+        pkt->had_max_data_frame         = 1;
+        pkt->had_max_streams_bidi_frame = 1;
+        pkt->had_max_streams_uni_frame  = 1;
+        pkt->had_ack_frame              = 1;
+    }
+
+    ack_ranges[0].start = 0;
+    ack_ranges[0].end   = 0;
+    ack.ack_ranges      = ack_ranges;
+    ack.num_ack_ranges  = 1;
+
+    if (!TEST_true(ossl_quic_fifd_pkt_commit(&info->fifd, pkt)))
+        goto err;
+
+    /* CFQ item should have been marked as transmitted */
+    if (!TEST_ptr_null(ossl_quic_cfq_get_priority_head(info->cfq, pn_space)))
+        goto err;
+
+    switch (kind) {
+    case TEST_KIND_ACK:
+        if (!TEST_true(ossl_ackm_on_rx_ack_frame(info->ackm, &ack,
+                                                 pn_space,
+                                                 cur_time)))
+            goto err;
+
+        for (i = 0; i < 2; ++i)
+            if (!TEST_size_t_eq(ossl_quic_sstream_get_buffer_used(info->sstream[i]), 0))
+                goto err;
+
+        /* This should fail, which proves the FIN was acked */
+        if (!TEST_false(ossl_quic_sstream_mark_lost_fin(info->sstream[1])))
+            goto err;
+
+        /* CFQ item must have been released */
+        if (!TEST_true(cfq_freed))
+            goto err;
+
+        /* No regen calls should have been made */
+        if (!TEST_size_t_eq(regen_count, 0))
+            goto err;
+
+        break;
+
+    case TEST_KIND_LOSS:
+        /* Trigger loss detection via packet threshold. */
+        if (!TEST_ptr(pkt2 = ossl_quic_txpim_pkt_alloc(info->txpim)))
+            goto err;
+
+        step_time(10000);
+        pkt2->ackm_pkt.pkt_num          = 50;
+        pkt2->ackm_pkt.pkt_space        = pn_space;
+        pkt2->ackm_pkt.largest_acked    = QUIC_PN_INVALID;
+        pkt2->ackm_pkt.num_bytes        = 50;
+        pkt2->ackm_pkt.time             = cur_time;
+        pkt2->ackm_pkt.is_inflight      = 1;
+        pkt2->ackm_pkt.is_ack_eliciting = 1;
+
+        ack_ranges[0].start = 50;
+        ack_ranges[0].end   = 50;
+        ack.ack_ranges      = ack_ranges;
+        ack.num_ack_ranges  = 1;
+
+        if (!TEST_true(ossl_quic_fifd_pkt_commit(&info->fifd, pkt2))
+            || !TEST_true(ossl_ackm_on_rx_ack_frame(info->ackm, &ack,
+                                                    pn_space, cur_time)))
+            goto err;
+
+        for (i = 0; i < 2; ++i) {
+            num_iov = OSSL_NELEM(iov);
+            /*
+             * Stream data we sent must have been marked as lost; check by
+             * ensuring it is returned again
+             */
+            if (!TEST_true(ossl_quic_sstream_get_stream_frame(info->sstream[i], 0,
+                                                              &hdr, iov, &num_iov))
+                || !TEST_uint64_t_eq(hdr.offset, 0)
+                || !TEST_uint64_t_eq(hdr.len, 12))
+                goto err;
+        }
+
+        /* FC frame should have regenerated for each stream */
+        if (!TEST_size_t_eq(regen_count, 7)
+            || !TEST_uint64_t_eq(regen_stream_id[0], 42)
+            || !TEST_uint64_t_eq(regen_frame_type[0], OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
+            || !TEST_uint64_t_eq(regen_stream_id[1], 43)
+            || !TEST_uint64_t_eq(regen_frame_type[1], OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
+            || !TEST_uint64_t_eq(regen_frame_type[2], OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE)
+            || !TEST_uint64_t_eq(regen_stream_id[2], UINT64_MAX)
+            || !TEST_uint64_t_eq(regen_frame_type[3], OSSL_QUIC_FRAME_TYPE_MAX_DATA)
+            || !TEST_uint64_t_eq(regen_stream_id[3], UINT64_MAX)
+            || !TEST_uint64_t_eq(regen_frame_type[4], OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI)
+            || !TEST_uint64_t_eq(regen_stream_id[4], UINT64_MAX)
+            || !TEST_uint64_t_eq(regen_frame_type[5], OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI)
+            || !TEST_uint64_t_eq(regen_stream_id[5], UINT64_MAX)
+            || !TEST_uint64_t_eq(regen_frame_type[6], OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN)
+            || !TEST_uint64_t_eq(regen_stream_id[6], UINT64_MAX))
+            goto err;
+
+        /* CFQ item should have been marked as lost */
+        if (!TEST_ptr_eq(cfq_item, ossl_quic_cfq_get_priority_head(info->cfq, pn_space)))
+            goto err;
+
+        /* FIN should have been marked as lost */
+        num_iov = OSSL_NELEM(iov);
+        if (!TEST_true(ossl_quic_sstream_get_stream_frame(info->sstream[1], 10,
+                                                          &hdr, iov, &num_iov))
+            || !TEST_true(hdr.is_fin)
+            || !TEST_uint64_t_eq(hdr.len, 0))
+            goto err;
+
+        break;
+
+    case TEST_KIND_DISCARD:
+        if (!TEST_true(ossl_ackm_on_pkt_space_discarded(info->ackm, pn_space)))
+            goto err;
+
+        /* CFQ item must have been released */
+        if (!TEST_true(cfq_freed))
+            goto err;
+
+        break;
+
+    default:
+        goto err;
+    }
+
+    /* TXPIM must have been released */
+    if (!TEST_size_t_eq(ossl_quic_txpim_get_in_use(info->txpim), 0))
+        goto err;
+
+    testresult = 1;
+err:
+    return testresult;
+}
+
+static int test_fifd(int idx)
+{
+    int testresult = 0;
+    INFO info = {0};
+    size_t i;
+
+    cur_info = &info;
+    cb_fail = 0;
+
+    if (!TEST_true(ossl_statm_init(&info.statm))
+        || !TEST_ptr(info.ccdata = ossl_cc_dummy_method.new(NULL, NULL, NULL))
+        || !TEST_ptr(info.ackm = ossl_ackm_new(fake_now, NULL,
+                                               &info.statm,
+                                               &ossl_cc_dummy_method,
+                                               info.ccdata))
+        || !TEST_true(ossl_ackm_on_handshake_confirmed(info.ackm))
+        || !TEST_ptr(info.cfq = ossl_quic_cfq_new())
+        || !TEST_ptr(info.txpim = ossl_quic_txpim_new())
+        || !TEST_true(ossl_quic_fifd_init(&info.fifd, info.cfq, info.ackm,
+                                          info.txpim,
+                                          get_sstream_by_id, NULL,
+                                          regen_frame, NULL)))
+        goto err;
+
+    for (i = 0; i < OSSL_NELEM(info.sstream); ++i)
+        if (!TEST_ptr(info.sstream[i] = ossl_quic_sstream_new(1024)))
+            goto err;
+
+    ossl_statm_update_rtt(&info.statm, ossl_time_zero(), ossl_ms2time(1));
+
+    if (!TEST_true(test_generic(&info, idx))
+        || !TEST_false(cb_fail))
+        goto err;
+
+    testresult = 1;
+err:
+    ossl_quic_fifd_cleanup(&info.fifd);
+    ossl_quic_cfq_free(info.cfq);
+    ossl_quic_txpim_free(info.txpim);
+    ossl_ackm_free(info.ackm);
+    ossl_statm_destroy(&info.statm);
+    if (info.ccdata != NULL)
+        ossl_cc_dummy_method.free(info.ccdata);
+    for (i = 0; i < OSSL_NELEM(info.sstream); ++i)
+        ossl_quic_sstream_free(info.sstream[i]);
+    cur_info = NULL;
+    return testresult;
+}
+
+int setup_tests(void)
+{
+    ADD_ALL_TESTS(test_fifd, TEST_KIND_NUM);
+    return 1;
+}

diff --git a/test/recipes/70-test_quic_fifd.t b/test/recipes/70-test_quic_fifd.t
new file mode 100644 (file)
index 0000000..4024552
--- /dev/null
+++ b/test/recipes/70-test_quic_fifd.t
@@ -0,0 +1,19 @@
+#! /usr/bin/env perl
+# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the Apache License 2.0 (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+use OpenSSL::Test;
+use OpenSSL::Test::Utils;
+
+setup("test_quic_fifd");
+
+plan skip_all => "QUIC protocol is not supported by this OpenSSL build"
+    if disabled('quic');
+
+plan tests => 1;
+
+ok(run(test(["quic_fifd_test"])));