Update bridge.go, setup_ipv6.go

Signed-off-by: mostolog <[email protected]>

Author: mostolog

drivers/bridge/bridge.go

@@ -1030,7 +1030,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
 	if config.NDPProxyInterface != "" && config.EnableIPv6 {
 		link, err := d.nlh.LinkByName(config.NDPProxyInterface)
 		if err != nil {
-			return err
+			return fmt.Errorf("could not find link for ndp proxy interface %q: %v", config.NDPProxyInterface, err)
 		}
 		neighbor := netlink.Neigh{
 			LinkIndex:    link.Attrs().Index,
@@ -1109,7 +1109,9 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {
 	// Also make sure defer does not see this error either.
 	if n.config.NDPProxyInterface != "" && n.config.EnableIPv6 {
 		link, err := d.nlh.LinkByName(n.config.NDPProxyInterface)
-		if err == nil {
+		if err != nil {
+			Logrus.Warnf("could not remove ndp neighbour, because could not find link for ndp proxy interface %q: %v", config.NDPProxyInterface, err)
+		} else {			
 			neighbor := netlink.Neigh{
 				LinkIndex:    link.Attrs().Index,
 				Family:       netlink.FAMILY_V6,

drivers/bridge/setup_ipv6.go

@@ -20,7 +20,6 @@ const (
 	ipv6ForwardConfAll     = "/proc/sys/net/ipv6/conf/all/forwarding"
 	ndpProxyConfPerm       = 0644
 	ndpProxyConfDefault    = "/proc/sys/net/ipv6/conf/default/proxy_ndp"
-	ndpProxyConfAll        = "/proc/sys/net/ipv6/conf/all/proxy_ndp"
 )
 
 func init() {
@@ -134,15 +133,15 @@ func setupNDPProxying(config *networkConfiguration, i *bridgeInterface) error {
 		}
 	}
 
-	// Get current NDP all proxying setup
-	ndpProxyDataAll, err := ioutil.ReadFile(ndpProxyConfAll)
+	// Get interface with proxy_ndp enabled.
+	ndpProxyConfPath := fmt.Sprintf("/proc/sys/net/ipv6/conf/%s/proxy_ndp", config.NDPProxyInterface)
 	if err != nil {
-		return fmt.Errorf("Cannot read NDP all proxying setup: %v", err)
+		return fmt.Errorf("Unable to enable NDP proxying for interface %s: %v", config.NDPProxyInterface,err)
 	}
-	// Enable NDP all proxying only if it is not already enabled
-	if ndpProxyDataAll[0] != '1' {
-		if err := ioutil.WriteFile(ndpProxyConfAll, []byte{'1', '\n'}, ndpProxyConfPerm); err != nil {
-			logrus.Warnf("Unable to enable NDP all proxying: %v", err)
+	// Enable NDP proxying only if it is not already enabled
+	if ndpProxyConfPerm[0] != '1' {
+		if err := ioutil.WriteFile(ndpProxyConfPath, []byte{'1', '\n'}, ndpProxyConfPerm); err != nil {
+			logrus.Warnf("Unable to enable NDP proxying for interface %s: %v", config.NDPProxyInterface,err)
 		}
 	}