global: use RTMGRP_* consts from x/sys/unix

tklauser · zx2c4 · commit 11be118eae09 · 2020-03-05T13:59:41.000+08:00
Update the golang.org/x/sys/unix dependency and use the newly introduced
RTMGRP_* consts instead of using the corresponding RTNLGRP_* const to
create a mask.

Signed-off-by: Tobias Klauser &lt;tklauser@distanz.ch&gt;
Signed-off-by: Jason A. Donenfeld &lt;Jason@zx2c4.com&gt;
diff --git a/device/conn_linux.go b/device/conn_linux.go
@@ -118,7 +118,7 @@ func createNetlinkRouteSocket() (int, error) {
 	}
 	saddr := &unix.SockaddrNetlink{
 		Family: unix.AF_NETLINK,
-		Groups: uint32(1 << (unix.RTNLGRP_IPV4_ROUTE - 1)),
+		Groups: unix.RTMGRP_IPV4_ROUTE,
 	}
 	err = unix.Bind(sock, saddr)
 	if err != nil {
diff --git a/go.mod b/go.mod
@@ -5,6 +5,6 @@ go 1.12
 require (
 	golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc
 	golang.org/x/net v0.0.0-20191003171128-d98b1b443823
-	golang.org/x/sys v0.0.0-20191003212358-c178f38b412c
+	golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527
 	golang.org/x/text v0.3.2
 )
diff --git a/go.sum b/go.sum
@@ -6,8 +6,8 @@ golang.org/x/net v0.0.0-20191003171128-d98b1b443823 h1:Ypyv6BNJh07T1pUSrehkLemqP
 golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191003212358-c178f38b412c h1:6Zx7DRlKXf79yfxuQ/7GqV3w2y7aDsk6bGg0MzF5RVU=
-golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/tun/tun_linux.go b/tun/tun_linux.go
@@ -85,7 +85,7 @@ func createNetlinkSocket() (int, error) {
 	}
 	saddr := &unix.SockaddrNetlink{
 		Family: unix.AF_NETLINK,
-		Groups: uint32((1 << (unix.RTNLGRP_LINK - 1)) | (1 << (unix.RTNLGRP_IPV4_IFADDR - 1)) | (1 << (unix.RTNLGRP_IPV6_IFADDR - 1))),
+		Groups: unix.RTMGRP_LINK | unix.RTMGRP_IPV4_IFADDR | unix.RTMGRP_IPV6_IFADDR,
 	}
 	err = unix.Bind(sock, saddr)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func createNetlinkRouteSocket() (int, error) {`
`118`	`118`	`}`
`119`	`119`	`saddr := &unix.SockaddrNetlink{`
`120`	`120`	`Family: unix.AF_NETLINK,`
`121`		`- Groups: uint32(1 << (unix.RTNLGRP_IPV4_ROUTE - 1)),`
	`121`	`+ Groups: unix.RTMGRP_IPV4_ROUTE,`
`122`	`122`	`}`
`123`	`123`	`err = unix.Bind(sock, saddr)`
`124`	`124`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ go 1.12`
`5`	`5`	`require (`
`6`	`6`	`golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc`
`7`	`7`	`golang.org/x/net v0.0.0-20191003171128-d98b1b443823`
`8`		`- golang.org/x/sys v0.0.0-20191003212358-c178f38b412c`
	`8`	`+ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527`
`9`	`9`	`golang.org/x/text v0.3.2`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func createNetlinkSocket() (int, error) {`
`85`	`85`	`}`
`86`	`86`	`saddr := &unix.SockaddrNetlink{`
`87`	`87`	`Family: unix.AF_NETLINK,`
`88`		`- Groups: uint32((1 << (unix.RTNLGRP_LINK - 1)) \| (1 << (unix.RTNLGRP_IPV4_IFADDR - 1)) \| (1 << (unix.RTNLGRP_IPV6_IFADDR - 1))),`
	`88`	`+ Groups: unix.RTMGRP_LINK \| unix.RTMGRP_IPV4_IFADDR \| unix.RTMGRP_IPV6_IFADDR,`
`89`	`89`	`}`
`90`	`90`	`err = unix.Bind(sock, saddr)`
`91`	`91`	`if err != nil {`