[Slirp] [Git][slirp/libslirp][master] 2 commits: Disable polling for PRI on MacOS

[Samuel Thibault]

Samuel Thibault pushed to branch master at slirp / libslirp


Commits:
7271345e by Samuel Thibault at 2021-03-01T20:11:49+01:00
Disable polling for PRI on MacOS

Fixes #35.

Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>

- - - - -
684f4e72 by Samuel Thibault at 2021-03-01T19:13:37+00:00
Merge branch 'macos-pri' into 'master'

Disable polling for PRI on MacOS

Closes #35

See merge request slirp/libslirp!73
- - - - -


1 changed file:

- src/slirp.c


Changes:

=====================================
src/slirp.c
=====================================
@@ -718,10 +718,16 @@ void slirp_pollfds_poll(Slirp *slirp, int select_error,
                 continue;
             }
 
+#ifndef __APPLE__
             /*
              * Check for URG data
              * This will soread as well, so no need to
-             * test for SLIRP_POLL_IN below if this succeeds
+             * test for SLIRP_POLL_IN below if this succeeds.
+             *
+             * This is however disabled on MacOS, which apparently always
+             * reports data as PRI when it is the last data of the
+             * connection. We would then report it out of band, which the guest
+             * would most probably not be ready for.
              */
             if (revents & SLIRP_POLL_PRI) {
                 ret = sorecvoob(so);
@@ -734,8 +740,10 @@ void slirp_pollfds_poll(Slirp *slirp, int select_error,
             /*
              * Check sockets for reading
              */
-            else if (revents &
-                     (SLIRP_POLL_IN | SLIRP_POLL_HUP | SLIRP_POLL_ERR)) {
+            else
+#endif
+                if (revents &
+                     (SLIRP_POLL_IN | SLIRP_POLL_HUP | SLIRP_POLL_ERR | SLIRP_POLL_PRI)) {
                 /*
                  * Check for incoming connections
                  */



View it on GitLab: https://gitlab.freedesktop.org/slirp/libslirp/-/compare/add9111ffe824f1321e759c2cfee8c6ad03709b8...684f4e7212b4951b7e0d3888970a9fab53892344

-- 
View it on GitLab: https://gitlab.freedesktop.org/slirp/libslirp/-/compare/add9111ffe824f1321e759c2cfee8c6ad03709b8...684f4e7212b4951b7e0d3888970a9fab53892344
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/slirp/attachments/20210301/f2bb9afd/attachment-0001.htm>