Date: Tue, 23 Oct 2018 12:52:53 +0900 From: =?UTF-8?B?6rmA7KKF7ISx?= <jongsung.kim@gmail.com> To: =?UTF-8?Q?Bernhard_Fr=C3=B6hlich?= <decke@freebsd.org>, ports@freebsd.org Subject: multimedia/tvheadend cannot service live TV after upgrading v4.2.7 Message-ID: <CAOVNo=CrG57EpHSpKN6AZUerwfJen%2BObxuU9oB69F%2BOeVop42Q@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
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@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOVNo=CrG57EpHSpKN6AZUerwfJen%2BObxuU9oB69F%2BOeVop42Q>