[Qemu-devel] [PATCH] slirp: Honour vlan/stack in hostfwd_remove commands

[Qemu-devel] [PATCH] slirp: Honour vlan/stack in hostfwd_remove commands

[Peter Maydell]

The hostfwd_add and hostfwd_remove monitor commands allow the user
to optionally specify a vlan/stack tuple. hostfwd_add honours this,
but hostfwd_remove does not (it looks up the tuple but then ignores
the SlirpState it has looked up and always uses the first stack
in the list anyway). Correct this to honour what the user requested.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 net/slirp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/slirp.c b/net/slirp.c
index 647039e..c171119 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -345,8 +345,7 @@ void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict)
 
     host_port = atoi(p);
 
-    err = slirp_remove_hostfwd(QTAILQ_FIRST(&slirp_stacks)->slirp, is_udp,
-                               host_addr, host_port);
+    err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port);
 
     monitor_printf(mon, "host forwarding rule for %s %s\n", src_str,
                    err ? "not found" : "removed");
-- 
1.9.2

Re: [Qemu-devel] [PATCH] slirp: Honour vlan/stack in hostfwd_remove commands

[Peter Maydell]

On 16 June 2014 16:47, Peter Maydell <peter.maydell@linaro.org> wrote:
> The hostfwd_add and hostfwd_remove monitor commands allow the user
> to optionally specify a vlan/stack tuple. hostfwd_add honours this,
> but hostfwd_remove does not (it looks up the tuple but then ignores
> the SlirpState it has looked up and always uses the first stack
> in the list anyway). Correct this to honour what the user requested.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  net/slirp.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/slirp.c b/net/slirp.c
> index 647039e..c171119 100644
> --- a/net/slirp.c
> +++ b/net/slirp.c
> @@ -345,8 +345,7 @@ void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict)
>
>      host_port = atoi(p);
>
> -    err = slirp_remove_hostfwd(QTAILQ_FIRST(&slirp_stacks)->slirp, is_udp,
> -                               host_addr, host_port);
> +    err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port);
>
>      monitor_printf(mon, "host forwarding rule for %s %s\n", src_str,
>                     err ? "not found" : "removed");
> --
> 1.9.2

Ping! (and cc trivial).

thanks
-- PMM

Re: [Qemu-devel] [PATCH] slirp: Honour vlan/stack in hostfwd_remove commands

[Peter Maydell]

On 26 June 2014 13:35, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 16 June 2014 16:47, Peter Maydell <peter.maydell@linaro.org> wrote:
>> The hostfwd_add and hostfwd_remove monitor commands allow the user
>> to optionally specify a vlan/stack tuple. hostfwd_add honours this,
>> but hostfwd_remove does not (it looks up the tuple but then ignores
>> the SlirpState it has looked up and always uses the first stack
>> in the list anyway). Correct this to honour what the user requested.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>>  net/slirp.c | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/net/slirp.c b/net/slirp.c
>> index 647039e..c171119 100644
>> --- a/net/slirp.c
>> +++ b/net/slirp.c
>> @@ -345,8 +345,7 @@ void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict)
>>
>>      host_port = atoi(p);
>>
>> -    err = slirp_remove_hostfwd(QTAILQ_FIRST(&slirp_stacks)->slirp, is_udp,
>> -                               host_addr, host_port);
>> +    err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port);
>>
>>      monitor_printf(mon, "host forwarding rule for %s %s\n", src_str,
>>                     err ? "not found" : "removed");
>> --
>> 1.9.2
>
> Ping! (and cc trivial).

Ping^2.

thanks
-- PMM

Re: [Qemu-devel] [PATCH] slirp: Honour vlan/stack in hostfwd_remove commands

[Peter Maydell]

