Commit 5b8e6b4c authored by Peter Maydell's avatar Peter Maydell
Browse files

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



slirp updates

# gpg: Signature made Tue 29 Mar 2016 00:16:05 BST using RSA key ID FB6B2F1D
# gpg: Good signature from "Samuel Thibault <samuel.thibault@gnu.org>"
# gpg:                 aka "Samuel Thibault <sthibault@debian.org>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>"
# 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: F632 74CD C630 0873 CB3D  29D9 E3E5 1CE8 FB6B 2F1D

* remotes/thibault/tags/samuel-thibault:
  Rework ipv6 options
  Use C99 flexible array instead of 1-byte trailing array
  Avoid embedding struct mbuf in other structures
  slirp: send icmp6 errors when UDP send failed
  slirp: Fix memory leak on small incoming ipv4 packet

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7cd592bc d8eb3864

net/slirp.c

+3 −3
Original line number Diff line number Diff line
@@ -829,10 +829,10 @@ int net_init_slirp(const NetClientOptions *opts, const char *name, 
    net_init_slirp_configs(user->guestfwd, 0);



    ret = net_slirp_init(peer, "user", name, user->q_restrict, vnet,

                         user->host, user->ip6_prefix, user->ip6_prefixlen,

                         user->ip6_host, user->hostname, user->tftp,

                         user->host, user->ipv6_prefix, user->ipv6_prefixlen,

                         user->ipv6_host, user->hostname, user->tftp,

                         user->bootfile, user->dhcpstart,

                         user->dns, user->ip6_dns, user->smb,

                         user->dns, user->ipv6_dns, user->smb,

                         user->smbserver, dnssearch);



    while (slirp_configs) {

qapi-schema.json

+16 −9
Original line number Diff line number Diff line
@@ -2427,7 +2427,10 @@ 
#

# @ip: #optional legacy parameter, use net= instead

#

# @net: #optional IP address and optional netmask

# @net: #optional IP network address that the guest will see, in the

#       form addr[/netmask] The netmask is optional, and can be

#       either in the form a.b.c.d or as a number of valid top-most

#       bits. Default is 10.0.2.0/24.

#

# @host: #optional guest-visible address of the host

#
@@ -2443,13 +2446,17 @@ 
# @dnssearch: #optional list of DNS suffixes to search, passed as DHCP option

#             to the guest

#

# @ip6-prefix: #optional IPv6 network prefix (default is fec0::) (since 2.6)

# @ipv6-prefix: #optional IPv6 network prefix (default is fec0::) (since

#               2.6). The network prefix is given in the usual

#               hexadecimal IPv6 address notation.

#

# @ip6-prefixlen: #optional IPv6 network prefix length (default is 64) (since 2.6)

# @ipv6-prefixlen: #optional IPv6 network prefix length (default is 64)

#                  (since 2.6)

#

# @ip6-host: #optional guest-visible IPv6 address of the host (since 2.6)

# @ipv6-host: #optional guest-visible IPv6 address of the host (since 2.6)

#

# @ip6-dns: #optional guest-visible IPv6 address of the virtual nameserver (since 2.6)

# @ipv6-dns: #optional guest-visible IPv6 address of the virtual

#            nameserver (since 2.6)

#

# @smb: #optional root directory of the built-in SMB server

#
@@ -2474,10 +2481,10 @@ 
    '*dhcpstart': 'str',

    '*dns':       'str',

    '*dnssearch': ['String'],

    '*ip6-prefix':      'str',

    '*ip6-prefixlen':   'int',

    '*ip6-host':        'str',

    '*ip6-dns':         'str',

    '*ipv6-prefix':      'str',

    '*ipv6-prefixlen':   'int',

    '*ipv6-host':        'str',

    '*ipv6-dns':         'str',

    '*smb':       'str',

    '*smbserver': 'str',

    '*hostfwd':   ['String'],

qemu-options.hx

+10 −8
Original line number Diff line number Diff line
@@ -1551,9 +1551,9 @@ DEF("smb", HAS_ARG, QEMU_OPTION_smb, "", QEMU_ARCH_ALL) 


DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,

#ifdef CONFIG_SLIRP

    "-netdev user,id=str[,net=addr[/mask]][,host=addr][,ip6-net=addr[/int]]\n"

    "         [,ip6-host=addr][,restrict=on|off][,hostname=host][,dhcpstart=addr]\n"

    "         [,dns=addr][,ip6-dns=addr][,dnssearch=domain][,tftp=dir]\n"

    "-netdev user,id=str[,net=addr[/mask]][,host=addr][,ipv6-net=addr[/int]]\n"

    "         [,ipv6-host=addr][,restrict=on|off][,hostname=host][,dhcpstart=addr]\n"

    "         [,dns=addr][,ipv6-dns=addr][,dnssearch=domain][,tftp=dir]\n"

    "         [,bootfile=f][,hostfwd=rule][,guestfwd=rule]"

#ifndef _WIN32

                                             "[,smb=dir[,smbserver=addr]]\n"
@@ -1710,11 +1710,13 @@ either in the form a.b.c.d or as number of valid top-most bits. Default is 
Specify the guest-visible address of the host. Default is the 2nd IP in the

guest network, i.e. x.x.x.2.



@item ip6-net=@var{addr}[/@var{int}]

Set IPv6 network address the guest will see. Optionally specify the prefix

size, as number of valid top-most bits. Default is fec0::/64.

@item ipv6-net=@var{addr}[/@var{int}]

Set IPv6 network address the guest will see (default is fec0::/64). The

network prefix is given in the usual hexadecimal IPv6 address

notation. The prefix size is optional, and is given as the number of

valid top-most bits (default is 64).



@item ip6-host=@var{addr}

@item ipv6-host=@var{addr}

Specify the guest-visible IPv6 address of the host. Default is the 2nd IPv6 in

the guest network, i.e. xxxx::2.
@@ -1735,7 +1737,7 @@ Specify the guest-visible address of the virtual nameserver. The address must 
be different from the host address. Default is the 3rd IP in the guest network,

i.e. x.x.x.3.



@item ip6-dns=@var{addr}

@item ipv6-dns=@var{addr}

Specify the guest-visible address of the IPv6 virtual nameserver. The address

must be different from the host address. Default is the 3rd IP in the guest

network, i.e. xxxx::3.

slirp/if.c

+14 −13
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ ifs_remque(struct mbuf *ifm) 
void

if_init(Slirp *slirp)

{

    slirp->if_fastq.ifq_next = slirp->if_fastq.ifq_prev = &slirp->if_fastq;

    slirp->if_batchq.ifq_next = slirp->if_batchq.ifq_prev = &slirp->if_batchq;

    slirp->next_m = &slirp->if_batchq;

    slirp->if_fastq.qh_link = slirp->if_fastq.qh_rlink = &slirp->if_fastq;

    slirp->if_batchq.qh_link = slirp->if_batchq.qh_rlink = &slirp->if_batchq;

    slirp->next_m = (struct mbuf *) &slirp->if_batchq;

}



/*
@@ -74,7 +74,8 @@ if_output(struct socket *so, struct mbuf *ifm) 
	 * We mustn't put this packet back on the fastq (or we'll send it out of order)

	 * XXX add cache here?

	 */

	for (ifq = slirp->if_batchq.ifq_prev; ifq != &slirp->if_batchq;

	for (ifq = (struct mbuf *) slirp->if_batchq.qh_rlink;

	     (struct quehead *) ifq != &slirp->if_batchq;

	     ifq = ifq->ifq_prev) {

		if (so == ifq->ifq_so) {

			/* A match! */
@@ -86,7 +87,7 @@ if_output(struct socket *so, struct mbuf *ifm) 


	/* No match, check which queue to put it on */

	if (so && (so->so_iptos & IPTOS_LOWDELAY)) {

		ifq = slirp->if_fastq.ifq_prev;

		ifq = (struct mbuf *) slirp->if_fastq.qh_rlink;

		on_fastq = 1;

		/*

		 * Check if this packet is a part of the last
@@ -98,9 +99,9 @@ if_output(struct socket *so, struct mbuf *ifm) 
			goto diddit;

		}

        } else {

		ifq = slirp->if_batchq.ifq_prev;

		ifq = (struct mbuf *) slirp->if_batchq.qh_rlink;

                /* Set next_m if the queue was empty so far */

                if (slirp->next_m == &slirp->if_batchq) {

                if ((struct quehead *) slirp->next_m == &slirp->if_batchq) {

                    slirp->next_m = ifm;

                }

        }
@@ -166,10 +167,10 @@ void if_start(Slirp *slirp) 
    }

    slirp->if_start_busy = true;



    if (slirp->if_fastq.ifq_next != &slirp->if_fastq) {

        ifm_next = slirp->if_fastq.ifq_next;

    if (slirp->if_fastq.qh_link != &slirp->if_fastq) {

        ifm_next = (struct mbuf *) slirp->if_fastq.qh_link;

        next_from_batchq = false;

    } else if (slirp->next_m != &slirp->if_batchq) {

    } else if ((struct quehead *) slirp->next_m != &slirp->if_batchq) {

        /* Nothing on fastq, pick up from batchq via next_m */

        ifm_next = slirp->next_m;

        next_from_batchq = true;
@@ -182,12 +183,12 @@ void if_start(Slirp *slirp) 
        from_batchq = next_from_batchq;



        ifm_next = ifm->ifq_next;

        if (ifm_next == &slirp->if_fastq) {

        if ((struct quehead *) ifm_next == &slirp->if_fastq) {

            /* No more packets in fastq, switch to batchq */

            ifm_next = slirp->next_m;

            next_from_batchq = true;

        }

        if (ifm_next == &slirp->if_batchq) {

        if ((struct quehead *) ifm_next == &slirp->if_batchq) {

            /* end of batchq */

            ifm_next = NULL;

        }
@@ -218,7 +219,7 @@ void if_start(Slirp *slirp) 
                /* Next packet in fastq is from the same session */

                ifm_next = next;

                next_from_batchq = false;

            } else if (slirp->next_m == &slirp->if_batchq) {

            } else if ((struct quehead *) slirp->next_m == &slirp->if_batchq) {

                /* Set next_m and ifm_next if the session packet is now the

                 * only one on batchq */

                slirp->next_m = ifm_next = next;

slirp/ip_input.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ ip_input(struct mbuf *m) 
	DEBUG_ARG("m_len = %d", m->m_len);



	if (m->m_len < sizeof (struct ip)) {

		return;

		goto bad;

	}



	ip = mtod(m, struct ip *);