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

server: proxy: refactor

Browse Source
This commit is contained in:
Kobi Mizrachi 2020-05-19 14:42:26 +03:00
parent eb088e0812
commit 9de59051f6
4 changed files with 39 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/proxy/modules/modules_api.h
View File

@ -106,7 +106,7 @@ typedef struct channel_data_event_info
/* actual data */
const BYTE* data;
int data_len;
size_t data_len;
} proxyChannelDataEventInfo;
#define WINPR_PACK_POP
#include <winpr/pack.h>

2
server/proxy/pf_client.c
View File

@ -177,7 +177,7 @@ static BOOL pf_client_pre_connect(freerdp* instance)
* Also, OrderSupport need to be zeroed, because it is currently not supported.
*/
settings->GlyphSupportLevel = GLYPH_SUPPORT_NONE;
ZeroMemory(instance->settings->OrderSupport, 32);
ZeroMemory(settings->OrderSupport, 32);
settings->SupportDynamicChannels = TRUE;

80
server/proxy/pf_context.c
View File

@ -112,49 +112,46 @@ BOOL pf_context_init_server_context(freerdp_peer* client)
return freerdp_peer_context_new(client);
}
/*
* pf_context_copy_settings copies settings from `src` to `dst`.
* when using this function, is_dst_server must be set to TRUE if the destination
* settings are server's settings. otherwise, they must be set to FALSE.
*/
BOOL pf_context_copy_settings(rdpSettings* dst, const rdpSettings* src)
{
rdpSettings* before_copy = freerdp_settings_clone(dst);
BOOL rc = FALSE;
rdpSettings* before_copy;
if (!dst || !src)
return FALSE;
before_copy = freerdp_settings_clone(dst);
if (!before_copy)
return FALSE;
#define REVERT_STR_VALUE(name) \
free(dst->name); \
dst->name = NULL; \
if (before_copy->name && !(dst->name = _strdup(before_copy->name))) \
goto out_fail
if (!freerdp_settings_copy(dst, src))
{
freerdp_settings_free(before_copy);
return FALSE;
}
free(dst->ConfigPath);
free(dst->PrivateKeyContent);
free(dst->RdpKeyContent);
free(dst->RdpKeyFile);
free(dst->PrivateKeyFile);
free(dst->CertificateFile);
free(dst->CertificateName);
free(dst->CertificateContent);
/* adjust pointer to instance pointer */
/* keep original ServerMode value */
dst->ServerMode = before_copy->ServerMode;
/* revert some values that must not be changed */
dst->ConfigPath = _strdup(before_copy->ConfigPath);
dst->PrivateKeyContent = _strdup(before_copy->PrivateKeyContent);
dst->RdpKeyContent = _strdup(before_copy->RdpKeyContent);
dst->RdpKeyFile = _strdup(before_copy->RdpKeyFile);
dst->PrivateKeyFile = _strdup(before_copy->PrivateKeyFile);
dst->CertificateFile = _strdup(before_copy->CertificateFile);
dst->CertificateName = _strdup(before_copy->CertificateName);
dst->CertificateContent = _strdup(before_copy->CertificateContent);
REVERT_STR_VALUE(ConfigPath);
REVERT_STR_VALUE(PrivateKeyContent);
REVERT_STR_VALUE(RdpKeyContent);
REVERT_STR_VALUE(RdpKeyFile);
REVERT_STR_VALUE(PrivateKeyFile);
REVERT_STR_VALUE(CertificateFile);
REVERT_STR_VALUE(CertificateName);
REVERT_STR_VALUE(CertificateContent);
if (!dst->ServerMode)
{
/* adjust instance pointer for client's context */
/* adjust instance pointer */
dst->instance = before_copy->instance;
/*
@ -168,8 +165,11 @@ BOOL pf_context_copy_settings(rdpSettings* dst, const rdpSettings* src)
dst->RdpServerRsaKey = NULL;
}
rc = TRUE;
out_fail:
freerdp_settings_free(before_copy);
return TRUE;
return rc;
}
pClientContext* pf_context_create_client_context(rdpSettings* clientSettings)
@ -203,42 +203,32 @@ proxyData* proxy_data_new(void)
BYTE temp[16];
proxyData* pdata = calloc(1, sizeof(proxyData));
if (pdata == NULL)
{
if (!pdata)
return NULL;
}
if (!(pdata->abort_event = CreateEvent(NULL, TRUE, FALSE, NULL)))
{
proxy_data_free(pdata);
return NULL;
}
goto error;
if (!(pdata->gfx_server_ready = CreateEvent(NULL, TRUE, FALSE, NULL)))
{
proxy_data_free(pdata);
return NULL;
}
goto error;
winpr_RAND((BYTE*)&temp, 16);
if (!(pdata->session_id = winpr_BinToHexString(temp, 16, FALSE)))
{
proxy_data_free(pdata);
return NULL;
}
goto error;
if (!(pdata->modules_info = HashTable_New(FALSE)))
{
proxy_data_free(pdata);
return NULL;
}
goto error;
/* modules_info maps between plugin name to custom data */
pdata->modules_info->hash = HashTable_StringHash;
pdata->modules_info->keyCompare = HashTable_StringCompare;
pdata->modules_info->keyClone = HashTable_StringClone;
pdata->modules_info->keyFree = HashTable_StringFree;
return pdata;
error:
proxy_data_free(pdata);
return NULL;
}
/* updates circular pointers between proxyData and pClientContext instances */

8
server/proxy/pf_server.c
View File

@ -60,11 +60,8 @@ static BOOL pf_server_parse_target_from_routing_token(rdpContext* context, char*
const char* routing_token = freerdp_nego_get_routing_token(context, &routing_token_length);
pServerContext* ps = (pServerContext*)context;
if (routing_token == NULL)
{
/* no routing token */
if (!routing_token)
return FALSE;
}
if ((routing_token_length <= prefix_len) || (routing_token_length >= TARGET_MAX))
{
@ -149,7 +146,7 @@ static BOOL pf_server_post_connect(freerdp_peer* peer)
pc = pf_context_create_client_context(peer->settings);
if (pc == NULL)
{
LOG_ERR(TAG, ps, "[%s]: pf_context_create_client_context failed!");
LOG_ERR(TAG, ps, "failed to create client context!");
return FALSE;
}
@ -160,7 +157,6 @@ static BOOL pf_server_post_connect(freerdp_peer* peer)
if (!pf_server_get_target_info(peer->context, client_settings, pdata->config))
{
LOG_INFO(TAG, ps, "pf_server_get_target_info failed!");
return FALSE;
}