morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11377 from llyzs/fix-transport

Browse Source 
[core,transport] fix transport written statistics overflowing.
This commit is contained in:
akallabeth
2025-03-19 11:48:04 +01:00
committed by GitHub
parent 5981f106ab 7338c52893
commit 97d359aafb
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libfreerdp/core/freerdp.c
View File

@@ -1198,7 +1198,8 @@ ULONG freerdp_get_transport_sent(rdpContext* context, BOOL resetCount)
{
WINPR_ASSERT(context);
WINPR_ASSERT(context->rdp);
return transport_get_bytes_sent(context->rdp->transport, resetCount);
UINT64 rc = transport_get_bytes_sent(context->rdp->transport, resetCount);
return WINPR_CXX_COMPAT_CAST(ULONG, MIN(rc, UINT32_MAX));
}
BOOL freerdp_nla_impersonate(rdpContext* context)

14
libfreerdp/core/transport.c
View File

@@ -87,7 +87,7 @@ struct rdp_transport
BOOL GatewayEnabled;
CRITICAL_SECTION ReadLock;
CRITICAL_SECTION WriteLock;
ULONG written;
UINT64 written;
HANDLE rereadEvent;
BOOL haveMoreBytesToRead;
wLog* log;
@@ -1236,13 +1236,7 @@ static int transport_default_write(rdpTransport* transport, wStream* s)
Stream_Seek(s, ustatus);
}
if (writtenlength + transport->written > UINT32_MAX)
{
status = -1;
goto out_cleanup;
}
transport->written += WINPR_ASSERTING_INT_CAST(uint32_t, writtenlength);
transport->written += writtenlength;
out_cleanup:
if (status < 0)
@@ -1823,9 +1817,9 @@ wStream* transport_take_from_pool(rdpTransport* transport, size_t size)
return StreamPool_Take(transport->ReceivePool, size);
}
ULONG transport_get_bytes_sent(rdpTransport* transport, BOOL resetCount)
UINT64 transport_get_bytes_sent(rdpTransport* transport, BOOL resetCount)
{
ULONG rc = 0;
UINT64 rc = 0;
WINPR_ASSERT(transport);
rc = transport->written;
if (resetCount)

2
libfreerdp/core/transport.h
View File

@@ -142,7 +142,7 @@ FREERDP_LOCAL rdpTsg* transport_get_tsg(rdpTransport* transport);
FREERDP_LOCAL wStream* transport_take_from_pool(rdpTransport* transport, size_t size);
FREERDP_LOCAL ULONG transport_get_bytes_sent(rdpTransport* transport, BOOL resetCount);
FREERDP_LOCAL UINT64 transport_get_bytes_sent(rdpTransport* transport, BOOL resetCount);
FREERDP_LOCAL BOOL transport_have_more_bytes_to_read(rdpTransport* transport);