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

Merge pull request #175.

Browse Source
This commit is contained in:
Stefan Junker 2016-05-19 12:07:30 +02:00
commit 74790e55ef
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/bridge.md
View File

@ -19,6 +19,7 @@ If the bridge is missing, the plugin will create one on first use and, if gatewa
"bridge": "mynet0", "bridge": "mynet0",
"isGateway": true, "isGateway": true,
"ipMasq": true, "ipMasq": true,
"hairpinMode": true,
"ipam": { "ipam": {
"type": "host-local", "type": "host-local",
"subnet": "10.10.0.0/16" "subnet": "10.10.0.0/16"
@ -34,4 +35,5 @@ If the bridge is missing, the plugin will create one on first use and, if gatewa
* `isGateway` (boolean, optional): assign an IP address to the bridge. Defaults to false. * `isGateway` (boolean, optional): assign an IP address to the bridge. Defaults to false.
* `ipMasq` (boolean, optional): set up IP Masquerade on the host for traffic originating from this network and destined outside of it. Defaults to false. * `ipMasq` (boolean, optional): set up IP Masquerade on the host for traffic originating from this network and destined outside of it. Defaults to false.
* `mtu` (integer, optional): explicitly set MTU to the specified value. Defaults to the value chosen by the kernel. * `mtu` (integer, optional): explicitly set MTU to the specified value. Defaults to the value chosen by the kernel.
* `hairpinMode` (boolean, optional): set hairpin mode for interfaces on the bridge. Defaults to false.
* `ipam` (dictionary, required): IPAM configuration to be used for this network. * `ipam` (dictionary, required): IPAM configuration to be used for this network.

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

@ -36,10 +36,11 @@ const defaultBrName = "cni0"
type NetConf struct { type NetConf struct {
types.NetConf types.NetConf
BrName string `json:"bridge"` BrName string `json:"bridge"`
IsGW bool `json:"isGateway"` IsGW bool `json:"isGateway"`
IPMasq bool `json:"ipMasq"` IPMasq bool `json:"ipMasq"`
MTU int `json:"mtu"` MTU int `json:"mtu"`
HairpinMode bool `json:"hairpinMode"`
} }
func init() { func init() {
@ -123,7 +124,7 @@ func ensureBridge(brName string, mtu int) (*netlink.Bridge, error) {
return br, nil return br, nil
} }
func setupVeth(netns string, br *netlink.Bridge, ifName string, mtu int) error { func setupVeth(netns string, br *netlink.Bridge, ifName string, mtu int, hairpinMode bool) error {
var hostVethName string var hostVethName string
err := ns.WithNetNSPath(netns, false, func(hostNS *os.File) error { err := ns.WithNetNSPath(netns, false, func(hostNS *os.File) error {
@ -151,6 +152,11 @@ func setupVeth(netns string, br *netlink.Bridge, ifName string, mtu int) error {
return fmt.Errorf("failed to connect %q to bridge %v: %v", hostVethName, br.Attrs().Name, err) return fmt.Errorf("failed to connect %q to bridge %v: %v", hostVethName, br.Attrs().Name, err)
} }
// set hairpin mode
if err = netlink.LinkSetHairpin(hostVeth, hairpinMode); err != nil {
return fmt.Errorf("failed to setup hairpin mode for %v: %v", hostVethName, err)
}
return nil return nil
} }
@ -180,7 +186,7 @@ func cmdAdd(args *skel.CmdArgs) error {
return err return err
} }
if err = setupVeth(args.Netns, br, args.IfName, n.MTU); err != nil { if err = setupVeth(args.Netns, br, args.IfName, n.MTU, n.HairpinMode); err != nil {
return err return err
} }