← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Network/slirp/tcp_subr.c
362
362
    if (   tp
363
363
        && tp->t_state >= TCPS_FIN_WAIT_2)
364
364
        soisfdisconnected(tp->t_socket);
365
 
    if (tp)
 
365
    /*
 
366
     * (vasily) there're situations when the FIN or FIN,ACK are lost (Windows host)
 
367
     * and retransmitting keeps VBox busy on sending closing sequences *very* frequent,
 
368
     * easting a lot of CPU. To avoid this we don't sent on sockets marked as closed
 
369
     * (see slirp.c for details about setting so_close member).
 
370
     */
 
371
    if (   tp
 
372
#ifdef RT_OS_WINDOWS
 
373
        && tp->t_socket
 
374
        && !tp->t_socket->so_close
 
375
#endif
 
376
        )
366
377
        tcp_output(pData, tp);
367
378
}
368
379