From 4d1ce89c2261ad3d9e72e22c5749839dbd1300ec Mon Sep 17 00:00:00 2001
From: Vojtech Bubnik <bubnikv@gmail.com>
Date: Fri, 3 Dec 2021 08:12:47 +0100
Subject: [PATCH] Follow-up to f4dfbb69e2e4397ff7369fd1709ecf6da17aab83 Now
 that libcurl is used for URL host substitution, we want to make sure that the
 new code compiles on Windows only because that is where we need to do the URL
 host substitution due to Windows 10/11 mDNS resolve issues and because we
 have a control on the libcurl version statically linked on Windows, so we are
 sure the URL API is available.

---
 src/slic3r/Utils/OctoPrint.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/slic3r/Utils/OctoPrint.cpp b/src/slic3r/Utils/OctoPrint.cpp
index 9842d7d89a..43e6145f50 100644
--- a/src/slic3r/Utils/OctoPrint.cpp
+++ b/src/slic3r/Utils/OctoPrint.cpp
@@ -26,6 +26,8 @@ namespace pt = boost::property_tree;
 
 namespace Slic3r {
 
+#ifdef WIN32
+// Workaround for Windows 10/11 mDNS resolve issue, where two mDNS resolves in succession fail.
 namespace {
 std::string substitute_host(const std::string& orig_addr, std::string sub_addr)
 {
@@ -90,6 +92,7 @@ std::string substitute_host(const std::string& orig_addr, std::string sub_addr)
 #endif
 }
 } //namespace
+#endif // WIN32
 
 OctoPrint::OctoPrint(DynamicPrintConfig *config) :
     m_host(config->opt_string("print_host")),
@@ -146,9 +149,11 @@ bool OctoPrint::test(wxString &msg) const
 #ifdef WIN32
         .ssl_revoke_best_effort(m_ssl_revoke_best_effort)
         .on_ip_resolve([&](std::string address) {
+            // Workaround for Windows 10/11 mDNS resolve issue, where two mDNS resolves in succession fail.
+            // Remember resolved address to be reused at successive REST API call.
             msg = GUI::from_u8(address);
         })
-#endif
+#endif // WIN32
         .perform_sync();
 
     return res;
@@ -185,13 +190,18 @@ bool OctoPrint::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Erro
     std::string url;
     bool res = true;
 
-    bool allow_ip_resolve = GUI::get_app_config()->get("allow_ip_resolve") == "1";
-
-    if (m_host.find("https://") == 0 || test_msg_or_host_ip.empty() || !allow_ip_resolve) {
+#ifdef WIN32
+    // Workaround for Windows 10/11 mDNS resolve issue, where two mDNS resolves in succession fail.
+    if (m_host.find("https://") == 0 || test_msg_or_host_ip.empty() || GUI::get_app_config()->get("allow_ip_resolve") != "1")
+#endif // _WIN32
+    {
         // If https is entered we assume signed ceritificate is being used
         // IP resolving will not happen - it could resolve into address not being specified in cert
         url = make_url("api/files/local");
-    } else {
+    }
+#ifdef WIN32
+    else {
+        // Workaround for Windows 10/11 mDNS resolve issue, where two mDNS resolves in succession fail.
         // Curl uses easy_getinfo to get ip address of last successful transaction.
         // If it got the address use it instead of the stored in "host" variable.
         // This new address returns in "test_msg_or_host_ip" variable.
@@ -200,6 +210,7 @@ bool OctoPrint::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, Erro
         url = substitute_host(make_url("api/files/local", m_host), GUI::into_u8(test_msg_or_host_ip));
         BOOST_LOG_TRIVIAL(info) << "Upload address after ip resolve: " << url;
     }
+#endif // _WIN32
 
     BOOST_LOG_TRIVIAL(info) << boost::format("%1%: Uploading file %2% at %3%, filename: %4%, path: %5%, print: %6%")
         % name