mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core,tcp] replace macros with inline functions

Browse Source
This commit is contained in:
Armin Novak 2024-06-24 10:21:25 +02:00
parent 66f31e5bb9
commit 8df1a9a52a
No known key found for this signature in database
GPG Key ID: 2CF4A2D2D3D72105
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfreerdp/core/gateway/http.c
View File

@ -1239,7 +1239,7 @@ HttpResponse* http_response_recv(rdpTls* tls, BOOL readContentLength)
char* end = NULL;
/* Read until we encounter \r\n\r\n */
ERR_clear_error();
const int wstatus = BIO_wait_read(tls->bio, timeout);
const long wstatus = BIO_wait_read(tls->bio, timeout);
if (wstatus < 0)
{
if (!BIO_should_retry(tls->bio))

46
libfreerdp/core/tcp.h
View File

@ -53,15 +53,43 @@
#define BIO_C_WAIT_WRITE 1108
#define BIO_C_SET_HANDLE 1109
#define BIO_set_socket(b, s, c) BIO_ctrl(b, BIO_C_SET_SOCKET, c, s);
#define BIO_get_socket(b, c) BIO_ctrl(b, BIO_C_GET_SOCKET, 0, (char*)c)
#define BIO_get_event(b, c) BIO_ctrl(b, BIO_C_GET_EVENT, 0, (char*)c)
#define BIO_set_handle(b, h) BIO_ctrl(b, BIO_C_SET_HANDLE, 0, h)
#define BIO_set_nonblock(b, c) BIO_ctrl(b, BIO_C_SET_NONBLOCK, c, NULL)
#define BIO_read_blocked(b) BIO_ctrl(b, BIO_C_READ_BLOCKED, 0, NULL)
#define BIO_write_blocked(b) BIO_ctrl(b, BIO_C_WRITE_BLOCKED, 0, NULL)
#define BIO_wait_read(b, c) BIO_ctrl(b, BIO_C_WAIT_READ, c, NULL)
#define BIO_wait_write(b, c) BIO_ctrl(b, BIO_C_WAIT_WRITE, c, NULL)
static INLINE long BIO_set_socket(BIO* b, SOCKET* s, long c)
{
return BIO_ctrl(b, BIO_C_SET_SOCKET, c, s);
}
static INLINE long BIO_get_socket(BIO* b, SOCKET* c)
{
return BIO_ctrl(b, BIO_C_GET_SOCKET, 0, c);
}
static INLINE long BIO_get_event(BIO* b, HANDLE* c)
{
return BIO_ctrl(b, BIO_C_GET_EVENT, 0, c);
}
static INLINE long BIO_set_handle(BIO* b, HANDLE* h)
{
return BIO_ctrl(b, BIO_C_SET_HANDLE, 0, h);
}
static INLINE long BIO_set_nonblock(BIO* b, long c)
{
return BIO_ctrl(b, BIO_C_SET_NONBLOCK, c, NULL);
}
static INLINE long BIO_read_blocked(BIO* b)
{
return BIO_ctrl(b, BIO_C_READ_BLOCKED, 0, NULL);
}
static INLINE long BIO_write_blocked(BIO* b)
{
return BIO_ctrl(b, BIO_C_WRITE_BLOCKED, 0, NULL);
}
static INLINE long BIO_wait_read(BIO* b, long c)
{
return BIO_ctrl(b, BIO_C_WAIT_READ, c, NULL);
}
static INLINE long BIO_wait_write(BIO* b, long c)
{
return BIO_ctrl(b, BIO_C_WAIT_WRITE, c, NULL);
}
FREERDP_LOCAL BIO_METHOD* BIO_s_simple_socket(void);
FREERDP_LOCAL BIO_METHOD* BIO_s_buffered_socket(void);