mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-27 11:54:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

TLS over TLS baseline functionality.

Browse Source 
TLS over TLS works and we get screen drawing and server interaction.
Network traffic flows in spurts with frequent apparent hangups.
This commit is contained in:
Dan Bungert 2013-10-24 12:31:28 -06:00
parent eb25e45149
commit db890d9bf2
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfreerdp/core/connection.c
View File

@ -211,12 +211,10 @@ BOOL rdp_client_connect(rdpRdp* rdp)
free(cookie);
settings->RdpSecurity = TRUE;
/* settings->TlsSecurity = FALSE; */
settings->TlsSecurity = TRUE;
settings->NlaSecurity = FALSE;
settings->ExtSecurity = FALSE;
settings->TlsSecurity = TRUE;
//settings->NlaSecurity = TRUE;
}
else
{

22
libfreerdp/core/transport.c
View File

@ -106,8 +106,8 @@ BOOL transport_connect_rdp(rdpTransport* transport)
long transport_bio_tsg_callback(BIO* bio, int mode, const char* argp, int argi, long argl, long ret)
{
printf("transport_bio_tsg_callback: mode: %d argp: %p argi: %d argl: %d ret: %d\n",
mode, argp, argi, argl, ret);
/* printf("transport_bio_tsg_callback: mode: %d argp: %p argi: %d argl: %d ret: %d\n", */
/* mode, argp, argi, argl, ret); */
return 1;
}
@ -117,12 +117,12 @@ static int transport_bio_tsg_write(BIO* bio, const char* buf, int num)
int status;
rdpTsg* tsg;
printf("transport_bio_tsg_write: %d\n", num);
/* printf("transport_bio_tsg_write: %d\n", num); */
tsg = (rdpTsg*) bio->ptr;
status = tsg_write(tsg, (BYTE*) buf, num);
printf("tsg_write: %d\n", status);
/* printf("tsg_write: %d\n", status); */
BIO_clear_retry_flags(bio);
@ -139,12 +139,12 @@ static int transport_bio_tsg_read(BIO* bio, char* buf, int size)
int status;
rdpTsg* tsg;
printf("transport_bio_tsg_read: %d\n", size);
/* printf("transport_bio_tsg_read: %d\n", size); */
tsg = (rdpTsg*) bio->ptr;
status = tsg_read(bio->ptr, (BYTE*) buf, size);
printf("tsg_read: %d\n", status);
/* printf("tsg_read: %d\n", status); */
BIO_clear_retry_flags(bio);
@ -158,19 +158,19 @@ static int transport_bio_tsg_read(BIO* bio, char* buf, int size)
static int transport_bio_tsg_puts(BIO* bio, const char* str)
{
printf("transport_bio_tsg_puts: %d\n", strlen(str));
/* printf("transport_bio_tsg_puts: %d\n", strlen(str)); */
return 1;
}
static int transport_bio_tsg_gets(BIO* bio, char* str, int size)
{
printf("transport_bio_tsg_gets: %d\n", size);
/* printf("transport_bio_tsg_gets: %d\n", size); */
return 1;
}
static long transport_bio_tsg_ctrl(BIO* bio, int cmd, long arg1, void* arg2)
{
printf("transport_bio_tsg_ctrl: cmd: %d arg1: %d arg2: %p\n", cmd, arg1, arg2);
/* printf("transport_bio_tsg_ctrl: cmd: %d arg1: %d arg2: %p\n", cmd, arg1, arg2); */
if(cmd == BIO_CTRL_FLUSH) {
return 1;
}
@ -179,7 +179,7 @@ static long transport_bio_tsg_ctrl(BIO* bio, int cmd, long arg1, void* arg2)
static int transport_bio_tsg_new(BIO* bio)
{
printf("transport_bio_tsg_new\n");
/* printf("transport_bio_tsg_new\n"); */
bio->init = 1;
bio->num = 0;
@ -191,7 +191,7 @@ static int transport_bio_tsg_new(BIO* bio)
static int transport_bio_tsg_free(BIO* bio)
{
printf("transport_bio_tsg_free\n");
/* printf("transport_bio_tsg_free\n"); */
return 1;
}