1.5.3

philippe44 · Dec 26, 2023 · 3b3c275 · 3b3c275
1 parent 8bc0afd
commit 3b3c275
Show file tree

Hide file tree

Showing 37 changed files with 24 additions and 11 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 Note: beware of crypto version (see shairtunes)
 
+1.5.3
+ - when player don't respond to mDNS search, keep them as long as they respond to ping
+
 1.5.2
  - invert 'f' stream_disconnect() and flush test order
 

diff --git a/application/crosstools b/application/crosstools
diff --git a/application/libraop b/application/libraop
diff --git a/application/squeeze2raop/inc/squeezedefs.h b/application/squeeze2raop/inc/squeezedefs.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#define VERSION "v1.5.2"" ("__DATE__" @ "__TIME__")"
+#define VERSION "v1.5.3"" ("__DATE__" @ "__TIME__")"
 
 #define STR_LEN 256
 

diff --git a/application/squeeze2raop/squeeze2raop.c b/application/squeeze2raop/squeeze2raop.c
@@ -636,11 +636,18 @@ static void UpdateDevices() {
 	// walk through the list for device whose timeout expired
 	for (int i = 0; i < MAX_RENDERERS; i++) {
 		struct sMR* Device = glMRDevices + i;
-		if (!Device->Running || Device->Config.RemoveTimeout <= 0 || !Device->Expired || now < Device->Expired + Device->Config.RemoveTimeout * 1000) continue;
+		if (!Device->Running || Device->Config.RemoveTimeout <= 0 || !Device->Expired || 
+			now < Device->Expired + Device->Config.RemoveTimeout * 1000) continue;
 
-		LOG_INFO("[%p]: removing renderer (%s) on timeout", Device, Device->FriendlyName);
-		if (Device->SqueezeHandle) sq_delete_device(Device->SqueezeHandle);
-		DelRaopDevice(Device);
+		if (!ping_host(Device->PlayerIP, 100)) {
+			LOG_INFO("[%p]: removing renderer (%s) on timeout", Device, Device->FriendlyName);
+			if (Device->SqueezeHandle) sq_delete_device(Device->SqueezeHandle);
+			DelRaopDevice(Device);
+		} else {
+			// device is in trouble, but let's renew grace period
+			Device->Expired = now | 0x01;
+			LOG_INFO("[%p]: %s mute to mDNS search, but answers ping, so keep it", Device, Device->FriendlyName);
+		}
 	}
 
 	pthread_mutex_unlock(&glMainMutex);
@@ -665,13 +672,13 @@ static bool mDNSsearchCallback(mdnssd_service_t *slist, void *cookie, bool *stop
 			Device->Expired = 0;
 			// device disconnected
 			if (s->expired) {
-				if (!raopcl_is_connected(Device->Raop) && !Device->Config.RemoveTimeout) {
+				if (!raopcl_is_connected(Device->Raop) && !Device->Config.RemoveTimeout && !ping_host(s->addr, 100)) {
 					LOG_INFO("[%p]: removing renderer (%s)", Device, Device->FriendlyName);
 					if (Device->SqueezeHandle) sq_delete_device(Device->SqueezeHandle);
 					DelRaopDevice(Device);
 				} else {
 					LOG_INFO("[%p]: keep missing renderer (%s)", Device, Device->FriendlyName);
-					Device->Expired = now ? now : 1;
+					Device->Expired = now | 0x01;
 				}
 			// device update - ignore changes in TXT
 			} else if (s->port != Device->PlayerPort || s->addr.s_addr != Device->PlayerIP.s_addr) {
+ −		bin/cliraop-freebsd-x86_64
+ −		bin/cliraop-linux-aarch64
+ −		bin/cliraop-linux-arm
+ −		bin/cliraop-linux-armv5
+ −		bin/cliraop-linux-armv6
+ −		bin/cliraop-linux-mips
+ −		bin/cliraop-linux-mipsel
+ −		bin/cliraop-linux-powerpc
+ −		bin/cliraop-linux-sparc64
+ −		bin/cliraop-linux-x86
+ −		bin/cliraop-linux-x86_64
+ −		bin/cliraop-macos-arm64
+ −		bin/cliraop-macos-x86_64
+ −		bin/cliraop-solaris-x86_64
+ −		bin/cliraop.exe
+1 −1		crosstools
+ −		targets/win32/x86/libraop.lib
+ −		targets/win32/x86/libraop.pdb
+ −		targets/win32/x86/libraop_d.lib
+ −		targets/win32/x86/libraop_d.pdb