Skip to content

Commit 1d1a33e

Browse files
author
ladeak
committed
push current state to fix later
1 parent 83446d6 commit 1d1a33e

9 files changed

+193
-55
lines changed

‎src/CHttpServer/CHttpServer/FlowControlSize.cs

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
namespace CHttpServer;
2+
3+
internal struct FlowControlSize
4+
{
5+
private uint _size;
6+
7+
public FlowControlSize(uint size)
8+
{
9+
_size = size;
10+
}
11+
12+
public bool TryUse(uint size)
13+
{
14+
uint current, newSize;
15+
do
16+
{
17+
current = _size;
18+
if (current < size)
19+
return false;
20+
newSize = current - _size;
21+
}
22+
while (Interlocked.CompareExchange(ref _size, newSize, current) != current);
23+
return true;
24+
}
25+
26+
public void ReleaseSize(uint size)
27+
{
28+
var result = Interlocked.Add(ref _size, size);
29+
if (result > Http2Connection.MaxWindowUpdateSize)
30+
throw new Http2FlowControlException();
31+
}
32+
}

‎src/CHttpServer/CHttpServer/FrameWriter.cs

+12-23
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,13 @@ internal sealed class FrameWriter
77
{
88
private const int FrameHeaderSize = 9;
99

10-
private readonly CHttpConnectionContext _context;
1110
private readonly Http2Frame _frame;
1211
private readonly PipeWriter _destination;
1312

14-
private uint _connectionWindowSize;
15-
private readonly Lock _connectionWindowLock;
16-
17-
public FrameWriter(CHttpConnectionContext context, uint connectionWindowSize)
13+
public FrameWriter(CHttpConnectionContext context)
1814
{
19-
_context = context;
2015
_destination = context.TransportPipe!.Output;
2116
_frame = new Http2Frame();
22-
_connectionWindowLock = new Lock();
23-
_connectionWindowSize = connectionWindowSize;
24-
}
25-
26-
internal void UpdateConnectionWindowSize(uint updateSize)
27-
{
28-
if (updateSize == 0)
29-
throw new Http2ConnectionException("Window Update Size must not be 0.");
30-
31-
lock (_connectionWindowLock)
32-
{
33-
var updatedValue = _connectionWindowSize + updateSize;
34-
if (updatedValue > Http2Connection.MaxWindowUpdateSize)
35-
throw new Http2FlowControlException();
36-
37-
_connectionWindowSize = updatedValue;
38-
}
3917
}
4018

4119
internal void WritePingAck()
@@ -91,6 +69,17 @@ internal void WriteSettingAck()
9169
_destination.Advance(FrameHeaderSize);
9270
}
9371

