ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #206 from jonboulle/steveeJ-v0.2

Browse Source 
v0.2.x: cherry-pick masquerading clean-up fixes
This commit is contained in:
Jonathan Boulle
2016-05-12 11:10:13 +02:00
parent 19bb4a15bb 8c51016e19
commit b634ff6bcd
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/main/bridge/bridge.go
View File

@ -238,14 +238,29 @@ func cmdDel(args *skel.CmdArgs) error {
return err return err
} }
err = ipam.ExecDel(n.IPAM.Type, args.StdinData) if err := ipam.ExecDel(n.IPAM.Type, args.StdinData); err != nil {
return err
}
var ipn *net.IPNet
err = ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
var err error
ipn, err = ip.DelLinkByNameAddr(args.IfName, netlink.FAMILY_V4)
return err
})
if err != nil { if err != nil {
return err return err
} }
return ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error { if n.IPMasq {
return ip.DelLinkByName(args.IfName) chain := utils.FormatChainName(n.Name, args.ContainerID)
}) comment := utils.FormatComment(n.Name, args.ContainerID)
if err = ip.TeardownIPMasq(ipn, chain, comment); err != nil {
return err
}
}
return nil
} }
func main() { func main() {

6
plugins/main/ptp/ptp.go
View File

@ -195,6 +195,10 @@ func cmdDel(args *skel.CmdArgs) error {
return fmt.Errorf("failed to load netconf: %v", err) return fmt.Errorf("failed to load netconf: %v", err)
} }
if err := ipam.ExecDel(conf.IPAM.Type, args.StdinData); err != nil {
return err
}
var ipn *net.IPNet var ipn *net.IPNet
err := ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error { err := ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
var err error var err error
@ -213,7 +217,7 @@ func cmdDel(args *skel.CmdArgs) error {
} }
} }
return ipam.ExecDel(conf.IPAM.Type, args.StdinData) return nil
} }
func main() { func main() {