]> Cypherpunks.ru repositories - gostls13.git/commitdiff
all: update vendored golang.org/x/{net,tools} for Go 1.20 development
authorDmitri Shuralyov <dmitshur@golang.org>
Fri, 5 Aug 2022 01:39:53 +0000 (21:39 -0400)
committerGopher Robot <gobot@golang.org>
Fri, 5 Aug 2022 19:54:32 +0000 (19:54 +0000)
CL 421334 updated most of golang.org/x dependencies at the start of
the Go 1.20 development cycle. This CL updates x/net and x/tools as
well, now that go.dev/issue/54259 is resolved.

For #36905.
Updates #54259.

Change-Id: Ie422b71cba060a4774076eebf3b499cda1150367
Reviewed-on: https://go-review.googlesource.com/c/go/+/421461
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
83 files changed:
src/cmd/go.mod
src/cmd/go.sum
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
src/cmd/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
src/cmd/vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
src/cmd/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
src/cmd/vendor/modules.txt
src/go.mod
src/go.sum
src/net/http/h2_bundle.go
src/vendor/golang.org/x/net/AUTHORS [deleted file]
src/vendor/golang.org/x/net/CONTRIBUTORS [deleted file]
src/vendor/golang.org/x/net/http2/hpack/encode.go
src/vendor/golang.org/x/net/http2/hpack/hpack.go
src/vendor/golang.org/x/net/http2/hpack/huffman.go
src/vendor/golang.org/x/net/lif/address.go
src/vendor/golang.org/x/net/lif/lif.go
src/vendor/golang.org/x/net/lif/link.go
src/vendor/golang.org/x/net/lif/zsys_solaris_amd64.go
src/vendor/golang.org/x/net/nettest/conntest.go
src/vendor/golang.org/x/net/route/address.go
src/vendor/golang.org/x/net/route/interface_classic.go
src/vendor/golang.org/x/net/route/interface_freebsd.go
src/vendor/golang.org/x/net/route/interface_openbsd.go
src/vendor/golang.org/x/net/route/route.go
src/vendor/golang.org/x/net/route/route_openbsd.go
src/vendor/golang.org/x/net/route/sys.go
src/vendor/golang.org/x/net/route/sys_darwin.go
src/vendor/golang.org/x/net/route/sys_dragonfly.go
src/vendor/golang.org/x/net/route/sys_freebsd.go
src/vendor/golang.org/x/net/route/sys_netbsd.go
src/vendor/golang.org/x/net/route/sys_openbsd.go
src/vendor/golang.org/x/net/route/zsys_darwin.go
src/vendor/golang.org/x/net/route/zsys_dragonfly.go
src/vendor/golang.org/x/net/route/zsys_freebsd_386.go
src/vendor/golang.org/x/net/route/zsys_freebsd_amd64.go
src/vendor/golang.org/x/net/route/zsys_freebsd_arm.go
src/vendor/golang.org/x/net/route/zsys_freebsd_arm64.go
src/vendor/golang.org/x/net/route/zsys_netbsd.go
src/vendor/golang.org/x/net/route/zsys_openbsd.go
src/vendor/modules.txt

