← Back to branch summary

~ubuntu-branches/ubuntu/wily/virtualbox-ose/wily

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Network/slirp/slirp.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-12-05 11:27:36 UTC
  • mfrom: (0.3.11 upstream) (0.4.21 sid)
  • Revision ID: james.westby@ubuntu.com-20101205112736-os9dcg0r9dxbfpa0
Tags: 3.2.12-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
  - Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
    variables.
  - Add ubuntu-02-as-needed.patch to fix FTBFS with --as-needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Network/slirp/slirp.c
1198
1198
            }
1199
1199
            /* mark the socket for termination _after_ it was drained */
1200
1200
            so->so_close = 1;
1201
 
            /* No idea about Windows but on Posix, POLLHUP means that we can't send more */
 
1201
            /* No idea about Windows but on Posix, POLLHUP means that we can't send more.
 
1202
             * Actually in the specific error scenario, POLLERR is set as well. */
1202
1203
#ifndef RT_OS_WINDOWS
1203
 
            sofcantsendmore(so);
 
1204
            if (CHECK_FD_SET(so, NetworkEvents, rderr))
 
1205
                sofcantsendmore(so);
1204
1206
#endif
1205
1207
            CONTINUE(tcp);
1206
1208
        }