morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 08:24:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

libfreerdp-core/nego: add connection error handling.

Browse Source
This commit is contained in:
Vic Lee
2011-08-13 12:40:14 +08:00
parent dff1de0a2c
commit b64bcecb75
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libfreerdp-core/nego.c
View File

@@ -93,23 +93,23 @@ boolean nego_connect(rdpNego* nego)
* @return
*/
int nego_tcp_connect(rdpNego* nego)
boolean nego_tcp_connect(rdpNego* nego)
{
if (nego->tcp_connected == 0)
{
if (transport_connect(nego->transport, nego->hostname, nego->port) == False)
{
nego->tcp_connected = 0;
return 0;
return False;
}
else
{
nego->tcp_connected = 1;
return 1;
return True;
}
}
return 1;
return True;
}
/**
@@ -138,7 +138,12 @@ void nego_attempt_nla(rdpNego* nego)
DEBUG_NEGO("Attempting NLA security");
nego_tcp_connect(nego);
if (!nego_tcp_connect(nego))
{
nego->state = NEGO_STATE_FAIL;
return;
}
nego_send_negotiation_request(nego);
nego_recv_response(nego);
@@ -167,7 +172,12 @@ void nego_attempt_tls(rdpNego* nego)
DEBUG_NEGO("Attempting TLS security");
nego_tcp_connect(nego);
if (!nego_tcp_connect(nego))
{
nego->state = NEGO_STATE_FAIL;
return;
}
nego_send_negotiation_request(nego);
nego_recv_response(nego);
@@ -194,7 +204,12 @@ void nego_attempt_rdp(rdpNego* nego)
DEBUG_NEGO("Attempting RDP security");
nego_tcp_connect(nego);
if (!nego_tcp_connect(nego))
{
nego->state = NEGO_STATE_FAIL;
return;
}
nego_send_negotiation_request(nego);
nego_recv_response(nego);