1.2.1

philippe44 · Sep 27, 2023 · 4062514 · 4062514
1 parent 84fa584
commit 4062514
Show file tree

Hide file tree

Showing 35 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 1.2.1
  - (airupnp) unified source with spotconnect
+ - (aircast) revert exclusion of devices based on netmask
  - display iface and network at start
  - update XML_UpdateNode bug
 

diff --git a/aircast/src/aircast.c b/aircast/src/aircast.c
@@ -394,6 +394,14 @@ static void UpdateDevices() {
 	pthread_mutex_unlock(&glMainMutex);
 }
 
+/*----------------------------------------------------------------------------*/
+static bool isMember(struct in_addr host) {
+	for (int i = 0; i < MAX_RENDERERS; i++) {
+		if (glMRDevices[i].Running && CastGetAddr(glMRDevices[i].CastCtx).s_addr == host.s_addr) return true;
+	}
+	return false;
+}
+
 /*----------------------------------------------------------------------------*/
 static bool mDNSsearchCallback(mdnssd_service_t *slist, void *cookie, bool *stop) {
 	struct sMR *Device;
@@ -428,8 +436,7 @@ static bool mDNSsearchCallback(mdnssd_service_t *slist, void *cookie, bool *stop
 		bool Group;
 
 		// is the mDNS record usable or announce made on behalf
-		if ((UDN = GetmDNSAttribute(s->attr, s->attr_count, "id")) == NULL ||
-			(s->host.s_addr != s->addr.s_addr && (s->host.s_addr & glNetmask) == (s->addr.s_addr & glNetmask))) continue;
+		if ((UDN = GetmDNSAttribute(s->attr, s->attr_count, "id")) == NULL || (s->host.s_addr != s->addr.s_addr && isMember(s->host))) continue;
 
 		// is that device already here
 		if ((Device = SearchUDN(UDN)) != NULL) {

diff --git a/aircast/src/castcore.c b/aircast/src/castcore.c
@@ -393,7 +393,7 @@ void CastQueueFlush(cross_queue_t *Queue) {
 }
 
 /*----------------------------------------------------------------------------*/
-void ProcessQueue(tCastCtx *Ctx) {
+static void ProcessQueue(tCastCtx *Ctx) {
 	tReqItem *item;
 
 	if ((item = queue_extract(&Ctx->reqQueue)) == NULL) return;

diff --git a/bin/aircast-freebsd-x86_64 b/bin/aircast-freebsd-x86_64
diff --git a/bin/aircast-freebsd-x86_64-static b/bin/aircast-freebsd-x86_64-static
diff --git a/bin/aircast-linux-aarch64 b/bin/aircast-linux-aarch64
diff --git a/bin/aircast-linux-aarch64-static b/bin/aircast-linux-aarch64-static
diff --git a/bin/aircast-linux-arm b/bin/aircast-linux-arm
diff --git a/bin/aircast-linux-arm-static b/bin/aircast-linux-arm-static
diff --git a/bin/aircast-linux-armv5 b/bin/aircast-linux-armv5
diff --git a/bin/aircast-linux-armv5-static b/bin/aircast-linux-armv5-static
diff --git a/bin/aircast-linux-armv6 b/bin/aircast-linux-armv6
diff --git a/bin/aircast-linux-armv6-static b/bin/aircast-linux-armv6-static
diff --git a/bin/aircast-linux-mips b/bin/aircast-linux-mips
diff --git a/bin/aircast-linux-mips-static b/bin/aircast-linux-mips-static
diff --git a/bin/aircast-linux-mipsel b/bin/aircast-linux-mipsel
diff --git a/bin/aircast-linux-mipsel-static b/bin/aircast-linux-mipsel-static
diff --git a/bin/aircast-linux-powerpc b/bin/aircast-linux-powerpc
diff --git a/bin/aircast-linux-powerpc-static b/bin/aircast-linux-powerpc-static
diff --git a/bin/aircast-linux-sparc64 b/bin/aircast-linux-sparc64
diff --git a/bin/aircast-linux-sparc64-static b/bin/aircast-linux-sparc64-static
diff --git a/bin/aircast-linux-x86 b/bin/aircast-linux-x86
diff --git a/bin/aircast-linux-x86-static b/bin/aircast-linux-x86-static
diff --git a/bin/aircast-linux-x86_64 b/bin/aircast-linux-x86_64
diff --git a/bin/aircast-linux-x86_64-static b/bin/aircast-linux-x86_64-static
diff --git a/bin/aircast-macos b/bin/aircast-macos
diff --git a/bin/aircast-macos-arm64 b/bin/aircast-macos-arm64
diff --git a/bin/aircast-macos-arm64-static b/bin/aircast-macos-arm64-static
diff --git a/bin/aircast-macos-static b/bin/aircast-macos-static
diff --git a/bin/aircast-macos-x86_64 b/bin/aircast-macos-x86_64
diff --git a/bin/aircast-macos-x86_64-static b/bin/aircast-macos-x86_64-static
diff --git a/bin/aircast-solaris-x86_64 b/bin/aircast-solaris-x86_64
diff --git a/bin/aircast-solaris-x86_64-static b/bin/aircast-solaris-x86_64-static
diff --git a/bin/aircast-static.exe b/bin/aircast-static.exe
diff --git a/bin/aircast.exe b/bin/aircast.exe