From 59193749be529f2b0323e1767ceb4edc7a4eebc0 Mon Sep 17 00:00:00 2001 From: Jidong Chen Date: Thu, 30 Mar 2023 22:14:05 +0800 Subject: [PATCH 1/2] Fixed bug #187 in netinterfaces.cpp --- src/netinterfaces.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/netinterfaces.cpp b/src/netinterfaces.cpp index 860670fa..7ae97c2f 100644 --- a/src/netinterfaces.cpp +++ b/src/netinterfaces.cpp @@ -87,7 +87,7 @@ std::vector lsl::get_local_interfaces() { // No address? Skip. if (addr->ifa_addr == nullptr) continue; LOG_F(INFO, "netif '%s' (status: %d, multicast: %d, broadcast: %d)", addr->ifa_name, - addr->ifa_flags & IFF_MULTICAST, addr->ifa_flags & IFF_UP, + addr->ifa_flags & IFF_UP, addr->ifa_flags & IFF_MULTICAST, addr->ifa_flags & IFF_BROADCAST); // Interface doesn't support multicast? Skip. if (!(addr->ifa_flags & IFF_MULTICAST)) continue; From f0d30d9de2e3af927599f9595a019b87a14d5519 Mon Sep 17 00:00:00 2001 From: Jidong Chen Date: Sat, 6 May 2023 17:33:19 +0800 Subject: [PATCH 2/2] Fix lsl_cpp.h exception handling For error code lsl_lost_error, check_error() shall throw lost_error rather than timeout_error. --- include/lsl_cpp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/lsl_cpp.h b/include/lsl_cpp.h index 72d58819..02997044 100644 --- a/include/lsl_cpp.h +++ b/include/lsl_cpp.h @@ -1705,7 +1705,7 @@ inline int32_t check_error(int32_t ec) { switch (ec) { case lsl_timeout_error: throw timeout_error("The operation has timed out."); case lsl_lost_error: - throw timeout_error( + throw lost_error( "The stream has been lost; to continue reading, you need to re-resolve it."); case lsl_argument_error: throw std::invalid_argument("An argument was incorrectly specified.");