clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-06-16 02:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly find the right Endpoint to steal networking information from.

Browse Source 
Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
This commit is contained in:
Dimitri John Ledkov
2015-09-16 19:52:09 +01:00
parent e51462ac68
commit d7c5f31c5b
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/execdriver/clr/driver.go
+10 -8
View File
@@ -10,6 +10,7 @@ import (
"net/http"
"os"
"os/exec"
"net"
"path"
"strconv"
"strings"
@@ -675,33 +676,34 @@ func (d *driver) setupNetwork(c *execdriver.Command) error {
var output []byte
var err error
if len(c.EndpointInfo) == 1 {
e := c.EndpointInfo[0]
bridgeName = e[netlabel.BridgeName].(string)
bridgeLinkName = e[netlabel.BridgeLinkName].(string)
for _, info := range c.EndpointInfo {
if info[netlabel.MacAddress].(net.HardwareAddr).String() == c.NetworkSettings.MacAddress {
bridgeName = info[netlabel.BridgeName].(string)
bridgeLinkName = info[netlabel.BridgeLinkName].(string)
}
}
// Strip existing veth
cmd := exec.Command("ip", "link", "del", bridgeLinkName)
if output, err = cmd.CombinedOutput(); err != nil {
logrus.Debugf("%s setupNetwork error: %s", driverName, output)
logrus.Debugf("%s setupNetwork error: %s %v, %s", driverName, cmd.Path, cmd.Args, output)
return err
}
cmd = exec.Command("ip", "tuntap", "add", "dev", ifname, "mode", "tap", "vnet_hdr")
if output, err = cmd.CombinedOutput(); err != nil {
logrus.Debugf("%s setupNetwork error: %s", driverName, output)
logrus.Debugf("%s setupNetwork error: %s %v, %s", driverName, cmd.Path, cmd.Args, output)
return err
}
cmd = exec.Command("ip", "link", "set", "dev", ifname, "master", bridgeName)
if output, err = cmd.CombinedOutput(); err != nil {
logrus.Debugf("%s setupNetwork error: %s", driverName, output)
logrus.Debugf("%s setupNetwork error: %s %v, %s", driverName, cmd.Path, cmd.Args, output)
return err
}
cmd = exec.Command("ip", "link", "set", "dev", ifname, "up")
if output, err = cmd.CombinedOutput(); err != nil {
logrus.Debugf("%s setupNetwork error: %s", driverName, output)
logrus.Debugf("%s setupNetwork error: %s %v, %s", driverName, cmd.Path, cmd.Args, output)
return err
}