Skip to content

bug fix - remove port bytes during port forwarding #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 1, 2019
Merged

bug fix - remove port bytes during port forwarding #233

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1986ac1
fix a race condition.
xinyanmsft Oct 19, 2018
bee9228
Merge remote-tracking branch 'upstream/master'
xinyanmsft Jan 24, 2019
d4278f8
add WebSocket server certificate validation support for net 452
xinyanmsft Jan 24, 2019
4d7ac87
Merge remote-tracking branch 'upstream/master'
xinyanmsft Jan 28, 2019
35f32bc
port forwarding bug fix
xinyanmsft Jan 28, 2019
dd76572
incorporate review feedbacks.
xinyanmsft Jan 30, 2019
52ebbce
add tests, fix skip bytes scenario for multiple streams
xinyanmsft Jan 30, 2019
b2f576e
add more tests for verifying content.
xinyanmsft Jan 31, 2019
a3376f2
simplify code a bit
xinyanmsft Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/KubernetesClient/StreamDemuxer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ protected async Task RunLoop(CancellationToken cancellationToken)
{
// Get a 1KB buffer
byte[] buffer = ArrayPool<byte>.Shared.Rent(1024 * 1024);

int byteCount = 0;
try
{
var segment = new ArraySegment<byte>(buffer);
Expand All @@ -199,6 +199,13 @@ protected async Task RunLoop(CancellationToken cancellationToken)

var streamIndex = buffer[0];
var extraByteCount = 1;
byteCount += result.Count - extraByteCount;
if (byteCount <= 2)
{
// The first 2 bytes from the web socket is port bytes, skip.
// https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/server/portforward/websocket.go
continue;
}

while (true)
{
Expand Down