[libvirt] [PATCH v2 4/4] network: Check for active network during networkGetDHCPLeases

[Michal Privoznik]

On 9/16/20 9:17 AM, morecache at gmail.com wrote:
> From: Lin Ma <lma at suse.de>
> 
> It doesn't make sense querying dhcp leases for interfaces against an inactive
> network, This patch adds a check to see if the network is active.
> 
> Signed-off-by: Lin Ma <lma at suse.de>
> ---
>   src/network/bridge_driver.c | 7 +++++++
>   1 file changed, 7 insertions(+)
> 
> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
> index 87d7acab06..1dffc2309f 100644
> --- a/src/network/bridge_driver.c
> +++ b/src/network/bridge_driver.c
> @@ -4068,6 +4068,13 @@ networkGetDHCPLeases(virNetworkPtr net,
>       if (virNetworkGetDHCPLeasesEnsureACL(net->conn, def) < 0)
>           goto cleanup;
>   
> +    if (!virNetworkObjIsActive(obj)) {
> +        virReportError(VIR_ERR_OPERATION_INVALID,
> +                       _("network '%s' is not active"),
> +                       def->name);
> +        goto error;

No need to jump all the way to 'error' when 'cleanup' is just fine. 
@leases_ret wasn't touched until now and hence is still NULL, this 
'error' is the same as 'cleanup'. But you can keep it, if you want, 
we're jumping "randomly" on error and cleanup.

Michal