fix(windows): resolve disappearing cursor after KVM switch

Author: tstokes22

src/platform/linux/misc.cpp

@@ -10,22 +10,14 @@
 
 // standard includes
 #include <fstream>
-#include <iomanip>
 #include <iostream>
-#include <sstream>
 
 // platform includes
 #include <arpa/inet.h>
 #include <dlfcn.h>
 #include <ifaddrs.h>
-#include <netinet/in.h>
 #include <netinet/udp.h>
 #include <pwd.h>
-#include <sys/socket.h>
-
-#ifdef __FreeBSD__
-  #include <net/if_dl.h>  // For sockaddr_dl, LLADDR, and AF_LINK
-#endif
 
 // lib includes
 #include <boost/asio/ip/address.hpp>
@@ -49,16 +41,6 @@
   #define SUNSHINE_GNUC_EXTENSION
 #endif
 
-#ifndef SOL_IP
-  #define SOL_IP IPPROTO_IP
-#endif
-#ifndef SOL_IPV6
-  #define SOL_IPV6 IPPROTO_IPV6
-#endif
-#ifndef SOL_UDP
-  #define SOL_UDP IPPROTO_UDP
-#endif
-
 using namespace std::literals;
 namespace fs = std::filesystem;
 namespace bp = boost::process::v1;
