Set connection error if TCP connect fails.

diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c
index 0bf1bc1..763fd21 100644 (file)
--- a/libfreerdp/core/connection.c
+++ b/libfreerdp/core/connection.c
@@ -279,9 +279,11 @@ BOOL rdp_client_connect(rdpRdp* rdp)
        if (!nego_connect(rdp->nego))
        {
                if (!freerdp_get_last_error(rdp->context))
+               {
                        freerdp_set_last_error(rdp->context, FREERDP_ERROR_SECURITY_NEGO_CONNECT_FAILED);
 
-               WLog_ERR(TAG, "Error: protocol security negotiation or connection failure");
+                       WLog_ERR(TAG, "Error: protocol security negotiation or connection failure");
+               }
                return FALSE;
        }
 

diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c
index ab4db4e..aafd474 100644 (file)
--- a/libfreerdp/core/nego.c
+++ b/libfreerdp/core/nego.c
@@ -157,7 +157,8 @@ BOOL nego_connect(rdpNego* nego)
 
                        if (nego->state == NEGO_STATE_FAIL)
                        {
-                               WLog_ERR(TAG, "Protocol Security Negotiation Failure");
+                               if (freerdp_get_last_error(nego->transport->context) == FREERDP_ERROR_SUCCESS)
+                                       WLog_ERR(TAG, "Protocol Security Negotiation Failure");
                                nego->state = NEGO_STATE_FINAL;
                                return FALSE;
                        }

diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c
index 03f848c..586a110 100644 (file)
--- a/libfreerdp/core/tcp.c
+++ b/libfreerdp/core/tcp.c
@@ -1070,7 +1070,12 @@ int freerdp_tcp_connect(rdpContext* context, rdpSettings* settings,
        BOOL useExternalDefinedSocket = FALSE;
 
        if (!hostname)
+       {
+               if (freerdp_get_last_error(context) == FREERDP_ERROR_SUCCESS)
+                       freerdp_set_last_error(context, FREERDP_ERROR_CONNECT_FAILED);
+
                return -1;
+       }
 
        if (hostname[0] == '/')
                ipcSocket = TRUE;
@@ -1083,7 +1088,12 @@ int freerdp_tcp_connect(rdpContext* context, rdpSettings* settings,
                sockfd = freerdp_uds_connect(hostname);
 
                if (sockfd < 0)
+               {
+                       if (freerdp_get_last_error(context) == FREERDP_ERROR_SUCCESS)
+                               freerdp_set_last_error(context, FREERDP_ERROR_CONNECT_FAILED);
+
                        return -1;
+               }
        }
        else if (useExternalDefinedSocket)
                sockfd = port;
@@ -1146,6 +1156,9 @@ int freerdp_tcp_connect(rdpContext* context, rdpSettings* settings,
 
                        if (sockfd < 0)
                        {
+                               if (freerdp_get_last_error(context) == FREERDP_ERROR_SUCCESS)
+                                       freerdp_set_last_error(context, FREERDP_ERROR_CONNECT_FAILED);
+
                                freeaddrinfo(result);
                                return -1;
                        }
@@ -1155,6 +1168,10 @@ int freerdp_tcp_connect(rdpContext* context, rdpSettings* settings,
                        {
                                freeaddrinfo(result);
                                close(sockfd);
+
+                               if (freerdp_get_last_error(context) == FREERDP_ERROR_SUCCESS)
+                                       freerdp_set_last_error(context, FREERDP_ERROR_CONNECT_FAILED);
+
                                WLog_ERR(TAG, "failed to connect to %s", hostname);
                                return -1;
                        }
@@ -1171,6 +1188,9 @@ int freerdp_tcp_connect(rdpContext* context, rdpSettings* settings,
                if (!useExternalDefinedSocket)
                        close(sockfd);
 
+               if (freerdp_get_last_error(context) == FREERDP_ERROR_SUCCESS)
+                       freerdp_set_last_error(context, FREERDP_ERROR_CONNECT_FAILED);
+
                WLog_ERR(TAG, "Couldn't get socket ip address");
                return -1;
        }
@@ -1195,6 +1215,10 @@ int freerdp_tcp_connect(rdpContext* context, rdpSettings* settings,
                        if (setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, (void*) &optval, optlen) < 0)
                        {
                                close(sockfd);
+
+                               if (freerdp_get_last_error(context) == FREERDP_ERROR_SUCCESS)
+                                       freerdp_set_last_error(context, FREERDP_ERROR_CONNECT_FAILED);
+
                                WLog_ERR(TAG, "unable to set receive buffer len");
                                return -1;
                        }
@@ -1206,6 +1230,10 @@ int freerdp_tcp_connect(rdpContext* context, rdpSettings* settings,
                if (!freerdp_tcp_set_keep_alive_mode(sockfd))
                {
                        close(sockfd);
+
+                       if (freerdp_get_last_error(context) == FREERDP_ERROR_SUCCESS)
+                               freerdp_set_last_error(context, FREERDP_ERROR_CONNECT_FAILED);
+
                        WLog_ERR(TAG, "Couldn't set keep alive mode.");
                        return -1;
                }
@@ -1214,6 +1242,10 @@ int freerdp_tcp_connect(rdpContext* context, rdpSettings* settings,
        if (WaitForSingleObject(context->abortEvent, 0) == WAIT_OBJECT_0)
        {
                close(sockfd);
+
+               if (freerdp_get_last_error(context) == FREERDP_ERROR_SUCCESS)
+                       freerdp_set_last_error(context, FREERDP_ERROR_CONNECT_CANCELLED);
+
                return -1;
        }