Merge pull request #970 from ccc-aaa/master

Fix compile errors when compiling against freerdp3
This commit is contained in:
van Hauser 2025-02-18 09:18:43 +01:00 committed by GitHub
commit e4367b2f13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -16,24 +16,30 @@ void dummy_rdp() { printf("\n"); }
#else #else
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <freerdp/version.h>
freerdp *instance = 0; freerdp *instance = 0;
BOOL rdp_connect(char *server, int32_t port, char *domain, char *login, char *password) { BOOL rdp_connect(char *server, int32_t port, char *domain, char *login, char *password) {
int32_t err = 0; int32_t err = 0;
instance->settings->Username = login; rdpSettings* settings = instance->context->settings;
instance->settings->Password = password;
instance->settings->IgnoreCertificate = TRUE; settings->Username = login;
settings->Password = password;
settings->IgnoreCertificate = TRUE;
if (password[0] == 0) if (password[0] == 0)
instance->settings->AuthenticationOnly = FALSE; settings->AuthenticationOnly = FALSE;
else else
instance->settings->AuthenticationOnly = TRUE; settings->AuthenticationOnly = TRUE;
instance->settings->ServerHostname = server; settings->ServerHostname = server;
instance->settings->ServerPort = port; settings->ServerPort = port;
instance->settings->Domain = domain; settings->Domain = domain;
instance->settings->MaxTimeInCheckLoop = 100;
#if FREERDP_VERSION_MAJOR == 2
settings->MaxTimeInCheckLoop = 100;
#endif
// freerdp timeout format is microseconds -> default:15000 // freerdp timeout format is microseconds -> default:15000
instance->settings->TcpConnectTimeout = hydra_options.waittime * 1000; settings->TcpConnectTimeout = hydra_options.waittime * 1000;
instance->settings->TlsSecLevel = 0; settings->TlsSecLevel = 0;
freerdp_connect(instance); freerdp_connect(instance);
err = freerdp_get_last_error(instance->context); err = freerdp_get_last_error(instance->context);
return err; return err;