networking.go tweak iptables functions

Took duplicated code and merged it into the helper function so only a single
exec was executed.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #446
Approved by: mheon

2 files changed, 13 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 0e50762cd..3fa9fa2ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 GO ?= go
-EPOCH_TEST_COMMIT ?= 0b68ba32
+EPOCH_TEST_COMMIT ?= bd7de5d5dd
 HEAD ?= HEAD
 PROJECT := github.com/projectatomic/libpod
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
diff --git a/libpod/networking.go b/libpod/networking.go
index 5118b972a..cceeb18d6 100644
--- a/libpod/networking.go
+++ b/libpod/networking.go
@@ -68,21 +68,22 @@ func (r *Runtime) createNetNS(ctr *Container) (err error) {
 	// https://github.com/containernetworking/plugins/pull/75
 	if resultStruct.IPs != nil {
 		for _, ip := range resultStruct.IPs {
-			iptablesCmd := iptablesDNS("-I", ip.Address.IP.String())
-			logrus.Debug("Running iptables command: ", strings.Join(iptablesCmd, " "))
-			_, err := utils.ExecCmd("iptables", iptablesCmd...)
-			if err != nil {
-				logrus.Error(err)
-			}
+			iptablesDNS("-I", ip.Address.IP.String())
 		}
 	}
 	return nil
 }
 
-// iptablesDNS accepts an arg (-I|-D) and IP address that generates the
-// iptables command to be run
-func iptablesDNS(arg, ip string) []string {
-	return []string{"-t", "filter", arg, "FORWARD", "-s", ip, "!", "-o", ip, "-j", "ACCEPT"}
+// iptablesDNS accepts an arg (-I|-D) and IP address of the container and then
+// generates an iptables command to either add or subtract the needed rule
+func iptablesDNS(arg, ip string) error {
+	iptablesCmd := []string{"-t", "filter", arg, "FORWARD", "-s", ip, "!", "-o", ip, "-j", "ACCEPT"}
+	logrus.Debug("Running iptables command: ", strings.Join(iptablesCmd, " "))
+	_, err := utils.ExecCmd("iptables", iptablesCmd...)
+	if err != nil {
+		logrus.Error(err)
+	}
+	return err
 }
 
 // Join an existing network namespace
@@ -128,12 +129,7 @@ func (r *Runtime) teardownNetNS(ctr *Container) error {
 	// on cleanup. Remove when https://github.com/containernetworking/plugins/pull/75
 	// is merged.
 	for _, ip := range ctr.state.IPs {
-		iptablesCmd := iptablesDNS("-D", ip.Address.IP.String())
-		logrus.Debug("Running iptables command: ", strings.Join(iptablesCmd, " "))
-		_, err := utils.ExecCmd("iptables", iptablesCmd...)
-		if err != nil {
-			logrus.Error(err)
-		}
+		iptablesDNS("-D", ip.Address.IP.String())
 	}
 
 	logrus.Debugf("Tearing down network namespace at %s for container %s", ctr.state.NetNS.Path(), ctr.ID())