On 8 July 2014 12:40, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 26 June 2014 13:35, Peter Maydell <peter.maydell@linaro.org> wrote:
>> On 16 June 2014 16:47, Peter Maydell <peter.maydell@linaro.org> wrote:
>>> The hostfwd_add and hostfwd_remove monitor commands allow the user
>>> to optionally specify a vlan/stack tuple. hostfwd_add honours this,
>>> but hostfwd_remove does not (it looks up the tuple but then ignores
>>> the SlirpState it has looked up and always uses the first stack
>>> in the list anyway). Correct this to honour what the user requested.
>>>
>>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>>> ---
>>>  net/slirp.c | 3 +--
>>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> diff --git a/net/slirp.c b/net/slirp.c
>>> index 647039e..c171119 100644
>>> --- a/net/slirp.c
>>> +++ b/net/slirp.c
>>> @@ -345,8 +345,7 @@ void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict)
>>>
>>>      host_port = atoi(p);
>>>
>>> -    err = slirp_remove_hostfwd(QTAILQ_FIRST(&slirp_stacks)->slirp, is_udp,
>>> -                               host_addr, host_port);
>>> +    err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port);
>>>
>>>      monitor_printf(mon, "host forwarding rule for %s %s\n", src_str,
>>>                     err ? "not found" : "removed");
>>> --
>>> 1.9.2
>>
>> Ping! (and cc trivial).
>
> Ping^2.

Ping^3 :-(

-- PMM

Re: [Qemu-devel] [PATCH] slirp: Honour vlan/stack in hostfwd_remove commands

[Jan Kiszka]

On 2014-09-02 12:33, Peter Maydell wrote:
> On 8 July 2014 12:40, Peter Maydell <peter.maydell@linaro.org> wrote:
>> On 26 June 2014 13:35, Peter Maydell <peter.maydell@linaro.org> wrote:
>>> On 16 June 2014 16:47, Peter Maydell <peter.maydell@linaro.org> wrote:
>>>> The hostfwd_add and hostfwd_remove monitor commands allow the user
>>>> to optionally specify a vlan/stack tuple. hostfwd_add honours this,
>>>> but hostfwd_remove does not (it looks up the tuple but then ignores
>>>> the SlirpState it has looked up and always uses the first stack
>>>> in the list anyway). Correct this to honour what the user requested.
>>>>
>>>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>>>> ---
>>>>  net/slirp.c | 3 +--
>>>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>>>
>>>> diff --git a/net/slirp.c b/net/slirp.c
>>>> index 647039e..c171119 100644
>>>> --- a/net/slirp.c
>>>> +++ b/net/slirp.c
>>>> @@ -345,8 +345,7 @@ void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict)
>>>>
>>>>      host_port = atoi(p);
>>>>
>>>> -    err = slirp_remove_hostfwd(QTAILQ_FIRST(&slirp_stacks)->slirp, is_udp,
>>>> -                               host_addr, host_port);
>>>> +    err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port);
>>>>
>>>>      monitor_printf(mon, "host forwarding rule for %s %s\n", src_str,
>>>>                     err ? "not found" : "removed");
>>>> --
>>>> 1.9.2
>>>
>>> Ping! (and cc trivial).
>>
>> Ping^2.
> 
> Ping^3 :-(

Sorry, you will probably need someone else for these topics. I've
difficulties scheduling these into my todo list. :(

Jan

-- 
Siemens AG, Corporate Technology, CT RTC ITP SES-DE
Corporate Competence Center Embedded Linux

Re: [Qemu-devel] [Qemu-trivial] [PATCH] slirp: Honour vlan/stack in hostfwd_remove commands

[Michael Tokarev]

26.06.2014 16:35, Peter Maydell wrote:
> On 16 June 2014 16:47, Peter Maydell <peter.maydell@linaro.org> wrote:
>> The hostfwd_add and hostfwd_remove monitor commands allow the user
>> to optionally specify a vlan/stack tuple. hostfwd_add honours this,
>> but hostfwd_remove does not (it looks up the tuple but then ignores
>> the SlirpState it has looked up and always uses the first stack
>> in the list anyway). Correct this to honour what the user requested.

I've applied this to -trivial.  Somehow this patch has been marked as
"handled" in my queue, but actually it weren't - that's why I haven't
really seen the pings.

Thanks,

/mjt