Commit 93653066 authored by Thomas Huth's avatar Thomas Huth Committed by Jason Wang
Browse files

net: Allow netdevs to be used with 'hostfwd_add' and 'hostfwd_remove' 



It does not make much sense to limit these commands to the legacy 'vlan'
concept only, they should work with the modern netdevs, too. So now
it is possible to use this command with one, two or three parameters.

With one parameter, the command installs a hostfwd rule on the default
"user" network:
    hostfwd_add tcp:...

With two parameters, the command installs a hostfwd rule on a netdev
(that's the new way of using this command):
    hostfwd_add netdev_id tcp:...

With three parameters, the command installs a rule on a 'vlan' (aka hub):
    hostfwd_add hub_id name tcp:...

Same applies to the hostfwd_remove command now.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 18d65d22

hmp-commands.hx

+2 −2
Original line number Diff line number Diff line
@@ -1383,7 +1383,7 @@ ETEXI 
    {

        .name       = "hostfwd_add",

        .args_type  = "arg1:s,arg2:s?,arg3:s?",

        .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",

        .params     = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",

        .help       = "redirect TCP or UDP connections from host to guest (requires -net user)",

        .cmd        = hmp_hostfwd_add,

    },
@@ -1398,7 +1398,7 @@ ETEXI 
    {

        .name       = "hostfwd_remove",

        .args_type  = "arg1:s,arg2:s?,arg3:s?",

        .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",

        .params     = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport",

        .help       = "remove host-to-guest TCP or UDP redirection",

        .cmd        = hmp_hostfwd_remove,

    },

net/slirp.c

+23 −10
Original line number Diff line number Diff line
@@ -405,17 +405,24 @@ error: 
    return -1;

}



static SlirpState *slirp_lookup(Monitor *mon, const char *vlan,

                                const char *stack)

static SlirpState *slirp_lookup(Monitor *mon, const char *hub_id,

                                const char *name)

{



    if (vlan) {

    if (name) {

        NetClientState *nc;

        nc = net_hub_find_client_by_name(strtol(vlan, NULL, 0), stack);

        if (hub_id) {

            nc = net_hub_find_client_by_name(strtol(hub_id, NULL, 0), name);

            if (!nc) {

                monitor_printf(mon, "unrecognized (vlan-id, stackname) pair\n");

                return NULL;

            }

        } else {

            nc = qemu_find_netdev(name);

            if (!nc) {

                monitor_printf(mon, "unrecognized netdev id '%s'\n", name);

                return NULL;

            }

        }

        if (strcmp(nc->model, "user")) {

            monitor_printf(mon, "invalid device specified\n");

            return NULL;
@@ -443,9 +450,12 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) 
    const char *arg2 = qdict_get_try_str(qdict, "arg2");

    const char *arg3 = qdict_get_try_str(qdict, "arg3");



    if (arg2) {

    if (arg3) {

        s = slirp_lookup(mon, arg1, arg2);

        src_str = arg3;

    } else if (arg2) {

        s = slirp_lookup(mon, NULL, arg1);

        src_str = arg2;

    } else {

        s = slirp_lookup(mon, NULL, NULL);

        src_str = arg1;
@@ -570,9 +580,12 @@ void hmp_hostfwd_add(Monitor *mon, const QDict *qdict) 
    const char *arg2 = qdict_get_try_str(qdict, "arg2");

    const char *arg3 = qdict_get_try_str(qdict, "arg3");



    if (arg2) {

    if (arg3) {

        s = slirp_lookup(mon, arg1, arg2);

        redir_str = arg3;

    } else if (arg2) {

        s = slirp_lookup(mon, NULL, arg1);

        redir_str = arg2;

    } else {

        s = slirp_lookup(mon, NULL, NULL);

        redir_str = arg1;