Date: Thu, 25 Oct 2018 13:48:58 +0200 From: =?UTF-8?Q?Bernhard_Fr=C3=B6hlich?= <decke@freebsd.org> To: jongsung.kim@gmail.com Cc: ports@freebsd.org Subject: Re: multimedia/tvheadend cannot service live TV after upgrading v4.2.7 Message-ID: <CAE-m3X3e2i3=XskeO0k=ojV4Bo2-MPaULLjmyYjV1U1fYcFBUA@mail.gmail.com> In-Reply-To: <CAOVNo=CrG57EpHSpKN6AZUerwfJen%2BObxuU9oB69F%2BOeVop42Q@mail.gmail.com> References: <CAOVNo=CrG57EpHSpKN6AZUerwfJen%2BObxuU9oB69F%2BOeVop42Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Oct 23, 2018 at 5:53 AM =EA=B9=80=EC=A2=85=EC=84=B1 <jongsung.kim@g= mail.com> wrote: > > 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 Rever= t "FreeBSD: Fix recv problem if no data received.") Please apply this rever= ting 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 =3D 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 =3D=3D 0) > - return -EIO; > #else > if (recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT) =3D=3D 0) > return -EIO; > > Thank you > JS Thanks! Committed in r482966. https://svnweb.freebsd.org/ports?view=3Drevision&revision=3D482966 --=20 Bernhard Froehlich http://www.bluelife.at/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-m3X3e2i3=XskeO0k=ojV4Bo2-MPaULLjmyYjV1U1fYcFBUA>