Fixed redirection with session brokers.

* Only reconnect channels on redirect, if they have already been connected.
* Prefer TargetNetAddress over FQDN to connect.

diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c
index 3b3b689..3a8cb6c 100644 (file)
--- a/libfreerdp/core/connection.c
+++ b/libfreerdp/core/connection.c
@@ -371,18 +371,18 @@ BOOL rdp_client_redirect(rdpRdp* rdp)
        }
        else
        {
-               if (settings->RedirectionFlags & LB_TARGET_FQDN)
+        if (settings->RedirectionFlags & LB_TARGET_NET_ADDRESS)
                {
                        free(settings->ServerHostname);
-                       settings->ServerHostname = _strdup(settings->RedirectionTargetFQDN);
+                       settings->ServerHostname = _strdup(settings->TargetNetAddress);
 
                        if (!settings->ServerHostname)
                                return FALSE;
                }
-               else if (settings->RedirectionFlags & LB_TARGET_NET_ADDRESS)
+               else if (settings->RedirectionFlags & LB_TARGET_FQDN)
                {
                        free(settings->ServerHostname);
-                       settings->ServerHostname = _strdup(settings->TargetNetAddress);
+                       settings->ServerHostname = _strdup(settings->RedirectionTargetFQDN);
 
                        if (!settings->ServerHostname)
                                return FALSE;

diff --git a/libfreerdp/core/redirection.c b/libfreerdp/core/redirection.c
index af030aa..ab96647 100644 (file)
--- a/libfreerdp/core/redirection.c
+++ b/libfreerdp/core/redirection.c
@@ -156,14 +156,14 @@ int rdp_redirection_apply_settings(rdpRdp* rdp)
                if (!settings->RedirectionTargetFQDN)
                        return -1;
        }
-       else if (settings->RedirectionFlags & LB_TARGET_NET_ADDRESS)
+       if (settings->RedirectionFlags & LB_TARGET_NET_ADDRESS)
        {
                free(settings->TargetNetAddress);
                settings->TargetNetAddress = _strdup(redirection->TargetNetAddress);
                if (!settings->TargetNetAddress)
                        return -1;
        }
-       else if (settings->RedirectionFlags & LB_TARGET_NETBIOS_NAME)
+       if (settings->RedirectionFlags & LB_TARGET_NETBIOS_NAME)
        {
                free(settings->RedirectionTargetNetBiosName);
                settings->RedirectionTargetNetBiosName = _strdup(redirection->TargetNetBiosName);