multimedia/tvheadend cannot service live TV after upgrading v4.2.7

김종성 jongsung.kim at gmail.com
Tue Oct 23 03:53:07 UTC 2018


Hi decke,
tvheadend v4.2.7 has a merged commit 3895c923a FreeBSD: Fix recv problem if
no data received, which touches my previous merged commit 0d5c8efee tcp:
fix tcp_socket_dead() for FreeBSD. It makes the FreeBSD port of tvheadend
unable to service live TV, and reverted from the mainline. (f08bbef11
Revert "FreeBSD: Fix recv problem if no data received.") Please apply this
reverting patch:

commit f08bbef11c77a6a81d4e2bf974e36e54b0cd14d6
Author: Jaroslav Kysela <perex at perex.cz>
Date:   Tue Oct 16 16:51:00 2018 +0200

    Revert "FreeBSD: Fix recv problem if no data received."

    This reverts commit 3895c923a3a959da05080831b8146c09ed143b00.

diff --git a/src/tcp.c b/src/tcp.c
index d15b4381f..5349784a4 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -454,11 +454,8 @@ tcp_socket_dead(int fd)
   if (err)
     return -err;
 #ifdef PLATFORM_FREEBSD
-  err = recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT);
-  if (err < 0)
+  if (recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT) < 0)
     return -errno;
-  else if (err == 0)
-      return -EIO;
 #else
   if (recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT) == 0)
     return -EIO;

Thank you
JS


More information about the freebsd-ports mailing list