Skip to content

fix(client): Clear internal client buffer on failed packet send #9100

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
TreeHunter9 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −1
Open

fix(client): Clear internal client buffer on failed packet send #9100

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
19 changes: 18 additions & 1 deletion src/remote/client/interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9801,6 +9801,15 @@ static void send_packet(rem_port* port, PACKET* packet)
*
**************************************/

auto buffer_cleanup = [](RemoteXdr* xdr)
{
if (xdr == nullptr)
return;

xdr->x_handy += xdr->x_private - xdr->x_base;
xdr->x_private = xdr->x_base;
};

RefMutexGuard guard(*port->port_write_sync, FB_FUNCTION);

if (port->port_flags & PORT_detached || port->port_state == rem_port::BROKEN)
Expand All @@ -9823,8 +9832,12 @@ static void send_packet(rem_port* port, PACKET* packet)
if (!p->sent)
{
if (!port->send_partial(&p->packet))
{
buffer_cleanup(port->port_send);

(Arg::Gds(isc_net_write_err) <<
Arg::Gds(isc_random) << "send_packet/send_partial").raise();
}

p->sent = true;
}
Expand All @@ -9833,7 +9846,11 @@ static void send_packet(rem_port* port, PACKET* packet)

if (!port->send(packet))
{
(Arg::Gds(isc_net_write_err)<< Arg::Gds(isc_random) << "send_packet/send").raise();
// Something went wrong in the send routine, so be sure to clear the port's internal buffer
// of rubbish packet.
buffer_cleanup(port->port_send);

(Arg::Gds(isc_net_write_err) << Arg::Gds(isc_random) << "send_packet/send").raise();
}
}

Expand Down
Loading