Re: [PULL 3/6] hmp-commands: Add new HMP command for filter passthrough

["chen.zhang@intel.com" <chen.zhang@intel.com>]

On 6/30/21 6:39 PM, Dr. David Alan Gilbert wrote:
> * Zhang Chen (chen.zhang@intel.com) wrote:
>> Add hmp_passthrough_filter_add and hmp_passthrough_filter_del make user
>> can maintain object network passthrough list in human monitor
>>
>> Signed-off-by: Zhang Chen <chen.zhang@intel.com>
>> ---
>>   hmp-commands.hx       | 26 +++++++++++++++
>>   include/monitor/hmp.h |  2 ++
>>   monitor/hmp-cmds.c    | 76 +++++++++++++++++++++++++++++++++++++++++++
>>   3 files changed, 104 insertions(+)
>>
>> diff --git a/hmp-commands.hx b/hmp-commands.hx
>> index 8e45bce2cd..426a7d6cda 100644
>> --- a/hmp-commands.hx
>> +++ b/hmp-commands.hx
>> @@ -1292,6 +1292,32 @@ SRST
>>     Remove host network device.
>>   ERST
>>   
>> +    {
>> +        .name       = "passthrough_filter_add",
>> +        .args_type  = "protocol:s?,object-name:s,src:s?,dst:s?",
>> +        .params     = "[protocol] object-name [src] [dst]",
>> +        .help       = "Add network passthrough rule to object passthrough list",
>> +        .cmd        = hmp_passthrough_filter_add,
>> +    },
>> +
>> +SRST
>> +``passthrough_filter_add``
>> +  Add network stream to object passthrough list.
>> +ERST
>> +
>> +    {
>> +        .name       = "passthrough_filter_del",
>> +        .args_type  = "protocol:s?,object-name:s,src:s?,dst:s?",
>> +        .params     = "[protocol] object-name [src] [dst]",
>> +        .help       = "Delete network passthrough rule from object passthrough list",
>> +        .cmd        = hmp_passthrough_filter_del,
>> +    },
>> +
>> +SRST
>> +``passthrough_filter_del``
>> +  Delete network stream from object passthrough list.
>> +ERST
>> +
>>       {
>>           .name       = "object_add",
>>           .args_type  = "object:S",
>> diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
>> index 3baa1058e2..ba6987e552 100644
>> --- a/include/monitor/hmp.h
>> +++ b/include/monitor/hmp.h
>> @@ -77,6 +77,8 @@ void hmp_device_del(Monitor *mon, const QDict *qdict);
>>   void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict);
>>   void hmp_netdev_add(Monitor *mon, const QDict *qdict);
>>   void hmp_netdev_del(Monitor *mon, const QDict *qdict);
>> +void hmp_passthrough_filter_add(Monitor *mon, const QDict *qdict);
>> +void hmp_passthrough_filter_del(Monitor *mon, const QDict *qdict);
>>   void hmp_getfd(Monitor *mon, const QDict *qdict);
>>   void hmp_closefd(Monitor *mon, const QDict *qdict);
>>   void hmp_sendkey(Monitor *mon, const QDict *qdict);
>> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
>> index 0942027208..26ff316c93 100644
>> --- a/monitor/hmp-cmds.c
>> +++ b/monitor/hmp-cmds.c
>> @@ -1638,6 +1638,82 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict)
>>       hmp_handle_error(mon, err);
>>   }
>>   
>> +void hmp_passthrough_filter_add(Monitor *mon, const QDict *qdict)
>> +{
>> +    IPFlowSpec *spec = g_new0(IPFlowSpec, 1);
>> +    char *src, *dst;
>> +    Error *err = NULL;
>> +
>> +    spec->protocol = g_strdup(qdict_get_try_str(qdict, "protocol"));
>> +    spec->object_name = g_strdup(qdict_get_try_str(qdict, "object-name"));
>> +    src = g_strdup(qdict_get_try_str(qdict, "src"));
>> +    dst = g_strdup(qdict_get_try_str(qdict, "dst"));
>> +
>> +    if (src) {
>> +        spec->source = g_new0(InetSocketAddressBase, 1);
>> +
>> +        if (inet_parse_base(spec->source, src, NULL)) {
>> +            monitor_printf(mon, "Incorrect passthrough src address\n");
>> +            goto out;
> Are you leaking spec->source ?


Good catch.


>
>> +        }
>> +    }
>> +
>> +    if (dst) {
>> +        spec->destination = g_new0(InetSocketAddressBase, 1);
>> +
>> +        if (inet_parse_base(spec->destination, dst, NULL)) {
>> +            monitor_printf(mon, "Incorrect passthrough dst address\n");
>> +            goto out;
>> +        }
>> +    }
>> +
>> +    qmp_passthrough_filter_add(spec, &err);
>> +
>> +out:
>> +    g_free(src);
>> +    g_free(dst);
>> +
>> +    hmp_handle_error(mon, err);
>> +}
>> +
>> +void hmp_passthrough_filter_del(Monitor *mon, const QDict *qdict)
>> +{
>> +    IPFlowSpec *spec = g_new0(IPFlowSpec, 1);
>> +    char *src, *dst;
>> +    Error *err = NULL;
>> +
>> +    spec->protocol = g_strdup(qdict_get_try_str(qdict, "protocol"));
>> +    spec->object_name = g_strdup(qdict_get_try_str(qdict, "object-name"));
>> +    src = g_strdup(qdict_get_try_str(qdict, "src"));
>> +    dst = g_strdup(qdict_get_try_str(qdict, "dst"));
>> +
>> +    if (src) {
>> +        spec->source = g_new0(InetSocketAddressBase, 1);
>> +
>> +        if (inet_parse_base(spec->source, src, NULL)) {
>> +            monitor_printf(mon, "Incorrect passthrough src address\n");
>> +            goto out;
>> +        }
>> +    }
>> +
>> +    if (dst) {
>> +        spec->destination = g_new0(InetSocketAddressBase, 1);
>> +
>> +        if (inet_parse_base(spec->destination, dst, NULL)) {
>> +            monitor_printf(mon, "Incorrect passthrough dst address\n");
>> +            goto out;
>> +        }
>> +    }
> You could merge that into something like:
>
>     IPFlowSpec *hmp_parse_IPFlowSpec(Monitor *mon, const QDict *qdict)


OK, I will update to V2.

Thanks

Chen


>
> Dave
>
>> +    qmp_passthrough_filter_del(spec, &err);
>> +
>> +out:
>> +    g_free(src);
>> +    g_free(dst);
>> +
>> +    hmp_handle_error(mon, err);
>> +}
>> +
>>   void hmp_object_add(Monitor *mon, const QDict *qdict)
>>   {
>>       const char *options = qdict_get_str(qdict, "object");
>> -- 
>> 2.25.1
>>