core: Enable network auto detection by default

(cherry picked from commit ce3edb00ef7471fc80b1991d126342aedc2d4c93)

diff --git a/libfreerdp/core/autodetect.c b/libfreerdp/core/autodetect.c
index 156ca54..bc116ba 100644 (file)
--- a/libfreerdp/core/autodetect.c
+++ b/libfreerdp/core/autodetect.c
@@ -593,11 +593,10 @@ int rdp_recv_autodetect_request_packet(rdpRdp* rdp, wStream* s)
 
        if (!rdp->settings->NetworkAutoDetect)
        {
-               WLog_ERR(AUTODETECT_TAG,
-                        "Received a [MS-RDPBCGR] 2.2.14.1.1 RTT Measure Request (RDP_RTT_REQUEST) [%s] "
-                        "message but support was not enabled",
-                        autodetect_request_type_to_string(autodetectReqPdu.requestType));
-               return -1;
+               WLog_WARN(AUTODETECT_TAG,
+                         "Received a [MS-RDPBCGR] 2.2.14.1.1 RTT Measure Request (RDP_RTT_REQUEST) [%s] "
+                         "message but support was not enabled",
+                         autodetect_request_type_to_string(autodetectReqPdu.requestType));
        }
 
        if (autodetectReqPdu.headerTypeId != TYPE_ID_AUTODETECT_REQUEST)
@@ -671,11 +670,10 @@ int rdp_recv_autodetect_response_packet(rdpRdp* rdp, wStream* s)
 
        if (!rdp->settings->NetworkAutoDetect)
        {
-               WLog_ERR(AUTODETECT_TAG,
-                        "Received a [MS-RDPBCGR] 2.2.14.2.1 RTT Measure Response (RDP_RTT_RESPONSE) [%s] "
-                        "message but support was not enabled",
-                        autodetect_request_type_to_string(autodetectRspPdu.responseType));
-               return -1;
+               WLog_WARN(AUTODETECT_TAG,
+                         "Received a [MS-RDPBCGR] 2.2.14.2.1 RTT Measure Response (RDP_RTT_RESPONSE) [%s] "
+                         "message but support was not enabled",
+                         autodetect_request_type_to_string(autodetectRspPdu.responseType));
        }
 
        if (autodetectRspPdu.headerTypeId != TYPE_ID_AUTODETECT_RESPONSE)

diff --git a/libfreerdp/core/settings.c b/libfreerdp/core/settings.c
index 23f5f05..d70b2e5 100644 (file)
--- a/libfreerdp/core/settings.c
+++ b/libfreerdp/core/settings.c
@@ -351,6 +351,7 @@ rdpSettings* freerdp_settings_new(DWORD flags)
        settings->DisableMenuAnims = TRUE;
        settings->DisableThemes = FALSE;
        settings->ConnectionType = CONNECTION_TYPE_LAN;
+       settings->NetworkAutoDetect = TRUE;
        settings->EncryptionMethods = ENCRYPTION_METHOD_NONE;
        settings->EncryptionLevel = ENCRYPTION_LEVEL_NONE;
        settings->FIPSMode = FALSE;