mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-07-20 20:22:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

networking.go tweak iptables functions

Browse Source 
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
This commit is contained in:
baude
2018-03-02 15:09:18 -06:00
committed by Atomic Bot
parent c187538b9e
commit 4f4a78abb4
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -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)

28
libpod/networking.go
View File

@@ -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())