[server,proxy] rewritten Stream_CheckAndLogRequiredLengthRx

make it windows compatible
This commit is contained in:
Armin Novak 2022-12-22 14:43:33 +01:00 committed by David Fort
parent b614a2da37
commit c4bbe09649

View File

@ -139,19 +139,16 @@ typedef struct
Stream_CheckAndLogRequiredLengthWLogEx(log, WLOG_WARN, s, len, \ Stream_CheckAndLogRequiredLengthWLogEx(log, WLOG_WARN, s, len, \
proxy_server_rx " %s(%s:%" PRIuz ")", __FUNCTION__, \ proxy_server_rx " %s(%s:%" PRIuz ")", __FUNCTION__, \
__FILE__, __LINE__) __FILE__, __LINE__)
#define Stream_CheckAndLogRequiredLengthRx(srv, log, s, len) \ #define Stream_CheckAndLogRequiredLengthRx(srv, log, s, len) \
({ \ Stream_CheckAndLogRequiredLengthRx_(srv, log, s, len, __FUNCTION__, __FILE__, __LINE__)
BOOL res; \ static BOOL Stream_CheckAndLogRequiredLengthRx_(BOOL srv, wLog* log, wStream* s, size_t len,
if (srv) \ const char* fkt, const char* file, size_t line)
{ \ {
res = Stream_CheckAndLogRequiredLengthSrv(log, s, len); \ const char* fmt =
} \ srv ? proxy_server_rx " %s(%s:%" PRIuz ")" : proxy_client_rx " %s(%s:%" PRIuz ")";
else \
{ \ return Stream_CheckAndLogRequiredLengthWLogEx(log, WLOG_WARN, s, len, fmt, fkt, file, line);
res = Stream_CheckAndLogRequiredLengthClient(log, s, len); \ }
} \
res; \
})
static const char* rdpdr_server_state_to_string(pf_channel_server_state state) static const char* rdpdr_server_state_to_string(pf_channel_server_state state)
{ {