From 0503cf2510ba77563ae4f731cc9ca599d45b7e3a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 16 Aug 2023 00:24:20 +0200 Subject: [PATCH] libnetwork/drivers/bridge: setupIPChains(): name output variables This function has _four_ output variables of the same type, and several defer statements that checked the error returned (but using the `err` variable). This patch names the return variables to make it clearer what's being returned, and renames the error-return to `retErr` to make it clearer where we're dealing with the returned error (and not any local err), to prevent accidentally shadowing. Signed-off-by: Sebastiaan van Stijn --- libnetwork/drivers/bridge/setup_ip_tables_linux.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libnetwork/drivers/bridge/setup_ip_tables_linux.go b/libnetwork/drivers/bridge/setup_ip_tables_linux.go index 5f4f6c7ab2..c98781f3b0 100644 --- a/libnetwork/drivers/bridge/setup_ip_tables_linux.go +++ b/libnetwork/drivers/bridge/setup_ip_tables_linux.go @@ -30,7 +30,7 @@ const ( IsolationChain2 = "DOCKER-ISOLATION-STAGE-2" ) -func setupIPChains(config configuration, version iptables.IPVersion) (*iptables.ChainInfo, *iptables.ChainInfo, *iptables.ChainInfo, *iptables.ChainInfo, error) { +func setupIPChains(config configuration, version iptables.IPVersion) (natChain *iptables.ChainInfo, filterChain *iptables.ChainInfo, isolationChain1 *iptables.ChainInfo, isolationChain2 *iptables.ChainInfo, retErr error) { // Sanity check. if !config.EnableIPTables { return nil, nil, nil, nil, errors.New("cannot create new chains, EnableIPTable is disabled") @@ -45,14 +45,14 @@ func setupIPChains(config configuration, version iptables.IPVersion) (*iptables. return nil, nil, nil, nil, fmt.Errorf("failed to create NAT chain %s: %v", DockerChain, err) } defer func() { - if err != nil { + if retErr != nil { if err := iptable.RemoveExistingChain(DockerChain, iptables.Nat); err != nil { log.G(context.TODO()).Warnf("failed on removing iptables NAT chain %s on cleanup: %v", DockerChain, err) } } }() - filterChain, err := iptable.NewChain(DockerChain, iptables.Filter, false) + filterChain, err = iptable.NewChain(DockerChain, iptables.Filter, false) if err != nil { return nil, nil, nil, nil, fmt.Errorf("failed to create FILTER chain %s: %v", DockerChain, err) } @@ -64,24 +64,24 @@ func setupIPChains(config configuration, version iptables.IPVersion) (*iptables. } }() - isolationChain1, err := iptable.NewChain(IsolationChain1, iptables.Filter, false) + isolationChain1, err = iptable.NewChain(IsolationChain1, iptables.Filter, false) if err != nil { return nil, nil, nil, nil, fmt.Errorf("failed to create FILTER isolation chain: %v", err) } defer func() { - if err != nil { + if retErr != nil { if err := iptable.RemoveExistingChain(IsolationChain1, iptables.Filter); err != nil { log.G(context.TODO()).Warnf("failed on removing iptables FILTER chain %s on cleanup: %v", IsolationChain1, err) } } }() - isolationChain2, err := iptable.NewChain(IsolationChain2, iptables.Filter, false) + isolationChain2, err = iptable.NewChain(IsolationChain2, iptables.Filter, false) if err != nil { return nil, nil, nil, nil, fmt.Errorf("failed to create FILTER isolation chain: %v", err) } defer func() { - if err != nil { + if retErr != nil { if err := iptable.RemoveExistingChain(IsolationChain2, iptables.Filter); err != nil { log.G(context.TODO()).Warnf("failed on removing iptables FILTER chain %s on cleanup: %v", IsolationChain2, err) }