index c444956c35b02e144e0dd5b6855b8c4026b23ce9..6629512617ea662af1db06504ef72e42121a248d 100644 (file)
@@ -7,9 +7,9 @@ require (
        golang.org/x/arch v0.0.0-20220722155209-00200b7164a7
        golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
        golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
-       golang.org/x/sys v0.0.0-20220803195053-6e608f9ce704
+       golang.org/x/sys v0.0.0-20220804214406-8e32c043e418
        golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
-       golang.org/x/tools v0.1.12-0.20220725193627-2a6393fe54b3
+       golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa
 )
 
 require (
index 1c3390cb1c84762e82b8377eaa83780aabb1f770..aa726504005379a350c79353e7b42460c20c296c 100644 (file)
@@ -10,9 +10,9 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVD
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20220803195053-6e608f9ce704 h1:Y7NOhdqIOU8kYI7BxsgL38d0ot0raxvcW+EMQU2QrT4=
-golang.org/x/sys v0.0.0-20220803195053-6e608f9ce704/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 h1:9vYwv7OjYaky/tlAeD7C4oC9EsPTlaFl1H2jS++V+ME=
+golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
 golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/tools v0.1.12-0.20220725193627-2a6393fe54b3 h1:w/Sued0p1rtooa9ACDVKK2YXKdoowvAcSAMCg0uxOe4=
-golang.org/x/tools v0.1.12-0.20220725193627-2a6393fe54b3/go.mod h1:LAN4g6CAevfxH/1ahTEeded+lrzLCK8eMwlRe2NVbGM=
+golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa h1:uKcci2q7Qtp6nMTC/AAvfNUAldFtJuHWV9/5QWiypts=
+golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
index 274e2dabdfed7410974b7bef1895b2c62bfc5bf1..36c0dfc7c4cf4533e61123140a1afa95243b7bde 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include -m32
+// mkerrors.sh -Wall -Werror -static -I/tmp/386/include -m32
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && linux
 // +build 386,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/386/include -m32 _const.go
 
 package unix
 
index 95b6eeedfece1ee7b5a4fbff3e7a2ee545e47292..4ff942703b7b0a15c7d820afc6a555e96466c6fd 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include -m64
+// mkerrors.sh -Wall -Werror -static -I/tmp/amd64/include -m64
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && linux
 // +build amd64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/amd64/include -m64 _const.go
 
 package unix
 
index 918cd130ec8b3d5b104962cece13cfe7d8bd0c4b..3eaa0fb78e30f90065faee9a0f9fab7668f014d2 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/arm/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && linux
 // +build arm,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/arm/include _const.go
 
 package unix
 
index 3907dc5a90e5cff06ca9270c1657b4c50d332cf7..d7995bdc3a21892c94c3055fc3374398126e463b 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
+// mkerrors.sh -Wall -Werror -static -I/tmp/arm64/include -fsigned-char
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && linux
 // +build arm64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/arm64/include -fsigned-char _const.go
 
 package unix
 
index 03d5c105a3850c513cf9884c8c1532ff0d4d54dd..928e24c20535371a1f4718606acfc5f76bd13a73 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/loong64/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build loong64 && linux
 // +build loong64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/loong64/include _const.go
 
 package unix
 
index bd794e0108ebc61a6bf64d8dbb875f5504dace00..179bffb474b43503d8ed8182195c161ef872568e 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/mips/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips && linux
 // +build mips,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/mips/include _const.go
 
 package unix
 
index 6c741b054765ea8eaf366a6960da54b5d078a6a6..1fba17bd75cb1c3d039a174cb9dea36b335be066 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/mips64/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64 && linux
 // +build mips64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/mips64/include _const.go
 
 package unix
 
index 807b8cd2a8d3ea48bcf690757e19c6766007c0c2..b77dde31537e6a3ee2b63b52b42ebafca6918f28 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/mips64le/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64le && linux
 // +build mips64le,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/mips64le/include _const.go
 
 package unix
 
index a39e4f5c206de1ca2fac2b88a24fbbd5a63b5136..78c6c751bfa5a639365832ce9d96988c46bc50dc 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/mipsle/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mipsle && linux
 // +build mipsle,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/mipsle/include _const.go
 
 package unix
 
index c0fcda86b4cecf1c5198dd0ef7de1b1c16a3a66e..1c0d31f0b4c28d5ba89f9a05c65bba17904b4228 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/ppc/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc && linux
 // +build ppc,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/ppc/include _const.go
 
 package unix
 
index f3b72407aa66aeeccbc3ed3722dd46b34057e680..959dd9bb8fcc050db999608e03c5c410b83e5a2b 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/ppc64/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64 && linux
 // +build ppc64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/ppc64/include _const.go
 
 package unix
 
index 72f2a45d5038442eab471d0d03c8ea8479535f83..5a873cdbc9d273d76a5fa3344e86aec353818298 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/ppc64le/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64le && linux
 // +build ppc64le,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/ppc64le/include _const.go
 
 package unix
 
index 45b214b4d3a8d115e4ee81b3a0a57057bc71e668..e336d141e1f19aa20cc339a685ef4e0115e99ebf 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/riscv64/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build riscv64 && linux
 // +build riscv64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/riscv64/include _const.go
 
 package unix
 
index 1897f207bb389468d2d4d926ea5fe7b029767b95..390c01d92a530d9ca06aee997ef330136f6ec1fa 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
+// mkerrors.sh -Wall -Werror -static -I/tmp/s390x/include -fsigned-char
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build s390x && linux
 // +build s390x,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/s390x/include -fsigned-char _const.go
 
 package unix
 
index 1fb7a3953a9ef7b0a40dbfbb64fc9a50eccd7635..98a6e5f11f5086083ce42e5e898980ccaf6e000b 100644 (file)
@@ -1,11 +1,11 @@
-// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// mkerrors.sh -Wall -Werror -static -I/tmp/sparc64/include
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build sparc64 && linux
 // +build sparc64,linux
 
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/sparc64/include _const.go
 
 package unix
 
index 62192e1de2a75541d59040fdf66ac39432155f1d..c9c4ad0314f98ce210a47ff2c2cdd2effca85593 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include -m32 /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/386/include -m32 /tmp/386/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && linux
index 490aab5d215e1e427f32fdc61f8f55c4b552a0fb..12ff3417c5fd4f9d0ba9cded79f634d60ea733cb 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include -m64 /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/amd64/include -m64 /tmp/amd64/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && linux
index aca17b6fad41744561f8a0a0a2bceefced07432b..c3fb5e77ab432fa2feb02d2d58f7389f6ae12180 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/arm/include /tmp/arm/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && linux
index 54b4dfa547f1bc48c5258a0e5d86d9eea73e6283..358c847a40c5fb71f64b46beda0660f8331e62cd 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/arm64/include -fsigned-char /tmp/arm64/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && linux
index 44a764c9917c1184f4baf2dee9cc1fbbf9f0c7f9..81c4849b1619a9fc3eef885e10b7d4119e236811 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/loong64/include /tmp/loong64/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build loong64 && linux
index 65a99efc236be115b39f06c3653bc0878fec9350..202a57e9008685943e499f0dd880d40469401606 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/mips/include /tmp/mips/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips && linux
index 841c8a668206b17d7e765b81421d27b39b7e7243..1fbceb52d7cf6330f9de65b388ec600ae05c5147 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/mips64/include /tmp/mips64/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64 && linux
index e26a7c7658e9bcb0761972d68ceb1e875e349d2f..b4ffb7a207d5432ada33f9b53d27325ab8ec2d1e 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/mips64le/include /tmp/mips64le/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64le && linux
index 26447260a9ef196769d160436ff1c8aa4834334b..867985f9b440536f198aebe7913b9d2e5bbb47bb 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/mipsle/include /tmp/mipsle/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mipsle && linux
index 26aefc1869aea0c4133da3bbcf7c6b7b9df55a35..a8cce69ede2f39bbda15524c6043b3a53cd1033a 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/ppc/include /tmp/ppc/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc && linux
index 8d4cd9d99d48cc614de076d0db232b2a390eda1b..d44c5b39d79deb495f93a1e66f0966648c8622e1 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/ppc64/include /tmp/ppc64/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64 && linux
index 3b405d1f82a8132bb93a2911aaf02ccc7f38b23e..4214dd9c03a7e323d5d46c37d014ec87c5bad5a5 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/ppc64le/include /tmp/ppc64le/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64le && linux
index 3a9c96b28820039df61a8cb7438b519bff2d8258..3e594a8c091026a390df22e1cb05a72c2e81226e 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/riscv64/include /tmp/riscv64/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build riscv64 && linux
index 8ffa66469ef9abda828d8e7386722a96f07ad67b..7ea465204b7c4652b2a62d7656db3f629ac94ae1 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/s390x/include -fsigned-char /tmp/s390x/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build s390x && linux
index 6a39640e76daa2423cb8ee2c4b13e9eb9b038e87..92f628ef4f23f6d6468db18dfa96a9819cdce9a9 100644 (file)
@@ -1,4 +1,4 @@
-// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/sparc64/include /tmp/sparc64/include/asm/unistd.h
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build sparc64 && linux
index f6de1eedbdf60549d65d5030939686697cbae28d..ff6881167d97978bc634c8cc4597e3ad1cbd205e 100644 (file)
@@ -1466,6 +1466,11 @@ const (
        IFLA_ALT_IFNAME                            = 0x35
        IFLA_PERM_ADDRESS                          = 0x36
        IFLA_PROTO_DOWN_REASON                     = 0x37
+       IFLA_PARENT_DEV_NAME                       = 0x38
+       IFLA_PARENT_DEV_BUS_NAME                   = 0x39
+       IFLA_GRO_MAX_SIZE                          = 0x3a
+       IFLA_TSO_MAX_SIZE                          = 0x3b
+       IFLA_TSO_MAX_SEGS                          = 0x3c
        IFLA_PROTO_DOWN_REASON_UNSPEC              = 0x0
        IFLA_PROTO_DOWN_REASON_MASK                = 0x1
        IFLA_PROTO_DOWN_REASON_VALUE               = 0x2
index 7551af4831817e4da15251ad40704972fa4cb75e..2636044018f25aad10ccbb98b869b160031801ce 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/386/cgo -- -Wall -Werror -static -I/tmp/386/include -m32 linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build 386 && linux
index 3e738ac0bbf523542c0b627106cddbe7f473f8bb..8187489d16fd20b8c953b1e29554259c470f99f4 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/amd64/cgo -- -Wall -Werror -static -I/tmp/amd64/include -m64 linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build amd64 && linux
index 6183eef4a40b251e33cb9b6cd6bd8da5d5561120..d1612335f4eaaf9c96c4756613359c67722a082b 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/arm/cgo -- -Wall -Werror -static -I/tmp/arm/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm && linux
index 968cecb17e885ac8599924ee2b64c733e4bec8b4..c28e5556b0a590095c9ea074c369d2842b72d244 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/arm64/cgo -- -Wall -Werror -static -I/tmp/arm64/include -fsigned-char linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build arm64 && linux
index 8fe4c522a9cc4fe855017d491497366da5bf4050..187061f9f86ff5f77d4b49fc714e76057a1a4bb5 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/loong64/cgo -- -Wall -Werror -static -I/tmp/loong64/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build loong64 && linux
index 11426a3010b59bde3f3d3b730780beb1238c8fd5..369129917aba25e67f67e8b75e85a633a3b982c8 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/mips/cgo -- -Wall -Werror -static -I/tmp/mips/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips && linux
index ad1c3b3de59789aecebf4f8d59ec99d51bc64d59..7473468d717f6eb29de8caa38d30d02fa33ff62c 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/mips64/cgo -- -Wall -Werror -static -I/tmp/mips64/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64 && linux
index 15fd84e4dd06cfd1a4e6d67882bec12b36606219..ed9448524b89ba74cf5eb9775b6293d996cb108c 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/mips64le/cgo -- -Wall -Werror -static -I/tmp/mips64le/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mips64le && linux
index 49c49825ab32cbf6ea9e017730dfb965bb563e4f..0892a73a4b7be2f608e0bf31819623a73a8a295e 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/mipsle/cgo -- -Wall -Werror -static -I/tmp/mipsle/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build mipsle && linux
index cd36d0da26a87cbb0c60df94c7e00607b78eea53..e1dd483333217b201efe1d2aee2471afa239836a 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/ppc/cgo -- -Wall -Werror -static -I/tmp/ppc/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc && linux
index 8c6fce039501447994d1522ed52a3c48cc6bb784..d9f654c7b1273cdf0ae1f602985abedc58a7a39c 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/ppc64/cgo -- -Wall -Werror -static -I/tmp/ppc64/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64 && linux
index 20910f2ad78c663be344e8127aba7571ca9e8799..74acda9fe44c6ffed987866b83dc99a7ec9df9b2 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/ppc64le/cgo -- -Wall -Werror -static -I/tmp/ppc64le/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build ppc64le && linux
index 71b7b3331db7e82d4fa155932af886056a94c219..50ebe69ebc03313bb1bdf3febcbdc651537d4001 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/riscv64/cgo -- -Wall -Werror -static -I/tmp/riscv64/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build riscv64 && linux
index 71184cc2cda8ca8427304753c05063b3995abf91..75b34c259930ce2e21871eb540526c44bdd4cdeb 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/s390x/cgo -- -Wall -Werror -static -I/tmp/s390x/include -fsigned-char linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build s390x && linux
index 06156285d9e7ee2409eae8121e9a5e3660f5a91b..429c3bf7dd8a7375c3f20ff6129786a2c1b84bf8 100644 (file)
@@ -1,4 +1,4 @@
-// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// cgo -godefs -objdir=/tmp/sparc64/cgo -- -Wall -Werror -static -I/tmp/sparc64/include linux/types.go | go run mkpost.go
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 //go:build sparc64 && linux
index 888ddbc4c120b0df1b574f54255c8a38394847c1..1df276804907fed9e88ed1c79a23d7a15dde0bfa 100644 (file)
@@ -40,7 +40,7 @@ golang.org/x/mod/zip
 # golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
 ## explicit
 golang.org/x/sync/semaphore
-# golang.org/x/sys v0.0.0-20220803195053-6e608f9ce704
+# golang.org/x/sys v0.0.0-20220804214406-8e32c043e418
 ## explicit; go 1.17
 golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/plan9
@@ -49,7 +49,7 @@ golang.org/x/sys/windows
 # golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
 ## explicit; go 1.17
 golang.org/x/term
-# golang.org/x/tools v0.1.12-0.20220725193627-2a6393fe54b3
+# golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa
 ## explicit; go 1.18
 golang.org/x/tools/cover
 golang.org/x/tools/go/analysis
index 8537e5737ff104589137c5f001a917a2a4505488..aeff4459ce3aeb98abe1b0dbd6d51da671176247 100644 (file)
@@ -4,10 +4,10 @@ go 1.20
 
 require (
        golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
-       golang.org/x/net v0.0.0-20220517181318-183a9ca12b87
+       golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48
 )
 
 require (
-       golang.org/x/sys v0.0.0-20220803195053-6e608f9ce704 // indirect
+       golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect
        golang.org/x/text v0.3.8-0.20220722155301-d03b41800055 // indirect
 )
index 46b9425c1b81f5eb48bd6e0ba2ea93993b0fd78f..eb2cc1572900c39cce1f2cdbe81add8aeb13fc0e 100644 (file)
@@ -1,8 +1,8 @@
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20220517181318-183a9ca12b87 h1:cCR+9mKLOGyX4Zx+uBZDXEDAQsvKQ/XbW4vreG5v1jU=
-golang.org/x/net v0.0.0-20220517181318-183a9ca12b87/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/sys v0.0.0-20220803195053-6e608f9ce704 h1:Y7NOhdqIOU8kYI7BxsgL38d0ot0raxvcW+EMQU2QrT4=
-golang.org/x/sys v0.0.0-20220803195053-6e608f9ce704/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 h1:N9Vc/rorQUDes6B9CNdIxAn5jODGj2wzfrei2x4wNj4=
+golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 h1:9vYwv7OjYaky/tlAeD7C4oC9EsPTlaFl1H2jS++V+ME=
+golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.8-0.20220722155301-d03b41800055 h1:mr0sHTB/O2dJ0ivoAAz1Mqs776JzxylyunOKJws3B88=
 golang.org/x/text v0.3.8-0.20220722155301-d03b41800055/go.mod h1:5O0TPrbzDRCcAYs9rc2W4CFPmVHJfNFe8tESfECPJPE=
index 53fbe9352aa8f0c993d455b6f6c688aaaa4184f0..ee0a40a15e4a0b87b5e3c8dc742409f6358091e9 100644 (file)
@@ -859,7 +859,6 @@ func (p *http2clientConnPool) getStartDialLocked(ctx context.Context, addr strin
 func (c *http2dialCall) dial(ctx context.Context, addr string) {
        const singleUse = false // shared conn
        c.res, c.err = c.p.t.dialClientConn(ctx, addr, singleUse)
-       close(c.done)
 
        c.p.mu.Lock()
        delete(c.p.dialing, addr)
@@ -867,6 +866,8 @@ func (c *http2dialCall) dial(ctx context.Context, addr string) {
                c.p.addConnLocked(addr, c.res)
        }
        c.p.mu.Unlock()
+
+       close(c.done)
 }
 
 // addConnIfNeeded makes a NewClientConn out of c if a connection for key doesn't
@@ -1351,7 +1352,7 @@ const http2frameHeaderLen = 9
 var http2padZeros = make([]byte, 255) // zeros for padding
 
 // A FrameType is a registered frame type as defined in
-// http://http2.github.io/http2-spec/#rfc.section.11.2
+// https://httpwg.org/specs/rfc7540.html#rfc.section.11.2
 type http2FrameType uint8
 
 const (
@@ -1474,7 +1475,7 @@ func http2typeFrameParser(t http2FrameType) http2frameParser {
 
 // A FrameHeader is the 9 byte header of all HTTP/2 frames.
 //
-// See http://http2.github.io/http2-spec/#FrameHeader
+// See https://httpwg.org/specs/rfc7540.html#FrameHeader
 type http2FrameHeader struct {
        valid bool // caller can access []byte fields in the Frame
 
@@ -1906,7 +1907,7 @@ func (fr *http2Framer) checkFrameOrder(f http2Frame) error {
 
 // A DataFrame conveys arbitrary, variable-length sequences of octets
 // associated with a stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.1
+// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.1
 type http2DataFrame struct {
        http2FrameHeader
        data []byte
@@ -2029,7 +2030,7 @@ func (f *http2Framer) WriteDataPadded(streamID uint32, endStream bool, data, pad
 // endpoints communicate, such as preferences and constraints on peer
 // behavior.
 //
-// See http://http2.github.io/http2-spec/#SETTINGS
+// See https://httpwg.org/specs/rfc7540.html#SETTINGS
 type http2SettingsFrame struct {
        http2FrameHeader
        p []byte
@@ -2168,7 +2169,7 @@ func (f *http2Framer) WriteSettingsAck() error {
 // A PingFrame is a mechanism for measuring a minimal round trip time
 // from the sender, as well as determining whether an idle connection
 // is still functional.
-// See http://http2.github.io/http2-spec/#rfc.section.6.7
+// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.7
 type http2PingFrame struct {
        http2FrameHeader
        Data [8]byte
@@ -2201,7 +2202,7 @@ func (f *http2Framer) WritePing(ack bool, data [8]byte) error {
 }
 
 // A GoAwayFrame informs the remote peer to stop creating streams on this connection.
-// See http://http2.github.io/http2-spec/#rfc.section.6.8
+// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.8
 type http2GoAwayFrame struct {
        http2FrameHeader
        LastStreamID uint32
@@ -2265,7 +2266,7 @@ func http2parseUnknownFrame(_ *http2frameCache, fh http2FrameHeader, countError
 }
 
 // A WindowUpdateFrame is used to implement flow control.
-// See http://http2.github.io/http2-spec/#rfc.section.6.9
+// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.9
 type http2WindowUpdateFrame struct {
        http2FrameHeader
        Increment uint32 // never read with high bit set
@@ -2454,7 +2455,7 @@ func (f *http2Framer) WriteHeaders(p http2HeadersFrameParam) error {
 }
 
 // A PriorityFrame specifies the sender-advised priority of a stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.3
+// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.3
 type http2PriorityFrame struct {
        http2FrameHeader
        http2PriorityParam
@@ -2524,7 +2525,7 @@ func (f *http2Framer) WritePriority(streamID uint32, p http2PriorityParam) error
 }
 
 // A RSTStreamFrame allows for abnormal termination of a stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.4
+// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.4
 type http2RSTStreamFrame struct {
        http2FrameHeader
        ErrCode http2ErrCode
@@ -2556,7 +2557,7 @@ func (f *http2Framer) WriteRSTStream(streamID uint32, code http2ErrCode) error {
 }
 
 // A ContinuationFrame is used to continue a sequence of header block fragments.
-// See http://http2.github.io/http2-spec/#rfc.section.6.10
+// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.10
 type http2ContinuationFrame struct {
        http2FrameHeader
        headerFragBuf []byte
@@ -2597,7 +2598,7 @@ func (f *http2Framer) WriteContinuation(streamID uint32, endHeaders bool, header
 }
 
 // A PushPromiseFrame is used to initiate a server stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.6
+// See https://httpwg.org/specs/rfc7540.html#rfc.section.6.6
 type http2PushPromiseFrame struct {
        http2FrameHeader
        PromiseID     uint32
@@ -3268,14 +3269,14 @@ const (
        http2ClientPreface = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
 
        // SETTINGS_MAX_FRAME_SIZE default
-       // http://http2.github.io/http2-spec/#rfc.section.6.5.2
+       // https://httpwg.org/specs/rfc7540.html#rfc.section.6.5.2
        http2initialMaxFrameSize = 16384
 
        // NextProtoTLS is the NPN/ALPN protocol negotiated during
        // HTTP/2's TLS setup.
        http2NextProtoTLS = "h2"
 
-       // http://http2.github.io/http2-spec/#SettingValues
+       // https://httpwg.org/specs/rfc7540.html#SettingValues
        http2initialHeaderTableSize = 4096
 
        http2initialWindowSize = 65535 // 6.9.2 Initial Flow Control Window Size
@@ -3324,7 +3325,7 @@ func (st http2streamState) String() string {
 // Setting is a setting parameter: which setting it is, and its value.
 type http2Setting struct {
        // ID is which setting is being set.
-       // See http://http2.github.io/http2-spec/#SettingValues
+       // See https://httpwg.org/specs/rfc7540.html#SettingFormat
        ID http2SettingID
 
        // Val is the value.
@@ -3356,7 +3357,7 @@ func (s http2Setting) Valid() error {
 }
 
 // A SettingID is an HTTP/2 setting as defined in
-// http://http2.github.io/http2-spec/#iana-settings
+// https://httpwg.org/specs/rfc7540.html#iana-settings
 type http2SettingID uint16
 
 const (
@@ -4034,6 +4035,20 @@ type http2ServeConnOpts struct {
        // requests. If nil, BaseConfig.Handler is used. If BaseConfig
        // or BaseConfig.Handler is nil, http.DefaultServeMux is used.
        Handler Handler
+
+       // UpgradeRequest is an initial request received on a connection
+       // undergoing an h2c upgrade. The request body must have been
+       // completely read from the connection before calling ServeConn,
+       // and the 101 Switching Protocols response written.
+       UpgradeRequest *Request
+
+       // Settings is the decoded contents of the HTTP2-Settings header
+       // in an h2c upgrade request.
+       Settings []byte
+
+       // SawClientPreface is set if the HTTP/2 connection preface
+       // has already been read from the connection.
+       SawClientPreface bool
 }
 
 func (o *http2ServeConnOpts) context() context.Context {
@@ -4102,6 +4117,7 @@ func (s *http2Server) ServeConn(c net.Conn, opts *http2ServeConnOpts) {
                headerTableSize:             http2initialHeaderTableSize,
                serveG:                      http2newGoroutineLock(),
                pushEnabled:                 true,
+               sawClientPreface:            opts.SawClientPreface,
        }
 
        s.state.registerConn(sc)
@@ -4184,9 +4200,27 @@ func (s *http2Server) ServeConn(c net.Conn, opts *http2ServeConnOpts) {
                }
        }
 
+       if opts.Settings != nil {
+               fr := &http2SettingsFrame{
+                       http2FrameHeader: http2FrameHeader{valid: true},
+                       p:                opts.Settings,
+               }
+               if err := fr.ForeachSetting(sc.processSetting); err != nil {
+                       sc.rejectConn(http2ErrCodeProtocol, "invalid settings")
+                       return
+               }
+               opts.Settings = nil
+       }
+
        if hook := http2testHookGetServerConn; hook != nil {
                hook(sc)
        }
+
+       if opts.UpgradeRequest != nil {
+               sc.upgradeRequest(opts.UpgradeRequest)
+               opts.UpgradeRequest = nil
+       }
+
        sc.serve()
 }
 
@@ -4231,6 +4265,7 @@ type http2serverConn struct {
        // Everything following is owned by the serve loop; use serveG.check():
        serveG                      http2goroutineLock // used to verify funcs are on serve()
        pushEnabled                 bool
+       sawClientPreface            bool // preface has already been read, used in h2c upgrade
        sawFirstSettings            bool // got the initial SETTINGS frame after the preface
        needToSendSettingsAck       bool
        unackedSettings             int    // how many SETTINGS have we sent without ACKs?
@@ -4698,6 +4733,9 @@ var http2errPrefaceTimeout = errors.New("timeout waiting for client preface")
 // returns errPrefaceTimeout on timeout, or an error if the greeting
 // is invalid.
 func (sc *http2serverConn) readPreface() error {
+       if sc.sawClientPreface {
+               return nil
+       }
        errc := make(chan error, 1)
        go func() {
                // Read the client preface
@@ -5639,6 +5677,26 @@ func (sc *http2serverConn) processHeaders(f *http2MetaHeadersFrame) error {
        return nil
 }
 
+func (sc *http2serverConn) upgradeRequest(req *Request) {
+       sc.serveG.check()
+       id := uint32(1)
+       sc.maxClientStreamID = id
+       st := sc.newStream(id, 0, http2stateHalfClosedRemote)
+       st.reqTrailer = req.Trailer
+       if st.reqTrailer != nil {
+               st.trailer = make(Header)
+       }
+       rw := sc.newResponseWriter(st, req)
+
+       // Disable any read deadline set by the net/http package
+       // prior to the upgrade.
+       if sc.hs.ReadTimeout != 0 {
+               sc.conn.SetReadDeadline(time.Time{})
+       }
+
+       go sc.runHandler(rw, req, sc.handler.ServeHTTP)
+}
+
 func (st *http2stream) processTrailerHeaders(f *http2MetaHeadersFrame) error {
        sc := st.sc
        sc.serveG.check()
@@ -5869,6 +5927,11 @@ func (sc *http2serverConn) newWriterAndRequestNoBody(st *http2stream, rp http2re
        }
        req = req.WithContext(st.ctx)
 
+       rw := sc.newResponseWriter(st, req)
+       return rw, req, nil
+}
+
+func (sc *http2serverConn) newResponseWriter(st *http2stream, req *Request) *http2responseWriter {
        rws := http2responseWriterStatePool.Get().(*http2responseWriterState)
        bwSave := rws.bw
        *rws = http2responseWriterState{} // zero all the fields
@@ -5877,10 +5940,7 @@ func (sc *http2serverConn) newWriterAndRequestNoBody(st *http2stream, rp http2re
        rws.bw.Reset(http2chunkWriter{rws})
        rws.stream = st
        rws.req = req
-       rws.body = body
-
-       rw := &http2responseWriter{rws: rws}
-       return rw, req, nil
+       return &http2responseWriter{rws: rws}
 }
 
 // Run on its own goroutine.
@@ -6095,7 +6155,6 @@ type http2responseWriterState struct {
        // immutable within a request:
        stream *http2stream
        req    *Request
-       body   *http2requestBody // to close at end of request, if DATA frames didn't
        conn   *http2serverConn
 
        // TODO: adjust buffer writing sizes based on server config, frame size updates from peer, etc
@@ -10782,16 +10841,15 @@ func (ws *http2priorityWriteScheduler) AdjustStream(streamID uint32, priority ht
 
 func (ws *http2priorityWriteScheduler) Push(wr http2FrameWriteRequest) {
        var n *http2priorityNode
-       if id := wr.StreamID(); id == 0 {
+       if wr.isControl() {
                n = &ws.root
        } else {
+               id := wr.StreamID()
                n = ws.nodes[id]
                if n == nil {
                        // id is an idle or closed stream. wr should not be a HEADERS or
-                       // DATA frame. However, wr can be a RST_STREAM. In this case, we
-                       // push wr onto the root, rather than creating a new priorityNode,
-                       // since RST_STREAM is tiny and the stream's priority is unknown
-                       // anyway. See issue #17919.
+                       // DATA frame. In other case, we push wr onto the root, rather
+                       // than creating a new priorityNode.
                        if wr.DataSize() > 0 {
                                panic("add DATA on non-open stream")
                        }
diff --git a/src/vendor/golang.org/x/net/AUTHORS b/src/vendor/golang.org/x/net/AUTHORS
deleted file mode 100644 (file)
index 15167cd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# This source code refers to The Go Authors for copyright purposes.
-# The master list of authors is in the main Go distribution,
-# visible at http://tip.golang.org/AUTHORS.
diff --git a/src/vendor/golang.org/x/net/CONTRIBUTORS b/src/vendor/golang.org/x/net/CONTRIBUTORS
deleted file mode 100644 (file)
index 1c4577e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# This source code was written by the Go contributors.
-# The master list of contributors is in the main Go distribution,
-# visible at http://tip.golang.org/CONTRIBUTORS.
index 97f17831fc55b8c944d501320dbc5d2f03016e39..6886dc163cba59157acd727c1b9295493c1e1f33 100644 (file)
@@ -191,7 +191,7 @@ func appendTableSize(dst []byte, v uint32) []byte {
 // bit prefix, to dst and returns the extended buffer.
 //
 // See
-// http://http2.github.io/http2-spec/compression.html#integer.representation
+// https://httpwg.org/specs/rfc7541.html#integer.representation
 func appendVarInt(dst []byte, n byte, i uint64) []byte {
        k := uint64((1 << n) - 1)
        if i < k {
index 85f18a2b0a8616295fdb1e69c9df352bf944e436..ebdfbee964ae38b90ec4a04dc8c200770b9d47e0 100644 (file)
@@ -59,7 +59,7 @@ func (hf HeaderField) String() string {
 
 // Size returns the size of an entry per RFC 7541 section 4.1.
 func (hf HeaderField) Size() uint32 {
-       // http://http2.github.io/http2-spec/compression.html#rfc.section.4.1
+       // https://httpwg.org/specs/rfc7541.html#rfc.section.4.1
        // "The size of the dynamic table is the sum of the size of
        // its entries. The size of an entry is the sum of its name's
        // length in octets (as defined in Section 5.2), its value's
@@ -158,7 +158,7 @@ func (d *Decoder) SetAllowedMaxDynamicTableSize(v uint32) {
 }
 
 type dynamicTable struct {
-       // http://http2.github.io/http2-spec/compression.html#rfc.section.2.3.2
+       // https://httpwg.org/specs/rfc7541.html#rfc.section.2.3.2
        table          headerFieldTable
        size           uint32 // in bytes
        maxSize        uint32 // current maxSize
@@ -307,27 +307,27 @@ func (d *Decoder) parseHeaderFieldRepr() error {
        case b&128 != 0:
                // Indexed representation.
                // High bit set?
-               // http://http2.github.io/http2-spec/compression.html#rfc.section.6.1
+               // https://httpwg.org/specs/rfc7541.html#rfc.section.6.1
                return d.parseFieldIndexed()
        case b&192 == 64:
                // 6.2.1 Literal Header Field with Incremental Indexing
                // 0b10xxxxxx: top two bits are 10
-               // http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.1
+               // https://httpwg.org/specs/rfc7541.html#rfc.section.6.2.1
                return d.parseFieldLiteral(6, indexedTrue)
        case b&240 == 0:
                // 6.2.2 Literal Header Field without Indexing
                // 0b0000xxxx: top four bits are 0000
-               // http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.2
+               // https://httpwg.org/specs/rfc7541.html#rfc.section.6.2.2
                return d.parseFieldLiteral(4, indexedFalse)
        case b&240 == 16:
                // 6.2.3 Literal Header Field never Indexed
                // 0b0001xxxx: top four bits are 0001
-               // http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.3
+               // https://httpwg.org/specs/rfc7541.html#rfc.section.6.2.3
                return d.parseFieldLiteral(4, indexedNever)
        case b&224 == 32:
                // 6.3 Dynamic Table Size Update
                // Top three bits are '001'.
-               // http://http2.github.io/http2-spec/compression.html#rfc.section.6.3
+               // https://httpwg.org/specs/rfc7541.html#rfc.section.6.3
                return d.parseDynamicTableSizeUpdate()
        }
 
@@ -420,7 +420,7 @@ var errVarintOverflow = DecodingError{errors.New("varint integer overflow")}
 
 // readVarInt reads an unsigned variable length integer off the
 // beginning of p. n is the parameter as described in
-// http://http2.github.io/http2-spec/compression.html#rfc.section.5.1.
+// https://httpwg.org/specs/rfc7541.html#rfc.section.5.1.
 //
 // n must always be between 1 and 8.
 //
index fe0b84ccd467c40be86070fef89ea75360afceb0..20d083a716da1b7f83363c9b80526322fafe8886 100644 (file)
@@ -169,25 +169,50 @@ func buildRootHuffmanNode() {
 // AppendHuffmanString appends s, as encoded in Huffman codes, to dst
 // and returns the extended buffer.
 func AppendHuffmanString(dst []byte, s string) []byte {
-       rembits := uint8(8)
-
+       // This relies on the maximum huffman code length being 30 (See tables.go huffmanCodeLen array)
+       // So if a uint64 buffer has less than 32 valid bits can always accommodate another huffmanCode.
+       var (
+               x uint64 // buffer
+               n uint   // number valid of bits present in x
+       )
        for i := 0; i < len(s); i++ {
-               if rembits == 8 {
-                       dst = append(dst, 0)
+               c := s[i]
+               n += uint(huffmanCodeLen[c])
+               x <<= huffmanCodeLen[c] % 64
+               x |= uint64(huffmanCodes[c])
+               if n >= 32 {
+                       n %= 32             // Normally would be -= 32 but %= 32 informs compiler 0 <= n <= 31 for upcoming shift
+                       y := uint32(x >> n) // Compiler doesn't combine memory writes if y isn't uint32
+                       dst = append(dst, byte(y>>24), byte(y>>16), byte(y>>8), byte(y))
                }
-               dst, rembits = appendByteToHuffmanCode(dst, rembits, s[i])
        }
-
-       if rembits < 8 {
-               // special EOS symbol
-               code := uint32(0x3fffffff)
-               nbits := uint8(30)
-
-               t := uint8(code >> (nbits - rembits))
-               dst[len(dst)-1] |= t
+       // Add padding bits if necessary
+       if over := n % 8; over > 0 {
+               const (
+                       eosCode    = 0x3fffffff
+                       eosNBits   = 30
+                       eosPadByte = eosCode >> (eosNBits - 8)
+               )
+               pad := 8 - over
+               x = (x << pad) | (eosPadByte >> over)
+               n += pad // 8 now divides into n exactly
        }
-
-       return dst
+       // n in (0, 8, 16, 24, 32)
+       switch n / 8 {
+       case 0:
+               return dst
+       case 1:
+               return append(dst, byte(x))
+       case 2:
+               y := uint16(x)
+               return append(dst, byte(y>>8), byte(y))
+       case 3:
+               y := uint16(x >> 8)
+               return append(dst, byte(y>>8), byte(y), byte(x))
+       }
+       //      case 4:
+       y := uint32(x)
+       return append(dst, byte(y>>24), byte(y>>16), byte(y>>8), byte(y))
 }
 
 // HuffmanEncodeLength returns the number of bytes required to encode
@@ -199,35 +224,3 @@ func HuffmanEncodeLength(s string) uint64 {
        }
        return (n + 7) / 8
 }
-
-// appendByteToHuffmanCode appends Huffman code for c to dst and
-// returns the extended buffer and the remaining bits in the last
-// element. The appending is not byte aligned and the remaining bits
-// in the last element of dst is given in rembits.
-func appendByteToHuffmanCode(dst []byte, rembits uint8, c byte) ([]byte, uint8) {
-       code := huffmanCodes[c]
-       nbits := huffmanCodeLen[c]
-
-       for {
-               if rembits > nbits {
-                       t := uint8(code << (rembits - nbits))
-                       dst[len(dst)-1] |= t
-                       rembits -= nbits
-                       break
-               }
-
-               t := uint8(code >> (nbits - rembits))
-               dst[len(dst)-1] |= t
-
-               nbits -= rembits
-               rembits = 8
-
-               if nbits == 0 {
-                       break
-               }
-
-               dst = append(dst, 0)
-       }
-
-       return dst, rembits
-}
index 34b6432d6e2002a9fa65948832e42422c5096d16..8eaddb508dcd98e0285b003ccf6f5708846f3171 100644 (file)
@@ -9,6 +9,7 @@ package lif
 
 import (
        "errors"
+       "syscall"
        "unsafe"
 )
 
@@ -25,7 +26,7 @@ type Inet4Addr struct {
 }
 
 // Family implements the Family method of Addr interface.
-func (a *Inet4Addr) Family() int { return sysAF_INET }
+func (a *Inet4Addr) Family() int { return syscall.AF_INET }
 
 // An Inet6Addr represents an internet address for IPv6.
 type Inet6Addr struct {
@@ -35,7 +36,7 @@ type Inet6Addr struct {
 }
 
 // Family implements the Family method of Addr interface.
-func (a *Inet6Addr) Family() int { return sysAF_INET6 }
+func (a *Inet6Addr) Family() int { return syscall.AF_INET6 }
 
 // Addrs returns a list of interface addresses.
 //
@@ -62,7 +63,7 @@ func Addrs(af int, name string) ([]Addr, error) {
                        lifr.Name[i] = int8(ll.Name[i])
                }
                for _, ep := range eps {
-                       ioc := int64(sysSIOCGLIFADDR)
+                       ioc := int64(syscall.SIOCGLIFADDR)
                        err := ioctl(ep.s, uintptr(ioc), unsafe.Pointer(&lifr))
                        if err != nil {
                                continue
@@ -73,11 +74,11 @@ func Addrs(af int, name string) ([]Addr, error) {
                                continue
                        }
                        switch sa.Family {
-                       case sysAF_INET:
+                       case syscall.AF_INET:
                                a := &Inet4Addr{PrefixLen: l}
                                copy(a.IP[:], lifr.Lifru[4:8])
                                as = append(as, a)
-                       case sysAF_INET6:
+                       case syscall.AF_INET6:
                                a := &Inet6Addr{PrefixLen: l, ZoneID: int(nativeEndian.Uint32(lifr.Lifru[24:28]))}
                                copy(a.IP[:], lifr.Lifru[8:24])
                                as = append(as, a)
index 95c7d25846684174048fbac258ae3ec08019c0b7..f1fce48b34c764ff86e3ac5cbf0f4b64931f2b5d 100644 (file)
@@ -11,7 +11,9 @@
 // The package supports Solaris 11 or above.
 package lif
 
-import "syscall"
+import (
+       "syscall"
+)
 
 type endpoint struct {
        af int
@@ -25,12 +27,12 @@ func (ep *endpoint) close() error {
 func newEndpoints(af int) ([]endpoint, error) {
        var lastErr error
        var eps []endpoint
-       afs := []int{sysAF_INET, sysAF_INET6}
-       if af != sysAF_UNSPEC {
+       afs := []int{syscall.AF_INET, syscall.AF_INET6}
+       if af != syscall.AF_UNSPEC {
                afs = []int{af}
        }
        for _, af := range afs {
-               s, err := syscall.Socket(af, sysSOCK_DGRAM, 0)
+               s, err := syscall.Socket(af, syscall.SOCK_DGRAM, 0)
                if err != nil {
                        lastErr = err
                        continue
index f1af1306ca3882ce0298b45ee8ec5cf92a83f4b3..00b78545b517ce94f5cd289e7f27675e4ef90822 100644 (file)
@@ -7,7 +7,10 @@
 
 package lif
 
-import "unsafe"
+import (
+       "syscall"
+       "unsafe"
+)
 
 // A Link represents logical data link information.
 //
@@ -30,22 +33,22 @@ func (ll *Link) fetch(s uintptr) {
        for i := 0; i < len(ll.Name); i++ {
                lifr.Name[i] = int8(ll.Name[i])
        }
-       ioc := int64(sysSIOCGLIFINDEX)
+       ioc := int64(syscall.SIOCGLIFINDEX)
        if err := ioctl(s, uintptr(ioc), unsafe.Pointer(&lifr)); err == nil {
                ll.Index = int(nativeEndian.Uint32(lifr.Lifru[:4]))
        }
-       ioc = int64(sysSIOCGLIFFLAGS)
+       ioc = int64(syscall.SIOCGLIFFLAGS)
        if err := ioctl(s, uintptr(ioc), unsafe.Pointer(&lifr)); err == nil {
                ll.Flags = int(nativeEndian.Uint64(lifr.Lifru[:8]))
        }
-       ioc = int64(sysSIOCGLIFMTU)
+       ioc = int64(syscall.SIOCGLIFMTU)
        if err := ioctl(s, uintptr(ioc), unsafe.Pointer(&lifr)); err == nil {
                ll.MTU = int(nativeEndian.Uint32(lifr.Lifru[:4]))
        }
        switch ll.Type {
-       case sysIFT_IPV4, sysIFT_IPV6, sysIFT_6TO4:
+       case syscall.IFT_IPV4, syscall.IFT_IPV6, syscall.IFT_6TO4:
        default:
-               ioc = int64(sysSIOCGLIFHWADDR)
+               ioc = int64(syscall.SIOCGLIFHWADDR)
                if err := ioctl(s, uintptr(ioc), unsafe.Pointer(&lifr)); err == nil {
                        ll.Addr, _ = parseLinkAddr(lifr.Lifru[4:])
                }
@@ -75,7 +78,7 @@ func links(eps []endpoint, name string) ([]Link, error) {
        lifc := lifconf{Flags: sysLIFC_NOXMIT | sysLIFC_TEMPORARY | sysLIFC_ALLZONES | sysLIFC_UNDER_IPMP}
        for _, ep := range eps {
                lifn.Family = uint16(ep.af)
-               ioc := int64(sysSIOCGLIFNUM)
+               ioc := int64(syscall.SIOCGLIFNUM)
                if err := ioctl(ep.s, uintptr(ioc), unsafe.Pointer(&lifn)); err != nil {
                        continue
                }
@@ -90,7 +93,7 @@ func links(eps []endpoint, name string) ([]Link, error) {
                } else {
                        nativeEndian.PutUint32(lifc.Lifcu[:], uint32(uintptr(unsafe.Pointer(&b[0]))))
                }
-               ioc = int64(sysSIOCGLIFCONF)
+               ioc = int64(syscall.SIOCGLIFCONF)
                if err := ioctl(ep.s, uintptr(ioc), unsafe.Pointer(&lifc)); err != nil {
                        continue
                }
index d7a70d4ed94a54a00797f987a798e1e42fc44a42..30651c76b683ad8bad2e115a04c4ae0e645dd700 100644 (file)
@@ -3,14 +3,6 @@
 
 package lif
 
-const (
-       sysAF_UNSPEC = 0x0
-       sysAF_INET   = 0x2
-       sysAF_INET6  = 0x1a
-
-       sysSOCK_DGRAM = 0x1
-)
-
 type sockaddrStorage struct {
        Family     uint16
        X_ss_pad1  [6]int8
@@ -25,37 +17,6 @@ const (
        sysLIFC_ALLZONES        = 0x8
        sysLIFC_UNDER_IPMP      = 0x10
        sysLIFC_ENABLED         = 0x20
-
-       sysSIOCGLIFADDR    = -0x3f87968f
-       sysSIOCGLIFDSTADDR = -0x3f87968d
-       sysSIOCGLIFFLAGS   = -0x3f87968b
-       sysSIOCGLIFMTU     = -0x3f879686
-       sysSIOCGLIFNETMASK = -0x3f879683
-       sysSIOCGLIFMETRIC  = -0x3f879681
-       sysSIOCGLIFNUM     = -0x3ff3967e
-       sysSIOCGLIFINDEX   = -0x3f87967b
-       sysSIOCGLIFSUBNET  = -0x3f879676
-       sysSIOCGLIFLNKINFO = -0x3f879674
-       sysSIOCGLIFCONF    = -0x3fef965b
-       sysSIOCGLIFHWADDR  = -0x3f879640
-)
-
-const (
-       sysIFF_UP          = 0x1
-       sysIFF_BROADCAST   = 0x2
-       sysIFF_DEBUG       = 0x4
-       sysIFF_LOOPBACK    = 0x8
-       sysIFF_POINTOPOINT = 0x10
-       sysIFF_NOTRAILERS  = 0x20
-       sysIFF_RUNNING     = 0x40
-       sysIFF_NOARP       = 0x80
-       sysIFF_PROMISC     = 0x100
-       sysIFF_ALLMULTI    = 0x200
-       sysIFF_INTELLIGENT = 0x400
-       sysIFF_MULTICAST   = 0x800
-       sysIFF_MULTI_BCAST = 0x1000
-       sysIFF_UNNUMBERED  = 0x2000
-       sysIFF_PRIVATE     = 0x8000
 )
 
 const (
@@ -95,9 +56,3 @@ type lifIfinfoReq struct {
        Reachretrans uint32
        Maxmtu       uint32
 }
-
-const (
-       sysIFT_IPV4 = 0xc8
-       sysIFT_IPV6 = 0xc9
-       sysIFT_6TO4 = 0xca
-)
index 55ad42aa280f3edfe52557494dd8294720d66e4e..615f4980c580c86f4d0ea598b4395dd7384f6104 100644 (file)
@@ -398,7 +398,11 @@ func checkForTimeoutError(t *testing.T, err error) {
        t.Helper()
        if nerr, ok := err.(net.Error); ok {
                if !nerr.Timeout() {
-                       t.Errorf("got error: %v, want err.Timeout() = true", nerr)
+                       if runtime.GOOS == "windows" && runtime.GOARCH == "arm64" && t.Name() == "TestTestConn/TCP/RacyRead" {
+                               t.Logf("ignoring known failure mode on windows/arm64; see https://go.dev/issue/52893")
+                       } else {
+                               t.Errorf("got error: %v, want err.Timeout() = true", nerr)
+                       }
                }
        } else {
                t.Errorf("got %T: %v, want net.Error", err, err)
index 1898ed0fad5decd0d030bc927412a00c014c6dc4..5a3cc065493065ac359b66a492c09bbf054f4430 100644 (file)
@@ -7,7 +7,10 @@
 
 package route
 
-import "runtime"
+import (
+       "runtime"
+       "syscall"
+)
 
 // An Addr represents an address associated with packet routing.
 type Addr interface {
@@ -23,7 +26,7 @@ type LinkAddr struct {
 }
 
 // Family implements the Family method of Addr interface.
-func (a *LinkAddr) Family() int { return sysAF_LINK }
+func (a *LinkAddr) Family() int { return syscall.AF_LINK }
 
 func (a *LinkAddr) lenAndSpace() (int, int) {
        l := 8 + len(a.Name) + len(a.Addr)
@@ -40,7 +43,7 @@ func (a *LinkAddr) marshal(b []byte) (int, error) {
                return 0, errInvalidAddr
        }
        b[0] = byte(l)
-       b[1] = sysAF_LINK
+       b[1] = syscall.AF_LINK
        if a.Index > 0 {
                nativeEndian.PutUint16(b[2:4], uint16(a.Index))
        }
@@ -62,7 +65,7 @@ func parseLinkAddr(b []byte) (Addr, error) {
        if len(b) < 8 {
                return nil, errInvalidAddr
        }
-       _, a, err := parseKernelLinkAddr(sysAF_LINK, b[4:])
+       _, a, err := parseKernelLinkAddr(syscall.AF_LINK, b[4:])
        if err != nil {
                return nil, err
        }
@@ -122,7 +125,7 @@ type Inet4Addr struct {
 }
 
 // Family implements the Family method of Addr interface.
-func (a *Inet4Addr) Family() int { return sysAF_INET }
+func (a *Inet4Addr) Family() int { return syscall.AF_INET }
 
 func (a *Inet4Addr) lenAndSpace() (int, int) {
        return sizeofSockaddrInet, roundup(sizeofSockaddrInet)
@@ -134,7 +137,7 @@ func (a *Inet4Addr) marshal(b []byte) (int, error) {
                return 0, errShortBuffer
        }
        b[0] = byte(l)
-       b[1] = sysAF_INET
+       b[1] = syscall.AF_INET
        copy(b[4:8], a.IP[:])
        return ll, nil
 }
@@ -146,7 +149,7 @@ type Inet6Addr struct {
 }
 
 // Family implements the Family method of Addr interface.
-func (a *Inet6Addr) Family() int { return sysAF_INET6 }
+func (a *Inet6Addr) Family() int { return syscall.AF_INET6 }
 
 func (a *Inet6Addr) lenAndSpace() (int, int) {
        return sizeofSockaddrInet6, roundup(sizeofSockaddrInet6)
@@ -158,7 +161,7 @@ func (a *Inet6Addr) marshal(b []byte) (int, error) {
                return 0, errShortBuffer
        }
        b[0] = byte(l)
-       b[1] = sysAF_INET6
+       b[1] = syscall.AF_INET6
        copy(b[8:24], a.IP[:])
        if a.ZoneID > 0 {
                nativeEndian.PutUint32(b[24:28], uint32(a.ZoneID))
@@ -169,14 +172,14 @@ func (a *Inet6Addr) marshal(b []byte) (int, error) {
 // parseInetAddr parses b as an internet address for IPv4 or IPv6.
 func parseInetAddr(af int, b []byte) (Addr, error) {
        switch af {
-       case sysAF_INET:
+       case syscall.AF_INET:
                if len(b) < sizeofSockaddrInet {
                        return nil, errInvalidAddr
                }
                a := &Inet4Addr{}
                copy(a.IP[:], b[4:8])
                return a, nil
-       case sysAF_INET6:
+       case syscall.AF_INET6:
                if len(b) < sizeofSockaddrInet6 {
                        return nil, errInvalidAddr
                }
@@ -245,7 +248,7 @@ func parseKernelInetAddr(af int, b []byte) (int, Addr, error) {
                a := &Inet6Addr{}
                copy(a.IP[:], b[off6:off6+16])
                return int(b[0]), a, nil
-       case af == sysAF_INET6:
+       case af == syscall.AF_INET6:
                a := &Inet6Addr{}
                if l-1 < off6 {
                        copy(a.IP[:], b[1:l])
@@ -365,15 +368,15 @@ func marshalAddrs(b []byte, as []Addr) (uint, error) {
 }
 
 func parseAddrs(attrs uint, fn func(int, []byte) (int, Addr, error), b []byte) ([]Addr, error) {
-       var as [sysRTAX_MAX]Addr
-       af := int(sysAF_UNSPEC)
-       for i := uint(0); i < sysRTAX_MAX && len(b) >= roundup(0); i++ {
+       var as [syscall.RTAX_MAX]Addr
+       af := int(syscall.AF_UNSPEC)
+       for i := uint(0); i < syscall.RTAX_MAX && len(b) >= roundup(0); i++ {
                if attrs&(1<<i) == 0 {
                        continue
                }
-               if i <= sysRTAX_BRD {
+               if i <= syscall.RTAX_BRD {
                        switch b[1] {
-                       case sysAF_LINK:
+                       case syscall.AF_LINK:
                                a, err := parseLinkAddr(b)
                                if err != nil {
                                        return nil, err
@@ -384,7 +387,7 @@ func parseAddrs(attrs uint, fn func(int, []byte) (int, Addr, error), b []byte) (
                                        return nil, errMessageTooShort
                                }
                                b = b[l:]
-                       case sysAF_INET, sysAF_INET6:
+                       case syscall.AF_INET, syscall.AF_INET6:
                                af = int(b[1])
                                a, err := parseInetAddr(af, b)
                                if err != nil {
index 85b7e993bb350f60ae5e1c7c9d0ae4663b5cb8d4..903a196346ba6e899ff5d2a7f2907eaa46293666 100644 (file)
@@ -7,7 +7,10 @@
 
 package route
 
-import "runtime"
+import (
+       "runtime"
+       "syscall"
+)
 
 func (w *wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
        if len(b) < w.bodyOff {
@@ -18,13 +21,13 @@ func (w *wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error)
                return nil, errInvalidMessage
        }
        attrs := uint(nativeEndian.Uint32(b[4:8]))
-       if attrs&sysRTA_IFP == 0 {
+       if attrs&syscall.RTA_IFP == 0 {
                return nil, nil
        }
        m := &InterfaceMessage{
                Version: int(b[2]),
                Type:    int(b[3]),
-               Addrs:   make([]Addr, sysRTAX_MAX),
+               Addrs:   make([]Addr, syscall.RTAX_MAX),
                Flags:   int(nativeEndian.Uint32(b[8:12])),
                Index:   int(nativeEndian.Uint16(b[12:14])),
                extOff:  w.extOff,
@@ -34,7 +37,7 @@ func (w *wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error)
        if err != nil {
                return nil, err
        }
-       m.Addrs[sysRTAX_IFP] = a
+       m.Addrs[syscall.RTAX_IFP] = a
        m.Name = a.(*LinkAddr).Name
        return m, nil
 }
index 9f6f50c00fe7281527add96d0261fc47dd044862..14d251c94f9084a1930654b4b12c09e889a7c2a9 100644 (file)
@@ -4,9 +4,11 @@
 
 package route
 
+import "syscall"
+
 func (w *wireFormat) parseInterfaceMessage(typ RIBType, b []byte) (Message, error) {
        var extOff, bodyOff int
-       if typ == sysNET_RT_IFLISTL {
+       if typ == syscall.NET_RT_IFLISTL {
                if len(b) < 20 {
                        return nil, errMessageTooShort
                }
@@ -24,7 +26,7 @@ func (w *wireFormat) parseInterfaceMessage(typ RIBType, b []byte) (Message, erro
                return nil, errInvalidMessage
        }
        attrs := uint(nativeEndian.Uint32(b[4:8]))
-       if attrs&sysRTA_IFP == 0 {
+       if attrs&syscall.RTA_IFP == 0 {
                return nil, nil
        }
        m := &InterfaceMessage{
@@ -32,7 +34,7 @@ func (w *wireFormat) parseInterfaceMessage(typ RIBType, b []byte) (Message, erro
                Type:    int(b[3]),
                Flags:   int(nativeEndian.Uint32(b[8:12])),
                Index:   int(nativeEndian.Uint16(b[12:14])),
-               Addrs:   make([]Addr, sysRTAX_MAX),
+               Addrs:   make([]Addr, syscall.RTAX_MAX),
                extOff:  extOff,
                raw:     b[:l],
        }
@@ -40,14 +42,14 @@ func (w *wireFormat) parseInterfaceMessage(typ RIBType, b []byte) (Message, erro
        if err != nil {
                return nil, err
        }
-       m.Addrs[sysRTAX_IFP] = a
+       m.Addrs[syscall.RTAX_IFP] = a
        m.Name = a.(*LinkAddr).Name
        return m, nil
 }
 
 func (w *wireFormat) parseInterfaceAddrMessage(typ RIBType, b []byte) (Message, error) {
        var bodyOff int
-       if typ == sysNET_RT_IFLISTL {
+       if typ == syscall.NET_RT_IFLISTL {
                if len(b) < 24 {
                        return nil, errMessageTooShort
                }
index e4a143c1c733a190eeb7a156e983331c91a4c10f..d369409a7252278f9688b84eb7098e045b00a090 100644 (file)
@@ -4,6 +4,8 @@
 
 package route
 
+import "syscall"
+
 func (*wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
        if len(b) < 32 {
                return nil, errMessageTooShort
@@ -13,7 +15,7 @@ func (*wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
                return nil, errInvalidMessage
        }
        attrs := uint(nativeEndian.Uint32(b[12:16]))
-       if attrs&sysRTA_IFP == 0 {
+       if attrs&syscall.RTA_IFP == 0 {
                return nil, nil
        }
        m := &InterfaceMessage{
@@ -21,7 +23,7 @@ func (*wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
                Type:    int(b[3]),
                Flags:   int(nativeEndian.Uint32(b[16:20])),
                Index:   int(nativeEndian.Uint16(b[6:8])),
-               Addrs:   make([]Addr, sysRTAX_MAX),
+               Addrs:   make([]Addr, syscall.RTAX_MAX),
                raw:     b[:l],
        }
        ll := int(nativeEndian.Uint16(b[4:6]))
@@ -32,7 +34,7 @@ func (*wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
        if err != nil {
                return nil, err
        }
-       m.Addrs[sysRTAX_IFP] = a
+       m.Addrs[syscall.RTAX_IFP] = a
        m.Name = a.(*LinkAddr).Name
        return m, nil
 }
index fd0019ecc560aaf061c4a590d9713ecd72ed2124..3ab5bcdc011996e6d96f31157e81a3260dea966a 100644 (file)
@@ -111,7 +111,7 @@ func FetchRIB(af int, typ RIBType, arg int) ([]byte, error) {
        try := 0
        for {
                try++
-               mib := [6]int32{sysCTL_NET, sysAF_ROUTE, 0, int32(af), int32(typ), int32(arg)}
+               mib := [6]int32{syscall.CTL_NET, syscall.AF_ROUTE, 0, int32(af), int32(typ), int32(arg)}
                n := uintptr(0)
                if err := sysctl(mib[:], nil, &n, nil, 0); err != nil {
                        return nil, os.NewSyscallError("sysctl", err)
index daf2e90c476279557fe7d4e2ecca06af13de7619..f848fb1f2453ae3cdd0c415d2614407de11bdb6d 100644 (file)
@@ -4,14 +4,16 @@
 
 package route
 
-import "syscall"
+import (
+       "syscall"
+)
 
 func (m *RouteMessage) marshal() ([]byte, error) {
        l := sizeofRtMsghdr + addrsSpace(m.Addrs)
        b := make([]byte, l)
        nativeEndian.PutUint16(b[:2], uint16(l))
        if m.Version == 0 {
-               b[2] = sysRTM_VERSION
+               b[2] = syscall.RTM_VERSION
        } else {
                b[2] = byte(m.Version)
        }
index 537484ae5aa2cedcff4bd3efc5a6bf7df42f9e83..7c75574f187ed587dc736643428089237a340ab3 100644 (file)
@@ -7,7 +7,10 @@
 
 package route
 
-import "unsafe"
+import (
+       "syscall"
+       "unsafe"
+)
 
 var (
        nativeEndian binaryByteOrder
@@ -25,7 +28,7 @@ func init() {
                nativeEndian = bigEndian
        }
        // might get overridden in probeRoutingStack
-       rtmVersion = sysRTM_VERSION
+       rtmVersion = syscall.RTM_VERSION
        kernelAlign, wireFormats = probeRoutingStack()
 }
 
index d2daf5c05aac23027ea03080f5de02d077d32da9..c8c4eecb8e9c6d9a54ced8689aed6b688681d02e 100644 (file)
@@ -4,9 +4,11 @@
 
 package route
 
+import "syscall"
+
 func (typ RIBType) parseable() bool {
        switch typ {
-       case sysNET_RT_STAT, sysNET_RT_TRASH:
+       case syscall.NET_RT_STAT, syscall.NET_RT_TRASH:
                return false
        default:
                return true
@@ -66,22 +68,22 @@ func probeRoutingStack() (int, map[int]*wireFormat) {
        ifmam2.parse = ifmam2.parseInterfaceMulticastAddrMessage
        // Darwin kernels require 32-bit aligned access to routing facilities.
        return 4, map[int]*wireFormat{
-               sysRTM_ADD:       rtm,
-               sysRTM_DELETE:    rtm,
-               sysRTM_CHANGE:    rtm,
-               sysRTM_GET:       rtm,
-               sysRTM_LOSING:    rtm,
-               sysRTM_REDIRECT:  rtm,
-               sysRTM_MISS:      rtm,
-               sysRTM_LOCK:      rtm,
-               sysRTM_RESOLVE:   rtm,
-               sysRTM_NEWADDR:   ifam,
-               sysRTM_DELADDR:   ifam,
-               sysRTM_IFINFO:    ifm,
-               sysRTM_NEWMADDR:  ifmam,
-               sysRTM_DELMADDR:  ifmam,
-               sysRTM_IFINFO2:   ifm2,
-               sysRTM_NEWMADDR2: ifmam2,
-               sysRTM_GET2:      rtm2,
+               syscall.RTM_ADD:       rtm,
+               syscall.RTM_DELETE:    rtm,
+               syscall.RTM_CHANGE:    rtm,
+               syscall.RTM_GET:       rtm,
+               syscall.RTM_LOSING:    rtm,
+               syscall.RTM_REDIRECT:  rtm,
+               syscall.RTM_MISS:      rtm,
+               syscall.RTM_LOCK:      rtm,
+               syscall.RTM_RESOLVE:   rtm,
+               syscall.RTM_NEWADDR:   ifam,
+               syscall.RTM_DELADDR:   ifam,
+               syscall.RTM_IFINFO:    ifm,
+               syscall.RTM_NEWMADDR:  ifmam,
+               syscall.RTM_DELMADDR:  ifmam,
+               syscall.RTM_IFINFO2:   ifm2,
+               syscall.RTM_NEWMADDR2: ifmam2,
+               syscall.RTM_GET2:      rtm2,
        }
 }
index a138951f94576618f5088c731756ad63f576f6db..577fb16eb4bb53e482de01ebcd711a1cb6499948 100644 (file)
@@ -69,20 +69,20 @@ func probeRoutingStack() (int, map[int]*wireFormat) {
        }
 
        return int(unsafe.Sizeof(p)), map[int]*wireFormat{
-               sysRTM_ADD:        rtm,
-               sysRTM_DELETE:     rtm,
-               sysRTM_CHANGE:     rtm,
-               sysRTM_GET:        rtm,
-               sysRTM_LOSING:     rtm,
-               sysRTM_REDIRECT:   rtm,
-               sysRTM_MISS:       rtm,
-               sysRTM_LOCK:       rtm,
-               sysRTM_RESOLVE:    rtm,
-               sysRTM_NEWADDR:    ifam,
-               sysRTM_DELADDR:    ifam,
-               sysRTM_IFINFO:     ifm,
-               sysRTM_NEWMADDR:   ifmam,
-               sysRTM_DELMADDR:   ifmam,
-               sysRTM_IFANNOUNCE: ifanm,
+               syscall.RTM_ADD:        rtm,
+               syscall.RTM_DELETE:     rtm,
+               syscall.RTM_CHANGE:     rtm,
+               syscall.RTM_GET:        rtm,
+               syscall.RTM_LOSING:     rtm,
+               syscall.RTM_REDIRECT:   rtm,
+               syscall.RTM_MISS:       rtm,
+               syscall.RTM_LOCK:       rtm,
+               syscall.RTM_RESOLVE:    rtm,
+               syscall.RTM_NEWADDR:    ifam,
+               syscall.RTM_DELADDR:    ifam,
+               syscall.RTM_IFINFO:     ifm,
+               syscall.RTM_NEWMADDR:   ifmam,
+               syscall.RTM_DELMADDR:   ifmam,
+               syscall.RTM_IFANNOUNCE: ifanm,
        }
 }
index 3599601740c267d459db3f453a04d74e8e045880..0a66dcedb386d9086595cb2d8a457b9bb9f38695 100644 (file)
@@ -141,20 +141,20 @@ func probeRoutingStack() (int, map[int]*wireFormat) {
        ifmam.parse = ifmam.parseInterfaceMulticastAddrMessage
        ifanm.parse = ifanm.parseInterfaceAnnounceMessage
        return align, map[int]*wireFormat{
-               sysRTM_ADD:        rtm,
-               sysRTM_DELETE:     rtm,
-               sysRTM_CHANGE:     rtm,
-               sysRTM_GET:        rtm,
-               sysRTM_LOSING:     rtm,
-               sysRTM_REDIRECT:   rtm,
-               sysRTM_MISS:       rtm,
-               sysRTM_LOCK:       rtm,
-               sysRTM_RESOLVE:    rtm,
-               sysRTM_NEWADDR:    ifam,
-               sysRTM_DELADDR:    ifam,
-               sysRTM_IFINFO:     ifm,
-               sysRTM_NEWMADDR:   ifmam,
-               sysRTM_DELMADDR:   ifmam,
-               sysRTM_IFANNOUNCE: ifanm,
+               syscall.RTM_ADD:        rtm,
+               syscall.RTM_DELETE:     rtm,
+               syscall.RTM_CHANGE:     rtm,
+               syscall.RTM_GET:        rtm,
+               syscall.RTM_LOSING:     rtm,
+               syscall.RTM_REDIRECT:   rtm,
+               syscall.RTM_MISS:       rtm,
+               syscall.RTM_LOCK:       rtm,
+               syscall.RTM_RESOLVE:    rtm,
+               syscall.RTM_NEWADDR:    ifam,
+               syscall.RTM_DELADDR:    ifam,
+               syscall.RTM_IFINFO:     ifm,
+               syscall.RTM_NEWMADDR:   ifmam,
+               syscall.RTM_DELMADDR:   ifmam,
+               syscall.RTM_IFANNOUNCE: ifanm,
        }
 }
index 02f71d54bbdfa6776826c1df09b96172a6bd1c9f..be4460e13f044cf84173ca543c99923a6df84f88 100644 (file)
@@ -4,6 +4,8 @@
 
 package route
 
+import "syscall"
+
 func (typ RIBType) parseable() bool { return true }
 
 // RouteMetrics represents route metrics.
@@ -54,18 +56,18 @@ func probeRoutingStack() (int, map[int]*wireFormat) {
        // NetBSD 6 and above kernels require 64-bit aligned access to
        // routing facilities.
        return 8, map[int]*wireFormat{
-               sysRTM_ADD:        rtm,
-               sysRTM_DELETE:     rtm,
-               sysRTM_CHANGE:     rtm,
-               sysRTM_GET:        rtm,
-               sysRTM_LOSING:     rtm,
-               sysRTM_REDIRECT:   rtm,
-               sysRTM_MISS:       rtm,
-               sysRTM_LOCK:       rtm,
-               sysRTM_RESOLVE:    rtm,
-               sysRTM_NEWADDR:    ifam,
-               sysRTM_DELADDR:    ifam,
-               sysRTM_IFANNOUNCE: ifanm,
-               sysRTM_IFINFO:     ifm,
+               syscall.RTM_ADD:        rtm,
+               syscall.RTM_DELETE:     rtm,
+               syscall.RTM_CHANGE:     rtm,
+               syscall.RTM_GET:        rtm,
+               syscall.RTM_LOSING:     rtm,
+               syscall.RTM_REDIRECT:   rtm,
+               syscall.RTM_MISS:       rtm,
+               syscall.RTM_LOCK:       rtm,
+               syscall.RTM_RESOLVE:    rtm,
+               syscall.RTM_NEWADDR:    ifam,
+               syscall.RTM_DELADDR:    ifam,
+               syscall.RTM_IFANNOUNCE: ifanm,
+               syscall.RTM_IFINFO:     ifm,
        }
 }
index c5674e83d0135019cf091daf54a0ae5fbc80b3ed..7f4f93cbea088d25664d93dc9457bbce4ed086da 100644 (file)
@@ -4,11 +4,14 @@
 
 package route
 
-import "unsafe"
+import (
+       "syscall"
+       "unsafe"
+)
 
 func (typ RIBType) parseable() bool {
        switch typ {
-       case sysNET_RT_STATS, sysNET_RT_TABLE:
+       case syscall.NET_RT_STATS, syscall.NET_RT_TABLE:
                return false
        default:
                return true
@@ -62,19 +65,18 @@ func probeRoutingStack() (int, map[int]*wireFormat) {
        ifanm := &wireFormat{extOff: -1, bodyOff: -1}
        ifanm.parse = ifanm.parseInterfaceAnnounceMessage
        return int(unsafe.Sizeof(p)), map[int]*wireFormat{
-               sysRTM_ADD:        rtm,
-               sysRTM_DELETE:     rtm,
-               sysRTM_CHANGE:     rtm,
-               sysRTM_GET:        rtm,
-               sysRTM_LOSING:     rtm,
-               sysRTM_REDIRECT:   rtm,
-               sysRTM_MISS:       rtm,
-               sysRTM_LOCK:       rtm,
-               sysRTM_RESOLVE:    rtm,
-               sysRTM_NEWADDR:    ifam,
-               sysRTM_DELADDR:    ifam,
-               sysRTM_IFINFO:     ifm,
-               sysRTM_IFANNOUNCE: ifanm,
-               sysRTM_DESYNC:     rtm,
+               syscall.RTM_ADD:        rtm,
+               syscall.RTM_DELETE:     rtm,
+               syscall.RTM_CHANGE:     rtm,
+               syscall.RTM_GET:        rtm,
+               syscall.RTM_LOSING:     rtm,
+               syscall.RTM_REDIRECT:   rtm,
+               syscall.RTM_MISS:       rtm,
+               syscall.RTM_RESOLVE:    rtm,
+               syscall.RTM_NEWADDR:    ifam,
+               syscall.RTM_DELADDR:    ifam,
+               syscall.RTM_IFINFO:     ifm,
+               syscall.RTM_IFANNOUNCE: ifanm,
+               syscall.RTM_DESYNC:     rtm,
        }
 }
index 19e4133f7d1911378f281412a3046e32d4be9da0..56a0c66f44f202764d12540509fb0d50f651cfdf 100644 (file)
@@ -3,83 +3,6 @@
 
 package route
 
-const (
-       sysAF_UNSPEC = 0x0
-       sysAF_INET   = 0x2
-       sysAF_ROUTE  = 0x11
-       sysAF_LINK   = 0x12
-       sysAF_INET6  = 0x1e
-
-       sysSOCK_RAW = 0x3
-
-       sysNET_RT_DUMP    = 0x1
-       sysNET_RT_FLAGS   = 0x2
-       sysNET_RT_IFLIST  = 0x3
-       sysNET_RT_STAT    = 0x4
-       sysNET_RT_TRASH   = 0x5
-       sysNET_RT_IFLIST2 = 0x6
-       sysNET_RT_DUMP2   = 0x7
-       sysNET_RT_MAXID   = 0xa
-)
-
-const (
-       sysCTL_MAXNAME = 0xc
-
-       sysCTL_UNSPEC  = 0x0
-       sysCTL_KERN    = 0x1
-       sysCTL_VM      = 0x2
-       sysCTL_VFS     = 0x3
-       sysCTL_NET     = 0x4
-       sysCTL_DEBUG   = 0x5
-       sysCTL_HW      = 0x6
-       sysCTL_MACHDEP = 0x7
-       sysCTL_USER    = 0x8
-       sysCTL_MAXID   = 0x9
-)
-
-const (
-       sysRTM_VERSION = 0x5
-
-       sysRTM_ADD       = 0x1
-       sysRTM_DELETE    = 0x2
-       sysRTM_CHANGE    = 0x3
-       sysRTM_GET       = 0x4
-       sysRTM_LOSING    = 0x5
-       sysRTM_REDIRECT  = 0x6
-       sysRTM_MISS      = 0x7
-       sysRTM_LOCK      = 0x8
-       sysRTM_OLDADD    = 0x9
-       sysRTM_OLDDEL    = 0xa
-       sysRTM_RESOLVE   = 0xb
-       sysRTM_NEWADDR   = 0xc
-       sysRTM_DELADDR   = 0xd
-       sysRTM_IFINFO    = 0xe
-       sysRTM_NEWMADDR  = 0xf
-       sysRTM_DELMADDR  = 0x10
-       sysRTM_IFINFO2   = 0x12
-       sysRTM_NEWMADDR2 = 0x13
-       sysRTM_GET2      = 0x14
-
-       sysRTA_DST     = 0x1
-       sysRTA_GATEWAY = 0x2
-       sysRTA_NETMASK = 0x4
-       sysRTA_GENMASK = 0x8
-       sysRTA_IFP     = 0x10
-       sysRTA_IFA     = 0x20
-       sysRTA_AUTHOR  = 0x40
-       sysRTA_BRD     = 0x80
-
-       sysRTAX_DST     = 0x0
-       sysRTAX_GATEWAY = 0x1
-       sysRTAX_NETMASK = 0x2
-       sysRTAX_GENMASK = 0x3
-       sysRTAX_IFP     = 0x4
-       sysRTAX_IFA     = 0x5
-       sysRTAX_AUTHOR  = 0x6
-       sysRTAX_BRD     = 0x7
-       sysRTAX_MAX     = 0x8
-)
-
 const (
        sizeofIfMsghdrDarwin15    = 0x70
        sizeofIfaMsghdrDarwin15   = 0x14
index 34f0eaaa42b0435cdf213fbb254c2cf9a12b4883..f7c7a60cd64220389c24ea758187983e5cf81a63 100644 (file)
@@ -3,84 +3,6 @@
 
 package route
 
-const (
-       sysAF_UNSPEC = 0x0
-       sysAF_INET   = 0x2
-       sysAF_ROUTE  = 0x11
-       sysAF_LINK   = 0x12
-       sysAF_INET6  = 0x1c
-
-       sysSOCK_RAW = 0x3
-
-       sysNET_RT_DUMP   = 0x1
-       sysNET_RT_FLAGS  = 0x2
-       sysNET_RT_IFLIST = 0x3
-       sysNET_RT_MAXID  = 0x4
-)
-
-const (
-       sysCTL_MAXNAME = 0xc
-
-       sysCTL_UNSPEC   = 0x0
-       sysCTL_KERN     = 0x1
-       sysCTL_VM       = 0x2
-       sysCTL_VFS      = 0x3
-       sysCTL_NET      = 0x4
-       sysCTL_DEBUG    = 0x5
-       sysCTL_HW       = 0x6
-       sysCTL_MACHDEP  = 0x7
-       sysCTL_USER     = 0x8
-       sysCTL_P1003_1B = 0x9
-       sysCTL_LWKT     = 0xa
-       sysCTL_MAXID    = 0xb
-)
-
-const (
-       sysRTM_VERSION = 0x6
-
-       sysRTM_ADD        = 0x1
-       sysRTM_DELETE     = 0x2
-       sysRTM_CHANGE     = 0x3
-       sysRTM_GET        = 0x4
-       sysRTM_LOSING     = 0x5
-       sysRTM_REDIRECT   = 0x6
-       sysRTM_MISS       = 0x7
-       sysRTM_LOCK       = 0x8
-       sysRTM_RESOLVE    = 0xb
-       sysRTM_NEWADDR    = 0xc
-       sysRTM_DELADDR    = 0xd
-       sysRTM_IFINFO     = 0xe
-       sysRTM_NEWMADDR   = 0xf
-       sysRTM_DELMADDR   = 0x10
-       sysRTM_IFANNOUNCE = 0x11
-       sysRTM_IEEE80211  = 0x12
-
-       sysRTA_DST     = 0x1
-       sysRTA_GATEWAY = 0x2
-       sysRTA_NETMASK = 0x4
-       sysRTA_GENMASK = 0x8
-       sysRTA_IFP     = 0x10
-       sysRTA_IFA     = 0x20
-       sysRTA_AUTHOR  = 0x40
-       sysRTA_BRD     = 0x80
-       sysRTA_MPLS1   = 0x100
-       sysRTA_MPLS2   = 0x200
-       sysRTA_MPLS3   = 0x400
-
-       sysRTAX_DST     = 0x0
-       sysRTAX_GATEWAY = 0x1
-       sysRTAX_NETMASK = 0x2
-       sysRTAX_GENMASK = 0x3
-       sysRTAX_IFP     = 0x4
-       sysRTAX_IFA     = 0x5
-       sysRTAX_AUTHOR  = 0x6
-       sysRTAX_BRD     = 0x7
-       sysRTAX_MPLS1   = 0x8
-       sysRTAX_MPLS2   = 0x9
-       sysRTAX_MPLS3   = 0xa
-       sysRTAX_MAX     = 0xb
-)
-
 const (
        sizeofIfMsghdrDragonFlyBSD4         = 0xb0
        sizeofIfaMsghdrDragonFlyBSD4        = 0x14
index f36aaadb59f71a310c904993991911373ab05b03..3f985c7ee90c1dc33dd050c6abd9f1988cb00440 100644 (file)
@@ -3,77 +3,6 @@
 
 package route
 
-const (
-       sysAF_UNSPEC = 0x0
-       sysAF_INET   = 0x2
-       sysAF_ROUTE  = 0x11
-       sysAF_LINK   = 0x12
-       sysAF_INET6  = 0x1c
-
-       sysSOCK_RAW = 0x3
-
-       sysNET_RT_DUMP     = 0x1
-       sysNET_RT_FLAGS    = 0x2
-       sysNET_RT_IFLIST   = 0x3
-       sysNET_RT_IFMALIST = 0x4
-       sysNET_RT_IFLISTL  = 0x5
-)
-
-const (
-       sysCTL_MAXNAME = 0x18
-
-       sysCTL_UNSPEC   = 0x0
-       sysCTL_KERN     = 0x1
-       sysCTL_VM       = 0x2
-       sysCTL_VFS      = 0x3
-       sysCTL_NET      = 0x4
-       sysCTL_DEBUG    = 0x5
-       sysCTL_HW       = 0x6
-       sysCTL_MACHDEP  = 0x7
-       sysCTL_USER     = 0x8
-       sysCTL_P1003_1B = 0x9
-)
-
-const (
-       sysRTM_VERSION = 0x5
-
-       sysRTM_ADD        = 0x1
-       sysRTM_DELETE     = 0x2
-       sysRTM_CHANGE     = 0x3
-       sysRTM_GET        = 0x4
-       sysRTM_LOSING     = 0x5
-       sysRTM_REDIRECT   = 0x6
-       sysRTM_MISS       = 0x7
-       sysRTM_LOCK       = 0x8
-       sysRTM_RESOLVE    = 0xb
-       sysRTM_NEWADDR    = 0xc
-       sysRTM_DELADDR    = 0xd
-       sysRTM_IFINFO     = 0xe
-       sysRTM_NEWMADDR   = 0xf
-       sysRTM_DELMADDR   = 0x10
-       sysRTM_IFANNOUNCE = 0x11
-       sysRTM_IEEE80211  = 0x12
-
-       sysRTA_DST     = 0x1
-       sysRTA_GATEWAY = 0x2
-       sysRTA_NETMASK = 0x4
-       sysRTA_GENMASK = 0x8
-       sysRTA_IFP     = 0x10
-       sysRTA_IFA     = 0x20
-       sysRTA_AUTHOR  = 0x40
-       sysRTA_BRD     = 0x80
-
-       sysRTAX_DST     = 0x0
-       sysRTAX_GATEWAY = 0x1
-       sysRTAX_NETMASK = 0x2
-       sysRTAX_GENMASK = 0x3
-       sysRTAX_IFP     = 0x4
-       sysRTAX_IFA     = 0x5
-       sysRTAX_AUTHOR  = 0x6
-       sysRTAX_BRD     = 0x7
-       sysRTAX_MAX     = 0x8
-)
-
 const (
        sizeofIfMsghdrlFreeBSD10        = 0x68
        sizeofIfaMsghdrFreeBSD10        = 0x14
index 4c639b82e4b3a3ed514648006fd5e001651c335e..929339369829dccd02191b4d4713a21a136e7275 100644 (file)
@@ -3,77 +3,6 @@
 
 package route
 
-const (
-       sysAF_UNSPEC = 0x0
-       sysAF_INET   = 0x2
-       sysAF_ROUTE  = 0x11
-       sysAF_LINK   = 0x12
-       sysAF_INET6  = 0x1c
-
-       sysSOCK_RAW = 0x3
-
-       sysNET_RT_DUMP     = 0x1
-       sysNET_RT_FLAGS    = 0x2
-       sysNET_RT_IFLIST   = 0x3
-       sysNET_RT_IFMALIST = 0x4
-       sysNET_RT_IFLISTL  = 0x5
-)
-
-const (
-       sysCTL_MAXNAME = 0x18
-
-       sysCTL_UNSPEC   = 0x0
-       sysCTL_KERN     = 0x1
-       sysCTL_VM       = 0x2
-       sysCTL_VFS      = 0x3
-       sysCTL_NET      = 0x4
-       sysCTL_DEBUG    = 0x5
-       sysCTL_HW       = 0x6
-       sysCTL_MACHDEP  = 0x7
-       sysCTL_USER     = 0x8
-       sysCTL_P1003_1B = 0x9
-)
-
-const (
-       sysRTM_VERSION = 0x5
-
-       sysRTM_ADD        = 0x1
-       sysRTM_DELETE     = 0x2
-       sysRTM_CHANGE     = 0x3
-       sysRTM_GET        = 0x4
-       sysRTM_LOSING     = 0x5
-       sysRTM_REDIRECT   = 0x6
-       sysRTM_MISS       = 0x7
-       sysRTM_LOCK       = 0x8
-       sysRTM_RESOLVE    = 0xb
-       sysRTM_NEWADDR    = 0xc
-       sysRTM_DELADDR    = 0xd
-       sysRTM_IFINFO     = 0xe
-       sysRTM_NEWMADDR   = 0xf
-       sysRTM_DELMADDR   = 0x10
-       sysRTM_IFANNOUNCE = 0x11
-       sysRTM_IEEE80211  = 0x12
-
-       sysRTA_DST     = 0x1
-       sysRTA_GATEWAY = 0x2
-       sysRTA_NETMASK = 0x4
-       sysRTA_GENMASK = 0x8
-       sysRTA_IFP     = 0x10
-       sysRTA_IFA     = 0x20
-       sysRTA_AUTHOR  = 0x40
-       sysRTA_BRD     = 0x80
-
-       sysRTAX_DST     = 0x0
-       sysRTAX_GATEWAY = 0x1
-       sysRTAX_NETMASK = 0x2
-       sysRTAX_GENMASK = 0x3
-       sysRTAX_IFP     = 0x4
-       sysRTAX_IFA     = 0x5
-       sysRTAX_AUTHOR  = 0x6
-       sysRTAX_BRD     = 0x7
-       sysRTAX_MAX     = 0x8
-)
-
 const (
        sizeofIfMsghdrlFreeBSD10        = 0xb0
        sizeofIfaMsghdrFreeBSD10        = 0x14
index 710c1472b64397610228c94363315a20e799e60b..a2bdb4ad3b58ea41c4765faa8e60048ce32a66ea 100644 (file)
@@ -3,77 +3,6 @@
 
 package route
 
-const (
-       sysAF_UNSPEC = 0x0
-       sysAF_INET   = 0x2
-       sysAF_ROUTE  = 0x11
-       sysAF_LINK   = 0x12
-       sysAF_INET6  = 0x1c
-
-       sysSOCK_RAW = 0x3
-
-       sysNET_RT_DUMP     = 0x1
-       sysNET_RT_FLAGS    = 0x2
-       sysNET_RT_IFLIST   = 0x3
-       sysNET_RT_IFMALIST = 0x4
-       sysNET_RT_IFLISTL  = 0x5
-)
-
-const (
-       sysCTL_MAXNAME = 0x18
-
-       sysCTL_UNSPEC   = 0x0
-       sysCTL_KERN     = 0x1
-       sysCTL_VM       = 0x2
-       sysCTL_VFS      = 0x3
-       sysCTL_NET      = 0x4
-       sysCTL_DEBUG    = 0x5
-       sysCTL_HW       = 0x6
-       sysCTL_MACHDEP  = 0x7
-       sysCTL_USER     = 0x8
-       sysCTL_P1003_1B = 0x9
-)
-
-const (
-       sysRTM_VERSION = 0x5
-
-       sysRTM_ADD        = 0x1
-       sysRTM_DELETE     = 0x2
-       sysRTM_CHANGE     = 0x3
-       sysRTM_GET        = 0x4
-       sysRTM_LOSING     = 0x5
-       sysRTM_REDIRECT   = 0x6
-       sysRTM_MISS       = 0x7
-       sysRTM_LOCK       = 0x8
-       sysRTM_RESOLVE    = 0xb
-       sysRTM_NEWADDR    = 0xc
-       sysRTM_DELADDR    = 0xd
-       sysRTM_IFINFO     = 0xe
-       sysRTM_NEWMADDR   = 0xf
-       sysRTM_DELMADDR   = 0x10
-       sysRTM_IFANNOUNCE = 0x11
-       sysRTM_IEEE80211  = 0x12
-
-       sysRTA_DST     = 0x1
-       sysRTA_GATEWAY = 0x2
-       sysRTA_NETMASK = 0x4
-       sysRTA_GENMASK = 0x8
-       sysRTA_IFP     = 0x10
-       sysRTA_IFA     = 0x20
-       sysRTA_AUTHOR  = 0x40
-       sysRTA_BRD     = 0x80
-
-       sysRTAX_DST     = 0x0
-       sysRTAX_GATEWAY = 0x1
-       sysRTAX_NETMASK = 0x2
-       sysRTAX_GENMASK = 0x3
-       sysRTAX_IFP     = 0x4
-       sysRTAX_IFA     = 0x5
-       sysRTAX_AUTHOR  = 0x6
-       sysRTAX_BRD     = 0x7
-       sysRTAX_MAX     = 0x8
-)
-
 const (
        sizeofIfMsghdrlFreeBSD10        = 0x68
        sizeofIfaMsghdrFreeBSD10        = 0x14
index 4c639b82e4b3a3ed514648006fd5e001651c335e..929339369829dccd02191b4d4713a21a136e7275 100644 (file)
@@ -3,77 +3,6 @@
 
 package route
 
-const (
-       sysAF_UNSPEC = 0x0
-       sysAF_INET   = 0x2
-       sysAF_ROUTE  = 0x11
-       sysAF_LINK   = 0x12
-       sysAF_INET6  = 0x1c
-
-       sysSOCK_RAW = 0x3
-
-       sysNET_RT_DUMP     = 0x1
-       sysNET_RT_FLAGS    = 0x2
-       sysNET_RT_IFLIST   = 0x3
-       sysNET_RT_IFMALIST = 0x4
-       sysNET_RT_IFLISTL  = 0x5
-)
-
-const (
-       sysCTL_MAXNAME = 0x18
-
-       sysCTL_UNSPEC   = 0x0
-       sysCTL_KERN     = 0x1
-       sysCTL_VM       = 0x2
-       sysCTL_VFS      = 0x3
-       sysCTL_NET      = 0x4
-       sysCTL_DEBUG    = 0x5
-       sysCTL_HW       = 0x6
-       sysCTL_MACHDEP  = 0x7
-       sysCTL_USER     = 0x8
-       sysCTL_P1003_1B = 0x9
-)
-
-const (
-       sysRTM_VERSION = 0x5
-
-       sysRTM_ADD        = 0x1
-       sysRTM_DELETE     = 0x2
-       sysRTM_CHANGE     = 0x3
-       sysRTM_GET        = 0x4
-       sysRTM_LOSING     = 0x5
-       sysRTM_REDIRECT   = 0x6
-       sysRTM_MISS       = 0x7
-       sysRTM_LOCK       = 0x8
-       sysRTM_RESOLVE    = 0xb
-       sysRTM_NEWADDR    = 0xc
-       sysRTM_DELADDR    = 0xd
-       sysRTM_IFINFO     = 0xe
-       sysRTM_NEWMADDR   = 0xf
-       sysRTM_DELMADDR   = 0x10
-       sysRTM_IFANNOUNCE = 0x11
-       sysRTM_IEEE80211  = 0x12
-
-       sysRTA_DST     = 0x1
-       sysRTA_GATEWAY = 0x2
-       sysRTA_NETMASK = 0x4
-       sysRTA_GENMASK = 0x8
-       sysRTA_IFP     = 0x10
-       sysRTA_IFA     = 0x20
-       sysRTA_AUTHOR  = 0x40
-       sysRTA_BRD     = 0x80
-
-       sysRTAX_DST     = 0x0
-       sysRTAX_GATEWAY = 0x1
-       sysRTAX_NETMASK = 0x2
-       sysRTAX_GENMASK = 0x3
-       sysRTAX_IFP     = 0x4
-       sysRTAX_IFA     = 0x5
-       sysRTAX_AUTHOR  = 0x6
-       sysRTAX_BRD     = 0x7
-       sysRTAX_MAX     = 0x8
-)
-
 const (
        sizeofIfMsghdrlFreeBSD10        = 0xb0
        sizeofIfaMsghdrFreeBSD10        = 0x14
index b4f66ca6cbc818ebfc1637e90afea30988e523ea..eaffe8c40804cbe29ba7fd33003256f20004018d 100644 (file)
@@ -3,86 +3,6 @@
 
 package route
 
-const (
-       sysAF_UNSPEC = 0x0
-       sysAF_INET   = 0x2
-       sysAF_ROUTE  = 0x22
-       sysAF_LINK   = 0x12
-       sysAF_INET6  = 0x18
-
-       sysSOCK_RAW = 0x3
-
-       sysNET_RT_DUMP   = 0x1
-       sysNET_RT_FLAGS  = 0x2
-       sysNET_RT_IFLIST = 0x5
-       sysNET_RT_MAXID  = 0x6
-)
-
-const (
-       sysCTL_MAXNAME = 0xc
-
-       sysCTL_UNSPEC   = 0x0
-       sysCTL_KERN     = 0x1
-       sysCTL_VM       = 0x2
-       sysCTL_VFS      = 0x3
-       sysCTL_NET      = 0x4
-       sysCTL_DEBUG    = 0x5
-       sysCTL_HW       = 0x6
-       sysCTL_MACHDEP  = 0x7
-       sysCTL_USER     = 0x8
-       sysCTL_DDB      = 0x9
-       sysCTL_PROC     = 0xa
-       sysCTL_VENDOR   = 0xb
-       sysCTL_EMUL     = 0xc
-       sysCTL_SECURITY = 0xd
-       sysCTL_MAXID    = 0xe
-)
-
-const (
-       sysRTM_VERSION = 0x4
-
-       sysRTM_ADD        = 0x1
-       sysRTM_DELETE     = 0x2
-       sysRTM_CHANGE     = 0x3
-       sysRTM_GET        = 0x4
-       sysRTM_LOSING     = 0x5
-       sysRTM_REDIRECT   = 0x6
-       sysRTM_MISS       = 0x7
-       sysRTM_LOCK       = 0x8
-       sysRTM_OLDADD     = 0x9
-       sysRTM_OLDDEL     = 0xa
-       sysRTM_RESOLVE    = 0xb
-       sysRTM_NEWADDR    = 0xc
-       sysRTM_DELADDR    = 0xd
-       sysRTM_IFANNOUNCE = 0x10
-       sysRTM_IEEE80211  = 0x11
-       sysRTM_SETGATE    = 0x12
-       sysRTM_LLINFO_UPD = 0x13
-       sysRTM_IFINFO     = 0x14
-       sysRTM_CHGADDR    = 0x15
-
-       sysRTA_DST     = 0x1
-       sysRTA_GATEWAY = 0x2
-       sysRTA_NETMASK = 0x4
-       sysRTA_GENMASK = 0x8
-       sysRTA_IFP     = 0x10
-       sysRTA_IFA     = 0x20
-       sysRTA_AUTHOR  = 0x40
-       sysRTA_BRD     = 0x80
-       sysRTA_TAG     = 0x100
-
-       sysRTAX_DST     = 0x0
-       sysRTAX_GATEWAY = 0x1
-       sysRTAX_NETMASK = 0x2
-       sysRTAX_GENMASK = 0x3
-       sysRTAX_IFP     = 0x4
-       sysRTAX_IFA     = 0x5
-       sysRTAX_AUTHOR  = 0x6
-       sysRTAX_BRD     = 0x7
-       sysRTAX_TAG     = 0x8
-       sysRTAX_MAX     = 0x9
-)
-
 const (
        sizeofIfMsghdrNetBSD7         = 0x98
        sizeofIfaMsghdrNetBSD7        = 0x18
index 1021b4cea4f3dd1751fa772b14767b77ec7db157..b11b8126801b688da447bee48b65cbc24238eec5 100644 (file)
@@ -3,95 +3,6 @@
 
 package route
 
-const (
-       sysAF_UNSPEC = 0x0
-       sysAF_INET   = 0x2
-       sysAF_ROUTE  = 0x11
-       sysAF_LINK   = 0x12
-       sysAF_INET6  = 0x18
-
-       sysSOCK_RAW = 0x3
-
-       sysNET_RT_DUMP    = 0x1
-       sysNET_RT_FLAGS   = 0x2
-       sysNET_RT_IFLIST  = 0x3
-       sysNET_RT_STATS   = 0x4
-       sysNET_RT_TABLE   = 0x5
-       sysNET_RT_IFNAMES = 0x6
-       sysNET_RT_MAXID   = 0x7
-)
-
-const (
-       sysCTL_MAXNAME = 0xc
-
-       sysCTL_UNSPEC  = 0x0
-       sysCTL_KERN    = 0x1
-       sysCTL_VM      = 0x2
-       sysCTL_FS      = 0x3
-       sysCTL_NET     = 0x4
-       sysCTL_DEBUG   = 0x5
-       sysCTL_HW      = 0x6
-       sysCTL_MACHDEP = 0x7
-       sysCTL_DDB     = 0x9
-       sysCTL_VFS     = 0xa
-       sysCTL_MAXID   = 0xb
-)
-
-const (
-       sysRTM_VERSION = 0x5
-
-       sysRTM_ADD        = 0x1
-       sysRTM_DELETE     = 0x2
-       sysRTM_CHANGE     = 0x3
-       sysRTM_GET        = 0x4
-       sysRTM_LOSING     = 0x5
-       sysRTM_REDIRECT   = 0x6
-       sysRTM_MISS       = 0x7
-       sysRTM_LOCK       = 0x8
-       sysRTM_RESOLVE    = 0xb
-       sysRTM_NEWADDR    = 0xc
-       sysRTM_DELADDR    = 0xd
-       sysRTM_IFINFO     = 0xe
-       sysRTM_IFANNOUNCE = 0xf
-       sysRTM_DESYNC     = 0x10
-       sysRTM_INVALIDATE = 0x11
-       sysRTM_BFD        = 0x12
-       sysRTM_PROPOSAL   = 0x13
-
-       sysRTA_DST     = 0x1
-       sysRTA_GATEWAY = 0x2
-       sysRTA_NETMASK = 0x4
-       sysRTA_GENMASK = 0x8
-       sysRTA_IFP     = 0x10
-       sysRTA_IFA     = 0x20
-       sysRTA_AUTHOR  = 0x40
-       sysRTA_BRD     = 0x80
-       sysRTA_SRC     = 0x100
-       sysRTA_SRCMASK = 0x200
-       sysRTA_LABEL   = 0x400
-       sysRTA_BFD     = 0x800
-       sysRTA_DNS     = 0x1000
-       sysRTA_STATIC  = 0x2000
-       sysRTA_SEARCH  = 0x4000
-
-       sysRTAX_DST     = 0x0
-       sysRTAX_GATEWAY = 0x1
-       sysRTAX_NETMASK = 0x2
-       sysRTAX_GENMASK = 0x3
-       sysRTAX_IFP     = 0x4
-       sysRTAX_IFA     = 0x5
-       sysRTAX_AUTHOR  = 0x6
-       sysRTAX_BRD     = 0x7
-       sysRTAX_SRC     = 0x8
-       sysRTAX_SRCMASK = 0x9
-       sysRTAX_LABEL   = 0xa
-       sysRTAX_BFD     = 0xb
-       sysRTAX_DNS     = 0xc
-       sysRTAX_STATIC  = 0xd
-       sysRTAX_SEARCH  = 0xe
-       sysRTAX_MAX     = 0xf
-)
-
 const (
        sizeofRtMsghdr = 0x60
 
index a07f830a48bc9f1051032abc45deaa301a63793d..a81495aeb5f96f7be609ea757b8ce279914ebcfc 100644 (file)
@@ -9,7 +9,7 @@ golang.org/x/crypto/curve25519/internal/field
 golang.org/x/crypto/hkdf
 golang.org/x/crypto/internal/poly1305
 golang.org/x/crypto/internal/subtle
-# golang.org/x/net v0.0.0-20220517181318-183a9ca12b87
+# golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48
 ## explicit; go 1.17
 golang.org/x/net/dns/dnsmessage
 golang.org/x/net/http/httpguts
@@ -19,7 +19,7 @@ golang.org/x/net/idna
 golang.org/x/net/lif
 golang.org/x/net/nettest
 golang.org/x/net/route
-# golang.org/x/sys v0.0.0-20220803195053-6e608f9ce704
+# golang.org/x/sys v0.0.0-20220804214406-8e32c043e418
 ## explicit; go 1.17
 golang.org/x/sys/cpu
 # golang.org/x/text v0.3.8-0.20220722155301-d03b41800055