diff --git a/net/arp.go b/net/arp.go index bbd6dd7b..7d9418f8 100644 --- a/net/arp.go +++ b/net/arp.go @@ -10,7 +10,7 @@ import ( // Configure the ARP cache parameters for the given interface. This // makes containers react more quickly to a change in the MAC address // associated with an IP address. -func ConfigureARPCache(procPath, name string) error { +func configureARPCache(procPath, name string) error { if err := sysctl(procPath, fmt.Sprintf("net/ipv4/neigh/%s/base_reachable_time", name), "5"); err != nil { return err } diff --git a/net/bridge.go b/net/bridge.go index 3be330fb..504a5d12 100644 --- a/net/bridge.go +++ b/net/bridge.go @@ -275,7 +275,7 @@ func EnsureBridge(procPath string, config *BridgeConfig, log *logrus.Logger) (Br return bridgeType, err } - if err := ConfigureARPCache(procPath, config.WeaveBridgeName); err != nil { + if err := configureARPCache(procPath, config.WeaveBridgeName); err != nil { return bridgeType, errors.Wrapf(err, "configuring ARP cache on bridge %q", config.WeaveBridgeName) } diff --git a/net/netdev.go b/net/netdev.go index 1aaba06e..33e9b8f2 100644 --- a/net/netdev.go +++ b/net/netdev.go @@ -15,7 +15,7 @@ type Dev struct { CIDRs []*net.IPNet `json:"CIDRs,omitempty"` } -func LinkToNetDev(link netlink.Link) (Dev, error) { +func linkToNetDev(link netlink.Link) (Dev, error) { addrs, err := netlink.AddrList(link, netlink.FAMILY_V4) if err != nil { return Dev{}, err @@ -103,7 +103,7 @@ func GetNetDevsByVethPeerIds(processID int, peerIDs []int) ([]Dev, error) { for _, link := range links { if _, found := indexes[link.Attrs().Index]; found { - netdev, err := LinkToNetDev(link) + netdev, err := linkToNetDev(link) if err != nil { return err } @@ -124,5 +124,5 @@ func GetBridgeNetDev(bridgeName string) (Dev, error) { return Dev{}, err } - return LinkToNetDev(link) + return linkToNetDev(link) } diff --git a/net/veth.go b/net/veth.go index 38d7c608..dd82abef 100644 --- a/net/veth.go +++ b/net/veth.go @@ -220,14 +220,14 @@ func setupIface(ifaceName, newIfName string) error { return err } // This is only called by AttachContainer which is only called in host pid namespace - if err := ConfigureARPCache("/proc", newIfName); err != nil { + if err := configureARPCache("/proc", newIfName); err != nil { return err } return ipt.Append("filter", "INPUT", "-i", newIfName, "-d", "224.0.0.0/4", "-j", "DROP") } -// ConfigureARP is a helper for the Docker plugin which doesn't set the addresses itself -func ConfigureArp(prefix, rootPath string) error { +// configureARP is a helper for the Docker plugin which doesn't set the addresses itself +func ConfigureARP(prefix, rootPath string) error { links, err := netlink.LinkList() if err != nil { return err @@ -235,7 +235,7 @@ func ConfigureArp(prefix, rootPath string) error { for _, link := range links { ifName := link.Attrs().Name if strings.HasPrefix(ifName, prefix) { - ConfigureARPCache(rootPath+"/proc", ifName) + configureARPCache(rootPath+"/proc", ifName) if addrs, err := netlink.AddrList(link, netlink.FAMILY_V4); err == nil { for _, addr := range addrs { arping.GratuitousArpOverIfaceByName(addr.IPNet.IP, ifName) diff --git a/plugin/net/watcher.go b/plugin/net/watcher.go index f3beac59..2c386a8c 100644 --- a/plugin/net/watcher.go +++ b/plugin/net/watcher.go @@ -50,7 +50,7 @@ func (w *watcher) ContainerStarted(id string) { } netNSPath := weavenet.NSPathByPidWithRoot(rootDir, info.State.Pid) if err := weavenet.WithNetNSByPath(netNSPath, func() error { - return weavenet.ConfigureArp(weavenet.VethName, rootDir) + return weavenet.ConfigureARP(weavenet.VethName, rootDir) }); err != nil { w.driver.warn("ContainerStarted", "unable to configure interfaces: %s", err) }