Date: Mon, 24 Oct 2016 10:11:49 -0700 From: John Baldwin <jhb@freebsd.org> To: Baptiste Daroussin <bapt@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r307791 - stable/11/usr.sbin/bhyve Message-ID: <18530830.i5Ci9ybOZ6@ralph.baldwin.cx> In-Reply-To: <201610222049.u9MKnirM010685@repo.freebsd.org> References: <201610222049.u9MKnirM010685@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Saturday, October 22, 2016 08:49:44 PM Baptiste Daroussin wrote: > Author: bapt > Date: Sat Oct 22 20:49:44 2016 > New Revision: 307791 > URL: https://svnweb.freebsd.org/changeset/base/307791 > > Log: > MFC r306554: > > Use accept4 with O_NONBLOCK rather than accept + fcntl > > Modified: > stable/11/usr.sbin/bhyve/dbgport.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/usr.sbin/bhyve/dbgport.c > ============================================================================== > --- stable/11/usr.sbin/bhyve/dbgport.c Sat Oct 22 20:49:07 2016 (r307790) > +++ stable/11/usr.sbin/bhyve/dbgport.c Sat Oct 22 20:49:44 2016 (r307791) > @@ -73,10 +73,8 @@ again: > printf("Waiting for connection from gdb\r\n"); > printonce = 1; > } > - conn_fd = accept(listen_fd, NULL, NULL); > - if (conn_fd >= 0) > - fcntl(conn_fd, F_SETFL, O_NONBLOCK); > - else if (errno != EINTR) > + conn_fd = accept4(listen_fd, NULL, NULL, O_NONBLOCK); > + if (conn_fd < 0 && errno != EINTR) This is actually wrong. accept4() uses SOCK_NONBLOCK, not O_NONBLOCK. Can you fix this in HEAD and MFC? -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?18530830.i5Ci9ybOZ6>