Selaa lähdekoodia

Update NetworkChangeName to be more similar to my original (moving IFNAMSIZ constant outside the function like it should've been)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Tianon Gravi 11 vuotta sitten
vanhempi
commit
3a7c144e99
1 muutettua tiedostoa jossa 4 lisäystä ja 2 poistoa
  1. 4 2
      pkg/netlink/netlink_linux.go

+ 4 - 2
pkg/netlink/netlink_linux.go

@@ -662,15 +662,17 @@ func getIfSocket() (int, error) {
 	return -1, sErr
 	return -1, sErr
 }
 }
 
 
+// from <net/if.h>
+const IFNAMSIZ = 16
+
 func NetworkChangeName(oldName, newName string) error {
 func NetworkChangeName(oldName, newName string) error {
 	fd, err := getIfSocket()
 	fd, err := getIfSocket()
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
 	defer syscall.Close(fd)
 	defer syscall.Close(fd)
-	IFNAMSIZ := 16
 
 
-	data := [32]byte{}
+	data := [IFNAMSIZ * 2]byte{}
 	copy(data[:IFNAMSIZ-1], oldName)
 	copy(data[:IFNAMSIZ-1], oldName)
 	copy(data[IFNAMSIZ:IFNAMSIZ*2-1], newName)
 	copy(data[IFNAMSIZ:IFNAMSIZ*2-1], newName)