cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multimedia/libhdhomerun: Backport FreeBSD broadcast patch

Browse Source 
Release 20190621 caused a regression in the ability to discover tuner
hardware, for example using: hdhomerun_config discover.

This change backports a commit [1] marked as "Release 20190625" which
doesn't (yet?) appear to be available/distributed.

[1] b0e5d5f5c8

PR:		240907
Reported by:	Daniel Becker <razzfazz gmail com>
Submitted by:	David O'Rourke <dor.bsd xm0 uk> (maintainer)
This commit is contained in:
Kubilay Kocak 2019-10-01 03:23:17 +00:00
parent 2b96ae02da
commit 41e4b588f5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=513445
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
multimedia/libhdhomerun/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= libhdhomerun
PORTVERSION= 20190621
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= https://download.silicondust.com/hdhomerun/
DISTNAME= ${PORTNAME}_${PORTVERSION}

35
multimedia/libhdhomerun/files/patch-hdhomerun__discover.c Normal file
View File

@ -0,0 +1,35 @@
# 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);
}
/*