Skip to content

Listener: defer Open frame until peer protocol header is received #651

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

Open
alt-Rational wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Listener: defer Open frame until peer protocol header is received #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 38 additions & 2 deletions src/Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,16 @@ public partial class Connection : AmqpObject
uint remoteMaxFrameSize;
ITransport writer;
HeartBeat heartBeat;
Open deferredOpen;

// When false, the local Open is not pipelined with the protocol header but is
// deferred until the peer's protocol header is received. Listener connections
// set this to avoid coalescing the header and Open into a single TCP segment,
// which some clients (e.g. the Node rhea library) fail to parse.
internal virtual bool PipelineOpen
{
get { return true; }
}

Connection(Address address, ushort channelMax, uint maxFrameSize)
{
Expand Down Expand Up @@ -280,8 +290,17 @@ internal void Init(IBufferManager bufferManager, AmqpSettings amqpSettings, IAsy
}

this.SendHeader();
this.SendOpen(open);
this.state = ConnectionState.OpenPipe;
if (this.PipelineOpen)
{
this.SendOpen(open);
this.state = ConnectionState.OpenPipe;
}
else
{
// Defer the Open until the peer's protocol header arrives (see PipelineOpen).
this.deferredOpen = open;
this.state = ConnectionState.HeaderSent;
}
}

static ConnectionFactory connectionFactory;
Expand Down Expand Up @@ -517,6 +536,14 @@ protected override bool OnClose(Error error)
{
newState = ConnectionState.OpenClosePipe;
}
else if (this.state == ConnectionState.HeaderSent)
{
// Non-pipelined Open was deferred and never sent; send it now so the
// peer sees a well-formed Open/Close sequence once its header arrives.
this.SendOpen(this.deferredOpen);
this.deferredOpen = null;
newState = ConnectionState.OpenClosePipe;
}
else if (state == ConnectionState.OpenSent)
{
newState = ConnectionState.ClosePipe;
Expand Down Expand Up @@ -764,6 +791,15 @@ internal bool OnHeader(ProtocolHeader header)
{
this.state = ConnectionState.OpenSent;
}
else if (this.state == ConnectionState.HeaderSent)
{
// Deferred (non-pipelined) Open: now that the peer's header has
// arrived, send our Open as a separate write so it is not coalesced
// with the protocol header.
this.SendOpen(this.deferredOpen);
this.deferredOpen = null;
this.state = ConnectionState.OpenSent;
}
else if (this.state == ConnectionState.OpenClosePipe)
{
this.state = ConnectionState.ClosePipe;
Expand Down
8 changes: 8 additions & 0 deletions src/Listener/ListenerConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ internal ListenerConnection(ConnectionListener listener, Address address, IHandl
this.listener = listener;
}

// Defer the local Open until the client's protocol header is received. Pipelining
// the header and Open into one TCP segment breaks some clients (Node rhea), which
// intermittently fail to parse the coalesced bytes and hang until their open timeout.
internal override bool PipelineOpen
{
get { return false; }
}

/// <summary>
/// Gets a IPrincipal object for the connection. If the value is null,
/// the connection is not authenticated.
Expand Down