72+
internal void WriteWindowUpdate(uint streamId, uint size)
73+
{
74+
_frame.SetWindowUpdate(streamId);
75+
int totalSize = FrameHeaderSize + 4;
76+
var buffer = _destination.GetSpan(totalSize);
77+
WriteFrameHeader(buffer);
78+
buffer = buffer[FrameHeaderSize..];
79+
IntegerSerializer.WriteUInt32BigEndian(buffer, size);
80+
_destination.Advance(totalSize);
81+
}
82+
9483
internal void WriteData(uint streamId, ReadOnlySequence<byte> data)
9584
{
9685
var dataLength = (int)data.Length; // Cast is safe as it fits in frame.

‎src/CHttpServer/CHttpServer/HostExtensions.cs

+6
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@ namespace CHttpServer;
1111

1212
public class CHttpServerOptions
1313
{
14+
internal const uint InitialStreamFlowControlSize = 65_535;
15+
1416
public int? Port { get; set; }
1517

1618
public IPAddress? Host { get; set; }
1719

20+
public uint ServerConnectionFlowControlSize { get; set; } = InitialStreamFlowControlSize * 10;
21+
22+
public uint ServerStreamFlowControlSize { get; set; } = InitialStreamFlowControlSize;
23+
1824
public X509Certificate2? Certificate { get; set; }
1925

2026
internal X509Certificate2? GetCertificate()

‎src/CHttpServer/CHttpServer/Http2Connection.cs

+15-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private enum ConnectionState : byte
1919

2020
private const int MaxFrameHeaderLength = 9;
2121
private const uint MaxStreamId = uint.MaxValue >> 1;
22-
internal const uint MaxWindowUpdateSize = 2_147_483_647;
22+
internal const uint MaxWindowUpdateSize = 2_147_483_647; // int.MaxValue
2323

2424
private static ReadOnlySpan<byte> PrefaceBytes => "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"u8;
2525

@@ -36,6 +36,8 @@ private enum ConnectionState : byte
3636
private ConcurrentDictionary<uint, Http2Stream> _streams;
3737
private Http2Stream _currentStream;
3838
private volatile bool _aborted;
39+
private FlowControlSize _serverWindow;
40+
private FlowControlSize _clientWindow;
3941

4042
public Http2Connection(CHttpConnectionContext connectionContext)
4143
{
@@ -49,13 +51,17 @@ public Http2Connection(CHttpConnectionContext connectionContext)
4951
_inputStream = connectionContext.Transport!;
5052
_aborted = false;
5153
_readFrame = new();
54+
_serverWindow = new(_context.ServerOptions.ServerConnectionFlowControlSize + CHttpServerOptions.InitialStreamFlowControlSize);
55+
_clientWindow = new(_h2Settings.InitialWindowSize);
5256
}
5357

5458
internal Http2ResponseWriter? ResponseWriter => _responseWriter;
5559

60+
internal CHttpServerOptions ServerOptions => _context.ServerOptions;
61+
5662
public async Task ProcessRequestAsync<TContext>(IHttpApplication<TContext> application) where TContext : notnull
5763
{
58-
_writer = new FrameWriter(_context, _h2Settings.InitialWindowSize);
64+
_writer = new FrameWriter(_context);
5965
_responseWriter = new Http2ResponseWriter(_writer, _h2Settings.MaxFrameSize);
6066
CancellationTokenSource cts = new();
6167
var responseWriting = _responseWriter.RunAsync(cts.Token);
@@ -64,7 +70,9 @@ public async Task ProcessRequestAsync<TContext>(IHttpApplication<TContext> appli
6470
{
6571
ValidateTlsRequirements();
6672
await ReadPreface();
67-
_writer.WriteSettings(_h2Settings);
73+
_writer.WriteSettings(new Http2SettingsPayload() { InitialWindowSize = _context.ServerOptions.ServerStreamFlowControlSize });
74+
_writer.WriteWindowUpdate(0, _context.ServerOptions.ServerConnectionFlowControlSize);
75+
await _writer.FlushAsync();
6876

6977
while (!_aborted)
7078
{
@@ -167,6 +175,7 @@ private async ValueTask ProcessDataFrame()
167175
.Slice(0, (int)_readFrame.PayloadLength); // framesize max
168176
await _inputStream.ReadExactlyAsync(buffer);
169177
httpStream.RequestPipe.Advance(buffer.Length - paddingLength); // Padding is read but not advanced.
178+
await httpStream.RequestPipe.FlushAsync();
170179

171180
if (_readFrame.EndStream)
172181
{
@@ -236,7 +245,7 @@ private async ValueTask ProcessWindowUpdateFrame()
236245
if (streamId > 0)
237246
_streams[_readFrame.StreamId].UpdateWindowSize(updateSize);
238247
else
239-
_writer!.UpdateConnectionWindowSize(updateSize);
248+
_clientWindow.ReleaseSize(updateSize);
240249
}
241250

242251
private async Task ReadFrameHeader()
@@ -259,7 +268,7 @@ private async ValueTask ProcessSettingsFrame()
259268
if (_readFrame.Flags == 1) // SETTING ACK
260269
return;
261270
if (_h2Settings.SettingsReceived)
262-
throw new Http2ConnectionException("Don't allow settings to change mid-connection");
271+
throw new Http2ConnectionException("Don't allow settings to change mid-connection"); // against the protocol
263272

264273
var payloadLength = (int)_readFrame.PayloadLength;
265274
var memory = _buffer.AsMemory(0, payloadLength);
@@ -284,7 +293,7 @@ private async ValueTask ProcessSettingsFrame()
284293
_h2Settings.MaxConcurrentStream = Math.Min(_h2Settings.MaxConcurrentStream, settingValue);
285294
break;
286295
case 4:
287-
_h2Settings.InitialWindowSize = Math.Min(_h2Settings.InitialWindowSize, settingValue);
296+
_h2Settings.InitialWindowSize = settingValue;
288297
break;
289298
case 5:
290299
_h2Settings.MaxFrameSize = Math.Min(_h2Settings.MaxFrameSize, settingValue);

‎src/CHttpServer/CHttpServer/Http2Frame.cs

+8
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ public void SetSettings(uint size)
8383
PayloadLength = size;
8484
}
8585

86+
internal void SetWindowUpdate(uint streamId)
87+
{
88+
Type = Http2FrameType.WINDOW_UPDATE;
89+
Flags = 0;
90+
StreamId = streamId;
91+
PayloadLength = 4;
92+
}
93+
8694
// Headers
8795
public bool EndStream
8896
{

‎src/CHttpServer/CHttpServer/Http2ResponseWriter.cs

+17-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ internal class Http2ResponseWriter
1414
private const string WriteEndStream = nameof(WriteEndStream);
1515
private const string WriteOutOfOrderFrame = nameof(WriteOutOfOrderFrame);
1616
private const string WriteTrailers = nameof(WriteTrailers);
17+
private const string WriteWindowUpdate = nameof(WriteWindowUpdate);
1718

18-
private record StreamWriteRequest(Http2Stream Stream, string OperationName);
19+
private record class StreamWriteRequest(Http2Stream Stream, string OperationName, uint WindowUpdateSize = 0);
1920

2021
private readonly DynamicHPackEncoder _hpackEncoder;
2122
private readonly FrameWriter _frameWriter;
@@ -54,6 +55,8 @@ public async Task RunAsync(CancellationToken token)
5455
await WriteEndStreamAsync(request.Stream);
5556
else if (request.OperationName == WriteTrailers)
5657
await WriteTrailersAsync(request.Stream);
58+
else if (request.OperationName == WriteWindowUpdate)
59+
await WriteWindowUpdateAsync(request.Stream, request.WindowUpdateSize);
5760
}
5861
}
5962
// TODO propagate the exception to the caller
@@ -85,9 +88,12 @@ public void ScheduleEndStream(Http2Stream source) =>
8588
internal void ScheduleWriteTrailers(Http2Stream http2Stream) =>
8689
_channel.Writer.TryWrite(new StreamWriteRequest(http2Stream, WriteTrailers));
8790

91+
public void ScheduleWriteWindowUpdate(Http2Stream source, uint size) =>
92+
_channel.Writer.TryWrite(new StreamWriteRequest(source, WriteWindowUpdate, size));
93+
8894
public void Complete() => _channel.Writer.Complete();
8995

90-
private async Task WriteDataAsync(Http2Stream stream)
96+
private async ValueTask WriteDataAsync(Http2Stream stream)
9197
{
9298
long writtenCount = 0;
9399
ReadResult readResult;
@@ -122,7 +128,7 @@ private async Task WriteEndStreamAsync(Http2Stream stream)
122128
await stream.OnStreamCompletedAsync();
123129
}
124130

125-
private async Task WriteHeadersAsync(Http2Stream stream)
131+
private async ValueTask WriteHeadersAsync(Http2Stream stream)
126132
{
127133
var buffer = _buffer.AsSpan(0, _maxFrameSize);
128134
HPackEncoder.EncodeStatusHeader(stream.StatusCode, buffer, out var writtenLength);
@@ -141,7 +147,7 @@ private async Task WriteHeadersAsync(Http2Stream stream)
141147
await _frameWriter.FlushAsync();
142148
}
143149

144-
private async Task WritePingAckAsync()
150+
private async ValueTask WritePingAckAsync()
145151
{
146152
_frameWriter.WritePingAck();
147153
await _frameWriter.FlushAsync();
@@ -167,6 +173,13 @@ private async Task WriteTrailersAsync(Http2Stream stream)
167173
await stream.OnStreamCompletedAsync();
168174
}
169175

176+
private async ValueTask WriteWindowUpdateAsync(Http2Stream stream, uint size)
177+
{
178+
_frameWriter.WriteWindowUpdate(stream.StreamId, size);
179+
_frameWriter.WriteWindowUpdate(0, size);
180+
await _frameWriter.FlushAsync();
181+
}
182+
170183
private HeaderEncodingHint GetHeaderEncodingHint(int headerIndex)
171184
{
172185
return headerIndex switch

‎src/CHttpServer/CHttpServer/Http2SettingsPayload.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public Http2SettingsPayload()
77
HeaderTableSize = 0;
88
EnablePush = 0;
99
MaxConcurrentStream = 100;
10-
InitialWindowSize = 65_535 * 2;
10+
InitialWindowSize = 65_535;
1111
MaxFrameSize = 16_384 * 2;
1212
SettingsReceived = false;
1313
}
@@ -18,7 +18,7 @@ public Http2SettingsPayload()
1818

1919
public uint MaxConcurrentStream { get; set; }
2020

21-
public uint InitialWindowSize { get; set; }
21+
public uint InitialWindowSize { get; set; }
2222

2323
public uint MaxFrameSize { get; set; }
2424

0 commit comments

Comments
 (0)