Attachment #219615 for bug #251088

View | Details | Raw Unified | Return to bug 251088
Collapse All | Expand All

Lines 1-8 Link Here

(-)multimedia/libhdhomerun/Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libhdhomerun	3	PORTNAME= libhdhomerun
4	PORTVERSION= 20190621	4	PORTVERSION= 20200907
5	PORTREVISION= 1
6	CATEGORIES= multimedia	5	CATEGORIES= multimedia
7	MASTER_SITES= https://download.silicondust.com/hdhomerun/	6	MASTER_SITES= https://download.silicondust.com/hdhomerun/
8	DISTNAME= ${PORTNAME}_${PORTVERSION}	7	DISTNAME= ${PORTNAME}_${PORTVERSION}

Lines 1-3 Link Here

(-)multimedia/libhdhomerun/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1569315689	1	TIMESTAMP = 1605223445
2	SHA256 (libhdhomerun_20190621.tgz) = 9a60f663b00de5f820bdb85806662e25f22da248b14942e33a8b43a0331f855a	2	SHA256 (libhdhomerun_20200907.tgz) = cbaeb779c5a4e07db45310ef4271872bcb7c472402ebc3c58e224653c09400ed
3	SIZE (libhdhomerun_20190621.tgz) = 50817	3	SIZE (libhdhomerun_20200907.tgz) = 51014




# Backport FreeBSD broadcast patch
# https://github.com/Silicondust/libhdhomerun/commit/b0e5d5f5c8e2bf37dea34beb014e08ebb598ebf6

--- hdhomerun_discover.c.orig	2019-09-30 16:45:23 UTC
+++ hdhomerun_discover.c
@@ -183,7 +183,8 @@ static bool hdhomerun_discover_send(struct hdhomerun_d
 	unsigned int i;
 	for (i = 1; i < ds->sock_count; i++) {
 		struct hdhomerun_discover_sock_t *dss = &ds->socks[i];
-	
+		uint32_t send_ip = target_ip;
+
 		if (target_ip != 0xFFFFFFFF) {
 			if (dss->subnet_mask == 0) {
 				continue;
@@ -193,7 +194,18 @@ static bool hdhomerun_discover_send(struct hdhomerun_d
 			}
 		}
 
-		result |= hdhomerun_discover_send_internal(ds, dss, target_ip, device_type, device_id);
+#if defined(IP_ONESBCAST)
+		/* FreeBSD special handling - send subnet broadcast */
+		if (target_ip == 0xFFFFFFFF) {
+			send_ip = dss->local_ip | ~dss->subnet_mask;
+
+			if ((send_ip == 0x00000000) || (send_ip == 0xFFFFFFFF)) {
+				continue;
+			}
+		}
+#endif
+
+		result |= hdhomerun_discover_send_internal(ds, dss, send_ip, device_type, device_id);
 	}
 
 	/*

Return to bug 251088

Lines 1-35 Link Here

(-)multimedia/libhdhomerun/files/patch-hdhomerun__discover.c (-35 lines)
1	# Backport FreeBSD broadcast patch
2	# https://github.com/Silicondust/libhdhomerun/commit/b0e5d5f5c8e2bf37dea34beb014e08ebb598ebf6
3
4	--- hdhomerun_discover.c.orig 2019-09-30 16:45:23 UTC
5	+++ hdhomerun_discover.c
6	@@ -183,7 +183,8 @@ static bool hdhomerun_discover_send(struct hdhomerun_d
7	unsigned int i;
8	for (i = 1; i < ds->sock_count; i++) {
9	struct hdhomerun_discover_sock_t *dss = &ds->socks[i];
10	-
11	+ uint32_t send_ip = target_ip;
12	+
13	if (target_ip != 0xFFFFFFFF) {
14	if (dss->subnet_mask == 0) {
15	continue;
16	@@ -193,7 +194,18 @@ static bool hdhomerun_discover_send(struct hdhomerun_d
17	}
18	}
19
20	- result \|= hdhomerun_discover_send_internal(ds, dss, target_ip, device_type, device_id);
21	+#if defined(IP_ONESBCAST)
22	+ /* FreeBSD special handling - send subnet broadcast */
23	+ if (target_ip == 0xFFFFFFFF) {
24	+ send_ip = dss->local_ip \| ~dss->subnet_mask;
25	+
26	+ if ((send_ip == 0x00000000) \|\| (send_ip == 0xFFFFFFFF)) {
27	+ continue;
28	+ }
29	+ }
30	+#endif
31	+
32	+ result \|= hdhomerun_discover_send_internal(ds, dss, send_ip, device_type, device_id);
33	}
34
35	/*