[Qemu-commits] [qemu/qemu] 632dd7: slirp: document mbuf pointers and sizes

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 632dd719b385016eb62273f12fe51512453624c1
      
https://github.com/qemu/qemu/commit/632dd719b385016eb62273f12fe51512453624c1
  Author: Peter Maydell <address@hidden>
  Date:   2018-10-07 (Sun, 07 Oct 2018)

  Changed paths:
    M slirp/mbuf.c
    M slirp/mbuf.h

  Log Message:
  -----------
  slirp: document mbuf pointers and sizes

and fix confusing datasize name into gapsize in m_inc.

Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 3d090aefe29846f8606d06bf55526ebb91f4d725
      
https://github.com/qemu/qemu/commit/3d090aefe29846f8606d06bf55526ebb91f4d725
  Author: Andrew Oates <address@hidden>
  Date:   2018-10-07 (Sun, 07 Oct 2018)

  Changed paths:
    M slirp/ip_icmp.c

  Log Message:
  -----------
  slirp: fix ICMP handling on macOS hosts

On Linux, SOCK_DGRAM+IPPROTO_ICMP sockets give only the ICMP packet when
read from.  On macOS, however, the socket acts like a SOCK_RAW socket
and includes the IP header as well.

This change strips the extra IP header from the received packet on macOS
before sending it to the guest.  SOCK_DGRAM ICMP sockets aren't
supported on other BSDs, but we enable this behavior for them as well to
treat the sockets the same as raw sockets.

Signed-off-by: Andrew Oates <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 93a972f8548571d35c718ca3a94d5ab1507b2443
      
https://github.com/qemu/qemu/commit/93a972f8548571d35c718ca3a94d5ab1507b2443
  Author: Gavin Grant <address@hidden>
  Date:   2018-10-07 (Sun, 07 Oct 2018)

  Changed paths:
    M slirp/socket.c

  Log Message:
  -----------
  slirp: Propagate host TCP RST packet to the guest after socket disconnected

Commit 27d92ebc5ed1bb0b518d0ebc4c609182ad20a799 handled the case where the TCP
connection is abruptly closed via a RST packet, by checking for the ECONNRESET
errno. However it does not consider the case where the connection has been
half-closed by the host (FIN/ACK), then the host socket is disconnected. For
example, if the host application calls close() on the socket, then the
application exits.

In this case, the socket still exists due to the file descriptor in SLIRP, but
it is disconnected. recv() does not indicate an error since an orderly socket
close has previously occurred. The socket will then be stuck in FIN_WAIT_2,
until the peer sends FIN/ACK or a timeout occurs. Instead we can send a RST
to the peer and transition to the CLOSED state.

Signed-off-by: Gavin Grant <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: bb94c11985a449dbbf47924637276b444857300c
      
https://github.com/qemu/qemu/commit/bb94c11985a449dbbf47924637276b444857300c
  Author: Peter Maydell <address@hidden>
  Date:   2018-10-08 (Mon, 08 Oct 2018)

  Changed paths:
    M slirp/ip_icmp.c
    M slirp/mbuf.c
    M slirp/mbuf.h
    M slirp/socket.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into 
staging

slirp updates

Andrew Oates (1):
  slirp: fix ICMP handling on macOS hosts

Gavin Grant (1):
  slirp: Propagate host TCP RST packet to the guest after socket
    disconnected

Peter Maydell (1):
  slirp: document mbuf pointers and sizes

# gpg: Signature made Sun 07 Oct 2018 19:04:13 BST
# gpg:                using RSA key E3F65A9E9560DB4C
# gpg: Good signature from "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: 33FA 7B64 6195 01F8 CE9C  8F97 E3F6 5A9E 9560 DB4C

* remotes/thibault/tags/samuel-thibault:
  slirp: Propagate host TCP RST packet to the guest after socket disconnected
  slirp: fix ICMP handling on macOS hosts
  slirp: document mbuf pointers and sizes

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/df51a005192e...bb94c11985a4
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.