Skip to content

Commit 3e95349

Browse files
committed
Missed changes when backporting #8318 (Send small blobs inline)
1 parent 2d71dd0 commit 3e95349

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/remote/inet.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,8 @@ rem_port* INET_analyze(ClntAuthBlock* cBlock,
716716
REMOTE_PROTOCOL(PROTOCOL_VERSION15, ptype_lazy_send, 6),
717717
REMOTE_PROTOCOL(PROTOCOL_VERSION16, ptype_lazy_send, 7),
718718
REMOTE_PROTOCOL(PROTOCOL_VERSION17, ptype_lazy_send, 8),
719-
REMOTE_PROTOCOL(PROTOCOL_VERSION18, ptype_lazy_send, 9)
719+
REMOTE_PROTOCOL(PROTOCOL_VERSION18, ptype_lazy_send, 9),
720+
REMOTE_PROTOCOL(PROTOCOL_VERSION19, ptype_lazy_send, 10)
720721
};
721722
fb_assert(FB_NELEM(protocols_to_try) <= FB_NELEM(cnct->p_cnct_versions));
722723
cnct->p_cnct_count = FB_NELEM(protocols_to_try);

src/remote/os/win32/xnet.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@ rem_port* XNET_analyze(ClntAuthBlock* cBlock,
307307
REMOTE_PROTOCOL(PROTOCOL_VERSION15, ptype_batch_send, 6),
308308
REMOTE_PROTOCOL(PROTOCOL_VERSION16, ptype_batch_send, 7),
309309
REMOTE_PROTOCOL(PROTOCOL_VERSION17, ptype_batch_send, 8),
310-
REMOTE_PROTOCOL(PROTOCOL_VERSION18, ptype_batch_send, 9)
310+
REMOTE_PROTOCOL(PROTOCOL_VERSION18, ptype_batch_send, 9),
311+
REMOTE_PROTOCOL(PROTOCOL_VERSION19, ptype_batch_send, 10)
311312
};
312313
fb_assert(FB_NELEM(protocols_to_try) <= FB_NELEM(cnct->p_cnct_versions));
313314
cnct->p_cnct_count = FB_NELEM(protocols_to_try);

src/remote/server/server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1994,7 +1994,7 @@ static bool accept_connection(rem_port* port, P_CNCT* connect, PACKET* send)
19941994
{
19951995
if ((protocol->p_cnct_version == PROTOCOL_VERSION10 ||
19961996
(protocol->p_cnct_version >= PROTOCOL_VERSION11 &&
1997-
protocol->p_cnct_version <= PROTOCOL_VERSION18)) &&
1997+
protocol->p_cnct_version <= PROTOCOL_VERSION19)) &&
19981998
(protocol->p_cnct_architecture == arch_generic ||
19991999
protocol->p_cnct_architecture == ARCHITECTURE) &&
20002000
protocol->p_cnct_weight >= weight)

0 commit comments

Comments
 (0)