@@ -232,40 +214,6 @@ namespace platf {
 
   std::string get_mac_address(const std::string_view &address) {
     auto ifaddrs = get_ifaddrs();
-
-#ifdef __FreeBSD__
-    // On FreeBSD, we need to find the interface name first, then look for its AF_LINK entry
-    std::string interface_name;
-    for (auto pos = ifaddrs.get(); pos != nullptr; pos = pos->ifa_next) {
-      if (pos->ifa_addr && address == from_sockaddr(pos->ifa_addr)) {
-        interface_name = pos->ifa_name;
-        break;
-      }
-    }
-
-    if (!interface_name.empty()) {
-      // Find the AF_LINK entry for this interface to get MAC address
-      for (auto pos = ifaddrs.get(); pos != nullptr; pos = pos->ifa_next) {
-        if (pos->ifa_addr && pos->ifa_addr->sa_family == AF_LINK &&
-            interface_name == pos->ifa_name) {
-          auto sdl = (struct sockaddr_dl *) pos->ifa_addr;
-          auto mac = (unsigned char *) LLADDR(sdl);
-
-          // Format MAC address as XX:XX:XX:XX:XX:XX
-          std::ostringstream mac_stream;
-          mac_stream << std::hex << std::setfill('0');
-          for (int i = 0; i < sdl->sdl_alen; i++) {
-            if (i > 0) {
-              mac_stream << ':';
-            }
-            mac_stream << std::setw(2) << (int) mac[i];
-          }
-          return mac_stream.str();
-        }
-      }
-    }
-#else
-    // On Linux, read MAC address from sysfs
     for (auto pos = ifaddrs.get(); pos != nullptr; pos = pos->ifa_next) {
       if (pos->ifa_addr && address == from_sockaddr(pos->ifa_addr)) {
         std::ifstream mac_file("/sys/class/net/"s + pos->ifa_name + "/address");
@@ -276,7 +224,6 @@ namespace platf {
         }
       }
     }
-#endif
 
     BOOST_LOG(warning) << "Unable to find MAC address for "sv << address;
     return "00:00:00:00:00:00"s;
@@ -323,6 +270,10 @@ namespace platf {
     }
   }
 
+  void enable_mouse_keys() {
+    // Unimplemented
+  }
+
   void adjust_thread_priority(thread_priority_e priority) {
     // Unimplemented
   }
@@ -430,12 +381,7 @@ namespace platf {
     }
 
     union {
-#ifdef IP_PKTINFO
       char buf[CMSG_SPACE(sizeof(uint16_t)) + std::max(CMSG_SPACE(sizeof(struct in_pktinfo)), CMSG_SPACE(sizeof(struct in6_pktinfo)))];
-#elif defined(IP_SENDSRCADDR)
-      // FreeBSD uses IP_SENDSRCADDR with struct in_addr instead of IP_PKTINFO with struct in_pktinfo
-      char buf[CMSG_SPACE(sizeof(uint16_t)) + std::max(CMSG_SPACE(sizeof(struct in_addr)), CMSG_SPACE(sizeof(struct in6_pktinfo)))];
-#endif
       struct cmsghdr alignment;
     } cmbuf = {};  // Must be zeroed for CMSG_NXTHDR()
 
@@ -461,7 +407,6 @@ namespace platf {
       pktinfo_cm->cmsg_len = CMSG_LEN(sizeof(pktInfo));
       memcpy(CMSG_DATA(pktinfo_cm), &pktInfo, sizeof(pktInfo));
     } else {
-#ifdef IP_PKTINFO
       struct in_pktinfo pktInfo;
 
       struct sockaddr_in saddr_v4 = to_sockaddr(send_info.source_address.to_v4(), 0);
@@ -474,18 +419,6 @@ namespace platf {
       pktinfo_cm->cmsg_type = IP_PKTINFO;
       pktinfo_cm->cmsg_len = CMSG_LEN(sizeof(pktInfo));
       memcpy(CMSG_DATA(pktinfo_cm), &pktInfo, sizeof(pktInfo));
-#elif defined(IP_SENDSRCADDR)
-      // FreeBSD uses IP_SENDSRCADDR with struct in_addr instead of IP_PKTINFO
-      struct sockaddr_in saddr_v4 = to_sockaddr(send_info.source_address.to_v4(), 0);
-      struct in_addr src_addr = saddr_v4.sin_addr;
-
-      cmbuflen += CMSG_SPACE(sizeof(src_addr));
-
-      pktinfo_cm->cmsg_level = IPPROTO_IP;
-      pktinfo_cm->cmsg_type = IP_SENDSRCADDR;
-      pktinfo_cm->cmsg_len = CMSG_LEN(sizeof(src_addr));
-      memcpy(CMSG_DATA(pktinfo_cm), &src_addr, sizeof(src_addr));
-#endif
     }
 
     auto const max_iovs_per_msg = send_info.payload_buffers.size() + (send_info.headers ? 1 : 0);
@@ -578,8 +511,8 @@ namespace platf {
 
     {
       // If GSO is not supported, use sendmmsg() instead.
-      std::vector<struct mmsghdr> msgs(send_info.block_count);
-      std::vector<struct iovec> iovs(send_info.block_count * (send_info.headers ? 2 : 1));
+      struct mmsghdr msgs[send_info.block_count];
+      struct iovec iovs[send_info.block_count * (send_info.headers ? 2 : 1)];
       int iov_idx = 0;
       for (size_t i = 0; i < send_info.block_count; i++) {
         msgs[i].msg_len = 0;
@@ -655,12 +588,7 @@ namespace platf {
     }
 
     union {
-#ifdef IP_PKTINFO
       char buf[std::max(CMSG_SPACE(sizeof(struct in_pktinfo)), CMSG_SPACE(sizeof(struct in6_pktinfo)))];
-#elif defined(IP_SENDSRCADDR)
-      // FreeBSD uses IP_SENDSRCADDR with struct in_addr instead of IP_PKTINFO with struct in_pktinfo
-      char buf[std::max(CMSG_SPACE(sizeof(struct in_addr)), CMSG_SPACE(sizeof(struct in6_pktinfo)))];
-#endif
       struct cmsghdr alignment;
     } cmbuf;
 
@@ -684,7 +612,6 @@ namespace platf {
       pktinfo_cm->cmsg_len = CMSG_LEN(sizeof(pktInfo));
       memcpy(CMSG_DATA(pktinfo_cm), &pktInfo, sizeof(pktInfo));
     } else {
-#ifdef IP_PKTINFO
       struct in_pktinfo pktInfo;
 
       struct sockaddr_in saddr_v4 = to_sockaddr(send_info.source_address.to_v4(), 0);
@@ -697,18 +624,6 @@ namespace platf {
       pktinfo_cm->cmsg_type = IP_PKTINFO;
       pktinfo_cm->cmsg_len = CMSG_LEN(sizeof(pktInfo));
       memcpy(CMSG_DATA(pktinfo_cm), &pktInfo, sizeof(pktInfo));
-#elif defined(IP_SENDSRCADDR)
-      // FreeBSD uses IP_SENDSRCADDR with struct in_addr instead of IP_PKTINFO
-      struct sockaddr_in saddr_v4 = to_sockaddr(send_info.source_address.to_v4(), 0);
-      struct in_addr src_addr = saddr_v4.sin_addr;
-
-      cmbuflen += CMSG_SPACE(sizeof(src_addr));
-
-      pktinfo_cm->cmsg_level = IPPROTO_IP;
-      pktinfo_cm->cmsg_type = IP_SENDSRCADDR;
-      pktinfo_cm->cmsg_len = CMSG_LEN(sizeof(src_addr));
-      memcpy(CMSG_DATA(pktinfo_cm), &src_addr, sizeof(src_addr));
-#endif
     }
 
     struct iovec iovs[2];
@@ -842,18 +757,13 @@ namespace platf {
     // reset SO_PRIORITY back to 0.
     //
     // 6 is the highest priority that can be used without SYS_CAP_ADMIN.
-#ifndef SO_PRIORITY
-    // FreeBSD doesn't support SO_PRIORITY, so we skip this
-    BOOST_LOG(debug) << "SO_PRIORITY not supported on this platform, skipping traffic priority setting";
-#else
     int priority = data_type == qos_data_type_e::audio ? 6 : 5;
     if (setsockopt(sockfd, SOL_SOCKET, SO_PRIORITY, &priority, sizeof(priority)) == 0) {
       // Reset SO_PRIORITY to 0 when QoS is disabled
       reset_options.emplace_back(std::make_tuple(SOL_SOCKET, SO_PRIORITY, 0));
     } else {
       BOOST_LOG(error) << "Failed to set SO_PRIORITY: "sv << errno;
     }
-#endif
 
     return std::make_unique<qos_t>(sockfd, reset_options);
   }

src/platform/macos/misc.mm

@@ -210,6 +210,10 @@ void open_url(const std::string &url) {
     }
   }
 
+  void enable_mouse_keys() {
+    // Unimplemented
+  }
+
   void adjust_thread_priority(thread_priority_e priority) {
     // Unimplemented
   }

src/video.cpp

@@ -897,7 +897,7 @@ namespace video {
     H264_ONLY | PARALLEL_ENCODING | ALWAYS_REPROBE | YUV444_SUPPORT
   };
 
-#if defined(__linux__) || defined(linux) || defined(__linux) || defined(__FreeBSD__)
+#ifdef __linux__
   encoder_t vaapi {
     "vaapi"sv,
     std::make_unique<encoder_platform_formats_avcodec>(
@@ -1032,7 +1032,7 @@ namespace video {
     &quicksync,
     &amdvce,
 #endif
-#if defined(__linux__) || defined(linux) || defined(__linux) || defined(__FreeBSD__)
+#ifdef __linux__
     &vaapi,
 #endif
 #ifdef __APPLE__
@@ -1977,6 +1977,10 @@ namespace video {
       }
 
       session->request_normal_frame();
+      
+      // While streaming check to see if the mouse is present and enable Mouse Keys to force the cursor to appear
+      // This is useful for KVM switch scenarios where mouse may disappear during streaming
+      platf::enable_mouse_keys();
     }
   }
 
@@ -2467,8 +2471,8 @@ namespace video {
     encoder.av1.capabilities.set();
 
     // First, test encoder viability
-    config_t config_max_ref_frames {1920, 1080, 60, 6000, 1000, 1, 1, 1, 0, 0, 0};
-    config_t config_autoselect {1920, 1080, 60, 6000, 1000, 1, 0, 1, 0, 0, 0};
+    config_t config_max_ref_frames {1920, 1080, 60, 1000, 1, 1, 1, 0, 0, 0};
+    config_t config_autoselect {1920, 1080, 60, 1000, 1, 0, 1, 0, 0, 0};
 
     // If the encoder isn't supported at all (not even H.264), bail early
     reset_display(disp, encoder.platform_formats->dev_type, output_name, config_autoselect);
@@ -2563,14 +2567,14 @@ namespace video {
     {
       // H.264 is special because encoders may support YUV 4:4:4 without supporting 10-bit color depth
       if (encoder.flags & YUV444_SUPPORT) {
-        config_t config_h264_yuv444 {1920, 1080, 60, 6000, 1000, 1, 0, 1, 0, 0, 1};
+        config_t config_h264_yuv444 {1920, 1080, 60, 1000, 1, 0, 1, 0, 0, 1};
         encoder.h264[encoder_t::YUV444] = disp->is_codec_supported(encoder.h264.name, config_h264_yuv444) &&
                                           validate_config(disp, encoder, config_h264_yuv444) >= 0;
       } else {
         encoder.h264[encoder_t::YUV444] = false;
       }
 
-      const config_t generic_hdr_config = {1920, 1080, 60, 6000, 1000, 1, 0, 3, 1, 1, 0};
+      const config_t generic_hdr_config = {1920, 1080, 60, 1000, 1, 0, 3, 1, 1, 0};
 
       // Reset the display since we're switching from SDR to HDR
       reset_display(disp, encoder.platform_formats->dev_type, output_name, generic_hdr_config);