Commit 9be4af13 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



slirp updates

Alexey Kardashevskiy
  slirp: Improve debugging messages

Andreas Gustafsson, Samuel Thibault, James Clarke
  slirp: Improve bandwidth in GDB remote debugging and FreeBSD guests

Benjamin Drung:
  slirp/dhcp: Add domainname option

Cédric Le Goater (3):
  slirp/ncsi: fix "Get Version ID" payload length
  slirp/ncsi: add a "Get Parameters" response
  slirp/ncsi: add checksum support

Nia Alarie:
  net/slirp: Convert atoi to qemu_strtoi to allow error checking

# gpg: Signature made Fri 01 Jun 2018 14:54:45 BST
# gpg:                using RSA key 996849C1CF560478
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>"
# gpg:                 aka "Samuel Thibault <sthibault@debian.org>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@gnu.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:                 aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>"
# 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: 3A3A 5D46 4660 E867 610C  A427 9968 49C1 CF56 0478

* remotes/thibault/tags/samuel-thibault:
  slirp/ncsi: add checksum support
  slirp/ncsi: add a "Get Parameters" response
  slirp/ncsi: fix "Get Version ID" payload length
  slirp: Send window updates to guest after window was closed
  net/slirp: Convert atoi to qemu_strtoi to allow error checking
  slirp/debug: Print IP addresses in human readable form
  slirp: disable Nagle in ingoing connections
  slirp: disable Nagle in outgoing connections
  slirp: Add domainname option to slirp's DHCP server

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c25e8bba 47335eee

net/slirp.c

+12 −4
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ static int net_slirp_init(NetClientState *peer, const char *model, 
                          const char *bootfile, const char *vdhcp_start,

                          const char *vnameserver, const char *vnameserver6,

                          const char *smb_export, const char *vsmbserver,

                          const char **dnssearch, Error **errp)

                          const char **dnssearch, const char *vdomainname,

                          Error **errp)

{

    /* default settings according to historic slirp */

    struct in_addr net  = { .s_addr = htonl(0x0a000200) }; /* 10.0.2.0 */
@@ -359,6 +360,11 @@ static int net_slirp_init(NetClientState *peer, const char *model, 
        ip6_dns.s6_addr[15] |= 3;

    }



    if (vdomainname && !*vdomainname) {

        error_setg(errp, "'domainname' parameter cannot be empty");

        return -1;

    }





    nc = qemu_new_net_client(&net_slirp_info, peer, model, name);
@@ -371,7 +377,7 @@ static int net_slirp_init(NetClientState *peer, const char *model, 
    s->slirp = slirp_init(restricted, ipv4, net, mask, host,

                          ipv6, ip6_prefix, vprefix6_len, ip6_host,

                          vhostname, tftp_export, bootfile, dhcp,

                          dns, ip6_dns, dnssearch, s);

                          dns, ip6_dns, dnssearch, vdomainname, s);

    QTAILQ_INSERT_TAIL(&slirp_stacks, s, entry);



    for (config = slirp_configs; config; config = config->next) {
@@ -486,7 +492,9 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) 
        goto fail_syntax;

    }



    host_port = atoi(p);

    if (qemu_strtoi(p, NULL, 10, &host_port)) {

        goto fail_syntax;

    }



    err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port);
@@ -958,7 +966,7 @@ int net_init_slirp(const Netdev *netdev, const char *name, 
                         user->ipv6_host, user->hostname, user->tftp,

                         user->bootfile, user->dhcpstart,

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

                         user->smbserver, dnssearch, errp);

                         user->smbserver, dnssearch, user->domainname, errp);



    while (slirp_configs) {

        config = slirp_configs;

qapi/net.json

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ 
# @dnssearch: list of DNS suffixes to search, passed as DHCP option

#             to the guest

#

# @domainname: guest-visible domain name of the virtual nameserver

#              (since 2.12)

#

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

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

#               hexadecimal IPv6 address notation.
@@ -197,6 +200,7 @@ 
    '*dhcpstart': 'str',

    '*dns':       'str',

    '*dnssearch': ['String'],

    '*domainname': 'str',

    '*ipv6-prefix':      'str',

    '*ipv6-prefixlen':   'int',

    '*ipv6-host':        'str',

qemu-options.hx

+5 −2
Original line number Diff line number Diff line
@@ -1906,8 +1906,8 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, 
    "-netdev user,id=str[,ipv4[=on|off]][,net=addr[/mask]][,host=addr]\n"

    "         [,ipv6[=on|off]][,ipv6-net=addr[/int]][,ipv6-host=addr]\n"

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

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

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

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

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

#ifndef _WIN32

                                             "[,smb=dir[,smbserver=addr]]\n"

#endif
@@ -2135,6 +2135,9 @@ Example: 
qemu-system-i386 -nic user,dnssearch=mgmt.example.org,dnssearch=example.org

@end example



@item domainname=@var{domain}

Specifies the client domain name reported by the built-in DHCP server.



@item tftp=@var{dir}

When using the user mode network stack, activate a built-in TFTP

server. The files in @var{dir} will be exposed as the root of a TFTP server.

slirp/arp_table.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN]) 
    int i;



    DEBUG_CALL("arp_table_add");

    DEBUG_ARG("ip = %s", inet_ntoa(*(struct in_addr *)&ip_addr));

    DEBUG_ARG("ip = %s", inet_ntoa((struct in_addr){.s_addr = ip_addr}));

    DEBUG_ARGS((dfd, " hw addr = %02x:%02x:%02x:%02x:%02x:%02x\n",

                ethaddr[0], ethaddr[1], ethaddr[2],

                ethaddr[3], ethaddr[4], ethaddr[5]));
@@ -67,7 +67,7 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr, 
    int i;



    DEBUG_CALL("arp_table_search");

    DEBUG_ARG("ip = %s", inet_ntoa(*(struct in_addr *)&ip_addr));

    DEBUG_ARG("ip = %s", inet_ntoa((struct in_addr){.s_addr = ip_addr}));



    /* If broadcast address */

    if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) {

slirp/bootp.c

+8 −0
Original line number Diff line number Diff line
@@ -298,6 +298,14 @@ static void bootp_reply(Slirp *slirp, const struct bootp_t *bp) 
            q += val;

        }



        if (slirp->vdomainname) {

            val = strlen(slirp->vdomainname);

            *q++ = RFC1533_DOMAINNAME;

            *q++ = val;

            memcpy(q, slirp->vdomainname, val);

            q += val;

        }



        if (slirp->vdnssearch) {

            size_t spaceleft = sizeof(rbp->bp_vend) - (q - rbp->bp_vend);

            val = slirp->vdnssearch_len;