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

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 <tklauser@distanz.ch>

diff --git a/device/conn_linux.go b/device/conn_linux.go
index 94b6d5c072c7d12410d1cbb281263c49b9f1cb6b..e90b0e35b456c1a3cd752fa10e0c441dbca65c68 100644 (file)
--- 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
index 34b1e720a8ea155ddb31f06ffb3911f48d38e626..f4e7b97c993e3417afefabb7d6515ce3a73d58a2 100644 (file)
--- 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
index 970f4cbade7116a742de5f846def4e71aab54c1e..be3d0cfdf4f3ad440c68075ebaa1a321ea0e04bb 100644 (file)
--- 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
index 36b43ea4d094bb1ade90c0cc1c127d0df78d5cea..7ab0623146623b148e89dcc8ad18ed82061ed78c 100644 (file)
--- 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 {