Merge pull request #36209 from dnephin/fix-image-prune-mapping
Remove broken container check from image prune
diff --git a/.gitignore b/.gitignore
index 93a6df4..392bf96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@
dockerversion/version_autogen_unix.go
vendor/pkg/
hack/integration-cli-on-swarm/integration-cli-on-swarm
+coverage.txt
+profile.out
diff --git a/.mailmap b/.mailmap
index 4dc2d65..828ea78 100644
--- a/.mailmap
+++ b/.mailmap
@@ -177,6 +177,7 @@
Hyzhou Zhy <hyzhou.zhy@alibaba-inc.com>
Hyzhou Zhy <hyzhou.zhy@alibaba-inc.com> <1187766782@qq.com>
Ilya Khlopotov <ilya.khlopotov@gmail.com>
+Ivan Markin <sw@nogoegst.net> <twim@riseup.net>
Jack Laxson <jackjrabbit@gmail.com>
Jacob Atzen <jacob@jacobatzen.dk> <jatzen@gmail.com>
Jacob Tomlinson <jacob@tom.linson.uk> <jacobtomlinson@users.noreply.github.com>
@@ -210,6 +211,7 @@
John Howard (VM) <John.Howard@microsoft.com> <jhowardmsft@users.noreply.github.com>
John Howard (VM) <John.Howard@microsoft.com> <john.howard@microsoft.com>
John Stephens <johnstep@docker.com> <johnstep@users.noreply.github.com>
+Jon Surrell <jon.surrell@gmail.com> <jon.surrell@automattic.com>
Jordan Arentsen <blissdev@gmail.com>
Jordan Jennings <jjn2009@gmail.com> <jjn2009@users.noreply.github.com>
Jorit Kleine-Möllhoff <joppich@bricknet.de> <joppich@users.noreply.github.com>
@@ -379,6 +381,7 @@
Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@us.ibm.com>
Stefan J. Wernli <swernli@microsoft.com> <swernli@ntdev.microsoft.com>
Stefan S. <tronicum@user.github.com>
+Stephan Spindler <shutefan@gmail.com> <shutefan@users.noreply.github.com>
Stephen Day <stephen.day@docker.com>
Stephen Day <stephen.day@docker.com> <stevvooe@users.noreply.github.com>
Steve Desmond <steve@vtsv.ca> <stevedesmond-ca@users.noreply.github.com>
@@ -436,6 +439,8 @@
Vishnu Kannan <vishnuk@google.com>
Vladimir Rutsky <altsysrq@gmail.com> <iamironbob@gmail.com>
Walter Stanish <walter@pratyeka.org>
+Wang Chao <chao.wang@ucloud.cn>
+Wang Chao <chao.wang@ucloud.cn> <wcwxyz@gmail.com>
Wang Guoliang <liangcszzu@163.com>
Wang Jie <wangjie5@chinaskycloud.com>
Wang Ping <present.wp@icloud.com>
diff --git a/AUTHORS b/AUTHORS
index 84059b7..c5dafd7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -374,6 +374,7 @@
Dan McPherson <dmcphers@redhat.com>
Dan Stine <sw@stinemail.com>
Dan Williams <me@deedubs.com>
+Dani Louca <dani.louca@docker.com>
Daniel Antlinger <d.antlinger@gmx.at>
Daniel Dao <dqminh@cloudflare.com>
Daniel Exner <dex@dragonslave.de>
@@ -740,7 +741,7 @@
Ivan Babrou <ibobrik@gmail.com>
Ivan Fraixedes <ifcdev@gmail.com>
Ivan Grcic <igrcic@gmail.com>
-Ivan Markin <twim@riseup.net>
+Ivan Markin <sw@nogoegst.net>
J Bruni <joaohbruni@yahoo.com.br>
J. Nunn <jbnunn@gmail.com>
Jack Danger Canty <jackdanger@squareup.com>
@@ -886,6 +887,7 @@
John Warwick <jwarwick@gmail.com>
John Willis <john.willis@docker.com>
Jon Johnson <jonjohnson@google.com>
+Jon Surrell <jon.surrell@gmail.com>
Jon Wedaman <jweede@gmail.com>
Jonas Pfenniger <jonas@pfenniger.name>
Jonathan A. Sternberg <jonathansternberg@gmail.com>
@@ -1161,6 +1163,7 @@
Matt McCormick <matt.mccormick@kitware.com>
Matt Moore <mattmoor@google.com>
Matt Richardson <matt@redgumtech.com.au>
+Matt Rickard <mrick@google.com>
Matt Robenolt <matt@ydekproductions.com>
Matt Schurenko <matt.schurenko@gmail.com>
Matt Williams <mattyw@me.com>
@@ -1317,6 +1320,7 @@
Nirmal Mehta <nirmalkmehta@gmail.com>
Nishant Totla <nishanttotla@gmail.com>
NIWA Hideyuki <niwa.niwa@nifty.ne.jp>
+Noah Meyerhans <nmeyerha@amazon.com>
Noah Treuhaft <noah.treuhaft@docker.com>
noducks <onemannoducks@gmail.com>
Nolan Darilek <nolan@thewordnerd.info>
@@ -1365,6 +1369,7 @@
Paul Weaver <pauweave@cisco.com>
Paulo Ribeiro <paigr.io@gmail.com>
Pavel Lobashov <ShockwaveNN@gmail.com>
+Pavel Pletenev <cpp.create@gmail.com>
Pavel Pospisil <pospispa@gmail.com>
Pavel Sutyrin <pavel.sutyrin@gmail.com>
Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
@@ -1642,6 +1647,7 @@
Stefan Scherer <scherer_stefan@icloud.com>
Stefan Staudenmeyer <doerte@instana.com>
Stefan Weil <sw@weilnetz.de>
+Stephan Spindler <shutefan@gmail.com>
Stephen Crosby <stevecrozz@gmail.com>
Stephen Day <stephen.day@docker.com>
Stephen Drake <stephen@xenolith.net>
@@ -1823,7 +1829,7 @@
waitingkuo <waitingkuo0527@gmail.com>
Walter Leibbrandt <github@wrl.co.za>
Walter Stanish <walter@pratyeka.org>
-WANG Chao <wcwxyz@gmail.com>
+Wang Chao <chao.wang@ucloud.cn>
Wang Guoliang <liangcszzu@163.com>
Wang Jie <wangjie5@chinaskycloud.com>
Wang Long <long.wanglong@huawei.com>
@@ -1834,6 +1840,7 @@
WarheadsSE <max@warheads.net>
Wayne Chang <wayne@neverfear.org>
Wayne Song <wsong@docker.com>
+Weerasak Chongnguluam <singpor@gmail.com>
Wei Wu <wuwei4455@gmail.com>
Wei-Ting Kuo <waitingkuo0527@gmail.com>
weiyan <weiyan3@huawei.com>
diff --git a/Dockerfile b/Dockerfile
index aa910c7..30c5dcd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,14 +2,23 @@
#
# Usage:
#
-# # Assemble the full dev environment. This is slow the first time.
-# docker build -t docker .
+# # Use make to build a development environment image and run it in a container.
+# # This is slow the first time.
+# make BIND_DIR=. shell
#
-# # Mount your source in an interactive container for quick testing:
-# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash
+# The following commands are executed inside the running container.
+
+# # Make a dockerd binary.
+# # hack/make.sh binary
#
-# # Run the test suite:
-# docker run -e DOCKER_GITCOMMIT=foo --privileged docker hack/make.sh test-unit test-integration test-docker-py
+# # Install dockerd to /usr/local/bin
+# # make install
+#
+# # Run unit tests
+# # hack/test/unit
+#
+# # Run tests e.g. integration, py
+# # hack/make.sh binary test-integration test-docker-py
#
# # Publish a release:
# docker run --privileged \
@@ -133,7 +142,7 @@
&& rm -rf "$GOPATH"
# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a
+ENV DOCKER_PY_COMMIT 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
# To run integration tests docker-pycreds is required.
RUN git clone https://github.com/docker/docker-py.git /docker-py \
&& cd /docker-py \
@@ -146,9 +155,12 @@
# Install go-swagger for validating swagger.yaml
ENV GO_SWAGGER_COMMIT c28258affb0b6251755d92489ef685af8d4ff3eb
-RUN git clone https://github.com/go-swagger/go-swagger.git /go/src/github.com/go-swagger/go-swagger \
- && (cd /go/src/github.com/go-swagger/go-swagger && git checkout -q $GO_SWAGGER_COMMIT) \
- && go install -v github.com/go-swagger/go-swagger/cmd/swagger
+RUN set -x \
+ && export GOPATH="$(mktemp -d)" \
+ && git clone https://github.com/go-swagger/go-swagger.git "$GOPATH/src/github.com/go-swagger/go-swagger" \
+ && (cd "$GOPATH/src/github.com/go-swagger/go-swagger" && git checkout -q "$GO_SWAGGER_COMMIT") \
+ && go build -o /usr/local/bin/swagger github.com/go-swagger/go-swagger/cmd/swagger \
+ && rm -rf "$GOPATH"
# Set user.email so crosbymichael's in-container merge commits go smoothly
RUN git config --global user.email 'docker-dummy@example.com'
@@ -168,10 +180,9 @@
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
-# TODO: when issue #35963 fixed, we can upgrade the busybox to multi-arch
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
- busybox:latest@sha256:32f093055929dbc23dec4d03e09dfe971f5973a9ca5cf059cbfb644c206aa83f \
+ busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \
debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c654207..8907384 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -106,7 +106,7 @@
&& rm -rf "$GOPATH"
# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a
+ENV DOCKER_PY_COMMIT 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
# To run integration tests docker-pycreds is required.
RUN git clone https://github.com/docker/docker-py.git /docker-py \
&& cd /docker-py \
@@ -119,9 +119,12 @@
# Install go-swagger for validating swagger.yaml
ENV GO_SWAGGER_COMMIT c28258affb0b6251755d92489ef685af8d4ff3eb
-RUN git clone https://github.com/go-swagger/go-swagger.git /go/src/github.com/go-swagger/go-swagger \
- && (cd /go/src/github.com/go-swagger/go-swagger && git checkout -q $GO_SWAGGER_COMMIT) \
- && go install -v github.com/go-swagger/go-swagger/cmd/swagger
+RUN set -x \
+ && export GOPATH="$(mktemp -d)" \
+ && git clone https://github.com/go-swagger/go-swagger.git "$GOPATH/src/github.com/go-swagger/go-swagger" \
+ && (cd "$GOPATH/src/github.com/go-swagger/go-swagger" && git checkout -q "$GO_SWAGGER_COMMIT") \
+ && go build -o /usr/local/bin/swagger github.com/go-swagger/go-swagger/cmd/swagger \
+ && rm -rf "$GOPATH"
# Set user.email so crosbymichael's in-container merge commits go smoothly
RUN git config --global user.email 'docker-dummy@example.com'
@@ -144,7 +147,7 @@
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
- busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \
+ busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \
debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 0a8f06c..b6a8ed3 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -104,7 +104,7 @@
&& rm -rf "$GOPATH"
# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a
+ENV DOCKER_PY_COMMIT 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
# To run integration tests docker-pycreds is required.
RUN git clone https://github.com/docker/docker-py.git /docker-py \
&& cd /docker-py \
@@ -133,7 +133,7 @@
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
- busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \
+ busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \
debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index 294a6aa..bfac86d 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -16,10 +16,10 @@
# Generate frozen images
COPY contrib/download-frozen-image-v2.sh contrib/download-frozen-image-v2.sh
RUN contrib/download-frozen-image-v2.sh /output/docker-frozen-images \
- buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
- busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \
- debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
- hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
+ buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
+ busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \
+ debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
+ hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
# Download Docker CLI binary
COPY hack/dockerfile hack/dockerfile
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
index 41c7318..690ed49 100644
--- a/Dockerfile.ppc64le
+++ b/Dockerfile.ppc64le
@@ -102,7 +102,7 @@
&& rm -rf "$GOPATH"
# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a
+ENV DOCKER_PY_COMMIT 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
# To run integration tests docker-pycreds is required.
RUN git clone https://github.com/docker/docker-py.git /docker-py \
&& cd /docker-py \
@@ -131,7 +131,7 @@
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
- busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \
+ busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \
debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)
diff --git a/Dockerfile.s390x b/Dockerfile.s390x
index f6cbe7d..53a567d 100644
--- a/Dockerfile.s390x
+++ b/Dockerfile.s390x
@@ -96,7 +96,7 @@
&& rm -rf "$GOPATH"
# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a
+ENV DOCKER_PY_COMMIT 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
# To run integration tests docker-pycreds is required.
RUN git clone https://github.com/docker/docker-py.git /docker-py \
&& cd /docker-py \
@@ -125,7 +125,7 @@
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
- busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \
+ busybox:1.27-glibc@sha256:8c8f261a462eead45ab8e610d3e8f7a1e4fd1cd9bed5bc0a0c386784ab105d8e \
debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4c831d7..e9a5566 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -23,29 +23,19 @@
# a subsystem, they are responsible for doing so and holding the
# subsystem maintainers accountable. If ownership is unclear, they are the de facto owners.
- # For each release (including minor releases), a "release captain" is assigned from the
- # pool of core maintainers. Rotation is encouraged across all maintainers, to ensure
- # the release process is clear and up-to-date.
-
people = [
"aaronlehmann",
"akihirosuda",
- "albers",
- "aluzzardi",
"anusha",
"coolljt0725",
"cpuguy83",
"crosbymichael",
"dnephin",
"duglin",
- "ehazlett",
"estesp",
- "icecrime",
"jhowardmsft",
"johnstep",
"justincormack",
- "lk4d4",
- "mavenugo",
"mhbauer",
"mlaventure",
"runcom",
@@ -103,6 +93,16 @@
# Thank you!
people = [
+ # Harald Albers is the mastermind behind the bash completion scripts for the
+ # Docker CLI. The completion scripts moved to the Docker CLI repository, so
+ # you can now find him perform his magic in the https://github.com/docker/cli repository.
+ "albers",
+
+ # Andrea Luzzardi started contributing to the Docker codebase in the "dotCloud"
+ # era, even before it was called "Docker". He is one of the architects of both
+ # Swarm and SwarmKit, and its integration into the Docker engine.
+ "aluzzardi",
+
# David Calavera contributed many features to Docker, such as an improved
# event system, dynamic configuration reloading, volume plugins, fancy
# new templating options, and an external client credential store. As a
@@ -120,6 +120,24 @@
# still stumble into him in our issue tracker, or on IRC.
"erikh",
+ # Evan Hazlett is the creator of of the Shipyard and Interlock open source projects,
+ # and the author of "Orca", which became the foundation of Docker Universal Control
+ # Plane (UCP). As a maintainer, Evan helped integrating SwarmKit (secrets, tasks)
+ # into the Docker engine.
+ "ehazlett",
+
+ # Arnaud Porterie (AKA "icecrime") was in charge of maintaining the maintainers.
+ # As a maintainer, he made life easier for contributors to the Docker open-source
+ # projects, bringing order in the chaos by designing a triage- and review workflow
+ # using labels (see https://icecrime.net/technology/a-structured-approach-to-labeling/),
+ # and automating the hell out of things with his buddies GordonTheTurtle and Poule
+ # (a chicken!).
+ #
+ # A lesser-known fact is that he created the first commit in the libnetwork repository
+ # even though he didn't know anything about it. Some say, he's now selling stuff on
+ # the internet ;-)
+ "icecrime",
+
# After a false start with his first PR being rejected, James Turnbull became a frequent
# contributor to the documentation, and became a docs maintainer on December 5, 2013. As
# a maintainer, James lifted the docs to a higher standard, and introduced the community
@@ -139,13 +157,24 @@
# containers a lot more secure). Besides being a maintainer, she
# set up the CI infrastructure for the project, giving everyone
# something to shout at if a PR failed ("noooo Janky!").
- # Jess is currently working on the DCOS security team at Mesosphere,
- # and contributing to various open source projects.
# Be sure you don't miss her talks at a conference near you (a must-see),
# read her blog at https://blog.jessfraz.com (a must-read), and
# check out her open source projects on GitHub https://github.com/jessfraz (a must-try).
"jessfraz",
+ # Alexander Morozov contributed many features to Docker, worked on the premise of
+ # what later became containerd (and worked on that too), and made a "stupid" Go
+ # vendor tool specificaly for docker/docker needs: vndr (https://github.com/LK4D4/vndr).
+ # Not many know that Alexander is a master negotiator, being able to change course
+ # of action with a single "Nope, we're not gonna do that".
+ "lk4d4",
+
+ # Madhu Venugopal was part of the SocketPlane team that joined Docker.
+ # As a maintainer, he was working with Jana for the Container Network
+ # Model (CNM) implemented through libnetwork, and the "routing mesh" powering
+ # Swarm mode networking.
+ "mavenugo",
+
# As a docs maintainer, Mary Anthony contributed greatly to the Docker
# docs. She wrote the Docker Contributor Guide and Getting Started
# Guides. She helped create a doc build system independent of
diff --git a/api/common.go b/api/common.go
index 97a92f8..beb251a 100644
--- a/api/common.go
+++ b/api/common.go
@@ -3,7 +3,7 @@
// Common constants for daemon and client.
const (
// DefaultVersion of Current REST API
- DefaultVersion string = "1.36"
+ DefaultVersion string = "1.37"
// NoBaseImageSpecifier is the symbol used by the FROM
// command to specify that no base image is to be used.
diff --git a/api/server/router/build/build_routes.go b/api/server/router/build/build_routes.go
index 396797d..09a1670 100644
--- a/api/server/router/build/build_routes.go
+++ b/api/server/router/build/build_routes.go
@@ -7,7 +7,6 @@
"fmt"
"io"
"net/http"
- "os"
"runtime"
"strconv"
"strings"
@@ -71,17 +70,7 @@
options.Target = r.FormValue("target")
options.RemoteContext = r.FormValue("remote")
if versions.GreaterThanOrEqualTo(version, "1.32") {
- // TODO @jhowardmsft. The following environment variable is an interim
- // measure to allow the daemon to have a default platform if omitted by
- // the client. This allows LCOW and WCOW to work with a down-level CLI
- // for a short period of time, as the CLI changes can't be merged
- // until after the daemon changes have been merged. Once the CLI is
- // updated, this can be removed. PR for CLI is currently in
- // https://github.com/docker/cli/pull/474.
apiPlatform := r.FormValue("platform")
- if system.LCOWSupported() && apiPlatform == "" {
- apiPlatform = os.Getenv("LCOW_API_PLATFORM_IF_OMITTED")
- }
p := system.ParsePlatform(apiPlatform)
if err := system.ValidatePlatform(p); err != nil {
return nil, errdefs.InvalidParameter(errors.Errorf("invalid platform: %s", err))
diff --git a/api/server/router/container/backend.go b/api/server/router/container/backend.go
index b6b1dec..5072083 100644
--- a/api/server/router/container/backend.go
+++ b/api/server/router/container/backend.go
@@ -68,8 +68,13 @@
ContainersPrune(ctx context.Context, pruneFilters filters.Args) (*types.ContainersPruneReport, error)
}
+type commitBackend interface {
+ CreateImageFromContainer(name string, config *backend.CreateImageConfig) (imageID string, err error)
+}
+
// Backend is all the methods that need to be implemented to provide container specific functionality.
type Backend interface {
+ commitBackend
execBackend
copyBackend
stateBackend
diff --git a/api/server/router/container/container.go b/api/server/router/container/container.go
index c763900..358f2bc 100644
--- a/api/server/router/container/container.go
+++ b/api/server/router/container/container.go
@@ -61,6 +61,7 @@
router.NewPostRoute("/containers/{name:.*}/rename", r.postContainerRename),
router.NewPostRoute("/containers/{name:.*}/update", r.postContainerUpdate),
router.NewPostRoute("/containers/prune", r.postContainersPrune, router.WithCancel),
+ router.NewPostRoute("/commit", r.postCommit),
// PUT
router.NewPutRoute("/containers/{name:.*}/archive", r.putContainersArchive),
// DELETE
diff --git a/api/server/router/container/container_routes.go b/api/server/router/container/container_routes.go
index 5de01e7..0527810 100644
--- a/api/server/router/container/container_routes.go
+++ b/api/server/router/container/container_routes.go
@@ -24,6 +24,45 @@
"golang.org/x/net/websocket"
)
+func (s *containerRouter) postCommit(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
+ if err := httputils.ParseForm(r); err != nil {
+ return err
+ }
+
+ if err := httputils.CheckForJSON(r); err != nil {
+ return err
+ }
+
+ // TODO: remove pause arg, and always pause in backend
+ pause := httputils.BoolValue(r, "pause")
+ version := httputils.VersionFromContext(ctx)
+ if r.FormValue("pause") == "" && versions.GreaterThanOrEqualTo(version, "1.13") {
+ pause = true
+ }
+
+ config, _, _, err := s.decoder.DecodeConfig(r.Body)
+ if err != nil && err != io.EOF { //Do not fail if body is empty.
+ return err
+ }
+
+ commitCfg := &backend.CreateImageConfig{
+ Pause: pause,
+ Repo: r.Form.Get("repo"),
+ Tag: r.Form.Get("tag"),
+ Author: r.Form.Get("author"),
+ Comment: r.Form.Get("comment"),
+ Config: config,
+ Changes: r.Form["changes"],
+ }
+
+ imgID, err := s.backend.CreateImageFromContainer(r.Form.Get("container"), commitCfg)
+ if err != nil {
+ return err
+ }
+
+ return httputils.WriteJSON(w, http.StatusCreated, &types.IDResponse{ID: imgID})
+}
+
func (s *containerRouter) getContainersJSON(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
if err := httputils.ParseForm(r); err != nil {
return err
diff --git a/api/server/router/image/backend.go b/api/server/router/image/backend.go
index dcf554c..e4d4b7d 100644
--- a/api/server/router/image/backend.go
+++ b/api/server/router/image/backend.go
@@ -4,7 +4,6 @@
"io"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/backend"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/registry"
@@ -14,22 +13,17 @@
// Backend is all the methods that need to be implemented
// to provide image specific functionality.
type Backend interface {
- containerBackend
imageBackend
importExportBackend
registryBackend
}
-type containerBackend interface {
- CreateImageFromContainer(name string, config *backend.CreateImageConfig) (imageID string, err error)
-}
-
type imageBackend interface {
ImageDelete(imageRef string, force, prune bool) ([]types.ImageDeleteResponseItem, error)
ImageHistory(imageName string) ([]*image.HistoryResponseItem, error)
Images(imageFilters filters.Args, all bool, withExtraAttrs bool) ([]*types.ImageSummary, error)
LookupImage(name string) (*types.ImageInspect, error)
- TagImage(imageName, repository, tag string) error
+ TagImage(imageName, repository, tag string) (string, error)
ImagesPrune(ctx context.Context, pruneFilters filters.Args) (*types.ImagesPruneReport, error)
}
diff --git a/api/server/router/image/image.go b/api/server/router/image/image.go
index 980bbd2..6d5d87f 100644
--- a/api/server/router/image/image.go
+++ b/api/server/router/image/image.go
@@ -1,23 +1,18 @@
package image // import "github.com/docker/docker/api/server/router/image"
import (
- "github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/server/router"
)
// imageRouter is a router to talk with the image controller
type imageRouter struct {
backend Backend
- decoder httputils.ContainerDecoder
routes []router.Route
}
// NewRouter initializes a new image router
-func NewRouter(backend Backend, decoder httputils.ContainerDecoder) router.Router {
- r := &imageRouter{
- backend: backend,
- decoder: decoder,
- }
+func NewRouter(backend Backend) router.Router {
+ r := &imageRouter{backend: backend}
r.initRoutes()
return r
}
@@ -38,7 +33,6 @@
router.NewGetRoute("/images/{name:.*}/history", r.getImagesHistory),
router.NewGetRoute("/images/{name:.*}/json", r.getImagesByName),
// POST
- router.NewPostRoute("/commit", r.postCommit),
router.NewPostRoute("/images/load", r.postImagesLoad),
router.NewPostRoute("/images/create", r.postImagesCreate, router.WithCancel),
router.NewPostRoute("/images/{name:.*}/push", r.postImagesPush, router.WithCancel),
diff --git a/api/server/router/image/image_routes.go b/api/server/router/image/image_routes.go
index 618ccdf..cb49713 100644
--- a/api/server/router/image/image_routes.go
+++ b/api/server/router/image/image_routes.go
@@ -4,15 +4,12 @@
"encoding/base64"
"encoding/json"
"fmt"
- "io"
"net/http"
- "os"
"strconv"
"strings"
"github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/backend"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/versions"
"github.com/docker/docker/errdefs"
@@ -25,45 +22,6 @@
"golang.org/x/net/context"
)
-func (s *imageRouter) postCommit(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
- if err := httputils.ParseForm(r); err != nil {
- return err
- }
-
- if err := httputils.CheckForJSON(r); err != nil {
- return err
- }
-
- // TODO: remove pause arg, and always pause in backend
- pause := httputils.BoolValue(r, "pause")
- version := httputils.VersionFromContext(ctx)
- if r.FormValue("pause") == "" && versions.GreaterThanOrEqualTo(version, "1.13") {
- pause = true
- }
-
- config, _, _, err := s.decoder.DecodeConfig(r.Body)
- if err != nil && err != io.EOF { //Do not fail if body is empty.
- return err
- }
-
- commitCfg := &backend.CreateImageConfig{
- Pause: pause,
- Repo: r.Form.Get("repo"),
- Tag: r.Form.Get("tag"),
- Author: r.Form.Get("author"),
- Comment: r.Form.Get("comment"),
- Config: config,
- Changes: r.Form["changes"],
- }
-
- imgID, err := s.backend.CreateImageFromContainer(r.Form.Get("container"), commitCfg)
- if err != nil {
- return err
- }
-
- return httputils.WriteJSON(w, http.StatusCreated, &types.IDResponse{ID: imgID})
-}
-
// Creates an image from Pull or from Import
func (s *imageRouter) postImagesCreate(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
@@ -86,17 +44,7 @@
version := httputils.VersionFromContext(ctx)
if versions.GreaterThanOrEqualTo(version, "1.32") {
- // TODO @jhowardmsft. The following environment variable is an interim
- // measure to allow the daemon to have a default platform if omitted by
- // the client. This allows LCOW and WCOW to work with a down-level CLI
- // for a short period of time, as the CLI changes can't be merged
- // until after the daemon changes have been merged. Once the CLI is
- // updated, this can be removed. PR for CLI is currently in
- // https://github.com/docker/cli/pull/474.
apiPlatform := r.FormValue("platform")
- if system.LCOWSupported() && apiPlatform == "" {
- apiPlatform = os.Getenv("LCOW_API_PLATFORM_IF_OMITTED")
- }
platform = system.ParsePlatform(apiPlatform)
if err = system.ValidatePlatform(platform); err != nil {
err = fmt.Errorf("invalid platform: %s", err)
@@ -303,7 +251,7 @@
if err := httputils.ParseForm(r); err != nil {
return err
}
- if err := s.backend.TagImage(vars["name"], r.Form.Get("repo"), r.Form.Get("tag")); err != nil {
+ if _, err := s.backend.TagImage(vars["name"], r.Form.Get("repo"), r.Form.Get("tag")); err != nil {
return err
}
w.WriteHeader(http.StatusCreated)
diff --git a/api/server/router/swarm/cluster_routes.go b/api/server/router/swarm/cluster_routes.go
index 33e52a3..6b13bf3 100644
--- a/api/server/router/swarm/cluster_routes.go
+++ b/api/server/router/swarm/cluster_routes.go
@@ -372,6 +372,10 @@
if err := json.NewDecoder(r.Body).Decode(&secret); err != nil {
return err
}
+ version := httputils.VersionFromContext(ctx)
+ if secret.Templating != nil && versions.LessThan(version, "1.37") {
+ return errdefs.InvalidParameter(errors.Errorf("secret templating is not supported on the specified API version: %s", version))
+ }
id, err := sr.backend.CreateSecret(secret)
if err != nil {
@@ -440,6 +444,11 @@
return err
}
+ version := httputils.VersionFromContext(ctx)
+ if config.Templating != nil && versions.LessThan(version, "1.37") {
+ return errdefs.InvalidParameter(errors.Errorf("config templating is not supported on the specified API version: %s", version))
+ }
+
id, err := sr.backend.CreateConfig(config)
if err != nil {
return err
diff --git a/api/swagger.yaml b/api/swagger.yaml
index cc3ee80..63cc577 100644
--- a/api/swagger.yaml
+++ b/api/swagger.yaml
@@ -19,10 +19,10 @@
consumes:
- "application/json"
- "text/plain"
-basePath: "/v1.36"
+basePath: "/v1.37"
info:
title: "Docker Engine API"
- version: "1.36"
+ version: "1.37"
x-logo:
url: "https://docs.docker.com/images/logo-docker-main.png"
description: |
@@ -49,7 +49,7 @@
the URL is not supported by the daemon, a HTTP `400 Bad Request` error message
is returned.
- If you omit the version-prefix, the current version of the API (v1.36) is used.
+ If you omit the version-prefix, the current version of the API (v1.37) is used.
For example, calling `/info` is the same as calling `/v1.36/info`. Using the
API without a version-prefix is deprecated and will be removed in a future release.
@@ -167,7 +167,7 @@
Type:
type: "string"
x-nullable: false
- enum: ["tcp", "udp"]
+ enum: ["tcp", "udp", "sctp"]
example:
PrivatePort: 8080
PublicPort: 80
@@ -801,7 +801,7 @@
description: |
An object mapping ports to an empty object in the form:
- `{"<port>/<tcp|udp>": {}}`
+ `{"<port>/<tcp|udp|sctp>": {}}`
type: "object"
additionalProperties:
type: "object"
@@ -1066,8 +1066,8 @@
container's port-number and protocol as key in the format `<port>/<protocol>`,
for example, `80/udp`.
- If a container's port is mapped for both `tcp` and `udp`, two separate
- entries are added to the mapping table.
+ If a container's port is mapped for multiple protocols, separate entries
+ are added to the mapping table.
type: "object"
additionalProperties:
type: "array"
@@ -3046,6 +3046,7 @@
enum:
- "tcp"
- "udp"
+ - "sctp"
TargetPort:
description: "The port inside the container."
type: "integer"
@@ -3338,6 +3339,13 @@
Driver:
description: "Name of the secrets driver used to fetch the secret's value from an external secret store"
$ref: "#/definitions/Driver"
+ Templating:
+ description: |
+ Templating driver, if applicable
+
+ Templating controls whether and how to evaluate the config payload as
+ a template. If no driver is set, no templating is used.
+ $ref: "#/definitions/Driver"
Secret:
type: "object"
@@ -3374,6 +3382,13 @@
Base64-url-safe-encoded ([RFC 4648](https://tools.ietf.org/html/rfc4648#section-3.2))
config data.
type: "string"
+ Templating:
+ description: |
+ Templating driver, if applicable
+
+ Templating controls whether and how to evaluate the config payload as
+ a template. If no driver is set, no templating is used.
+ $ref: "#/definitions/Driver"
Config:
type: "object"
@@ -6173,8 +6188,19 @@
type: "integer"
- name: "buildargs"
in: "query"
- description: "JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)"
- type: "integer"
+ description: >
+ JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker
+ uses the buildargs as the environment context for commands run via the `Dockerfile` RUN
+ instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for
+ passing secret values.
+
+
+ For example, the build arg `FOO=bar` would become `{"FOO":"bar"}` in JSON. This would result in the
+ the query parameter `buildargs={"FOO":"bar"}`. Note that `{"FOO":"bar"}` should be URI component encoded.
+
+
+ [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)
+ type: "string"
- name: "shmsize"
in: "query"
description: "Size of `/dev/shm` in bytes. The size must be greater than 0. If omitted the system uses 64MB."
diff --git a/api/types/swarm/config.go b/api/types/swarm/config.go
index c1fdf3b..a1555cf 100644
--- a/api/types/swarm/config.go
+++ b/api/types/swarm/config.go
@@ -13,6 +13,10 @@
type ConfigSpec struct {
Annotations
Data []byte `json:",omitempty"`
+
+ // Templating controls whether and how to evaluate the config payload as
+ // a template. If it is not set, no templating is used.
+ Templating *Driver `json:",omitempty"`
}
// ConfigReferenceFileTarget is a file target in a config reference
diff --git a/api/types/swarm/network.go b/api/types/swarm/network.go
index fd9b1a5..98ef328 100644
--- a/api/types/swarm/network.go
+++ b/api/types/swarm/network.go
@@ -62,6 +62,8 @@
PortConfigProtocolTCP PortConfigProtocol = "tcp"
// PortConfigProtocolUDP UDP
PortConfigProtocolUDP PortConfigProtocol = "udp"
+ // PortConfigProtocolSCTP SCTP
+ PortConfigProtocolSCTP PortConfigProtocol = "sctp"
)
// EndpointVirtualIP represents the virtual ip of a port.
diff --git a/api/types/swarm/secret.go b/api/types/swarm/secret.go
index cfba114..d5213ec 100644
--- a/api/types/swarm/secret.go
+++ b/api/types/swarm/secret.go
@@ -14,6 +14,10 @@
Annotations
Data []byte `json:",omitempty"`
Driver *Driver `json:",omitempty"` // name of the secrets driver used to fetch the secret's value from an external secret store
+
+ // Templating controls whether and how to evaluate the secret payload as
+ // a template. If it is not set, no templating is used.
+ Templating *Driver `json:",omitempty"`
}
// SecretReferenceFileTarget is a file target in a secret reference
diff --git a/client/client.go b/client/client.go
index 240e32a..e129bb2 100644
--- a/client/client.go
+++ b/client/client.go
@@ -42,8 +42,8 @@
package client // import "github.com/docker/docker/client"
import (
- "errors"
"fmt"
+ "net"
"net/http"
"net/url"
"os"
@@ -56,6 +56,7 @@
"github.com/docker/docker/api/types/versions"
"github.com/docker/go-connections/sockets"
"github.com/docker/go-connections/tlsconfig"
+ "github.com/pkg/errors"
"golang.org/x/net/context"
)
@@ -103,18 +104,21 @@
}
// NewEnvClient initializes a new API client based on environment variables.
-// Use DOCKER_HOST to set the url to the docker server.
-// Use DOCKER_API_VERSION to set the version of the API to reach, leave empty for latest.
-// Use DOCKER_CERT_PATH to load the TLS certificates from.
-// Use DOCKER_TLS_VERIFY to enable or disable TLS verification, off by default.
-// deprecated: use NewClientWithOpts(FromEnv)
+// See FromEnv for a list of support environment variables.
+//
+// Deprecated: use NewClientWithOpts(FromEnv)
func NewEnvClient() (*Client, error) {
return NewClientWithOpts(FromEnv)
}
-// FromEnv enhance the default client with values from environment variables
+// FromEnv configures the client with values from environment variables.
+//
+// Supported environment variables:
+// DOCKER_HOST to set the url to the docker server.
+// DOCKER_API_VERSION to set the version of the API to reach, leave empty for latest.
+// DOCKER_CERT_PATH to load the TLS certificates from.
+// DOCKER_TLS_VERIFY to enable or disable TLS verification, off by default.
func FromEnv(c *Client) error {
- var httpClient *http.Client
if dockerCertPath := os.Getenv("DOCKER_CERT_PATH"); dockerCertPath != "" {
options := tlsconfig.Options{
CAFile: filepath.Join(dockerCertPath, "ca.pem"),
@@ -127,38 +131,58 @@
return err
}
- httpClient = &http.Client{
- Transport: &http.Transport{
- TLSClientConfig: tlsc,
- },
+ c.client = &http.Client{
+ Transport: &http.Transport{TLSClientConfig: tlsc},
CheckRedirect: CheckRedirect,
}
}
- host := os.Getenv("DOCKER_HOST")
- if host != "" {
- var err error
+ if host := os.Getenv("DOCKER_HOST"); host != "" {
if err := WithHost(host)(c); err != nil {
return err
}
- httpClient, err = defaultHTTPClient(host)
- if err != nil {
- return err
- }
}
- if httpClient != nil {
- if err := WithHTTPClient(httpClient)(c); err != nil {
- return err
- }
- }
- version := os.Getenv("DOCKER_API_VERSION")
- if version != "" {
+
+ if version := os.Getenv("DOCKER_API_VERSION"); version != "" {
c.version = version
c.manualOverride = true
}
return nil
}
+// WithTLSClientConfig applies a tls config to the client transport.
+func WithTLSClientConfig(cacertPath, certPath, keyPath string) func(*Client) error {
+ return func(c *Client) error {
+ opts := tlsconfig.Options{
+ CAFile: cacertPath,
+ CertFile: certPath,
+ KeyFile: keyPath,
+ ExclusiveRootPools: true,
+ }
+ config, err := tlsconfig.Client(opts)
+ if err != nil {
+ return errors.Wrap(err, "failed to create tls config")
+ }
+ if transport, ok := c.client.Transport.(*http.Transport); ok {
+ transport.TLSClientConfig = config
+ return nil
+ }
+ return errors.Errorf("cannot apply tls config to transport: %T", c.client.Transport)
+ }
+}
+
+// WithDialer applies the dialer.DialContext to the client transport. This can be
+// used to set the Timeout and KeepAlive settings of the client.
+func WithDialer(dialer *net.Dialer) func(*Client) error {
+ return func(c *Client) error {
+ if transport, ok := c.client.Transport.(*http.Transport); ok {
+ transport.DialContext = dialer.DialContext
+ return nil
+ }
+ return errors.Errorf("cannot apply dialer to transport: %T", c.client.Transport)
+ }
+}
+
// WithVersion overrides the client version with the specified one
func WithVersion(version string) func(*Client) error {
return func(c *Client) error {
@@ -167,7 +191,7 @@
}
}
-// WithHost overrides the client host with the specified one
+// WithHost overrides the client host with the specified one.
func WithHost(host string) func(*Client) error {
return func(c *Client) error {
hostURL, err := ParseHostURL(host)
@@ -178,11 +202,10 @@
c.proto = hostURL.Scheme
c.addr = hostURL.Host
c.basePath = hostURL.Path
- client, err := defaultHTTPClient(host)
- if err != nil {
- return err
+ if transport, ok := c.client.Transport.(*http.Transport); ok {
+ return sockets.ConfigureTransport(transport, c.proto, c.addr)
}
- return WithHTTPClient(client)(c)
+ return errors.Errorf("cannot apply host to transport: %T", c.client.Transport)
}
}
@@ -267,7 +290,7 @@
// It won't send any version information if the version number is empty. It is
// highly recommended that you set a version or your client may break if the
// server is upgraded.
-// deprecated: use NewClientWithOpts
+// Deprecated: use NewClientWithOpts
func NewClient(host string, version string, client *http.Client, httpHeaders map[string]string) (*Client, error) {
return NewClientWithOpts(WithHost(host), WithVersion(version), WithHTTPClient(client), WithHTTPHeaders(httpHeaders))
}
@@ -333,17 +356,6 @@
return cli.host
}
-// ParseHost parses a url string, validates the strings is a host url, and returns
-// the parsed host as: protocol, address, and base path
-// Deprecated: use ParseHostURL
-func ParseHost(host string) (string, string, string, error) {
- hostURL, err := ParseHostURL(host)
- if err != nil {
- return "", "", "", err
- }
- return hostURL.Scheme, hostURL.Host, hostURL.Path, nil
-}
-
// ParseHostURL parses a url string, validates the string is a host url, and
// returns the parsed URL
func ParseHostURL(host string) (*url.URL, error) {
@@ -379,6 +391,7 @@
}
// SetCustomHTTPHeaders that will be set on every HTTP request made by the client.
+// Deprecated: use WithHTTPHeaders when creating the client.
func (cli *Client) SetCustomHTTPHeaders(headers map[string]string) {
cli.customHTTPHeaders = headers
}
diff --git a/client/client_test.go b/client/client_test.go
index 59b08bd..db394e2 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -6,41 +6,47 @@
"net/url"
"os"
"runtime"
- "strings"
"testing"
"github.com/docker/docker/api"
"github.com/docker/docker/api/types"
"github.com/docker/docker/internal/testutil"
+ "github.com/gotestyourself/gotestyourself/env"
+ "github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
func TestNewEnvClient(t *testing.T) {
- if runtime.GOOS == "windows" {
- t.Skip("skipping unix only test for windows")
- }
- cases := []struct {
+ skip.If(t, runtime.GOOS == "windows")
+
+ testcases := []struct {
+ doc string
envs map[string]string
expectedError string
expectedVersion string
}{
{
+ doc: "default api version",
envs: map[string]string{},
expectedVersion: api.DefaultVersion,
},
{
+ doc: "invalid cert path",
envs: map[string]string{
"DOCKER_CERT_PATH": "invalid/path",
},
expectedError: "Could not load X509 key pair: open invalid/path/cert.pem: no such file or directory",
},
{
+ doc: "default api version with cert path",
envs: map[string]string{
"DOCKER_CERT_PATH": "testdata/",
},
expectedVersion: api.DefaultVersion,
},
{
+ doc: "default api version with cert path and tls verify",
envs: map[string]string{
"DOCKER_CERT_PATH": "testdata/",
"DOCKER_TLS_VERIFY": "1",
@@ -48,6 +54,7 @@
expectedVersion: api.DefaultVersion,
},
{
+ doc: "default api version with cert path and host",
envs: map[string]string{
"DOCKER_CERT_PATH": "testdata/",
"DOCKER_HOST": "https://notaunixsocket",
@@ -55,24 +62,21 @@
expectedVersion: api.DefaultVersion,
},
{
+ doc: "invalid docker host",
envs: map[string]string{
"DOCKER_HOST": "host",
},
expectedError: "unable to parse docker host `host`",
},
{
+ doc: "invalid docker host, with good format",
envs: map[string]string{
"DOCKER_HOST": "invalid://url",
},
expectedVersion: api.DefaultVersion,
},
{
- envs: map[string]string{
- "DOCKER_API_VERSION": "anything",
- },
- expectedVersion: "anything",
- },
- {
+ doc: "override api version",
envs: map[string]string{
"DOCKER_API_VERSION": "1.22",
},
@@ -80,26 +84,24 @@
},
}
- env := envToMap()
- defer mapToEnv(env)
- for _, c := range cases {
- mapToEnv(env)
- mapToEnv(c.envs)
+ defer env.PatchAll(t, nil)()
+ for _, c := range testcases {
+ env.PatchAll(t, c.envs)
apiclient, err := NewEnvClient()
if c.expectedError != "" {
- assert.Error(t, err)
- assert.Equal(t, c.expectedError, err.Error())
+ assert.Error(t, err, c.doc)
+ assert.Equal(t, c.expectedError, err.Error(), c.doc)
} else {
- assert.NoError(t, err)
+ assert.NoError(t, err, c.doc)
version := apiclient.ClientVersion()
- assert.Equal(t, c.expectedVersion, version)
+ assert.Equal(t, c.expectedVersion, version, c.doc)
}
if c.envs["DOCKER_TLS_VERIFY"] != "" {
// pedantic checking that this is handled correctly
tr := apiclient.client.Transport.(*http.Transport)
- assert.NotNil(t, tr.TLSClientConfig)
- assert.Equal(t, tr.TLSClientConfig.InsecureSkipVerify, false)
+ assert.NotNil(t, tr.TLSClientConfig, c.doc)
+ assert.Equal(t, tr.TLSClientConfig.InsecureSkipVerify, false, c.doc)
}
}
}
@@ -130,32 +132,6 @@
}
}
-func TestParseHost(t *testing.T) {
- cases := []struct {
- host string
- proto string
- addr string
- base string
- err bool
- }{
- {"", "", "", "", true},
- {"foobar", "", "", "", true},
- {"foo://bar", "foo", "bar", "", false},
- {"tcp://localhost:2476", "tcp", "localhost:2476", "", false},
- {"tcp://localhost:2476/path", "tcp", "localhost:2476", "/path", false},
- }
-
- for _, cs := range cases {
- p, a, b, e := ParseHost(cs.host)
- if cs.err {
- assert.Error(t, e)
- }
- assert.Equal(t, cs.proto, p)
- assert.Equal(t, cs.addr, a)
- assert.Equal(t, cs.base, b)
- }
-}
-
func TestParseHostURL(t *testing.T) {
testcases := []struct {
host string
@@ -194,16 +170,12 @@
}
func TestNewEnvClientSetsDefaultVersion(t *testing.T) {
- env := envToMap()
- defer mapToEnv(env)
-
- envMap := map[string]string{
+ defer env.PatchAll(t, map[string]string{
"DOCKER_HOST": "",
"DOCKER_API_VERSION": "",
"DOCKER_TLS_VERIFY": "",
"DOCKER_CERT_PATH": "",
- }
- mapToEnv(envMap)
+ })()
client, err := NewEnvClient()
if err != nil {
@@ -223,18 +195,10 @@
// TestNegotiateAPIVersionEmpty asserts that client.Client can
// negotiate a compatible APIVersion when omitted
func TestNegotiateAPIVersionEmpty(t *testing.T) {
- env := envToMap()
- defer mapToEnv(env)
-
- envMap := map[string]string{
- "DOCKER_API_VERSION": "",
- }
- mapToEnv(envMap)
+ defer env.PatchAll(t, map[string]string{"DOCKER_API_VERSION": ""})
client, err := NewEnvClient()
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
ping := types.Ping{
APIVersion: "",
@@ -258,12 +222,9 @@
// negotiate a compatible APIVersion with the server
func TestNegotiateAPIVersion(t *testing.T) {
client, err := NewEnvClient()
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
expected := "1.21"
-
ping := types.Ping{
APIVersion: expected,
OSType: "linux",
@@ -289,18 +250,11 @@
// TestNegotiateAPIVersionOverride asserts that we honor
// the environment variable DOCKER_API_VERSION when negotianing versions
func TestNegotiateAPVersionOverride(t *testing.T) {
- env := envToMap()
- defer mapToEnv(env)
-
- envMap := map[string]string{
- "DOCKER_API_VERSION": "9.99",
- }
- mapToEnv(envMap)
+ expected := "9.99"
+ defer env.PatchAll(t, map[string]string{"DOCKER_API_VERSION": expected})()
client, err := NewEnvClient()
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
ping := types.Ping{
APIVersion: "1.24",
@@ -308,31 +262,11 @@
Experimental: false,
}
- expected := envMap["DOCKER_API_VERSION"]
-
// test that we honored the env var
client.NegotiateAPIVersionPing(ping)
assert.Equal(t, expected, client.version)
}
-// mapToEnv takes a map of environment variables and sets them
-func mapToEnv(env map[string]string) {
- for k, v := range env {
- os.Setenv(k, v)
- }
-}
-
-// envToMap returns a map of environment variables
-func envToMap() map[string]string {
- env := make(map[string]string)
- for _, e := range os.Environ() {
- kv := strings.SplitAfterN(e, "=", 2)
- env[kv[0]] = kv[1]
- }
-
- return env
-}
-
type roundTripFunc func(*http.Request) (*http.Response, error)
func (rtf roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
diff --git a/client/config_inspect.go b/client/config_inspect.go
index b49fdf5..7ae1376 100644
--- a/client/config_inspect.go
+++ b/client/config_inspect.go
@@ -11,6 +11,9 @@
// ConfigInspectWithRaw returns the config information with raw data
func (cli *Client) ConfigInspectWithRaw(ctx context.Context, id string) (swarm.Config, []byte, error) {
+ if id == "" {
+ return swarm.Config{}, nil, objectNotFoundError{object: "config", id: id}
+ }
if err := cli.NewVersionError("1.30", "config inspect"); err != nil {
return swarm.Config{}, nil, err
}
diff --git a/client/config_inspect_test.go b/client/config_inspect_test.go
index 18776a9..c6d73e5 100644
--- a/client/config_inspect_test.go
+++ b/client/config_inspect_test.go
@@ -10,10 +10,34 @@
"testing"
"github.com/docker/docker/api/types/swarm"
+ "github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
)
+func TestConfigInspectNotFound(t *testing.T) {
+ client := &Client{
+ client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
+ }
+
+ _, _, err := client.ConfigInspectWithRaw(context.Background(), "unknown")
+ if err == nil || !IsErrNotFound(err) {
+ t.Fatalf("expected a NotFoundError error, got %v", err)
+ }
+}
+
+func TestConfigInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, _, err := client.ConfigInspectWithRaw(context.Background(), "")
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
+
func TestConfigInspectUnsupported(t *testing.T) {
client := &Client{
version: "1.29",
diff --git a/client/container_inspect.go b/client/container_inspect.go
index 1ec45e8..d1dbd47 100644
--- a/client/container_inspect.go
+++ b/client/container_inspect.go
@@ -12,6 +12,9 @@
// ContainerInspect returns the container information.
func (cli *Client) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {
+ if containerID == "" {
+ return types.ContainerJSON{}, objectNotFoundError{object: "container", id: containerID}
+ }
serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", nil, nil)
if err != nil {
return types.ContainerJSON{}, wrapResponseError(err, serverResp, "container", containerID)
@@ -25,6 +28,9 @@
// ContainerInspectWithRaw returns the container information and its raw representation.
func (cli *Client) ContainerInspectWithRaw(ctx context.Context, containerID string, getSize bool) (types.ContainerJSON, []byte, error) {
+ if containerID == "" {
+ return types.ContainerJSON{}, nil, objectNotFoundError{object: "container", id: containerID}
+ }
query := url.Values{}
if getSize {
query.Set("size", "1")
diff --git a/client/container_inspect_test.go b/client/container_inspect_test.go
index b181053..eeb903e 100644
--- a/client/container_inspect_test.go
+++ b/client/container_inspect_test.go
@@ -10,6 +10,7 @@
"testing"
"github.com/docker/docker/api/types"
+ "github.com/pkg/errors"
"golang.org/x/net/context"
)
@@ -35,6 +36,18 @@
}
}
+func TestContainerInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, _, err := client.ContainerInspectWithRaw(context.Background(), "", true)
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
+
func TestContainerInspect(t *testing.T) {
expectedURL := "/containers/container_id/json"
client := &Client{
diff --git a/client/distribution_inspect.go b/client/distribution_inspect.go
index 5f55945..4644ea4 100644
--- a/client/distribution_inspect.go
+++ b/client/distribution_inspect.go
@@ -12,6 +12,9 @@
func (cli *Client) DistributionInspect(ctx context.Context, image, encodedRegistryAuth string) (registrytypes.DistributionInspect, error) {
// Contact the registry to retrieve digest and platform information
var distributionInspect registrytypes.DistributionInspect
+ if image == "" {
+ return distributionInspect, objectNotFoundError{object: "distribution", id: image}
+ }
if err := cli.NewVersionError("1.30", "distribution inspect"); err != nil {
return distributionInspect, err
diff --git a/client/distribution_inspect_test.go b/client/distribution_inspect_test.go
index af5de27..90b35a2 100644
--- a/client/distribution_inspect_test.go
+++ b/client/distribution_inspect_test.go
@@ -4,6 +4,7 @@
"net/http"
"testing"
+ "github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
)
@@ -16,3 +17,15 @@
_, err := client.DistributionInspect(context.Background(), "foobar:1.0", "")
assert.EqualError(t, err, `"distribution inspect" requires API version 1.30, but the Docker daemon API version is 1.29`)
}
+
+func TestDistributionInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, err := client.DistributionInspect(context.Background(), "", "")
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
diff --git a/client/image_inspect.go b/client/image_inspect.go
index 75057bf..1581133 100644
--- a/client/image_inspect.go
+++ b/client/image_inspect.go
@@ -11,6 +11,9 @@
// ImageInspectWithRaw returns the image information and its raw representation.
func (cli *Client) ImageInspectWithRaw(ctx context.Context, imageID string) (types.ImageInspect, []byte, error) {
+ if imageID == "" {
+ return types.ImageInspect{}, nil, objectNotFoundError{object: "image", id: imageID}
+ }
serverResp, err := cli.get(ctx, "/images/"+imageID+"/json", nil, nil)
if err != nil {
return types.ImageInspect{}, nil, wrapResponseError(err, serverResp, "image", imageID)
diff --git a/client/image_inspect_test.go b/client/image_inspect_test.go
index 47910e9..e42d251 100644
--- a/client/image_inspect_test.go
+++ b/client/image_inspect_test.go
@@ -11,6 +11,7 @@
"testing"
"github.com/docker/docker/api/types"
+ "github.com/pkg/errors"
"golang.org/x/net/context"
)
@@ -36,6 +37,18 @@
}
}
+func TestImageInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, _, err := client.ImageInspectWithRaw(context.Background(), "")
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
+
func TestImageInspect(t *testing.T) {
expectedURL := "/images/image_id/json"
expectedTags := []string{"tag1", "tag2"}
diff --git a/client/interface.go b/client/interface.go
index e928e64..8517546 100644
--- a/client/interface.go
+++ b/client/interface.go
@@ -37,6 +37,7 @@
NegotiateAPIVersion(ctx context.Context)
NegotiateAPIVersionPing(types.Ping)
DialSession(ctx context.Context, proto string, meta map[string][]string) (net.Conn, error)
+ Close() error
}
// ContainerAPIClient defines API client methods for the containers
diff --git a/client/network_inspect.go b/client/network_inspect.go
index 3308f18..0e18caf 100644
--- a/client/network_inspect.go
+++ b/client/network_inspect.go
@@ -18,6 +18,9 @@
// NetworkInspectWithRaw returns the information for a specific network configured in the docker host and its raw representation.
func (cli *Client) NetworkInspectWithRaw(ctx context.Context, networkID string, options types.NetworkInspectOptions) (types.NetworkResource, []byte, error) {
+ if networkID == "" {
+ return types.NetworkResource{}, nil, objectNotFoundError{object: "network", id: networkID}
+ }
var (
networkResource types.NetworkResource
resp serverResponse
diff --git a/client/network_inspect_test.go b/client/network_inspect_test.go
index 95fcb0d..7031611 100644
--- a/client/network_inspect_test.go
+++ b/client/network_inspect_test.go
@@ -11,6 +11,7 @@
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/network"
+ "github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
)
@@ -34,6 +35,18 @@
assert.True(t, IsErrNotFound(err))
}
+func TestNetworkInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, _, err := client.NetworkInspectWithRaw(context.Background(), "", types.NetworkInspectOptions{})
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
+
func TestNetworkInspect(t *testing.T) {
expectedURL := "/networks/network_id"
client := &Client{
diff --git a/client/node_inspect.go b/client/node_inspect.go
index 454db9f..7c0c1d4 100644
--- a/client/node_inspect.go
+++ b/client/node_inspect.go
@@ -11,6 +11,9 @@
// NodeInspectWithRaw returns the node information.
func (cli *Client) NodeInspectWithRaw(ctx context.Context, nodeID string) (swarm.Node, []byte, error) {
+ if nodeID == "" {
+ return swarm.Node{}, nil, objectNotFoundError{object: "node", id: nodeID}
+ }
serverResp, err := cli.get(ctx, "/nodes/"+nodeID, nil, nil)
if err != nil {
return swarm.Node{}, nil, wrapResponseError(err, serverResp, "node", nodeID)
diff --git a/client/node_inspect_test.go b/client/node_inspect_test.go
index 2fcd0d6..efda287 100644
--- a/client/node_inspect_test.go
+++ b/client/node_inspect_test.go
@@ -10,6 +10,7 @@
"testing"
"github.com/docker/docker/api/types/swarm"
+ "github.com/pkg/errors"
"golang.org/x/net/context"
)
@@ -35,6 +36,18 @@
}
}
+func TestNodeInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, _, err := client.NodeInspectWithRaw(context.Background(), "")
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
+
func TestNodeInspect(t *testing.T) {
expectedURL := "/nodes/node_id"
client := &Client{
diff --git a/client/plugin_inspect.go b/client/plugin_inspect.go
index 8957a80..983b109 100644
--- a/client/plugin_inspect.go
+++ b/client/plugin_inspect.go
@@ -11,6 +11,9 @@
// PluginInspectWithRaw inspects an existing plugin
func (cli *Client) PluginInspectWithRaw(ctx context.Context, name string) (*types.Plugin, []byte, error) {
+ if name == "" {
+ return nil, nil, objectNotFoundError{object: "plugin", id: name}
+ }
resp, err := cli.get(ctx, "/plugins/"+name+"/json", nil, nil)
if err != nil {
return nil, nil, wrapResponseError(err, resp, "plugin", name)
diff --git a/client/plugin_inspect_test.go b/client/plugin_inspect_test.go
index e3958b4..eada16d 100644
--- a/client/plugin_inspect_test.go
+++ b/client/plugin_inspect_test.go
@@ -10,6 +10,7 @@
"testing"
"github.com/docker/docker/api/types"
+ "github.com/pkg/errors"
"golang.org/x/net/context"
)
@@ -24,6 +25,18 @@
}
}
+func TestPluginInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, _, err := client.PluginInspectWithRaw(context.Background(), "")
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
+
func TestPluginInspect(t *testing.T) {
expectedURL := "/plugins/plugin_name"
client := &Client{
diff --git a/client/request.go b/client/request.go
index 986b512..302f599 100644
--- a/client/request.go
+++ b/client/request.go
@@ -123,10 +123,7 @@
if err != nil {
return resp, err
}
- if err := cli.checkResponseErr(resp); err != nil {
- return resp, err
- }
- return resp, nil
+ return resp, cli.checkResponseErr(resp)
}
func (cli *Client) doRequest(ctx context.Context, req *http.Request) (serverResponse, error) {
diff --git a/client/request_test.go b/client/request_test.go
index f3c136a..1dbfed6 100644
--- a/client/request_test.go
+++ b/client/request_test.go
@@ -9,6 +9,7 @@
"testing"
"github.com/docker/docker/api/types"
+ "github.com/stretchr/testify/require"
"golang.org/x/net/context"
)
@@ -44,10 +45,8 @@
}
for c, test := range testCases {
- proto, addr, basePath, err := ParseHost(test.host)
- if err != nil {
- t.Fatal(err)
- }
+ hostURL, err := ParseHostURL(test.host)
+ require.NoError(t, err)
client := &Client{
client: newMockClient(func(req *http.Request) (*http.Response, error) {
@@ -66,15 +65,13 @@
}, nil
}),
- proto: proto,
- addr: addr,
- basePath: basePath,
+ proto: hostURL.Scheme,
+ addr: hostURL.Host,
+ basePath: hostURL.Path,
}
_, err = client.sendRequest(context.Background(), "GET", testURL, nil, nil, nil)
- if err != nil {
- t.Fatal(err)
- }
+ require.NoError(t, err)
}
}
diff --git a/client/secret_inspect.go b/client/secret_inspect.go
index 6ff7549..9342e3b 100644
--- a/client/secret_inspect.go
+++ b/client/secret_inspect.go
@@ -14,6 +14,9 @@
if err := cli.NewVersionError("1.25", "secret inspect"); err != nil {
return swarm.Secret{}, nil, err
}
+ if id == "" {
+ return swarm.Secret{}, nil, objectNotFoundError{object: "secret", id: id}
+ }
resp, err := cli.get(ctx, "/secrets/"+id, nil, nil)
if err != nil {
return swarm.Secret{}, nil, wrapResponseError(err, resp, "secret", id)
diff --git a/client/secret_inspect_test.go b/client/secret_inspect_test.go
index 5fba8ba..eb63162 100644
--- a/client/secret_inspect_test.go
+++ b/client/secret_inspect_test.go
@@ -10,6 +10,7 @@
"testing"
"github.com/docker/docker/api/types/swarm"
+ "github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
)
@@ -47,6 +48,18 @@
}
}
+func TestSecretInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, _, err := client.SecretInspectWithRaw(context.Background(), "")
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
+
func TestSecretInspect(t *testing.T) {
expectedURL := "/v1.25/secrets/secret_id"
client := &Client{
diff --git a/client/service_inspect.go b/client/service_inspect.go
index 67bcc9c..b4c2944 100644
--- a/client/service_inspect.go
+++ b/client/service_inspect.go
@@ -14,6 +14,9 @@
// ServiceInspectWithRaw returns the service information and the raw data.
func (cli *Client) ServiceInspectWithRaw(ctx context.Context, serviceID string, opts types.ServiceInspectOptions) (swarm.Service, []byte, error) {
+ if serviceID == "" {
+ return swarm.Service{}, nil, objectNotFoundError{object: "service", id: serviceID}
+ }
query := url.Values{}
query.Set("insertDefaults", fmt.Sprintf("%v", opts.InsertDefaults))
serverResp, err := cli.get(ctx, "/services/"+serviceID, query, nil)
diff --git a/client/service_inspect_test.go b/client/service_inspect_test.go
index b528688..be5165a 100644
--- a/client/service_inspect_test.go
+++ b/client/service_inspect_test.go
@@ -11,6 +11,7 @@
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
+ "github.com/pkg/errors"
"golang.org/x/net/context"
)
@@ -36,6 +37,18 @@
}
}
+func TestServiceInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, _, err := client.ServiceInspectWithRaw(context.Background(), "", types.ServiceInspectOptions{})
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
+
func TestServiceInspect(t *testing.T) {
expectedURL := "/services/service_id"
client := &Client{
diff --git a/client/task_inspect.go b/client/task_inspect.go
index a7b3121..13e0a85 100644
--- a/client/task_inspect.go
+++ b/client/task_inspect.go
@@ -11,6 +11,9 @@
// TaskInspectWithRaw returns the task information and its raw representation..
func (cli *Client) TaskInspectWithRaw(ctx context.Context, taskID string) (swarm.Task, []byte, error) {
+ if taskID == "" {
+ return swarm.Task{}, nil, objectNotFoundError{object: "task", id: taskID}
+ }
serverResp, err := cli.get(ctx, "/tasks/"+taskID, nil, nil)
if err != nil {
return swarm.Task{}, nil, wrapResponseError(err, serverResp, "task", taskID)
diff --git a/client/task_inspect_test.go b/client/task_inspect_test.go
index 6adba92..6ca98dd 100644
--- a/client/task_inspect_test.go
+++ b/client/task_inspect_test.go
@@ -10,6 +10,7 @@
"testing"
"github.com/docker/docker/api/types/swarm"
+ "github.com/pkg/errors"
"golang.org/x/net/context"
)
@@ -24,6 +25,18 @@
}
}
+func TestTaskInspectWithEmptyID(t *testing.T) {
+ client := &Client{
+ client: newMockClient(func(req *http.Request) (*http.Response, error) {
+ return nil, errors.New("should not make request")
+ }),
+ }
+ _, _, err := client.TaskInspectWithRaw(context.Background(), "")
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
+}
+
func TestTaskInspect(t *testing.T) {
expectedURL := "/tasks/task_id"
client := &Client{
diff --git a/client/volume_inspect.go b/client/volume_inspect.go
index b72e64d..eb90f66 100644
--- a/client/volume_inspect.go
+++ b/client/volume_inspect.go
@@ -4,7 +4,6 @@
"bytes"
"encoding/json"
"io/ioutil"
- "path"
"github.com/docker/docker/api/types"
"golang.org/x/net/context"
@@ -18,15 +17,12 @@
// VolumeInspectWithRaw returns the information about a specific volume in the docker host and its raw representation
func (cli *Client) VolumeInspectWithRaw(ctx context.Context, volumeID string) (types.Volume, []byte, error) {
- // The empty ID needs to be handled here because with an empty ID the
- // request url will not contain a trailing / which calls the volume list API
- // instead of volume inspect
if volumeID == "" {
return types.Volume{}, nil, objectNotFoundError{object: "volume", id: volumeID}
}
var volume types.Volume
- resp, err := cli.get(ctx, path.Join("/volumes", volumeID), nil, nil)
+ resp, err := cli.get(ctx, "/volumes/"+volumeID, nil, nil)
if err != nil {
return volume, nil, wrapResponseError(err, resp, "volume", volumeID)
}
diff --git a/client/volume_inspect_test.go b/client/volume_inspect_test.go
index 1ec10b2..c97f5c7 100644
--- a/client/volume_inspect_test.go
+++ b/client/volume_inspect_test.go
@@ -11,6 +11,7 @@
"github.com/docker/docker/api/types"
"github.com/docker/docker/internal/testutil"
+ "github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
@@ -35,20 +36,15 @@
}
func TestVolumeInspectWithEmptyID(t *testing.T) {
- expectedURL := "/volumes/"
-
client := &Client{
client: newMockClient(func(req *http.Request) (*http.Response, error) {
- assert.Equal(t, req.URL.Path, expectedURL)
- return &http.Response{
- StatusCode: http.StatusNotFound,
- Body: ioutil.NopCloser(bytes.NewReader(nil)),
- }, nil
+ return nil, errors.New("should not make request")
}),
}
- _, err := client.VolumeInspect(context.Background(), "")
- testutil.ErrorContains(t, err, "No such volume: ")
-
+ _, _, err := client.VolumeInspectWithRaw(context.Background(), "")
+ if !IsErrNotFound(err) {
+ t.Fatalf("Expected NotFoundError, got %v", err)
+ }
}
func TestVolumeInspect(t *testing.T) {
diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go
index d73b63a..cba9a7b 100644
--- a/cmd/dockerd/daemon.go
+++ b/cmd/dockerd/daemon.go
@@ -34,7 +34,6 @@
"github.com/docker/docker/daemon/cluster"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/listeners"
- "github.com/docker/docker/daemon/logger"
"github.com/docker/docker/dockerversion"
"github.com/docker/docker/libcontainerd"
dopts "github.com/docker/docker/opts"
@@ -106,12 +105,6 @@
return fmt.Errorf("Failed to set umask: %v", err)
}
- if len(cli.LogConfig.Config) > 0 {
- if err := logger.ValidateLogOpts(cli.LogConfig.Type, cli.LogConfig.Config); err != nil {
- return fmt.Errorf("Failed to set log opts: %v", err)
- }
- }
-
// Create the daemon root before we create ANY other files (PID, or migrate keys)
// to ensure the appropriate ACL is set (particularly relevant on Windows)
if err := daemon.CreateDaemonRoot(cli.Config); err != nil {
@@ -514,7 +507,7 @@
// we need to add the checkpoint router before the container router or the DELETE gets masked
checkpointrouter.NewRouter(opts.daemon, decoder),
container.NewRouter(opts.daemon, decoder),
- image.NewRouter(opts.daemon, decoder),
+ image.NewRouter(opts.daemon),
systemrouter.NewRouter(opts.daemon, opts.cluster, opts.buildCache),
volume.NewRouter(opts.daemon),
build.NewRouter(opts.buildBackend, opts.daemon),
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 0000000..594265c
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,17 @@
+comment:
+ layout: header, changes, diff, sunburst
+coverage:
+ status:
+ patch:
+ default:
+ target: 50%
+ only_pulls: true
+ # project will give us the diff in the total code coverage between a commit
+ # and its parent
+ project:
+ default:
+ target: auto
+ threshold: "15%"
+ changes: false
+ignore:
+ - "vendor/*"
diff --git a/container/container.go b/container/container.go
index 938d66f..46e592a 100644
--- a/container/container.go
+++ b/container/container.go
@@ -1049,21 +1049,6 @@
return filepath.Join(containerSecretMountPath, r.File.Name)
}
-// ConfigsDirPath returns the path to the directory where configs are stored on
-// disk.
-func (container *Container) ConfigsDirPath() (string, error) {
- return container.GetRootResourcePath("configs")
-}
-
-// ConfigFilePath returns the path to the on-disk location of a config.
-func (container *Container) ConfigFilePath(configRef swarmtypes.ConfigReference) (string, error) {
- configs, err := container.ConfigsDirPath()
- if err != nil {
- return "", err
- }
- return filepath.Join(configs, configRef.ConfigID), nil
-}
-
// CreateDaemonEnvironment creates a new environment variable slice for this container.
func (container *Container) CreateDaemonEnvironment(tty bool, linkedEnv []string) []string {
// Setup environment
diff --git a/container/container_unix.go b/container/container_unix.go
index 32805e5..e5cecf3 100644
--- a/container/container_unix.go
+++ b/container/container_unix.go
@@ -5,14 +5,15 @@
import (
"io/ioutil"
"os"
+ "path/filepath"
+ "github.com/containerd/continuity/fs"
"github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container"
mounttypes "github.com/docker/docker/api/types/mount"
- "github.com/docker/docker/pkg/chrootarchive"
+ swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/stringid"
- "github.com/docker/docker/pkg/system"
"github.com/docker/docker/volume"
"github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors"
@@ -234,6 +235,17 @@
Writable: false,
})
}
+ for _, r := range container.ConfigReferences {
+ fPath, err := container.ConfigFilePath(*r)
+ if err != nil {
+ return nil, err
+ }
+ mounts = append(mounts, Mount{
+ Source: fPath,
+ Destination: r.File.Name,
+ Writable: false,
+ })
+ }
return mounts, nil
}
@@ -254,27 +266,6 @@
return mount.RecursiveUnmount(p)
}
-// ConfigMounts returns the mounts for configs.
-func (container *Container) ConfigMounts() ([]Mount, error) {
- var mounts []Mount
- for _, configRef := range container.ConfigReferences {
- if configRef.File == nil {
- continue
- }
- src, err := container.ConfigFilePath(*configRef)
- if err != nil {
- return nil, err
- }
- mounts = append(mounts, Mount{
- Source: src,
- Destination: configRef.File.Name,
- Writable: false,
- })
- }
-
- return mounts, nil
-}
-
type conflictingUpdateOptions string
func (e conflictingUpdateOptions) Error() string {
@@ -398,53 +389,15 @@
// copyExistingContents copies from the source to the destination and
// ensures the ownership is appropriately set.
func copyExistingContents(source, destination string) error {
- volList, err := ioutil.ReadDir(source)
+ dstList, err := ioutil.ReadDir(destination)
if err != nil {
return err
}
- if len(volList) > 0 {
- srcList, err := ioutil.ReadDir(destination)
- if err != nil {
- return err
- }
- if len(srcList) == 0 {
- // If the source volume is empty, copies files from the root into the volume
- if err := chrootarchive.NewArchiver(nil).CopyWithTar(source, destination); err != nil {
- return err
- }
- }
+ if len(dstList) != 0 {
+ // destination is not empty, do not copy
+ return nil
}
- return copyOwnership(source, destination)
-}
-
-// copyOwnership copies the permissions and uid:gid of the source file
-// to the destination file
-func copyOwnership(source, destination string) error {
- stat, err := system.Stat(source)
- if err != nil {
- return err
- }
-
- destStat, err := system.Stat(destination)
- if err != nil {
- return err
- }
-
- // In some cases, even though UID/GID match and it would effectively be a no-op,
- // this can return a permission denied error... for example if this is an NFS
- // mount.
- // Since it's not really an error that we can't chown to the same UID/GID, don't
- // even bother trying in such cases.
- if stat.UID() != destStat.UID() || stat.GID() != destStat.GID() {
- if err := os.Chown(destination, int(stat.UID()), int(stat.GID())); err != nil {
- return err
- }
- }
-
- if stat.Mode() != destStat.Mode() {
- return os.Chmod(destination, os.FileMode(stat.Mode()))
- }
- return nil
+ return fs.CopyDir(destination, source)
}
// TmpfsMounts returns the list of tmpfs mounts
@@ -496,3 +449,13 @@
}
return mountPoints
}
+
+// ConfigFilePath returns the path to the on-disk location of a config.
+// On unix, configs are always considered secret
+func (container *Container) ConfigFilePath(configRef swarmtypes.ConfigReference) (string, error) {
+ mounts, err := container.SecretMountPath()
+ if err != nil {
+ return "", err
+ }
+ return filepath.Join(mounts, configRef.ConfigID), nil
+}
diff --git a/container/container_windows.go b/container/container_windows.go
index 44b646a..b5bdb5b 100644
--- a/container/container_windows.go
+++ b/container/container_windows.go
@@ -7,6 +7,7 @@
"github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container"
+ swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/pkg/system"
)
@@ -102,23 +103,20 @@
}
// ConfigMounts returns the mount for configs.
-// All configs are stored in a single mount on Windows. Target symlinks are
-// created for each config, pointing to the files in this mount.
-func (container *Container) ConfigMounts() ([]Mount, error) {
+// TODO: Right now Windows doesn't really have a "secure" storage for secrets,
+// however some configs may contain secrets. Once secure storage is worked out,
+// configs and secret handling should be merged.
+func (container *Container) ConfigMounts() []Mount {
var mounts []Mount
if len(container.ConfigReferences) > 0 {
- src, err := container.ConfigsDirPath()
- if err != nil {
- return nil, err
- }
mounts = append(mounts, Mount{
- Source: src,
+ Source: container.ConfigsDirPath(),
Destination: containerInternalConfigsDirPath,
Writable: false,
})
}
- return mounts, nil
+ return mounts
}
// DetachAndUnmount unmounts all volumes.
@@ -204,3 +202,12 @@
}
return mountPoints
}
+
+func (container *Container) ConfigsDirPath() string {
+ return filepath.Join(container.Root, "configs")
+}
+
+// ConfigFilePath returns the path to the on-disk location of a config.
+func (container *Container) ConfigFilePath(configRef swarmtypes.ConfigReference) string {
+ return filepath.Join(container.ConfigsDirPath(), configRef.ConfigID)
+}
diff --git a/daemon/changes.go b/daemon/changes.go
index 306790e..70b3f6b 100644
--- a/daemon/changes.go
+++ b/daemon/changes.go
@@ -22,6 +22,9 @@
container.Lock()
defer container.Unlock()
+ if container.RWLayer == nil {
+ return nil, errors.New("RWLayer of container " + name + " is unexpectedly nil")
+ }
c, err := container.RWLayer.Changes()
if err != nil {
return nil, err
diff --git a/daemon/cluster/controllers/plugin/controller.go b/daemon/cluster/controllers/plugin/controller.go
index dbeeb6d..f1d6ddd 100644
--- a/daemon/cluster/controllers/plugin/controller.go
+++ b/daemon/cluster/controllers/plugin/controller.go
@@ -26,7 +26,7 @@
// We'll also end up with many tasks all pointing to the same plugin ID.
//
// TODO(@cpuguy83): registry auth is intentionally not supported until we work out
-// the right way to pass registry crednetials via secrets.
+// the right way to pass registry credentials via secrets.
type Controller struct {
backend Backend
spec runtime.PluginSpec
diff --git a/daemon/cluster/convert/config.go b/daemon/cluster/convert/config.go
index ba7920e..16b3475 100644
--- a/daemon/cluster/convert/config.go
+++ b/daemon/cluster/convert/config.go
@@ -2,6 +2,7 @@
import (
swarmtypes "github.com/docker/docker/api/types/swarm"
+ types "github.com/docker/docker/api/types/swarm"
swarmapi "github.com/docker/swarmkit/api"
gogotypes "github.com/gogo/protobuf/types"
)
@@ -21,18 +22,34 @@
config.CreatedAt, _ = gogotypes.TimestampFromProto(s.Meta.CreatedAt)
config.UpdatedAt, _ = gogotypes.TimestampFromProto(s.Meta.UpdatedAt)
+ if s.Spec.Templating != nil {
+ config.Spec.Templating = &types.Driver{
+ Name: s.Spec.Templating.Name,
+ Options: s.Spec.Templating.Options,
+ }
+ }
+
return config
}
// ConfigSpecToGRPC converts Config to a grpc Config.
func ConfigSpecToGRPC(s swarmtypes.ConfigSpec) swarmapi.ConfigSpec {
- return swarmapi.ConfigSpec{
+ spec := swarmapi.ConfigSpec{
Annotations: swarmapi.Annotations{
Name: s.Name,
Labels: s.Labels,
},
Data: s.Data,
}
+
+ if s.Templating != nil {
+ spec.Templating = &swarmapi.Driver{
+ Name: s.Templating.Name,
+ Options: s.Templating.Options,
+ }
+ }
+
+ return spec
}
// ConfigReferencesFromGRPC converts a slice of grpc ConfigReference to ConfigReference
diff --git a/daemon/cluster/convert/secret.go b/daemon/cluster/convert/secret.go
index 3ec2a35..d0e5ac4 100644
--- a/daemon/cluster/convert/secret.go
+++ b/daemon/cluster/convert/secret.go
@@ -2,6 +2,7 @@
import (
swarmtypes "github.com/docker/docker/api/types/swarm"
+ types "github.com/docker/docker/api/types/swarm"
swarmapi "github.com/docker/swarmkit/api"
gogotypes "github.com/gogo/protobuf/types"
)
@@ -22,12 +23,19 @@
secret.CreatedAt, _ = gogotypes.TimestampFromProto(s.Meta.CreatedAt)
secret.UpdatedAt, _ = gogotypes.TimestampFromProto(s.Meta.UpdatedAt)
+ if s.Spec.Templating != nil {
+ secret.Spec.Templating = &types.Driver{
+ Name: s.Spec.Templating.Name,
+ Options: s.Spec.Templating.Options,
+ }
+ }
+
return secret
}
// SecretSpecToGRPC converts Secret to a grpc Secret.
func SecretSpecToGRPC(s swarmtypes.SecretSpec) swarmapi.SecretSpec {
- return swarmapi.SecretSpec{
+ spec := swarmapi.SecretSpec{
Annotations: swarmapi.Annotations{
Name: s.Name,
Labels: s.Labels,
@@ -35,6 +43,15 @@
Data: s.Data,
Driver: driverToGRPC(s.Driver),
}
+
+ if s.Templating != nil {
+ spec.Templating = &swarmapi.Driver{
+ Name: s.Templating.Name,
+ Options: s.Templating.Options,
+ }
+ }
+
+ return spec
}
// SecretReferencesFromGRPC converts a slice of grpc SecretReference to SecretReference
diff --git a/daemon/cluster/executor/container/controller.go b/daemon/cluster/executor/container/controller.go
index 09fecf1..5b7732c 100644
--- a/daemon/cluster/executor/container/controller.go
+++ b/daemon/cluster/executor/container/controller.go
@@ -621,6 +621,8 @@
protocol = api.ProtocolTCP
case "udp":
protocol = api.ProtocolUDP
+ case "sctp":
+ protocol = api.ProtocolSCTP
default:
return nil, fmt.Errorf("invalid protocol: %s", parts[1])
}
diff --git a/daemon/cluster/executor/container/executor.go b/daemon/cluster/executor/container/executor.go
index 48ec7e0..2c4f619 100644
--- a/daemon/cluster/executor/container/executor.go
+++ b/daemon/cluster/executor/container/executor.go
@@ -19,6 +19,7 @@
"github.com/docker/swarmkit/agent/exec"
"github.com/docker/swarmkit/api"
"github.com/docker/swarmkit/api/naming"
+ "github.com/docker/swarmkit/template"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
)
@@ -191,7 +192,7 @@
// Controller returns a docker container runner.
func (e *executor) Controller(t *api.Task) (exec.Controller, error) {
- dependencyGetter := agent.Restrict(e.dependencies, t)
+ dependencyGetter := template.NewTemplatedDependencyGetter(agent.Restrict(e.dependencies, t), t, nil)
// Get the node description from the executor field
e.mutex.Lock()
diff --git a/daemon/commit.go b/daemon/commit.go
index 5f2e3c6..8865d83 100644
--- a/daemon/commit.go
+++ b/daemon/commit.go
@@ -8,7 +8,6 @@
"strings"
"time"
- "github.com/docker/distribution/reference"
"github.com/docker/docker/api/types/backend"
containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/builder/dockerfile"
@@ -176,9 +175,12 @@
return "", err
}
- imageRef, err := daemon.tagCommit(c.Repo, c.Tag, id)
- if err != nil {
- return "", err
+ var imageRef string
+ if c.Repo != "" {
+ imageRef, err = daemon.TagImage(string(id), c.Repo, c.Tag)
+ if err != nil {
+ return "", err
+ }
}
daemon.LogContainerEventWithAttributes(container, "commit", map[string]string{
"comment": c.Comment,
@@ -247,30 +249,6 @@
return id, nil
}
-// TODO: remove from Daemon, move to api backend
-func (daemon *Daemon) tagCommit(repo string, tag string, id image.ID) (string, error) {
- imageRef := ""
- if repo != "" {
- newTag, err := reference.ParseNormalizedNamed(repo) // todo: should move this to API layer
- if err != nil {
- return "", err
- }
- if !reference.IsNameOnly(newTag) {
- return "", errors.Errorf("unexpected repository name: %s", repo)
- }
- if tag != "" {
- if newTag, err = reference.WithTag(newTag, tag); err != nil {
- return "", err
- }
- }
- if err := daemon.TagImageWithReference(id, newTag); err != nil {
- return "", err
- }
- imageRef = reference.FamiliarString(newTag)
- }
- return imageRef, nil
-}
-
func exportContainerRw(layerStore layer.Store, id, mountLabel string) (arch io.ReadCloser, err error) {
rwlayer, err := layerStore.GetRWLayer(id)
if err != nil {
diff --git a/daemon/configs.go b/daemon/configs.go
index f85c51d..4fd0d22 100644
--- a/daemon/configs.go
+++ b/daemon/configs.go
@@ -16,8 +16,6 @@
if err != nil {
return err
}
-
- c.ConfigReferences = refs
-
+ c.ConfigReferences = append(c.ConfigReferences, refs...)
return nil
}
diff --git a/daemon/container.go b/daemon/container.go
index 1c01a74..a16abf2 100644
--- a/daemon/container.go
+++ b/daemon/container.go
@@ -343,6 +343,16 @@
return nil, errors.Errorf("invalid isolation '%s' on %s", hostConfig.Isolation, runtime.GOOS)
}
+ var (
+ err error
+ warnings []string
+ )
// Now do platform-specific verification
- return verifyPlatformContainerSettings(daemon, hostConfig, config, update)
+ if warnings, err = verifyPlatformContainerSettings(daemon, hostConfig, config, update); err != nil {
+ return warnings, err
+ }
+ if hostConfig.NetworkMode.IsHost() && len(hostConfig.PortBindings) > 0 {
+ warnings = append(warnings, "Published ports are discarded when using host network mode")
+ }
+ return warnings, err
}
diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go
index abd47c8..4e92b63 100644
--- a/daemon/container_operations_unix.go
+++ b/daemon/container_operations_unix.go
@@ -161,43 +161,26 @@
}
func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) {
- if len(c.SecretReferences) == 0 {
+ if len(c.SecretReferences) == 0 && len(c.ConfigReferences) == 0 {
return nil
}
- localMountPath, err := c.SecretMountPath()
- if err != nil {
- return errors.Wrap(err, "error getting secrets mount dir")
+ if err := daemon.createSecretsDir(c); err != nil {
+ return err
}
- logrus.Debugf("secrets: setting up secret dir: %s", localMountPath)
-
- // retrieve possible remapped range start for root UID, GID
- rootIDs := daemon.idMappings.RootPair()
- // create tmpfs
- if err := idtools.MkdirAllAndChown(localMountPath, 0700, rootIDs); err != nil {
- return errors.Wrap(err, "error creating secret local mount path")
- }
-
defer func() {
if setupErr != nil {
- // cleanup
- _ = detachMounted(localMountPath)
-
- if err := os.RemoveAll(localMountPath); err != nil {
- logrus.Errorf("error cleaning up secret mount: %s", err)
- }
+ daemon.cleanupSecretDir(c)
}
}()
- tmpfsOwnership := fmt.Sprintf("uid=%d,gid=%d", rootIDs.UID, rootIDs.GID)
- if err := mount.Mount("tmpfs", localMountPath, "tmpfs", "nodev,nosuid,noexec,"+tmpfsOwnership); err != nil {
- return errors.Wrap(err, "unable to setup secret mount")
- }
-
if c.DependencyStore == nil {
return fmt.Errorf("secret store is not initialized")
}
+ // retrieve possible remapped range start for root UID, GID
+ rootIDs := daemon.idMappings.RootPair()
+
for _, s := range c.SecretReferences {
// TODO (ehazlett): use type switch when more are supported
if s.File == nil {
@@ -244,78 +227,38 @@
}
}
- label.Relabel(localMountPath, c.MountLabel, false)
-
- // remount secrets ro
- if err := mount.Mount("tmpfs", localMountPath, "tmpfs", "remount,ro,"+tmpfsOwnership); err != nil {
- return errors.Wrap(err, "unable to remount secret dir as readonly")
- }
-
- return nil
-}
-
-func (daemon *Daemon) setupConfigDir(c *container.Container) (setupErr error) {
- if len(c.ConfigReferences) == 0 {
- return nil
- }
-
- localPath, err := c.ConfigsDirPath()
- if err != nil {
- return err
- }
- logrus.Debugf("configs: setting up config dir: %s", localPath)
-
- // retrieve possible remapped range start for root UID, GID
- rootIDs := daemon.idMappings.RootPair()
- // create tmpfs
- if err := idtools.MkdirAllAndChown(localPath, 0700, rootIDs); err != nil {
- return errors.Wrap(err, "error creating config dir")
- }
-
- defer func() {
- if setupErr != nil {
- if err := os.RemoveAll(localPath); err != nil {
- logrus.Errorf("error cleaning up config dir: %s", err)
- }
- }
- }()
-
- if c.DependencyStore == nil {
- return fmt.Errorf("config store is not initialized")
- }
-
- for _, configRef := range c.ConfigReferences {
+ for _, ref := range c.ConfigReferences {
// TODO (ehazlett): use type switch when more are supported
- if configRef.File == nil {
+ if ref.File == nil {
logrus.Error("config target type is not a file target")
continue
}
- fPath, err := c.ConfigFilePath(*configRef)
+ fPath, err := c.ConfigFilePath(*ref)
if err != nil {
- return err
+ return errors.Wrap(err, "error getting config file path for container")
}
-
- log := logrus.WithFields(logrus.Fields{"name": configRef.File.Name, "path": fPath})
-
if err := idtools.MkdirAllAndChown(filepath.Dir(fPath), 0700, rootIDs); err != nil {
- return errors.Wrap(err, "error creating config path")
+ return errors.Wrap(err, "error creating config mount path")
}
- log.Debug("injecting config")
- config, err := c.DependencyStore.Configs().Get(configRef.ConfigID)
+ logrus.WithFields(logrus.Fields{
+ "name": ref.File.Name,
+ "path": fPath,
+ }).Debug("injecting config")
+ config, err := c.DependencyStore.Configs().Get(ref.ConfigID)
if err != nil {
return errors.Wrap(err, "unable to get config from config store")
}
- if err := ioutil.WriteFile(fPath, config.Spec.Data, configRef.File.Mode); err != nil {
+ if err := ioutil.WriteFile(fPath, config.Spec.Data, ref.File.Mode); err != nil {
return errors.Wrap(err, "error injecting config")
}
- uid, err := strconv.Atoi(configRef.File.UID)
+ uid, err := strconv.Atoi(ref.File.UID)
if err != nil {
return err
}
- gid, err := strconv.Atoi(configRef.File.GID)
+ gid, err := strconv.Atoi(ref.File.GID)
if err != nil {
return err
}
@@ -323,16 +266,69 @@
if err := os.Chown(fPath, rootIDs.UID+uid, rootIDs.GID+gid); err != nil {
return errors.Wrap(err, "error setting ownership for config")
}
- if err := os.Chmod(fPath, configRef.File.Mode); err != nil {
+ if err := os.Chmod(fPath, ref.File.Mode); err != nil {
return errors.Wrap(err, "error setting file mode for config")
}
+ }
- label.Relabel(fPath, c.MountLabel, false)
+ return daemon.remountSecretDir(c)
+}
+
+// createSecretsDir is used to create a dir suitable for storing container secrets.
+// In practice this is using a tmpfs mount and is used for both "configs" and "secrets"
+func (daemon *Daemon) createSecretsDir(c *container.Container) error {
+ // retrieve possible remapped range start for root UID, GID
+ rootIDs := daemon.idMappings.RootPair()
+ dir, err := c.SecretMountPath()
+ if err != nil {
+ return errors.Wrap(err, "error getting container secrets dir")
+ }
+
+ // create tmpfs
+ if err := idtools.MkdirAllAndChown(dir, 0700, rootIDs); err != nil {
+ return errors.Wrap(err, "error creating secret local mount path")
+ }
+
+ tmpfsOwnership := fmt.Sprintf("uid=%d,gid=%d", rootIDs.UID, rootIDs.GID)
+ if err := mount.Mount("tmpfs", dir, "tmpfs", "nodev,nosuid,noexec,"+tmpfsOwnership); err != nil {
+ return errors.Wrap(err, "unable to setup secret mount")
}
return nil
}
+func (daemon *Daemon) remountSecretDir(c *container.Container) error {
+ dir, err := c.SecretMountPath()
+ if err != nil {
+ return errors.Wrap(err, "error getting container secrets path")
+ }
+ if err := label.Relabel(dir, c.MountLabel, false); err != nil {
+ logrus.WithError(err).WithField("dir", dir).Warn("Error while attempting to set selinux label")
+ }
+ rootIDs := daemon.idMappings.RootPair()
+ tmpfsOwnership := fmt.Sprintf("uid=%d,gid=%d", rootIDs.UID, rootIDs.GID)
+
+ // remount secrets ro
+ if err := mount.Mount("tmpfs", dir, "tmpfs", "remount,ro,"+tmpfsOwnership); err != nil {
+ return errors.Wrap(err, "unable to remount dir as readonly")
+ }
+
+ return nil
+}
+
+func (daemon *Daemon) cleanupSecretDir(c *container.Container) {
+ dir, err := c.SecretMountPath()
+ if err != nil {
+ logrus.WithError(err).WithField("container", c.ID).Warn("error getting secrets mount path for container")
+ }
+ if err := mount.RecursiveUnmount(dir); err != nil {
+ logrus.WithField("dir", dir).WithError(err).Warn("Error while attmepting to unmount dir, this may prevent removal of container.")
+ }
+ if err := os.RemoveAll(dir); err != nil && !os.IsNotExist(err) {
+ logrus.WithField("dir", dir).WithError(err).Error("Error removing dir.")
+ }
+}
+
func killProcessDirectly(cntr *container.Container) error {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
diff --git a/daemon/container_operations_windows.go b/daemon/container_operations_windows.go
index e3914f9..0559b8a 100644
--- a/daemon/container_operations_windows.go
+++ b/daemon/container_operations_windows.go
@@ -21,10 +21,7 @@
return nil
}
- localPath, err := c.ConfigsDirPath()
- if err != nil {
- return err
- }
+ localPath := c.ConfigsDirPath()
logrus.Debugf("configs: setting up config dir: %s", localPath)
// create local config root
@@ -51,11 +48,7 @@
continue
}
- fPath, err := c.ConfigFilePath(*configRef)
- if err != nil {
- return err
- }
-
+ fPath := c.ConfigFilePath(*configRef)
log := logrus.WithFields(logrus.Fields{"name": configRef.File.Name, "path": fPath})
log.Debug("injecting config")
diff --git a/daemon/container_unix_test.go b/daemon/container_unix_test.go
new file mode 100644
index 0000000..e102be6
--- /dev/null
+++ b/daemon/container_unix_test.go
@@ -0,0 +1,44 @@
+// +build linux freebsd
+
+package daemon
+
+import (
+ "testing"
+
+ "github.com/docker/docker/api/types"
+ containertypes "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/daemon/config"
+ "github.com/docker/go-connections/nat"
+ "github.com/stretchr/testify/require"
+)
+
+// TestContainerWarningHostAndPublishPorts that a warning is returned when setting network mode to host and specifying published ports.
+// This should not be tested on Windows because Windows doesn't support "host" network mode.
+func TestContainerWarningHostAndPublishPorts(t *testing.T) {
+ testCases := []struct {
+ ports nat.PortMap
+ warnings []string
+ }{
+ {ports: nat.PortMap{}},
+ {ports: nat.PortMap{
+ "8080": []nat.PortBinding{{HostPort: "8989"}},
+ }, warnings: []string{"Published ports are discarded when using host network mode"}},
+ }
+
+ for _, tc := range testCases {
+ hostConfig := &containertypes.HostConfig{
+ Runtime: "runc",
+ NetworkMode: "host",
+ PortBindings: tc.ports,
+ }
+ cs := &config.Config{
+ CommonUnixConfig: config.CommonUnixConfig{
+ Runtimes: map[string]types.Runtime{"runc": {}},
+ },
+ }
+ d := &Daemon{configStore: cs}
+ wrns, err := d.verifyContainerSettings("", hostConfig, &containertypes.Config{}, false)
+ require.NoError(t, err)
+ require.Equal(t, tc.warnings, wrns)
+ }
+}
diff --git a/daemon/create.go b/daemon/create.go
index 05231df..7e6b651 100644
--- a/daemon/create.go
+++ b/daemon/create.go
@@ -266,7 +266,7 @@
rwLayerOpts := &layer.CreateRWLayerOpts{
MountLabel: container.MountLabel,
- InitFunc: daemon.getLayerInit(),
+ InitFunc: setupInitLayer(daemon.idMappings),
StorageOpt: container.HostConfig.StorageOpt,
}
diff --git a/daemon/daemon.go b/daemon/daemon.go
index 982cdf5..335e644 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -32,7 +32,6 @@
"github.com/sirupsen/logrus"
// register graph drivers
_ "github.com/docker/docker/daemon/graphdriver/register"
- "github.com/docker/docker/daemon/initlayer"
"github.com/docker/docker/daemon/stats"
dmetadata "github.com/docker/docker/distribution/metadata"
"github.com/docker/docker/distribution/xfer"
@@ -41,7 +40,6 @@
"github.com/docker/docker/layer"
"github.com/docker/docker/libcontainerd"
"github.com/docker/docker/migrate/v1"
- "github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/locker"
"github.com/docker/docker/pkg/plugingetter"
@@ -671,8 +669,6 @@
return nil, fmt.Errorf("error setting default isolation mode: %v", err)
}
- logrus.Debugf("Using default logging driver %s", config.LogConfig.Type)
-
if err := configureMaxThreads(config); err != nil {
logrus.Warnf("Failed to configure golang's threads limit: %v", err)
}
@@ -753,6 +749,10 @@
return nil, errors.Wrap(err, "couldn't create plugin manager")
}
+ if err := d.setupDefaultLogConfig(); err != nil {
+ return nil, err
+ }
+
for operatingSystem, gd := range d.graphDrivers {
d.layerStores[operatingSystem], err = layer.NewStoreFromOptions(layer.StoreOptions{
Root: config.Root,
@@ -873,10 +873,7 @@
d.trustKey = trustKey
d.idIndex = truncindex.NewTruncIndex([]string{})
d.statsCollector = d.newStatsCollector(1 * time.Second)
- d.defaultLogConfig = containertypes.LogConfig{
- Type: config.LogConfig.Type,
- Config: config.LogConfig.Config,
- }
+
d.EventsService = eventsService
d.volumes = volStore
d.root = config.Root
@@ -1051,6 +1048,9 @@
// Mount sets container.BaseFS
// (is it not set coming in? why is it unset?)
func (daemon *Daemon) Mount(container *container.Container) error {
+ if container.RWLayer == nil {
+ return errors.New("RWLayer of container " + container.ID + " is unexpectedly nil")
+ }
dir, err := container.RWLayer.Mount(container.GetMountLabel())
if err != nil {
return err
@@ -1073,6 +1073,9 @@
// Unmount unsets the container base filesystem
func (daemon *Daemon) Unmount(container *container.Container) error {
+ if container.RWLayer == nil {
+ return errors.New("RWLayer of container " + container.ID + " is unexpectedly nil")
+ }
if err := container.RWLayer.Unmount(); err != nil {
logrus.Errorf("Error unmounting container %s: %s", container.ID, err)
return err
@@ -1136,11 +1139,6 @@
return tmpDir, idtools.MkdirAllAndChown(tmpDir, 0700, rootIDs)
}
-func (daemon *Daemon) setupInitLayer(initPath containerfs.ContainerFS) error {
- rootIDs := daemon.idMappings.RootPair()
- return initlayer.Setup(initPath, rootIDs)
-}
-
func (daemon *Daemon) setGenericResources(conf *config.Config) error {
genericResources, err := config.ParseGenericResources(conf.NodeGenericResources)
if err != nil {
diff --git a/daemon/daemon_linux.go b/daemon/daemon_linux.go
index 911ef7f..d27e733 100644
--- a/daemon/daemon_linux.go
+++ b/daemon/daemon_linux.go
@@ -10,6 +10,7 @@
"github.com/docker/docker/pkg/fileutils"
"github.com/docker/docker/pkg/mount"
+ "github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
@@ -67,9 +68,29 @@
return nil
}
-// cleanupMounts umounts shm/mqueue mounts for old containers
+// cleanupMounts umounts used by container resources and the daemon root mount
func (daemon *Daemon) cleanupMounts() error {
- return daemon.cleanupMountsByID("")
+ if err := daemon.cleanupMountsByID(""); err != nil {
+ return err
+ }
+
+ infos, err := mount.GetMounts()
+ if err != nil {
+ return errors.Wrap(err, "error reading mount table for cleanup")
+ }
+
+ info := getMountInfo(infos, daemon.root)
+ // `info.Root` here is the root mountpoint of the passed in path (`daemon.root`).
+ // The ony cases that need to be cleaned up is when the daemon has performed a
+ // `mount --bind /daemon/root /daemon/root && mount --make-shared /daemon/root`
+ // This is only done when the daemon is started up and `/daemon/root` is not
+ // already on a shared mountpoint.
+ if !shouldUnmountRoot(daemon.root, info) {
+ return nil
+ }
+
+ logrus.WithField("mountpoint", daemon.root).Debug("unmounting daemon root")
+ return mount.Unmount(daemon.root)
}
func getCleanPatterns(id string) (regexps []*regexp.Regexp) {
@@ -91,3 +112,16 @@
func getRealPath(path string) (string, error) {
return fileutils.ReadSymlinkedDirectory(path)
}
+
+func shouldUnmountRoot(root string, info *mount.Info) bool {
+ if info == nil {
+ return false
+ }
+ if info.Mountpoint != root {
+ return false
+ }
+ if !strings.HasSuffix(root, info.Root) {
+ return false
+ }
+ return hasMountinfoOption(info.Optional, sharedPropagationOption)
+}
diff --git a/daemon/daemon_linux_test.go b/daemon/daemon_linux_test.go
index ac9404c..ad651e3 100644
--- a/daemon/daemon_linux_test.go
+++ b/daemon/daemon_linux_test.go
@@ -10,6 +10,7 @@
"github.com/docker/docker/container"
"github.com/docker/docker/oci"
"github.com/docker/docker/pkg/idtools"
+ "github.com/docker/docker/pkg/mount"
"github.com/stretchr/testify/assert"
)
@@ -164,3 +165,66 @@
_, err := d.verifyContainerSettings("linux", &containertypes.HostConfig{Isolation: containertypes.IsolationHyperV}, nil, false)
assert.EqualError(t, err, "invalid isolation 'hyperv' on linux")
}
+
+func TestShouldUnmountRoot(t *testing.T) {
+ for _, test := range []struct {
+ desc string
+ root string
+ info *mount.Info
+ expect bool
+ }{
+ {
+ desc: "root is at /",
+ root: "/docker",
+ info: &mount.Info{Root: "/docker", Mountpoint: "/docker"},
+ expect: true,
+ },
+ {
+ desc: "not a mountpoint",
+ root: "/docker",
+ info: nil,
+ expect: false,
+ },
+ {
+ desc: "root is at in a submount from `/`",
+ root: "/foo/docker",
+ info: &mount.Info{Root: "/docker", Mountpoint: "/foo/docker"},
+ expect: true,
+ },
+ {
+ desc: "root is mounted in from a parent mount namespace same root dir", // dind is an example of this
+ root: "/docker",
+ info: &mount.Info{Root: "/docker/volumes/1234657/_data", Mountpoint: "/docker"},
+ expect: false,
+ },
+ {
+ desc: "root is mounted in from a parent mount namespace different root dir",
+ root: "/foo/bar",
+ info: &mount.Info{Root: "/docker/volumes/1234657/_data", Mountpoint: "/foo/bar"},
+ expect: false,
+ },
+ } {
+ t.Run(test.desc, func(t *testing.T) {
+ for _, options := range []struct {
+ desc string
+ Optional string
+ expect bool
+ }{
+ {desc: "shared", Optional: "shared:", expect: true},
+ {desc: "slave", Optional: "slave:", expect: false},
+ {desc: "private", Optional: "private:", expect: false},
+ } {
+ t.Run(options.desc, func(t *testing.T) {
+ expect := options.expect
+ if expect {
+ expect = test.expect
+ }
+ if test.info != nil {
+ test.info.Optional = options.Optional
+ }
+ assert.Equal(t, expect, shouldUnmountRoot(test.root, test.info))
+ })
+ }
+ })
+ }
+}
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
index 55ff9f8..670d564 100644
--- a/daemon/daemon_unix.go
+++ b/daemon/daemon_unix.go
@@ -23,7 +23,7 @@
containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/container"
"github.com/docker/docker/daemon/config"
- "github.com/docker/docker/image"
+ "github.com/docker/docker/daemon/initlayer"
"github.com/docker/docker/opts"
"github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/idtools"
@@ -1000,8 +1000,10 @@
}
}
-func (daemon *Daemon) getLayerInit() func(containerfs.ContainerFS) error {
- return daemon.setupInitLayer
+func setupInitLayer(idMappings *idtools.IDMappings) func(containerfs.ContainerFS) error {
+ return func(initPath containerfs.ContainerFS) error {
+ return initlayer.Setup(initPath, idMappings.RootPair())
+ }
}
// Parse the remapped root (user namespace) option, which can be one of:
@@ -1357,17 +1359,6 @@
return nil
}
-func rootFSToAPIType(rootfs *image.RootFS) types.RootFS {
- var layers []string
- for _, l := range rootfs.DiffIDs {
- layers = append(layers, l.String())
- }
- return types.RootFS{
- Type: rootfs.Type,
- Layers: layers,
- }
-}
-
// setupDaemonProcess sets various settings for the daemon's process
func setupDaemonProcess(config *config.Config) error {
// setup the daemons oom_score_adj
diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go
index 7b5d954..50507e5 100644
--- a/daemon/daemon_windows.go
+++ b/daemon/daemon_windows.go
@@ -11,7 +11,6 @@
containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/container"
"github.com/docker/docker/daemon/config"
- "github.com/docker/docker/image"
"github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/fileutils"
"github.com/docker/docker/pkg/idtools"
@@ -54,7 +53,7 @@
return nil
}
-func (daemon *Daemon) getLayerInit() func(containerfs.ContainerFS) error {
+func setupInitLayer(idMappings *idtools.IDMappings) func(containerfs.ContainerFS) error {
return nil
}
@@ -629,17 +628,6 @@
return nil
}
-func rootFSToAPIType(rootfs *image.RootFS) types.RootFS {
- var layers []string
- for _, l := range rootfs.DiffIDs {
- layers = append(layers, l.String())
- }
- return types.RootFS{
- Type: rootfs.Type,
- Layers: layers,
- }
-}
-
func setupDaemonProcess(config *config.Config) error {
return nil
}
diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
index f214ee9..69a9745 100644
--- a/daemon/graphdriver/btrfs/btrfs.go
+++ b/daemon/graphdriver/btrfs/btrfs.go
@@ -29,7 +29,6 @@
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/containerfs"
"github.com/docker/docker/pkg/idtools"
- "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/system"
"github.com/docker/go-units"
@@ -163,7 +162,7 @@
return err
}
- return mount.RecursiveUnmount(d.home)
+ return nil
}
func free(p *C.char) {
diff --git a/daemon/graphdriver/counter.go b/daemon/graphdriver/counter.go
index 53123f5..2772bd2 100644
--- a/daemon/graphdriver/counter.go
+++ b/daemon/graphdriver/counter.go
@@ -54,6 +54,9 @@
}
infoOp(m)
count := m.count
+ if count <= 0 {
+ delete(c.counts, path)
+ }
c.mu.Unlock()
return count
}
diff --git a/daemon/graphdriver/lcow/lcow.go b/daemon/graphdriver/lcow/lcow.go
index 04701c9..f5a2ee2 100644
--- a/daemon/graphdriver/lcow/lcow.go
+++ b/daemon/graphdriver/lcow/lcow.go
@@ -409,7 +409,7 @@
svm.signalStopFinished(err)
}()
- // Now it's possible that the serivce VM failed to start and now we are trying to termiante it.
+ // Now it's possible that the serivce VM failed to start and now we are trying to terminate it.
// In this case, we will relay the error to the goroutines waiting for this vm to stop.
if err := svm.getStartError(); err != nil {
logrus.Debugf("lcowdriver: terminateservicevm: %s had failed to start up: %s", id, err)
diff --git a/daemon/graphdriver/plugin.go b/daemon/graphdriver/plugin.go
index 2b69f54..d8058d9 100644
--- a/daemon/graphdriver/plugin.go
+++ b/daemon/graphdriver/plugin.go
@@ -23,7 +23,7 @@
home := config.Root
if !pl.IsV1() {
if p, ok := pl.(*v2.Plugin); ok {
- if p.PropagatedMount != "" {
+ if p.PluginObj.Config.PropagatedMount != "" {
home = p.PluginObj.Config.PropagatedMount
}
}
diff --git a/daemon/graphdriver/proxy.go b/daemon/graphdriver/proxy.go
index d9c8639..10a7a52 100644
--- a/daemon/graphdriver/proxy.go
+++ b/daemon/graphdriver/proxy.go
@@ -4,7 +4,6 @@
"errors"
"fmt"
"io"
- "path/filepath"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/containerfs"
@@ -143,7 +142,7 @@
if ret.Err != "" {
err = errors.New(ret.Err)
}
- return containerfs.NewLocalContainerFS(filepath.Join(d.p.BasePath(), ret.Dir)), err
+ return containerfs.NewLocalContainerFS(d.p.ScopedPath(ret.Dir)), err
}
func (d *graphDriverProxy) Put(id string) error {
diff --git a/daemon/graphdriver/zfs/zfs.go b/daemon/graphdriver/zfs/zfs.go
index 507fa84..7183e69 100644
--- a/daemon/graphdriver/zfs/zfs.go
+++ b/daemon/graphdriver/zfs/zfs.go
@@ -178,9 +178,10 @@
return "zfs"
}
-// Cleanup is called on daemon shutdown, it is used to clean up any remaining mounts
+// Cleanup is called on daemon shutdown, it is a no-op for ZFS.
+// TODO(@cpuguy83): Walk layer tree and check mounts?
func (d *Driver) Cleanup() error {
- return mount.RecursiveUnmount(d.options.mountPath)
+ return nil
}
// Status returns information about the ZFS filesystem. It returns a two dimensional array of information
diff --git a/daemon/image_inspect.go b/daemon/image_inspect.go
index 066466e..731057c 100644
--- a/daemon/image_inspect.go
+++ b/daemon/image_inspect.go
@@ -5,6 +5,7 @@
"github.com/docker/distribution/reference"
"github.com/docker/docker/api/types"
+ "github.com/docker/docker/image"
"github.com/docker/docker/layer"
"github.com/docker/docker/pkg/system"
"github.com/pkg/errors"
@@ -90,3 +91,14 @@
return imageInspect, nil
}
+
+func rootFSToAPIType(rootfs *image.RootFS) types.RootFS {
+ var layers []string
+ for _, l := range rootfs.DiffIDs {
+ layers = append(layers, l.String())
+ }
+ return types.RootFS{
+ Type: rootfs.Type,
+ Layers: layers,
+ }
+}
diff --git a/daemon/image_tag.go b/daemon/image_tag.go
index 80abd9f..56b325f 100644
--- a/daemon/image_tag.go
+++ b/daemon/image_tag.go
@@ -7,23 +7,24 @@
// TagImage creates the tag specified by newTag, pointing to the image named
// imageName (alternatively, imageName can also be an image ID).
-func (daemon *Daemon) TagImage(imageName, repository, tag string) error {
+func (daemon *Daemon) TagImage(imageName, repository, tag string) (string, error) {
imageID, _, err := daemon.GetImageIDAndOS(imageName)
if err != nil {
- return err
+ return "", err
}
newTag, err := reference.ParseNormalizedNamed(repository)
if err != nil {
- return err
+ return "", err
}
if tag != "" {
if newTag, err = reference.WithTag(reference.TrimNamed(newTag), tag); err != nil {
- return err
+ return "", err
}
}
- return daemon.TagImageWithReference(imageID, newTag)
+ err = daemon.TagImageWithReference(imageID, newTag)
+ return reference.FamiliarString(newTag), err
}
// TagImageWithReference adds the given reference to the image ID provided.
diff --git a/daemon/inspect.go b/daemon/inspect.go
index c38cee5..164e1aa 100644
--- a/daemon/inspect.go
+++ b/daemon/inspect.go
@@ -1,6 +1,7 @@
package daemon // import "github.com/docker/docker/daemon"
import (
+ "errors"
"fmt"
"time"
@@ -184,14 +185,24 @@
contJSONBase.GraphDriver.Name = container.Driver
+ if container.RWLayer == nil {
+ if container.Dead {
+ return contJSONBase, nil
+ }
+ return nil, errdefs.System(errors.New("RWLayer of container " + container.ID + " is unexpectedly nil"))
+ }
+
graphDriverData, err := container.RWLayer.Metadata()
// If container is marked as Dead, the container's graphdriver metadata
// could have been removed, it will cause error if we try to get the metadata,
// we can ignore the error if the container is dead.
- if err != nil && !container.Dead {
- return nil, errdefs.System(err)
+ if err != nil {
+ if !container.Dead {
+ return nil, errdefs.System(err)
+ }
+ } else {
+ contJSONBase.GraphDriver.Data = graphDriverData
}
- contJSONBase.GraphDriver.Data = graphDriverData
return contJSONBase, nil
}
diff --git a/daemon/inspect_test.go b/daemon/inspect_test.go
new file mode 100644
index 0000000..c10cc56
--- /dev/null
+++ b/daemon/inspect_test.go
@@ -0,0 +1,33 @@
+package daemon // import "github.com/docker/docker/daemon"
+
+import (
+ "testing"
+
+ containertypes "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/container"
+ "github.com/docker/docker/daemon/config"
+ "github.com/docker/docker/daemon/exec"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestGetInspectData(t *testing.T) {
+ c := &container.Container{
+ ID: "inspect-me",
+ HostConfig: &containertypes.HostConfig{},
+ State: container.NewState(),
+ ExecCommands: exec.NewStore(),
+ }
+
+ d := &Daemon{
+ linkIndex: newLinkIndex(),
+ configStore: &config.Config{},
+ }
+
+ _, err := d.getInspectData(c)
+ assert.Error(t, err)
+
+ c.Dead = true
+ _, err = d.getInspectData(c)
+ assert.NoError(t, err)
+}
diff --git a/daemon/list.go b/daemon/list.go
index 4c01d88..e9c5007 100644
--- a/daemon/list.go
+++ b/daemon/list.go
@@ -182,6 +182,10 @@
// reduceContainers parses the user's filtering options and generates the list of containers to return based on a reducer.
func (daemon *Daemon) reduceContainers(config *types.ContainerListOptions, reducer containerReducer) ([]*types.Container, error) {
+ if err := config.Filters.Validate(acceptedPsFilterTags); err != nil {
+ return nil, err
+ }
+
var (
view = daemon.containersReplica.Snapshot()
containers = []*types.Container{}
@@ -246,10 +250,6 @@
func (daemon *Daemon) foldFilter(view container.View, config *types.ContainerListOptions) (*listContext, error) {
psFilters := config.Filters
- if err := psFilters.Validate(acceptedPsFilterTags); err != nil {
- return nil, err
- }
-
var filtExited []int
err := psFilters.WalkValues("exited", func(value string) error {
diff --git a/daemon/list_test.go b/daemon/list_test.go
new file mode 100644
index 0000000..d35eac3
--- /dev/null
+++ b/daemon/list_test.go
@@ -0,0 +1,26 @@
+package daemon
+
+import (
+ "testing"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/filters"
+ "github.com/docker/docker/container"
+ "github.com/gotestyourself/gotestyourself/assert"
+ is "github.com/gotestyourself/gotestyourself/assert/cmp"
+)
+
+func TestListInvalidFilter(t *testing.T) {
+ db, err := container.NewViewDB()
+ assert.Assert(t, err == nil)
+ d := &Daemon{
+ containersReplica: db,
+ }
+
+ f := filters.NewArgs(filters.Arg("invalid", "foo"))
+
+ _, err = d.Containers(&types.ContainerListOptions{
+ Filters: f,
+ })
+ assert.Assert(t, is.Error(err, "Invalid filter 'invalid'"))
+}
diff --git a/daemon/logger/adapter.go b/daemon/logger/adapter.go
index 016e0c2..71d033f 100644
--- a/daemon/logger/adapter.go
+++ b/daemon/logger/adapter.go
@@ -3,7 +3,7 @@
import (
"io"
"os"
- "strings"
+ "path/filepath"
"sync"
"time"
@@ -19,7 +19,6 @@
driverName string
id string
plugin logPlugin
- basePath string
fifoPath string
capabilities Capability
logInfo Info
@@ -58,7 +57,7 @@
a.mu.Lock()
defer a.mu.Unlock()
- if err := a.plugin.StopLogging(strings.TrimPrefix(a.fifoPath, a.basePath)); err != nil {
+ if err := a.plugin.StopLogging(filepath.Join("/", "run", "docker", "logging", a.id)); err != nil {
return err
}
diff --git a/daemon/logger/logger.go b/daemon/logger/logger.go
index a548768..b64d778 100644
--- a/daemon/logger/logger.go
+++ b/daemon/logger/logger.go
@@ -42,7 +42,7 @@
messagePool.Put(msg)
}
-// Message is datastructure that represents piece of output produced by some
+// Message is data structure that represents piece of output produced by some
// container. The Line member is a slice of an array whose contents can be
// changed after a log driver's Log() method returns.
//
@@ -133,7 +133,7 @@
return w.closeNotifier
}
-// Capability defines the list of capabilties that a driver can implement
+// Capability defines the list of capabilities that a driver can implement
// These capabilities are not required to be a logging driver, however do
// determine how a logging driver can be used
type Capability struct {
diff --git a/daemon/logger/loggerutils/logfile.go b/daemon/logger/loggerutils/logfile.go
index ff7a332..a9d9d63 100644
--- a/daemon/logger/loggerutils/logfile.go
+++ b/daemon/logger/loggerutils/logfile.go
@@ -192,8 +192,12 @@
for _, f := range files {
seekers = append(seekers, f)
}
- seekers = append(seekers, currentChunk)
- tailFile(multireader.MultiReadSeeker(seekers...), watcher, w.createDecoder, config)
+ if currentChunk.Size() > 0 {
+ seekers = append(seekers, currentChunk)
+ }
+ if len(seekers) > 0 {
+ tailFile(multireader.MultiReadSeeker(seekers...), watcher, w.createDecoder, config)
+ }
}
w.mu.RLock()
diff --git a/daemon/logger/loggerutils/multireader/multireader.go b/daemon/logger/loggerutils/multireader/multireader.go
index e5ebac2..77980a2 100644
--- a/daemon/logger/loggerutils/multireader/multireader.go
+++ b/daemon/logger/loggerutils/multireader/multireader.go
@@ -138,22 +138,6 @@
return totalSize, nil
}
-func (r *multiReadSeeker) getOffsetToReader(rdr io.ReadSeeker) (int64, error) {
- var offset int64
- for _, r := range r.readers {
- if r == rdr {
- break
- }
-
- size, err := getReadSeekerSize(rdr)
- if err != nil {
- return -1, err
- }
- offset += size
- }
- return offset, nil
-}
-
func (r *multiReadSeeker) Read(b []byte) (int, error) {
if r.pos == nil {
// make sure all readers are at 0
diff --git a/daemon/logger/plugin.go b/daemon/logger/plugin.go
index 209bec3..cd0e60b 100644
--- a/daemon/logger/plugin.go
+++ b/daemon/logger/plugin.go
@@ -5,7 +5,6 @@
"io"
"os"
"path/filepath"
- "strings"
"github.com/docker/docker/api/types/plugins/logdriver"
getter "github.com/docker/docker/pkg/plugingetter"
@@ -39,18 +38,20 @@
}
d := &logPluginProxy{p.Client()}
- return makePluginCreator(name, d, p.BasePath()), nil
+ return makePluginCreator(name, d, p.ScopedPath), nil
}
-func makePluginCreator(name string, l *logPluginProxy, basePath string) Creator {
+func makePluginCreator(name string, l *logPluginProxy, scopePath func(s string) string) Creator {
return func(logCtx Info) (logger Logger, err error) {
defer func() {
if err != nil {
pluginGetter.Get(name, extName, getter.Release)
}
}()
- root := filepath.Join(basePath, "run", "docker", "logging")
- if err := os.MkdirAll(root, 0700); err != nil {
+
+ unscopedPath := filepath.Join("/", "run", "docker", "logging")
+ logRoot := scopePath(unscopedPath)
+ if err := os.MkdirAll(logRoot, 0700); err != nil {
return nil, err
}
@@ -59,8 +60,7 @@
driverName: name,
id: id,
plugin: l,
- basePath: basePath,
- fifoPath: filepath.Join(root, id),
+ fifoPath: filepath.Join(logRoot, id),
logInfo: logCtx,
}
@@ -77,7 +77,7 @@
a.stream = stream
a.enc = logdriver.NewLogEntryEncoder(a.stream)
- if err := l.StartLogging(strings.TrimPrefix(a.fifoPath, basePath), logCtx); err != nil {
+ if err := l.StartLogging(filepath.Join(unscopedPath, id), logCtx); err != nil {
return nil, errors.Wrapf(err, "error creating logger")
}
diff --git a/daemon/logs.go b/daemon/logs.go
index 0701310..f1ca5c9 100644
--- a/daemon/logs.go
+++ b/daemon/logs.go
@@ -1,7 +1,6 @@
package daemon // import "github.com/docker/docker/daemon"
import (
- "errors"
"strconv"
"time"
@@ -14,6 +13,7 @@
"github.com/docker/docker/container"
"github.com/docker/docker/daemon/logger"
"github.com/docker/docker/errdefs"
+ "github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
@@ -184,3 +184,18 @@
return logger.ValidateLogOpts(cfg.Type, cfg.Config)
}
+
+func (daemon *Daemon) setupDefaultLogConfig() error {
+ config := daemon.configStore
+ if len(config.LogConfig.Config) > 0 {
+ if err := logger.ValidateLogOpts(config.LogConfig.Type, config.LogConfig.Config); err != nil {
+ return errors.Wrap(err, "failed to set log opts")
+ }
+ }
+ daemon.defaultLogConfig = containertypes.LogConfig{
+ Type: config.LogConfig.Type,
+ Config: config.LogConfig.Config,
+ }
+ logrus.Debugf("Using default logging driver %s", daemon.defaultLogConfig.Type)
+ return nil
+}
diff --git a/daemon/metrics.go b/daemon/metrics.go
index b3f603c..b283526 100644
--- a/daemon/metrics.go
+++ b/daemon/metrics.go
@@ -1,10 +1,8 @@
package daemon // import "github.com/docker/docker/daemon"
import (
- "path/filepath"
"sync"
- "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/plugingetter"
metrics "github.com/docker/go-metrics"
"github.com/pkg/errors"
@@ -132,18 +130,6 @@
}
}
-type metricsPlugin struct {
- plugingetter.CompatPlugin
-}
-
-func (p metricsPlugin) sock() string {
- return "metrics.sock"
-}
-
-func (p metricsPlugin) sockBase() string {
- return filepath.Join(p.BasePath(), "run", "docker")
-}
-
func pluginStartMetricsCollection(p plugingetter.CompatPlugin) error {
type metricsPluginResponse struct {
Err string
@@ -162,12 +148,4 @@
if err := p.Client().Call(metricsPluginType+".StopMetrics", nil, nil); err != nil {
logrus.WithError(err).WithField("name", p.Name()).Error("error stopping metrics collector")
}
-
- mp := metricsPlugin{p}
- sockPath := filepath.Join(mp.sockBase(), mp.sock())
- if err := mount.Unmount(sockPath); err != nil {
- if mounted, _ := mount.Mounted(sockPath); mounted {
- logrus.WithError(err).WithField("name", p.Name()).WithField("socket", sockPath).Error("error unmounting metrics socket for plugin")
- }
- }
}
diff --git a/daemon/metrics_unix.go b/daemon/metrics_unix.go
index ed40406..fbf561e 100644
--- a/daemon/metrics_unix.go
+++ b/daemon/metrics_unix.go
@@ -5,13 +5,13 @@
import (
"net"
"net/http"
- "os"
"path/filepath"
- "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugins"
+ "github.com/docker/docker/plugin"
metrics "github.com/docker/go-metrics"
+ specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
@@ -34,52 +34,22 @@
return path, nil
}
-func registerMetricsPluginCallback(getter plugingetter.PluginGetter, sockPath string) {
- getter.Handle(metricsPluginType, func(name string, client *plugins.Client) {
+func registerMetricsPluginCallback(store *plugin.Store, sockPath string) {
+ store.RegisterRuntimeOpt(metricsPluginType, func(s *specs.Spec) {
+ f := plugin.WithSpecMounts([]specs.Mount{
+ {Type: "bind", Source: sockPath, Destination: "/run/docker/metrics.sock", Options: []string{"bind", "ro"}},
+ })
+ f(s)
+ })
+ store.Handle(metricsPluginType, func(name string, client *plugins.Client) {
// Use lookup since nothing in the system can really reference it, no need
// to protect against removal
- p, err := getter.Get(name, metricsPluginType, plugingetter.Lookup)
+ p, err := store.Get(name, metricsPluginType, plugingetter.Lookup)
if err != nil {
return
}
- mp := metricsPlugin{p}
- sockBase := mp.sockBase()
- if err := os.MkdirAll(sockBase, 0755); err != nil {
- logrus.WithError(err).WithField("name", name).WithField("path", sockBase).Error("error creating metrics plugin base path")
- return
- }
-
- defer func() {
- if err != nil {
- os.RemoveAll(sockBase)
- }
- }()
-
- pluginSockPath := filepath.Join(sockBase, mp.sock())
- _, err = os.Stat(pluginSockPath)
- if err == nil {
- mount.Unmount(pluginSockPath)
- } else {
- logrus.WithField("path", pluginSockPath).Debugf("creating plugin socket")
- f, err := os.OpenFile(pluginSockPath, os.O_CREATE, 0600)
- if err != nil {
- return
- }
- f.Close()
- }
-
- if err := mount.Mount(sockPath, pluginSockPath, "none", "bind,ro"); err != nil {
- logrus.WithError(err).WithField("name", name).Error("could not mount metrics socket to plugin")
- return
- }
-
if err := pluginStartMetricsCollection(p); err != nil {
- if err := mount.Unmount(pluginSockPath); err != nil {
- if mounted, _ := mount.Mounted(pluginSockPath); mounted {
- logrus.WithError(err).WithField("sock_path", pluginSockPath).Error("error unmounting metrics socket from plugin during cleanup")
- }
- }
logrus.WithError(err).WithField("name", name).Error("error while initializing metrics plugin")
}
})
diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go
index 68243e8..15bcb70 100644
--- a/daemon/oci_linux.go
+++ b/daemon/oci_linux.go
@@ -24,6 +24,7 @@
"github.com/opencontainers/runc/libcontainer/devices"
"github.com/opencontainers/runc/libcontainer/user"
specs "github.com/opencontainers/runtime-spec/specs-go"
+ "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
)
@@ -419,52 +420,46 @@
return "", "", fmt.Errorf("Could not find source mount of %s", source)
}
+const (
+ sharedPropagationOption = "shared:"
+ slavePropagationOption = "master:"
+)
+
+// hasMountinfoOption checks if any of the passed any of the given option values
+// are set in the passed in option string.
+func hasMountinfoOption(opts string, vals ...string) bool {
+ for _, opt := range strings.Split(opts, " ") {
+ for _, val := range vals {
+ if strings.HasPrefix(opt, val) {
+ return true
+ }
+ }
+ }
+ return false
+}
+
// Ensure mount point on which path is mounted, is shared.
func ensureShared(path string) error {
- sharedMount := false
-
sourceMount, optionalOpts, err := getSourceMount(path)
if err != nil {
return err
}
// Make sure source mount point is shared.
- optsSplit := strings.Split(optionalOpts, " ")
- for _, opt := range optsSplit {
- if strings.HasPrefix(opt, "shared:") {
- sharedMount = true
- break
- }
- }
-
- if !sharedMount {
- return fmt.Errorf("path %s is mounted on %s but it is not a shared mount", path, sourceMount)
+ if !hasMountinfoOption(optionalOpts, sharedPropagationOption) {
+ return errors.Errorf("path %s is mounted on %s but it is not a shared mount", path, sourceMount)
}
return nil
}
// Ensure mount point on which path is mounted, is either shared or slave.
func ensureSharedOrSlave(path string) error {
- sharedMount := false
- slaveMount := false
-
sourceMount, optionalOpts, err := getSourceMount(path)
if err != nil {
return err
}
- // Make sure source mount point is shared.
- optsSplit := strings.Split(optionalOpts, " ")
- for _, opt := range optsSplit {
- if strings.HasPrefix(opt, "shared:") {
- sharedMount = true
- break
- } else if strings.HasPrefix(opt, "master:") {
- slaveMount = true
- break
- }
- }
- if !sharedMount && !slaveMount {
- return fmt.Errorf("path %s is mounted on %s but it is not a shared or slave mount", path, sourceMount)
+ if !hasMountinfoOption(optionalOpts, sharedPropagationOption, slavePropagationOption) {
+ return errors.Errorf("path %s is mounted on %s but it is not a shared or slave mount", path, sourceMount)
}
return nil
}
@@ -604,7 +599,8 @@
//
// For private volumes any root propagation value should work.
pFlag := mountPropagationMap[m.Propagation]
- if pFlag == mount.SHARED || pFlag == mount.RSHARED {
+ switch pFlag {
+ case mount.SHARED, mount.RSHARED:
if err := ensureShared(m.Source); err != nil {
return err
}
@@ -612,13 +608,34 @@
if rootpg != mount.SHARED && rootpg != mount.RSHARED {
s.Linux.RootfsPropagation = mountPropagationReverseMap[mount.SHARED]
}
- } else if pFlag == mount.SLAVE || pFlag == mount.RSLAVE {
+ case mount.SLAVE, mount.RSLAVE:
+ var fallback bool
if err := ensureSharedOrSlave(m.Source); err != nil {
- return err
+ // For backwards compatability purposes, treat mounts from the daemon root
+ // as special since we automatically add rslave propagation to these mounts
+ // when the user did not set anything, so we should fallback to the old
+ // behavior which is to use private propagation which is normally the
+ // default.
+ if !strings.HasPrefix(m.Source, daemon.root) && !strings.HasPrefix(daemon.root, m.Source) {
+ return err
+ }
+
+ cm, ok := c.MountPoints[m.Destination]
+ if !ok {
+ return err
+ }
+ if cm.Spec.BindOptions != nil && cm.Spec.BindOptions.Propagation != "" {
+ // This means the user explicitly set a propagation, do not fallback in that case.
+ return err
+ }
+ fallback = true
+ logrus.WithField("container", c.ID).WithField("source", m.Source).Warn("Falling back to default propagation for bind source in daemon root")
}
- rootpg := mountPropagationMap[s.Linux.RootfsPropagation]
- if rootpg != mount.SHARED && rootpg != mount.RSHARED && rootpg != mount.SLAVE && rootpg != mount.RSLAVE {
- s.Linux.RootfsPropagation = mountPropagationReverseMap[mount.RSLAVE]
+ if !fallback {
+ rootpg := mountPropagationMap[s.Linux.RootfsPropagation]
+ if rootpg != mount.SHARED && rootpg != mount.RSHARED && rootpg != mount.SLAVE && rootpg != mount.RSLAVE {
+ s.Linux.RootfsPropagation = mountPropagationReverseMap[mount.RSLAVE]
+ }
}
}
@@ -738,7 +755,7 @@
return nil
}
-func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
+func (daemon *Daemon) createSpec(c *container.Container) (retSpec *specs.Spec, err error) {
s := oci.DefaultSpec()
if err := daemon.populateCommonSpec(&s, c); err != nil {
return nil, err
@@ -820,11 +837,13 @@
return nil, err
}
- if err := daemon.setupSecretDir(c); err != nil {
- return nil, err
- }
+ defer func() {
+ if err != nil {
+ daemon.cleanupSecretDir(c)
+ }
+ }()
- if err := daemon.setupConfigDir(c); err != nil {
+ if err := daemon.setupSecretDir(c); err != nil {
return nil, err
}
@@ -849,12 +868,6 @@
}
ms = append(ms, secretMounts...)
- configMounts, err := c.ConfigMounts()
- if err != nil {
- return nil, err
- }
- ms = append(ms, configMounts...)
-
sort.Sort(mounts(ms))
if err := setMounts(daemon, &s, c, ms); err != nil {
return nil, fmt.Errorf("linux mounts: %v", err)
diff --git a/daemon/oci_windows.go b/daemon/oci_windows.go
index 7444053..64c651c 100644
--- a/daemon/oci_windows.go
+++ b/daemon/oci_windows.go
@@ -1,6 +1,7 @@
package daemon // import "github.com/docker/docker/daemon"
import (
+ "errors"
"fmt"
"io/ioutil"
"path/filepath"
@@ -101,10 +102,7 @@
mounts = append(mounts, secretMounts...)
}
- configMounts, err := c.ConfigMounts()
- if err != nil {
- return nil, err
- }
+ configMounts := c.ConfigMounts()
if configMounts != nil {
mounts = append(mounts, configMounts...)
}
@@ -156,6 +154,9 @@
// Reverse order, expecting parent most first
s.Windows.LayerFolders = append([]string{layerPath}, s.Windows.LayerFolders...)
}
+ if c.RWLayer == nil {
+ return nil, errors.New("RWLayer of container " + c.ID + " is unexpectedly nil")
+ }
m, err := c.RWLayer.Metadata()
if err != nil {
return nil, fmt.Errorf("failed to get layer metadata - %s", err)
diff --git a/daemon/volumes.go b/daemon/volumes.go
index 9a2e7d7..a63a907 100644
--- a/daemon/volumes.go
+++ b/daemon/volumes.go
@@ -10,6 +10,7 @@
"github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/api/types/mount"
mounttypes "github.com/docker/docker/api/types/mount"
"github.com/docker/docker/container"
"github.com/docker/docker/errdefs"
@@ -146,6 +147,13 @@
if err != nil {
return err
}
+ needsSlavePropagation, err := daemon.validateBindDaemonRoot(bind.Spec)
+ if err != nil {
+ return err
+ }
+ if needsSlavePropagation {
+ bind.Propagation = mount.PropagationRSlave
+ }
// #10618
_, tmpfsExists := hostConfig.Tmpfs[bind.Destination]
@@ -178,6 +186,13 @@
if err != nil {
return errdefs.InvalidParameter(err)
}
+ needsSlavePropagation, err := daemon.validateBindDaemonRoot(mp.Spec)
+ if err != nil {
+ return err
+ }
+ if needsSlavePropagation {
+ mp.Propagation = mount.PropagationRSlave
+ }
if binds[mp.Destination] {
return duplicateMountPointError(cfg.Target)
diff --git a/daemon/volumes_linux.go b/daemon/volumes_linux.go
new file mode 100644
index 0000000..cf3d9ed
--- /dev/null
+++ b/daemon/volumes_linux.go
@@ -0,0 +1,36 @@
+package daemon
+
+import (
+ "strings"
+
+ "github.com/docker/docker/api/types/mount"
+ "github.com/docker/docker/errdefs"
+ "github.com/pkg/errors"
+)
+
+// validateBindDaemonRoot ensures that if a given mountpoint's source is within
+// the daemon root path, that the propagation is setup to prevent a container
+// from holding private refereneces to a mount within the daemon root, which
+// can cause issues when the daemon attempts to remove the mountpoint.
+func (daemon *Daemon) validateBindDaemonRoot(m mount.Mount) (bool, error) {
+ if m.Type != mount.TypeBind {
+ return false, nil
+ }
+
+ // check if the source is within the daemon root, or if the daemon root is within the source
+ if !strings.HasPrefix(m.Source, daemon.root) && !strings.HasPrefix(daemon.root, m.Source) {
+ return false, nil
+ }
+
+ if m.BindOptions == nil {
+ return true, nil
+ }
+
+ switch m.BindOptions.Propagation {
+ case mount.PropagationRSlave, mount.PropagationRShared, "":
+ return m.BindOptions.Propagation == "", nil
+ default:
+ }
+
+ return false, errdefs.InvalidParameter(errors.Errorf(`invalid mount config: must use either propagation mode "rslave" or "rshared" when mount source is within the daemon root, daemon root: %q, bind mount source: %q, propagation: %q`, daemon.root, m.Source, m.BindOptions.Propagation))
+}
diff --git a/daemon/volumes_linux_test.go b/daemon/volumes_linux_test.go
new file mode 100644
index 0000000..72830c3
--- /dev/null
+++ b/daemon/volumes_linux_test.go
@@ -0,0 +1,56 @@
+package daemon
+
+import (
+ "path/filepath"
+ "testing"
+
+ "github.com/docker/docker/api/types/mount"
+)
+
+func TestBindDaemonRoot(t *testing.T) {
+ t.Parallel()
+ d := &Daemon{root: "/a/b/c/daemon"}
+ for _, test := range []struct {
+ desc string
+ opts *mount.BindOptions
+ needsProp bool
+ err bool
+ }{
+ {desc: "nil propagation settings", opts: nil, needsProp: true, err: false},
+ {desc: "empty propagation settings", opts: &mount.BindOptions{}, needsProp: true, err: false},
+ {desc: "private propagation", opts: &mount.BindOptions{Propagation: mount.PropagationPrivate}, err: true},
+ {desc: "rprivate propagation", opts: &mount.BindOptions{Propagation: mount.PropagationRPrivate}, err: true},
+ {desc: "slave propagation", opts: &mount.BindOptions{Propagation: mount.PropagationSlave}, err: true},
+ {desc: "rslave propagation", opts: &mount.BindOptions{Propagation: mount.PropagationRSlave}, err: false, needsProp: false},
+ {desc: "shared propagation", opts: &mount.BindOptions{Propagation: mount.PropagationShared}, err: true},
+ {desc: "rshared propagation", opts: &mount.BindOptions{Propagation: mount.PropagationRSlave}, err: false, needsProp: false},
+ } {
+ t.Run(test.desc, func(t *testing.T) {
+ test := test
+ for desc, source := range map[string]string{
+ "source is root": d.root,
+ "source is subpath": filepath.Join(d.root, "a", "b"),
+ "source is parent": filepath.Dir(d.root),
+ "source is /": "/",
+ } {
+ t.Run(desc, func(t *testing.T) {
+ mount := mount.Mount{
+ Type: mount.TypeBind,
+ Source: source,
+ BindOptions: test.opts,
+ }
+ needsProp, err := d.validateBindDaemonRoot(mount)
+ if (err != nil) != test.err {
+ t.Fatalf("expected err=%v, got: %v", test.err, err)
+ }
+ if test.err {
+ return
+ }
+ if test.needsProp != needsProp {
+ t.Fatalf("expected needsProp=%v, got: %v", test.needsProp, needsProp)
+ }
+ })
+ }
+ })
+ }
+}
diff --git a/daemon/volumes_windows.go b/daemon/volumes_windows.go
index 886679a..458f285 100644
--- a/daemon/volumes_windows.go
+++ b/daemon/volumes_windows.go
@@ -3,6 +3,7 @@
import (
"sort"
+ "github.com/docker/docker/api/types/mount"
"github.com/docker/docker/container"
"github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/volume"
@@ -44,3 +45,7 @@
func setBindModeIfNull(bind *volume.MountPoint) {
return
}
+
+func (daemon *Daemon) validateBindDaemonRoot(m mount.Mount) (bool, error) {
+ return false, nil
+}
diff --git a/docs/api/version-history.md b/docs/api/version-history.md
index 3de652d..51111bf 100644
--- a/docs/api/version-history.md
+++ b/docs/api/version-history.md
@@ -13,6 +13,16 @@
will be rejected.
-->
+## v1.37 API changes
+
+[Docker Engine API v1.37](https://docs.docker.com/engine/api/v1.36/) documentation
+
+* `POST /containers/create` and `POST /services/create` now supports exposing SCTP ports.
+* `POST /configs/create` and `POST /configs/{id}/create` now accept a `Templating` driver.
+* `GET /configs` and `GET /configs/{id}` now return the `Templating` driver of the config.
+* `POST /secrets/create` and `POST /secrets/{id}/create` now accept a `Templating` driver.
+* `GET /secrets` and `GET /secrets/{id}` now return the `Templating` driver of the secret.
+
## v1.36 API changes
[Docker Engine API v1.36](https://docs.docker.com/engine/api/v1.36/) documentation
diff --git a/docs/contributing/set-up-dev-env.md b/docs/contributing/set-up-dev-env.md
index 7f8a381..311edf8 100644
--- a/docs/contributing/set-up-dev-env.md
+++ b/docs/contributing/set-up-dev-env.md
@@ -131,7 +131,7 @@
Successfully built 3d872560918e
Successfully tagged docker-dev:dry-run-test
docker run --rm -i --privileged -e BUILDFLAGS -e KEEPBUNDLE -e DOCKER_BUILD_GOGC -e DOCKER_BUILD_PKGS -e DOCKER_CLIENTONLY -e DOCKER_DEBUG -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT -e DOCKER_GRAPHDRIVER=devicemapper -e DOCKER_INCREMENTAL_BINARY -e DOCKER_REMAP_ROOT -e DOCKER_STORAGE_OPTS -e DOCKER_USERLANDPROXY -e TESTDIRS -e TESTFLAGS -e TIMEOUT -v "home/ubuntu/repos/docker/bundles:/go/src/github.com/docker/docker/bundles" -t "docker-dev:dry-run-test" bash
- root@f31fa223770f:/go/src/github.com/docker/docker#
+ #
```
At this point, your prompt reflects the container's BASH shell.
@@ -146,7 +146,7 @@
6. Make a `dockerd` binary.
```none
- root@a8b2885ab900:/go/src/github.com/docker/docker# hack/make.sh binary
+ # hack/make.sh binary
Removing bundles/
---> Making bundle: binary (in bundles/binary)
@@ -160,13 +160,13 @@
`/usr/local/bin/` directory.
```none
- root@a8b2885ab900:/go/src/github.com/docker/docker# make install
+ # make install
```
8. Start the Engine daemon running in the background.
```none
- root@a8b2885ab900:/go/src/github.com/docker/docker# dockerd -D &
+ # dockerd -D &
...output snipped...
DEBU[0001] Registering POST, /networks/{id:.*}/connect
DEBU[0001] Registering POST, /networks/{id:.*}/disconnect
@@ -252,13 +252,13 @@
10. Run the `hello-world` image.
```none
- root@5f8630b873fe:/go/src/github.com/docker/docker# docker run hello-world
+ # docker run hello-world
```
11. List the image you just downloaded.
```none
- root@5f8630b873fe:/go/src/github.com/docker/docker# docker images
+ # docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
hello-world latest c54a2cc56cbb 3 months ago 1.85 kB
```
@@ -347,7 +347,7 @@
10. To view your change, run the `dockerd --help` command in the docker development container shell.
```bash
- root@b0cb4f22715d:/go/src/github.com/docker/docker# dockerd --help
+ # dockerd --help
Usage: dockerd COMMAND
diff --git a/docs/contributing/test.md b/docs/contributing/test.md
index 7e9107d..fdcee32 100644
--- a/docs/contributing/test.md
+++ b/docs/contributing/test.md
@@ -29,7 +29,10 @@
are tests that combine two or more work units into one component. These work
units each have unit tests and then, together, integration tests that test the
interface between the components. The `integration` and `integration-cli`
-directories in the Docker repository contain integration test code.
+directories in the Docker repository contain integration test code. Note that
+`integration-cli` tests are now deprecated in the Moby project, and new tests
+cannot be added to this suite - add `integration` tests instead using the API
+client.
Testing is its own specialty. If you aren't familiar with testing techniques,
there is a lot of information available to you on the Web. For now, you should
@@ -93,7 +96,8 @@
## Run targets inside a development container
If you are working inside a development container, you use the
-`hack/make.sh` script to run tests. The `hack/make.sh` script doesn't
+`hack/test/unit` script to run unit-tests, and `hack/make.sh` script to run
+integration and other tests. The `hack/make.sh` script doesn't
have a single target that runs all the tests. Instead, you provide a single
command line with multiple targets that does the same thing.
@@ -110,19 +114,25 @@
$ docker run --privileged --rm -ti -v `pwd`:/go/src/github.com/docker/docker dry-run-test /bin/bash
```
-3. Run the tests using the `hack/make.sh` script.
+3. Run the unit tests using the `hack/test/unit` script.
```bash
- root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit test-integration test-docker-py
+ # hack/test/unit
+ ```
+
+4. Run the tests using the `hack/make.sh` script.
+
+ ```bash
+ # hack/make.sh dynbinary binary cross test-integration test-docker-py
```
The tests run just as they did within your local host.
Of course, you can also run a subset of these targets too. For example, to run
- just the unit tests:
+ just the integration tests:
```bash
- root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit
+ # hack/make.sh dynbinary binary cross test-integration
```
Most test targets require that you build these precursor targets first:
@@ -170,7 +180,7 @@
To run the same test inside your Docker development container, you do this:
```bash
-root@5f8630b873fe:/go/src/github.com/docker/docker# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration
+# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration
```
## Test the Windows binary against a Linux daemon
diff --git a/hack/ci/janky b/hack/ci/janky
index 180f8c60..c77cd02 100755
--- a/hack/ci/janky
+++ b/hack/ci/janky
@@ -4,6 +4,10 @@
hack/validate/default
hack/test/unit
+bash <(curl -s https://codecov.io/bash) \
+ -f coverage.txt \
+ -C $GIT_SHA1 || \
+ echo 'Codecov failed to upload'
hack/make.sh \
binary-daemon \
diff --git a/hack/dockerfile/binaries-commits b/hack/dockerfile/binaries-commits
index ca84b44..b04b0d3 100644
--- a/hack/dockerfile/binaries-commits
+++ b/hack/dockerfile/binaries-commits
@@ -1,16 +1,22 @@
#!/bin/sh
-TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
+# When updating TOMLV_COMMIT, consider updating github.com/BurntSushi/toml
+# in vendor.conf accordingly
+TOMLV_COMMIT=a368813c5e648fee92e5f6c30e3944ff9d5e8895
# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
-RUNC_COMMIT=9f9c96235cc97674e935002fc3d78361b696a69e
+RUNC_COMMIT=6c55f98695e902427906eed2c799e566e3d3dfb5
# containerd is also pinned in vendor.conf. When updating the binary
# version you may also need to update the vendor version to pick up bug
# fixes or new APIs.
-CONTAINERD_COMMIT=9b55aab90508bd389d7654c4baf173a981477d55 # v1.0.1
+CONTAINERD_COMMIT=cfd04396dc68220d1cecbe686a6cc3aa5ce3667c # v1.0.2
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
-LIBNETWORK_COMMIT=fcf1c3b5e57833aaaa756ae3c4140ea54da00319
+
+# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
+# updating the binary version, consider updating github.com/docker/libnetwork
+# in vendor.conf accordingly
+LIBNETWORK_COMMIT=ed2130d117c11c542327b4d5216a5db36770bc65
VNDR_COMMIT=a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
# Linting
diff --git a/hack/make/.integration-daemon-start b/hack/make/.integration-daemon-start
index 7314f71..20801fc 100644
--- a/hack/make/.integration-daemon-start
+++ b/hack/make/.integration-daemon-start
@@ -7,10 +7,6 @@
export TEST_CLIENT_BINARY=docker
-# Do not bump this version! Integration tests should no longer rely on the docker cli, they should be
-# API tests instead. For the existing tests the scripts will use a frozen version of the docker cli
-# with a DOCKER_API_VERSION frozen to 1.30, which should ensure that the CI remains green at all times.
-export DOCKER_API_VERSION=1.30
if [ -n "$DOCKER_CLI_PATH" ]; then
export TEST_CLIENT_BINARY=/usr/local/cli/$(basename "$DOCKER_CLI_PATH")
fi
diff --git a/hack/make/.integration-test-helpers b/hack/make/.integration-test-helpers
index 3b1326d..bb34d45 100644
--- a/hack/make/.integration-test-helpers
+++ b/hack/make/.integration-test-helpers
@@ -17,7 +17,7 @@
integration_api_dirs=${TEST_INTEGRATION_DIR:-"$(
find ./integration -type d |
- grep -vE '(^./integration($|/util)|/testdata)')"}
+ grep -vE '(^./integration($|/internal)|/testdata)')"}
run_test_integration() {
[[ "$TESTFLAGS" != *-check.f* ]] && run_test_integration_suites
diff --git a/hack/test/unit b/hack/test/unit
index 76e5d46..d0e85f1 100755
--- a/hack/test/unit
+++ b/hack/test/unit
@@ -19,4 +19,20 @@
exclude_paths="/vendor/|/integration"
pkg_list=$(go list $TESTDIRS | grep -vE "($exclude_paths)")
-go test -cover "${BUILDFLAGS[@]}" $TESTFLAGS $pkg_list
+# install test dependencies once before running tests for each package. This
+# significantly reduces the runtime.
+go test -i "${BUILDFLAGS[@]}" $pkg_list
+
+for pkg in $pkg_list; do
+ go test "${BUILDFLAGS[@]}" \
+ -cover \
+ -coverprofile=profile.out \
+ -covermode=atomic \
+ $TESTFLAGS \
+ "${pkg}"
+
+ if test -f profile.out; then
+ cat profile.out >> coverage.txt
+ rm profile.out
+ fi
+done
diff --git a/image/store.go b/image/store.go
index c79fe39..a8f8cee 100644
--- a/image/store.go
+++ b/image/store.go
@@ -79,6 +79,10 @@
}
l, err = is.lss[img.OperatingSystem()].Get(chainID)
if err != nil {
+ if err == layer.ErrLayerDoesNotExist {
+ logrus.Errorf("layer does not exist, not restoring image %v, %v, %s", dgst, chainID, img.OperatingSystem())
+ return nil
+ }
return err
}
}
diff --git a/integration-cli/daemon/daemon.go b/integration-cli/daemon/daemon.go
index 69a87d9..9672d16 100644
--- a/integration-cli/daemon/daemon.go
+++ b/integration-cli/daemon/daemon.go
@@ -1,7 +1,6 @@
package daemon // import "github.com/docker/docker/integration-cli/daemon"
import (
- "bytes"
"encoding/json"
"fmt"
"io"
@@ -14,7 +13,6 @@
"strings"
"time"
- "github.com/docker/docker/api"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/events"
"github.com/docker/docker/client"
@@ -596,28 +594,6 @@
return append([]string{"--host", d.Sock()}, args...)
}
-// SockRequest executes a socket request on a daemon and returns statuscode and output.
-func (d *Daemon) SockRequest(method, endpoint string, data interface{}) (int, []byte, error) {
- jsonData := bytes.NewBuffer(nil)
- if err := json.NewEncoder(jsonData).Encode(data); err != nil {
- return -1, nil, err
- }
-
- res, body, err := d.SockRequestRaw(method, endpoint, jsonData, "application/json")
- if err != nil {
- return -1, nil, err
- }
- b, err := request.ReadBody(body)
- return res.StatusCode, b, err
-}
-
-// SockRequestRaw executes a socket request on a daemon and returns an http
-// response and a reader for the output data.
-// Deprecated: use request package instead
-func (d *Daemon) SockRequestRaw(method, endpoint string, data io.Reader, ct string) (*http.Response, io.ReadCloser, error) {
- return request.SockRequestRaw(method, endpoint, data, ct, d.Sock())
-}
-
// LogFileName returns the path the daemon's log file
func (d *Daemon) LogFileName() string {
return d.logFile.Name()
@@ -746,12 +722,9 @@
// NewClient creates new client based on daemon's socket path
func (d *Daemon) NewClient() (*client.Client, error) {
- httpClient, err := request.NewHTTPClient(d.Sock())
- if err != nil {
- return nil, err
- }
-
- return client.NewClient(d.Sock(), api.DefaultVersion, httpClient, nil)
+ return client.NewClientWithOpts(
+ client.FromEnv,
+ client.WithHost(d.Sock()))
}
// WaitInspectWithArgs waits for the specified expression to be equals to the specified expected string in the given time.
diff --git a/integration-cli/daemon/daemon_swarm.go b/integration-cli/daemon/daemon_swarm.go
index 4be0acc..cb44f63 100644
--- a/integration-cli/daemon/daemon_swarm.go
+++ b/integration-cli/daemon/daemon_swarm.go
@@ -1,18 +1,18 @@
package daemon // import "github.com/docker/docker/integration-cli/daemon"
import (
- "encoding/json"
"fmt"
- "net/http"
"strings"
"time"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/swarm"
+ "github.com/docker/docker/client"
"github.com/docker/docker/integration-cli/checker"
"github.com/go-check/check"
"github.com/pkg/errors"
+ "github.com/stretchr/testify/require"
"golang.org/x/net/context"
)
@@ -234,31 +234,28 @@
// CheckPluginRunning returns the runtime state of the plugin
func (d *Swarm) CheckPluginRunning(plugin string) func(c *check.C) (interface{}, check.CommentInterface) {
return func(c *check.C) (interface{}, check.CommentInterface) {
- status, out, err := d.SockRequest("GET", "/plugins/"+plugin+"/json", nil)
- c.Assert(err, checker.IsNil, check.Commentf(string(out)))
- if status != http.StatusOK {
- return false, nil
+ apiclient, err := d.NewClient()
+ require.NoError(c, err)
+ resp, _, err := apiclient.PluginInspectWithRaw(context.Background(), plugin)
+ if client.IsErrNotFound(err) {
+ return false, check.Commentf("%v", err)
}
-
- var p types.Plugin
- c.Assert(json.Unmarshal(out, &p), checker.IsNil, check.Commentf(string(out)))
-
- return p.Enabled, check.Commentf("%+v", p)
+ require.NoError(c, err)
+ return resp.Enabled, check.Commentf("%+v", resp)
}
}
// CheckPluginImage returns the runtime state of the plugin
func (d *Swarm) CheckPluginImage(plugin string) func(c *check.C) (interface{}, check.CommentInterface) {
return func(c *check.C) (interface{}, check.CommentInterface) {
- status, out, err := d.SockRequest("GET", "/plugins/"+plugin+"/json", nil)
- c.Assert(err, checker.IsNil, check.Commentf(string(out)))
- if status != http.StatusOK {
- return false, nil
+ apiclient, err := d.NewClient()
+ require.NoError(c, err)
+ resp, _, err := apiclient.PluginInspectWithRaw(context.Background(), plugin)
+ if client.IsErrNotFound(err) {
+ return false, check.Commentf("%v", err)
}
-
- var p types.Plugin
- c.Assert(json.Unmarshal(out, &p), checker.IsNil, check.Commentf(string(out)))
- return p.PluginReference, check.Commentf("%+v", p)
+ require.NoError(c, err)
+ return resp.PluginReference, check.Commentf("%+v", resp)
}
}
diff --git a/integration-cli/docker_api_attach_test.go b/integration-cli/docker_api_attach_test.go
index a3aa40f..e191f27 100644
--- a/integration-cli/docker_api_attach_test.go
+++ b/integration-cli/docker_api_attach_test.go
@@ -4,9 +4,11 @@
"bufio"
"bytes"
"context"
+ "fmt"
"io"
"net"
"net/http"
+ "net/http/httputil"
"strings"
"time"
@@ -73,10 +75,8 @@
// regression gh14320
func (s *DockerSuite) TestPostContainersAttachContainerNotFound(c *check.C) {
- client, err := request.NewHTTPClient(daemonHost())
+ resp, _, err := request.Post("/containers/doesnotexist/attach")
c.Assert(err, checker.IsNil)
- req, err := request.New(daemonHost(), "/containers/doesnotexist/attach", request.Method(http.MethodPost))
- resp, err := client.Do(req)
// connection will shutdown, err should be "persistent connection closed"
c.Assert(resp.StatusCode, checker.Equals, http.StatusNotFound)
content, err := request.ReadBody(resp.Body)
@@ -140,12 +140,12 @@
cid, _ := dockerCmd(c, "run", "-di", "busybox", "cat")
cid = strings.TrimSpace(cid)
// Attach to the container's stdout stream.
- conn, br, err := request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", daemonHost())
+ conn, br, err := sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", daemonHost())
c.Assert(err, checker.IsNil)
// Check if the data from stdout can be received.
expectSuccess(conn, br, "stdout", false)
// Attach to the container's stderr stream.
- conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", daemonHost())
+ conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", daemonHost())
c.Assert(err, checker.IsNil)
// Since the container only emits stdout, attaching to stderr should return nothing.
expectTimeout(conn, br, "stdout")
@@ -153,10 +153,10 @@
// Test the similar functions of the stderr stream.
cid, _ = dockerCmd(c, "run", "-di", "busybox", "/bin/sh", "-c", "cat >&2")
cid = strings.TrimSpace(cid)
- conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", daemonHost())
+ conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", daemonHost())
c.Assert(err, checker.IsNil)
expectSuccess(conn, br, "stderr", false)
- conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", daemonHost())
+ conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", daemonHost())
c.Assert(err, checker.IsNil)
expectTimeout(conn, br, "stderr")
@@ -164,12 +164,12 @@
cid, _ = dockerCmd(c, "run", "-dit", "busybox", "/bin/sh", "-c", "cat >&2")
cid = strings.TrimSpace(cid)
// Attach to stdout only.
- conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", daemonHost())
+ conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain", daemonHost())
c.Assert(err, checker.IsNil)
expectSuccess(conn, br, "stdout", true)
// Attach without stdout stream.
- conn, br, err = request.SockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", daemonHost())
+ conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain", daemonHost())
c.Assert(err, checker.IsNil)
// Nothing should be received because both the stdout and stderr of the container will be
// sent to the client as stdout when tty is enabled.
@@ -210,3 +210,43 @@
stdcopy.StdCopy(actualStdout, actualStderr, resp.Reader)
c.Assert(actualStdout.Bytes(), checker.DeepEquals, []byte("hello\nsuccess"), check.Commentf("Attach didn't return the expected data from stdout"))
}
+
+// SockRequestHijack creates a connection to specified host (with method, contenttype, …) and returns a hijacked connection
+// and the output as a `bufio.Reader`
+func sockRequestHijack(method, endpoint string, data io.Reader, ct string, daemon string, modifiers ...func(*http.Request)) (net.Conn, *bufio.Reader, error) {
+ req, client, err := newRequestClient(method, endpoint, data, ct, daemon, modifiers...)
+ if err != nil {
+ return nil, nil, err
+ }
+
+ client.Do(req)
+ conn, br := client.Hijack()
+ return conn, br, nil
+}
+
+// FIXME(vdemeester) httputil.ClientConn is deprecated, use http.Client instead (closer to actual client)
+// Deprecated: Use New instead of NewRequestClient
+// Deprecated: use request.Do (or Get, Delete, Post) instead
+func newRequestClient(method, endpoint string, data io.Reader, ct, daemon string, modifiers ...func(*http.Request)) (*http.Request, *httputil.ClientConn, error) {
+ c, err := request.SockConn(time.Duration(10*time.Second), daemon)
+ if err != nil {
+ return nil, nil, fmt.Errorf("could not dial docker daemon: %v", err)
+ }
+
+ client := httputil.NewClientConn(c, nil)
+
+ req, err := http.NewRequest(method, endpoint, data)
+ if err != nil {
+ client.Close()
+ return nil, nil, fmt.Errorf("could not create new request: %v", err)
+ }
+
+ for _, opt := range modifiers {
+ opt(req)
+ }
+
+ if ct != "" {
+ req.Header.Set("Content-Type", ct)
+ }
+ return req, client, nil
+}
diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go
index 6da8e5b..e5423a4 100644
--- a/integration-cli/docker_api_build_test.go
+++ b/integration-cli/docker_api_build_test.go
@@ -319,8 +319,7 @@
assert.Len(c, imageIDs, 2)
parentID, childID := imageIDs[0], imageIDs[1]
- client, err := request.NewClient()
- require.NoError(c, err)
+ client := testEnv.APIClient()
// check parentID is correct
image, _, err := client.ImageInspectWithRaw(context.Background(), childID)
@@ -329,12 +328,11 @@
}
func (s *DockerRegistrySuite) TestBuildCopyFromForcePull(c *check.C) {
- client, err := request.NewClient()
- require.NoError(c, err)
+ client := testEnv.APIClient()
repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
// tag the image to upload it to the private registry
- err = client.ImageTag(context.TODO(), "busybox", repoName)
+ err := client.ImageTag(context.TODO(), "busybox", repoName)
assert.Nil(c, err)
// push the image to the registry
rc, err := client.ImagePush(context.TODO(), repoName, types.ImagePushOptions{RegistryAuth: "{}"})
@@ -545,9 +543,7 @@
assert.Equal(c, strings.Count(out, "Using cache"), 2)
assert.Contains(c, out, "contentcontent")
- client, err := request.NewClient()
- require.NoError(c, err)
-
+ client := testEnv.APIClient()
du, err := client.DiskUsage(context.TODO())
assert.Nil(c, err)
assert.True(c, du.BuilderSize > 10)
@@ -582,9 +578,7 @@
}
func testBuildWithSession(c *check.C, dir, dockerfile string) (outStr string) {
- client, err := request.NewClient()
- require.NoError(c, err)
-
+ client := testEnv.APIClient()
sess, err := session.NewSession("foo1", "foo")
assert.Nil(c, err)
diff --git a/integration-cli/docker_api_containers_windows_test.go b/integration-cli/docker_api_containers_windows_test.go
index ae60cfe..eb28925 100644
--- a/integration-cli/docker_api_containers_windows_test.go
+++ b/integration-cli/docker_api_containers_windows_test.go
@@ -6,17 +6,20 @@
"fmt"
"io/ioutil"
"math/rand"
- "net/http"
"strings"
winio "github.com/Microsoft/go-winio"
- "github.com/docker/docker/integration-cli/checker"
- "github.com/docker/docker/integration-cli/request"
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/api/types/mount"
"github.com/go-check/check"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "golang.org/x/net/context"
)
func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *check.C) {
- testRequires(c, SameHostDaemon, DaemonIsWindowsAtLeastBuild(16210)) // Named pipe support was added in RS3
+ testRequires(c, SameHostDaemon, DaemonIsWindowsAtLeastBuild(16299)) // Named pipe support was added in RS3
// Create a host pipe to map into the container
hostPipeName := fmt.Sprintf(`\\.\pipe\docker-cli-test-pipe-%x`, rand.Uint64())
@@ -44,28 +47,30 @@
containerPipeName := `\\.\pipe\docker-cli-test-pipe`
text := "hello from a pipe"
cmd := fmt.Sprintf("echo %s > %s", text, containerPipeName)
-
name := "test-bind-npipe"
- data := map[string]interface{}{
- "Image": testEnv.PlatformDefaults.BaseImage,
- "Cmd": []string{"cmd", "/c", cmd},
- "HostConfig": map[string]interface{}{"Mounts": []map[string]interface{}{{"Type": "npipe", "Source": hostPipeName, "Target": containerPipeName}}},
- }
- status, resp, err := request.SockRequest("POST", "/containers/create?name="+name, data, daemonHost())
- c.Assert(err, checker.IsNil, check.Commentf(string(resp)))
- c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf(string(resp)))
+ ctx := context.Background()
+ client := testEnv.APIClient()
+ _, err = client.ContainerCreate(ctx,
+ &container.Config{
+ Image: testEnv.PlatformDefaults.BaseImage,
+ Cmd: []string{"cmd", "/c", cmd},
+ }, &container.HostConfig{
+ Mounts: []mount.Mount{
+ {
+ Type: "npipe",
+ Source: hostPipeName,
+ Target: containerPipeName,
+ },
+ },
+ },
+ nil, name)
+ require.NoError(c, err)
- status, _, err = request.SockRequest("POST", "/containers/"+name+"/start", nil, daemonHost())
- c.Assert(err, checker.IsNil)
- c.Assert(status, checker.Equals, http.StatusNoContent)
+ err = client.ContainerStart(ctx, name, types.ContainerStartOptions{})
+ require.NoError(c, err)
err = <-ch
- if err != nil {
- c.Fatal(err)
- }
- result := strings.TrimSpace(string(b))
- if result != text {
- c.Errorf("expected pipe to contain %s, got %s", text, result)
- }
+ require.NoError(c, err)
+ assert.Equal(c, text, strings.TrimSpace(string(b)))
}
diff --git a/integration-cli/docker_api_exec_resize_test.go b/integration-cli/docker_api_exec_resize_test.go
index 961d911..7289b26 100644
--- a/integration-cli/docker_api_exec_resize_test.go
+++ b/integration-cli/docker_api_exec_resize_test.go
@@ -59,7 +59,7 @@
}
payload := bytes.NewBufferString(`{"Tty":true}`)
- conn, _, err := request.SockRequestHijack("POST", fmt.Sprintf("/exec/%s/start", execID), payload, "application/json", daemonHost())
+ conn, _, err := sockRequestHijack("POST", fmt.Sprintf("/exec/%s/start", execID), payload, "application/json", daemonHost())
if err != nil {
return fmt.Errorf("Failed to start the exec: %q", err.Error())
}
diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go
index a5628e4..7c6c235 100644
--- a/integration-cli/docker_api_images_test.go
+++ b/integration-cli/docker_api_images_test.go
@@ -157,33 +157,21 @@
// Test case for 30027: image size reported as -1 in v1.12 client against v1.13 daemon.
// This test checks to make sure both v1.12 and v1.13 client against v1.13 daemon get correct `Size` after the fix.
func (s *DockerSuite) TestAPIImagesSizeCompatibility(c *check.C) {
- cli, err := client.NewEnvClient()
- c.Assert(err, checker.IsNil)
- defer cli.Close()
+ apiclient := testEnv.APIClient()
+ defer apiclient.Close()
- images, err := cli.ImageList(context.Background(), types.ImageListOptions{})
+ images, err := apiclient.ImageList(context.Background(), types.ImageListOptions{})
c.Assert(err, checker.IsNil)
c.Assert(len(images), checker.Not(checker.Equals), 0)
for _, image := range images {
c.Assert(image.Size, checker.Not(checker.Equals), int64(-1))
}
- type v124Image struct {
- ID string `json:"Id"`
- ParentID string `json:"ParentId"`
- RepoTags []string
- RepoDigests []string
- Created int64
- Size int64
- VirtualSize int64
- Labels map[string]string
- }
-
- cli, err = client.NewClientWithOpts(client.FromEnv, client.WithVersion("v1.24"))
+ apiclient, err = client.NewClientWithOpts(client.FromEnv, client.WithVersion("v1.24"))
c.Assert(err, checker.IsNil)
- defer cli.Close()
+ defer apiclient.Close()
- v124Images, err := cli.ImageList(context.Background(), types.ImageListOptions{})
+ v124Images, err := apiclient.ImageList(context.Background(), types.ImageListOptions{})
c.Assert(err, checker.IsNil)
c.Assert(len(v124Images), checker.Not(checker.Equals), 0)
for _, image := range v124Images {
diff --git a/integration-cli/docker_api_inspect_unix_test.go b/integration-cli/docker_api_inspect_unix_test.go
deleted file mode 100644
index 17844e0..0000000
--- a/integration-cli/docker_api_inspect_unix_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// +build !windows
-
-package main
-
-import (
- "encoding/json"
-
- "github.com/docker/docker/client"
- "github.com/docker/docker/integration-cli/checker"
- "github.com/go-check/check"
- "golang.org/x/net/context"
-)
-
-// #16665
-func (s *DockerSuite) TestInspectAPICpusetInConfigPre120(c *check.C) {
- testRequires(c, DaemonIsLinux)
- testRequires(c, cgroupCpuset)
-
- name := "cpusetinconfig-pre120"
- dockerCmd(c, "run", "--name", name, "--cpuset-cpus", "0", "busybox", "true")
- cli, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion("v1.19"))
- c.Assert(err, checker.IsNil)
- defer cli.Close()
- _, body, err := cli.ContainerInspectWithRaw(context.Background(), name, false)
- c.Assert(err, check.IsNil)
-
- var inspectJSON map[string]interface{}
- err = json.Unmarshal(body, &inspectJSON)
- c.Assert(err, checker.IsNil, check.Commentf("unable to unmarshal body for version 1.19"))
-
- config, ok := inspectJSON["Config"]
- c.Assert(ok, checker.True, check.Commentf("Unable to find 'Config'"))
- cfg := config.(map[string]interface{})
- _, ok = cfg["Cpuset"]
- c.Assert(ok, checker.True, check.Commentf("API version 1.19 expected to include Cpuset in 'Config'"))
-}
diff --git a/integration-cli/docker_api_ipcmode_test.go b/integration-cli/docker_api_ipcmode_test.go
index 0254887..5bca6d0 100644
--- a/integration-cli/docker_api_ipcmode_test.go
+++ b/integration-cli/docker_api_ipcmode_test.go
@@ -12,7 +12,6 @@
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/cli"
- "github.com/docker/docker/integration-cli/request"
"github.com/go-check/check"
"golang.org/x/net/context"
)
@@ -59,8 +58,7 @@
}
ctx := context.Background()
- client, err := request.NewClient()
- c.Assert(err, checker.IsNil)
+ client := testEnv.APIClient()
resp, err := client.ContainerCreate(ctx, &cfg, &hostCfg, nil, "")
c.Assert(err, checker.IsNil)
@@ -125,8 +123,7 @@
}
ctx := context.Background()
- client, err := request.NewClient()
- c.Assert(err, checker.IsNil)
+ client := testEnv.APIClient()
// create and start the "donor" container
resp, err := client.ContainerCreate(ctx, &cfg, &hostCfg, nil, "")
@@ -195,9 +192,7 @@
}
ctx := context.Background()
- client, err := request.NewClient()
- c.Assert(err, checker.IsNil)
-
+ client := testEnv.APIClient()
resp, err := client.ContainerCreate(ctx, &cfg, &hostCfg, nil, "")
c.Assert(err, checker.IsNil)
c.Assert(len(resp.Warnings), checker.Equals, 0)
diff --git a/integration-cli/docker_api_session_test.go b/integration-cli/docker_api_session_test.go
deleted file mode 100644
index f1c4489..0000000
--- a/integration-cli/docker_api_session_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package main
-
-import (
- "net/http"
-
- "github.com/docker/docker/integration-cli/checker"
- "github.com/docker/docker/integration-cli/request"
- "github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestSessionCreate(c *check.C) {
- testRequires(c, ExperimentalDaemon)
-
- res, body, err := request.Post("/session", func(r *http.Request) error {
- r.Header.Set("X-Docker-Expose-Session-Uuid", "testsessioncreate") // so we don't block default name if something else is using it
- r.Header.Set("Upgrade", "h2c")
- return nil
- })
- c.Assert(err, checker.IsNil)
- c.Assert(res.StatusCode, checker.Equals, http.StatusSwitchingProtocols)
- c.Assert(res.Header.Get("Upgrade"), checker.Equals, "h2c")
- c.Assert(body.Close(), checker.IsNil)
-}
-
-func (s *DockerSuite) TestSessionCreateWithBadUpgrade(c *check.C) {
- testRequires(c, ExperimentalDaemon)
-
- res, body, err := request.Post("/session")
- c.Assert(err, checker.IsNil)
- c.Assert(res.StatusCode, checker.Equals, http.StatusBadRequest)
- buf, err := request.ReadBody(body)
- c.Assert(err, checker.IsNil)
-
- out := string(buf)
- c.Assert(out, checker.Contains, "no upgrade")
-
- res, body, err = request.Post("/session", func(r *http.Request) error {
- r.Header.Set("Upgrade", "foo")
- return nil
- })
- c.Assert(err, checker.IsNil)
- c.Assert(res.StatusCode, checker.Equals, http.StatusBadRequest)
- buf, err = request.ReadBody(body)
- c.Assert(err, checker.IsNil)
-
- out = string(buf)
- c.Assert(out, checker.Contains, "not supported")
-}
diff --git a/integration-cli/docker_api_swarm_config_test.go b/integration-cli/docker_api_swarm_config_test.go
deleted file mode 100644
index c01d80f..0000000
--- a/integration-cli/docker_api_swarm_config_test.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// +build !windows
-
-package main
-
-import (
- "github.com/docker/docker/api/types/swarm"
- "github.com/docker/docker/integration-cli/checker"
- "github.com/go-check/check"
- "golang.org/x/net/context"
-)
-
-func (s *DockerSwarmSuite) TestAPISwarmConfigsEmptyList(c *check.C) {
- d := s.AddDaemon(c, true, true)
-
- configs := d.ListConfigs(c)
- c.Assert(configs, checker.NotNil)
- c.Assert(len(configs), checker.Equals, 0, check.Commentf("configs: %#v", configs))
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmConfigsCreate(c *check.C) {
- d := s.AddDaemon(c, true, true)
-
- testName := "test_config"
- id := d.CreateConfig(c, swarm.ConfigSpec{
- Annotations: swarm.Annotations{
- Name: testName,
- },
- Data: []byte("TESTINGDATA"),
- })
- c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("configs: %s", id))
-
- configs := d.ListConfigs(c)
- c.Assert(len(configs), checker.Equals, 1, check.Commentf("configs: %#v", configs))
- name := configs[0].Spec.Annotations.Name
- c.Assert(name, checker.Equals, testName, check.Commentf("configs: %s", name))
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmConfigsDelete(c *check.C) {
- d := s.AddDaemon(c, true, true)
-
- testName := "test_config"
- id := d.CreateConfig(c, swarm.ConfigSpec{Annotations: swarm.Annotations{
- Name: testName,
- },
- Data: []byte("TESTINGDATA"),
- })
- c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("configs: %s", id))
-
- config := d.GetConfig(c, id)
- c.Assert(config.ID, checker.Equals, id, check.Commentf("config: %v", config))
-
- d.DeleteConfig(c, config.ID)
-
- cli, err := d.NewClient()
- c.Assert(err, checker.IsNil)
- defer cli.Close()
-
- _, _, err = cli.ConfigInspectWithRaw(context.Background(), id)
- c.Assert(err.Error(), checker.Contains, "No such config")
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmConfigsUpdate(c *check.C) {
- d := s.AddDaemon(c, true, true)
-
- testName := "test_config"
- id := d.CreateConfig(c, swarm.ConfigSpec{
- Annotations: swarm.Annotations{
- Name: testName,
- Labels: map[string]string{
- "test": "test1",
- },
- },
- Data: []byte("TESTINGDATA"),
- })
- c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("configs: %s", id))
-
- config := d.GetConfig(c, id)
- c.Assert(config.ID, checker.Equals, id, check.Commentf("config: %v", config))
-
- // test UpdateConfig with full ID
- d.UpdateConfig(c, id, func(s *swarm.Config) {
- s.Spec.Labels = map[string]string{
- "test": "test1",
- }
- })
-
- config = d.GetConfig(c, id)
- c.Assert(config.Spec.Labels["test"], checker.Equals, "test1", check.Commentf("config: %v", config))
-
- // test UpdateConfig with full name
- d.UpdateConfig(c, config.Spec.Name, func(s *swarm.Config) {
- s.Spec.Labels = map[string]string{
- "test": "test2",
- }
- })
-
- config = d.GetConfig(c, id)
- c.Assert(config.Spec.Labels["test"], checker.Equals, "test2", check.Commentf("config: %v", config))
-
- // test UpdateConfig with prefix ID
- d.UpdateConfig(c, id[:1], func(s *swarm.Config) {
- s.Spec.Labels = map[string]string{
- "test": "test3",
- }
- })
-
- config = d.GetConfig(c, id)
- c.Assert(config.Spec.Labels["test"], checker.Equals, "test3", check.Commentf("config: %v", config))
-
- // test UpdateConfig in updating Data which is not supported in daemon
- // this test will produce an error in func UpdateConfig
- config = d.GetConfig(c, id)
- config.Spec.Data = []byte("TESTINGDATA2")
-
- cli, err := d.NewClient()
- c.Assert(err, checker.IsNil)
- defer cli.Close()
-
- expected := "only updates to Labels are allowed"
-
- err = cli.ConfigUpdate(context.Background(), config.ID, config.Version, config.Spec)
- c.Assert(err.Error(), checker.Contains, expected)
-}
diff --git a/integration-cli/docker_api_swarm_secret_test.go b/integration-cli/docker_api_swarm_secret_test.go
deleted file mode 100644
index c30e223..0000000
--- a/integration-cli/docker_api_swarm_secret_test.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// +build !windows
-
-package main
-
-import (
- "net/http"
-
- "github.com/docker/docker/api/types/swarm"
- "github.com/docker/docker/integration-cli/checker"
- "github.com/go-check/check"
- "golang.org/x/net/context"
-)
-
-func (s *DockerSwarmSuite) TestAPISwarmSecretsEmptyList(c *check.C) {
- d := s.AddDaemon(c, true, true)
-
- secrets := d.ListSecrets(c)
- c.Assert(secrets, checker.NotNil)
- c.Assert(len(secrets), checker.Equals, 0, check.Commentf("secrets: %#v", secrets))
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmSecretsCreate(c *check.C) {
- d := s.AddDaemon(c, true, true)
-
- testName := "test_secret"
- secretSpec := swarm.SecretSpec{
- Annotations: swarm.Annotations{
- Name: testName,
- },
- Data: []byte("TESTINGDATA"),
- }
-
- id := d.CreateSecret(c, secretSpec)
- c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
- secrets := d.ListSecrets(c)
- c.Assert(len(secrets), checker.Equals, 1, check.Commentf("secrets: %#v", secrets))
- name := secrets[0].Spec.Annotations.Name
- c.Assert(name, checker.Equals, testName, check.Commentf("secret: %s", name))
-
- // create an already existing secret, daemon should return a status code of 409
- status, out, err := d.SockRequest("POST", "/secrets/create", secretSpec)
- c.Assert(err, checker.IsNil)
- c.Assert(status, checker.Equals, http.StatusConflict, check.Commentf("secret create: %s", string(out)))
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmSecretsDelete(c *check.C) {
- d := s.AddDaemon(c, true, true)
-
- testName := "test_secret"
- id := d.CreateSecret(c, swarm.SecretSpec{Annotations: swarm.Annotations{
- Name: testName,
- },
- Data: []byte("TESTINGDATA"),
- })
- c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
- secret := d.GetSecret(c, id)
- c.Assert(secret.ID, checker.Equals, id, check.Commentf("secret: %v", secret))
-
- d.DeleteSecret(c, secret.ID)
-
- cli, err := d.NewClient()
- c.Assert(err, checker.IsNil)
- defer cli.Close()
-
- _, _, err = cli.SecretInspectWithRaw(context.Background(), id)
- c.Assert(err.Error(), checker.Contains, "No such secret")
-
- id = "non-existing"
- err = cli.SecretRemove(context.Background(), id)
- c.Assert(err.Error(), checker.Contains, "No such secret: non-existing")
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmSecretsUpdate(c *check.C) {
- d := s.AddDaemon(c, true, true)
-
- testName := "test_secret"
- id := d.CreateSecret(c, swarm.SecretSpec{
- Annotations: swarm.Annotations{
- Name: testName,
- Labels: map[string]string{
- "test": "test1",
- },
- },
- Data: []byte("TESTINGDATA"),
- })
- c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
- secret := d.GetSecret(c, id)
- c.Assert(secret.ID, checker.Equals, id, check.Commentf("secret: %v", secret))
-
- // test UpdateSecret with full ID
- d.UpdateSecret(c, id, func(s *swarm.Secret) {
- s.Spec.Labels = map[string]string{
- "test": "test1",
- }
- })
-
- secret = d.GetSecret(c, id)
- c.Assert(secret.Spec.Labels["test"], checker.Equals, "test1", check.Commentf("secret: %v", secret))
-
- // test UpdateSecret with full name
- d.UpdateSecret(c, secret.Spec.Name, func(s *swarm.Secret) {
- s.Spec.Labels = map[string]string{
- "test": "test2",
- }
- })
-
- secret = d.GetSecret(c, id)
- c.Assert(secret.Spec.Labels["test"], checker.Equals, "test2", check.Commentf("secret: %v", secret))
-
- // test UpdateSecret with prefix ID
- d.UpdateSecret(c, id[:1], func(s *swarm.Secret) {
- s.Spec.Labels = map[string]string{
- "test": "test3",
- }
- })
-
- secret = d.GetSecret(c, id)
- c.Assert(secret.Spec.Labels["test"], checker.Equals, "test3", check.Commentf("secret: %v", secret))
-
- // test UpdateSecret in updating Data which is not supported in daemon
- // this test will produce an error in func UpdateSecret
- secret = d.GetSecret(c, id)
- secret.Spec.Data = []byte("TESTINGDATA2")
-
- cli, err := d.NewClient()
- c.Assert(err, checker.IsNil)
- defer cli.Close()
-
- expected := "only updates to Labels are allowed"
-
- err = cli.SecretUpdate(context.Background(), secret.ID, secret.Version, secret.Spec)
- c.Assert(err.Error(), checker.Contains, expected)
-}
diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go
index a9b0458..fd0b4e6 100644
--- a/integration-cli/docker_api_swarm_test.go
+++ b/integration-cli/docker_api_swarm_test.go
@@ -3,12 +3,10 @@
package main
import (
- "encoding/json"
"fmt"
"io/ioutil"
"net"
"net/http"
- "net/url"
"os"
"path/filepath"
"strings"
@@ -21,11 +19,14 @@
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/swarm"
+ "github.com/docker/docker/client"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/daemon"
"github.com/docker/docker/integration-cli/request"
"github.com/docker/swarmkit/ca"
"github.com/go-check/check"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
"golang.org/x/net/context"
)
@@ -1006,32 +1007,19 @@
func (s *DockerSwarmSuite) TestAPINetworkInspectWithScope(c *check.C) {
d := s.AddDaemon(c, true, true)
- name := "foo"
- networkCreateRequest := types.NetworkCreateRequest{
- Name: name,
- }
+ name := "test-scoped-network"
+ ctx := context.Background()
+ apiclient, err := d.NewClient()
+ require.NoError(c, err)
- var n types.NetworkCreateResponse
- networkCreateRequest.NetworkCreate.Driver = "overlay"
+ resp, err := apiclient.NetworkCreate(ctx, name, types.NetworkCreate{Driver: "overlay"})
+ require.NoError(c, err)
- status, out, err := d.SockRequest("POST", "/networks/create", networkCreateRequest)
- c.Assert(err, checker.IsNil, check.Commentf(string(out)))
- c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf(string(out)))
- c.Assert(json.Unmarshal(out, &n), checker.IsNil)
+ network, err := apiclient.NetworkInspect(ctx, name, types.NetworkInspectOptions{})
+ require.NoError(c, err)
+ assert.Equal(c, "swarm", network.Scope)
+ assert.Equal(c, resp.ID, network.ID)
- var r types.NetworkResource
-
- status, body, err := d.SockRequest("GET", "/networks/"+name, nil)
- c.Assert(err, checker.IsNil, check.Commentf(string(out)))
- c.Assert(status, checker.Equals, http.StatusOK, check.Commentf(string(out)))
- c.Assert(json.Unmarshal(body, &r), checker.IsNil)
- c.Assert(r.Scope, checker.Equals, "swarm")
- c.Assert(r.ID, checker.Equals, n.ID)
-
- v := url.Values{}
- v.Set("scope", "local")
-
- status, _, err = d.SockRequest("GET", "/networks/"+name+"?"+v.Encode(), nil)
- c.Assert(err, checker.IsNil, check.Commentf(string(out)))
- c.Assert(status, checker.Equals, http.StatusNotFound, check.Commentf(string(out)))
+ _, err = apiclient.NetworkInspect(ctx, name, types.NetworkInspectOptions{Scope: "local"})
+ assert.True(c, client.IsErrNotFound(err))
}
diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index dda77c9..5dd1d8b 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -400,13 +400,7 @@
defer server.Close()
var out, out2 string
- var args []string
- // Temopray workaround for #35963. Will remove this when that issue fixed
- if runtime.GOARCH == "amd64" {
- args = []string{"run", name, "ls", "-le", "/file"}
- } else {
- args = []string{"run", name, "ls", "-l", "--full-time", "/file"}
- }
+ args := []string{"run", name, "ls", "-l", "--full-time", "/file"}
dFmt := `FROM busybox
ADD %s/file /`
diff --git a/integration-cli/docker_cli_config_ls_test.go b/integration-cli/docker_cli_config_ls_test.go
deleted file mode 100644
index 5f002bc..0000000
--- a/integration-cli/docker_cli_config_ls_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// +build !windows
-
-package main
-
-import (
- "strings"
-
- "github.com/docker/docker/api/types/swarm"
- "github.com/docker/docker/integration-cli/checker"
- "github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestConfigList(c *check.C) {
- testRequires(c, SameHostDaemon)
- d := s.AddDaemon(c, true, true)
-
- testName0 := "test0"
- testName1 := "test1"
-
- // create config test0
- id0 := d.CreateConfig(c, swarm.ConfigSpec{
- Annotations: swarm.Annotations{
- Name: testName0,
- Labels: map[string]string{"type": "test"},
- },
- Data: []byte("TESTINGDATA0"),
- })
- c.Assert(id0, checker.Not(checker.Equals), "", check.Commentf("configs: %s", id0))
-
- config := d.GetConfig(c, id0)
- c.Assert(config.Spec.Name, checker.Equals, testName0)
-
- // create config test1
- id1 := d.CreateConfig(c, swarm.ConfigSpec{
- Annotations: swarm.Annotations{
- Name: testName1,
- Labels: map[string]string{"type": "production"},
- },
- Data: []byte("TESTINGDATA1"),
- })
- c.Assert(id1, checker.Not(checker.Equals), "", check.Commentf("configs: %s", id1))
-
- config = d.GetConfig(c, id1)
- c.Assert(config.Spec.Name, checker.Equals, testName1)
-
- // test by command `docker config ls`
- out, err := d.Cmd("config", "ls")
- c.Assert(err, checker.IsNil, check.Commentf(out))
- c.Assert(strings.TrimSpace(out), checker.Contains, testName0)
- c.Assert(strings.TrimSpace(out), checker.Contains, testName1)
-
- // test filter by name `docker config ls --filter name=xxx`
- args := []string{
- "config",
- "ls",
- "--filter",
- "name=test0",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Contains, testName0)
- c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), testName1)
-
- // test filter by id `docker config ls --filter id=xxx`
- args = []string{
- "config",
- "ls",
- "--filter",
- "id=" + id1,
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), testName0)
- c.Assert(strings.TrimSpace(out), checker.Contains, testName1)
-
- // test filter by label `docker config ls --filter label=xxx`
- args = []string{
- "config",
- "ls",
- "--filter",
- "label=type",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Contains, testName0)
- c.Assert(strings.TrimSpace(out), checker.Contains, testName1)
-
- args = []string{
- "config",
- "ls",
- "--filter",
- "label=type=test",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Contains, testName0)
- c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), testName1)
-
- args = []string{
- "config",
- "ls",
- "--filter",
- "label=type=production",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), testName0)
- c.Assert(strings.TrimSpace(out), checker.Contains, testName1)
-
- // test invalid filter `docker config ls --filter noexisttype=xxx`
- args = []string{
- "config",
- "ls",
- "--filter",
- "noexisttype=test0",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.NotNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Contains, "Error response from daemon: Invalid filter 'noexisttype'")
-}
diff --git a/integration-cli/docker_cli_daemon_plugins_test.go b/integration-cli/docker_cli_daemon_plugins_test.go
index 10aa514..c527cb1 100644
--- a/integration-cli/docker_cli_daemon_plugins_test.go
+++ b/integration-cli/docker_cli_daemon_plugins_test.go
@@ -3,8 +3,6 @@
package main
import (
- "os"
- "path/filepath"
"strings"
"github.com/docker/docker/integration-cli/checker"
@@ -199,12 +197,6 @@
if err != nil {
c.Fatalf("Could not install plugin: %v %s", err, out)
}
- pluginID, err := s.d.Cmd("plugin", "inspect", "-f", "{{.Id}}", pName)
- pluginID = strings.TrimSpace(pluginID)
- if err != nil {
- c.Fatalf("Could not retrieve plugin ID: %v %s", err, pluginID)
- }
- mountpointPrefix := filepath.Join(s.d.RootDir(), "plugins", pluginID, "rootfs")
defer func() {
if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
c.Fatalf("Could not disable plugin: %v %s", err, out)
@@ -213,11 +205,6 @@
if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
c.Fatalf("Could not remove plugin: %v %s", err, out)
}
-
- exists, err := existsMountpointWithPrefix(mountpointPrefix)
- c.Assert(err, checker.IsNil)
- c.Assert(exists, checker.Equals, false)
-
}()
out, err = s.d.Cmd("volume", "create", "-d", pName, volName)
@@ -237,21 +224,11 @@
c.Assert(out, checker.Contains, volName)
c.Assert(out, checker.Contains, pName)
- mountPoint, err := s.d.Cmd("volume", "inspect", volName, "--format", "{{.Mountpoint}}")
- if err != nil {
- c.Fatalf("Could not inspect volume: %v %s", err, mountPoint)
- }
- mountPoint = strings.TrimSpace(mountPoint)
-
out, err = s.d.Cmd("run", "--rm", "-v", volName+":"+destDir, "busybox", "touch", destDir+destFile)
c.Assert(err, checker.IsNil, check.Commentf(out))
- path := filepath.Join(s.d.RootDir(), "plugins", pluginID, "rootfs", mountPoint, destFile)
- _, err = os.Lstat(path)
- c.Assert(err, checker.IsNil)
- exists, err := existsMountpointWithPrefix(mountpointPrefix)
- c.Assert(err, checker.IsNil)
- c.Assert(exists, checker.Equals, true)
+ out, err = s.d.Cmd("run", "--rm", "-v", volName+":"+destDir, "busybox", "ls", destDir+destFile)
+ c.Assert(err, checker.IsNil, check.Commentf(out))
}
func (s *DockerDaemonSuite) TestGraphdriverPlugin(c *check.C) {
diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go
index d6d2ef7..2646de3 100644
--- a/integration-cli/docker_cli_daemon_test.go
+++ b/integration-cli/docker_cli_daemon_test.go
@@ -1697,7 +1697,7 @@
Experimental: testEnv.DaemonInfo.ExperimentalBuild,
})
c.Assert(d.StartWithError("--log-driver=syslog", "--log-opt", "syslog-address=corrupted:42"), check.NotNil)
- expected := "Failed to set log opts: syslog-address should be in form proto://address"
+ expected := "syslog-address should be in form proto://address"
icmd.RunCommand("grep", expected, d.LogFileName()).Assert(c, icmd.Success)
}
@@ -1707,7 +1707,7 @@
Experimental: testEnv.DaemonInfo.ExperimentalBuild,
})
c.Assert(d.StartWithError("--log-driver=fluentd", "--log-opt", "fluentd-address=corrupted:c"), check.NotNil)
- expected := "Failed to set log opts: invalid fluentd-address corrupted:c: "
+ expected := "invalid fluentd-address corrupted:c: "
icmd.RunCommand("grep", expected, d.LogFileName()).Assert(c, icmd.Success)
}
diff --git a/integration-cli/docker_cli_diff_test.go b/integration-cli/docker_cli_diff_test.go
deleted file mode 100644
index 614beee..0000000
--- a/integration-cli/docker_cli_diff_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package main
-
-import (
- "strings"
- "time"
-
- "github.com/docker/docker/integration-cli/checker"
- "github.com/docker/docker/integration-cli/cli"
- "github.com/go-check/check"
-)
-
-// ensure that an added file shows up in docker diff
-func (s *DockerSuite) TestDiffFilenameShownInOutput(c *check.C) {
- containerCmd := `mkdir /foo; echo xyzzy > /foo/bar`
- out := cli.DockerCmd(c, "run", "-d", "busybox", "sh", "-c", containerCmd).Combined()
-
- // Wait for it to exit as cannot diff a running container on Windows, and
- // it will take a few seconds to exit. Also there's no way in Windows to
- // differentiate between an Add or a Modify, and all files are under
- // a "Files/" prefix.
- containerID := strings.TrimSpace(out)
- lookingFor := "A /foo/bar"
- if testEnv.OSType == "windows" {
- cli.WaitExited(c, containerID, 60*time.Second)
- lookingFor = "C Files/foo/bar"
- }
-
- cleanCID := strings.TrimSpace(out)
- out = cli.DockerCmd(c, "diff", cleanCID).Combined()
-
- found := false
- for _, line := range strings.Split(out, "\n") {
- if strings.Contains(line, lookingFor) {
- found = true
- break
- }
- }
- c.Assert(found, checker.True)
-}
-
-// test to ensure GH #3840 doesn't occur any more
-func (s *DockerSuite) TestDiffEnsureInitLayerFilesAreIgnored(c *check.C) {
- testRequires(c, DaemonIsLinux)
- // this is a list of files which shouldn't show up in `docker diff`
- initLayerFiles := []string{"/etc/resolv.conf", "/etc/hostname", "/etc/hosts", "/.dockerenv"}
- containerCount := 5
-
- // we might not run into this problem from the first run, so start a few containers
- for i := 0; i < containerCount; i++ {
- containerCmd := `echo foo > /root/bar`
- out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", containerCmd)
-
- cleanCID := strings.TrimSpace(out)
- out, _ = dockerCmd(c, "diff", cleanCID)
-
- for _, filename := range initLayerFiles {
- c.Assert(out, checker.Not(checker.Contains), filename)
- }
- }
-}
-
-func (s *DockerSuite) TestDiffEnsureDefaultDevs(c *check.C) {
- testRequires(c, DaemonIsLinux)
- out, _ := dockerCmd(c, "run", "-d", "busybox", "sleep", "0")
-
- cleanCID := strings.TrimSpace(out)
- out, _ = dockerCmd(c, "diff", cleanCID)
-
- expected := map[string]bool{
- "C /dev": true,
- "A /dev/full": true, // busybox
- "C /dev/ptmx": true, // libcontainer
- "A /dev/mqueue": true,
- "A /dev/kmsg": true,
- "A /dev/fd": true,
- "A /dev/ptmx": true,
- "A /dev/null": true,
- "A /dev/random": true,
- "A /dev/stdout": true,
- "A /dev/stderr": true,
- "A /dev/tty1": true,
- "A /dev/stdin": true,
- "A /dev/tty": true,
- "A /dev/urandom": true,
- "A /dev/zero": true,
- }
-
- for _, line := range strings.Split(out, "\n") {
- c.Assert(line == "" || expected[line], checker.True, check.Commentf(line))
- }
-}
-
-// https://github.com/docker/docker/pull/14381#discussion_r33859347
-func (s *DockerSuite) TestDiffEmptyArgClientError(c *check.C) {
- out, _, err := dockerCmdWithError("diff", "")
- c.Assert(err, checker.NotNil)
- c.Assert(strings.TrimSpace(out), checker.Contains, "Container name cannot be empty")
-}
diff --git a/integration-cli/docker_cli_kill_test.go b/integration-cli/docker_cli_kill_test.go
deleted file mode 100644
index e2e510f..0000000
--- a/integration-cli/docker_cli_kill_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package main
-
-import (
- "strings"
- "time"
-
- "github.com/docker/docker/integration-cli/checker"
- "github.com/docker/docker/integration-cli/cli"
- "github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestKillDifferentUserContainer(c *check.C) {
- // TODO Windows: Windows does not yet support -u (Feb 2016).
- testRequires(c, DaemonIsLinux)
- out := cli.DockerCmd(c, "run", "-u", "daemon", "-d", "busybox", "top").Combined()
- cleanedContainerID := strings.TrimSpace(out)
- cli.WaitRun(c, cleanedContainerID)
-
- cli.DockerCmd(c, "kill", cleanedContainerID)
- cli.WaitExited(c, cleanedContainerID, 10*time.Second)
-
- out = cli.DockerCmd(c, "ps", "-q").Combined()
- c.Assert(out, checker.Not(checker.Contains), cleanedContainerID, check.Commentf("killed container is still running"))
-
-}
diff --git a/integration-cli/docker_cli_oom_killed_test.go b/integration-cli/docker_cli_oom_killed_test.go
deleted file mode 100644
index 54c34d2..0000000
--- a/integration-cli/docker_cli_oom_killed_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build !windows
-
-package main
-
-import (
- "github.com/docker/docker/integration-cli/checker"
- "github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestInspectOomKilledTrue(c *check.C) {
- testRequires(c, DaemonIsLinux, memoryLimitSupport, swapMemorySupport)
-
- name := "testoomkilled"
- _, exitCode, _ := dockerCmdWithError("run", "--name", name, "--memory", "32MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
-
- c.Assert(exitCode, checker.Equals, 137, check.Commentf("OOM exit should be 137"))
-
- oomKilled := inspectField(c, name, "State.OOMKilled")
- c.Assert(oomKilled, checker.Equals, "true")
-}
-
-func (s *DockerSuite) TestInspectOomKilledFalse(c *check.C) {
- testRequires(c, DaemonIsLinux, memoryLimitSupport, swapMemorySupport)
-
- name := "testoomkilled"
- dockerCmd(c, "run", "--name", name, "--memory", "32MB", "busybox", "sh", "-c", "echo hello world")
-
- oomKilled := inspectField(c, name, "State.OOMKilled")
- c.Assert(oomKilled, checker.Equals, "false")
-}
diff --git a/integration-cli/docker_cli_pause_test.go b/integration-cli/docker_cli_pause_test.go
deleted file mode 100644
index 682384f..0000000
--- a/integration-cli/docker_cli_pause_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package main
-
-import (
- "strings"
- "time"
-
- "github.com/docker/docker/integration-cli/checker"
- "github.com/docker/docker/integration-cli/cli"
- "github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestPause(c *check.C) {
- testRequires(c, IsPausable)
-
- name := "testeventpause"
- runSleepingContainer(c, "-d", "--name", name)
-
- cli.DockerCmd(c, "pause", name)
- pausedContainers := strings.Fields(
- cli.DockerCmd(c, "ps", "-f", "status=paused", "-q", "-a").Combined(),
- )
- c.Assert(len(pausedContainers), checker.Equals, 1)
-
- cli.DockerCmd(c, "unpause", name)
-
- out := cli.DockerCmd(c, "events", "--since=0", "--until", daemonUnixTime(c)).Combined()
- events := strings.Split(strings.TrimSpace(out), "\n")
- actions := eventActionsByIDAndType(c, events, name, "container")
-
- c.Assert(actions[len(actions)-2], checker.Equals, "pause")
- c.Assert(actions[len(actions)-1], checker.Equals, "unpause")
-}
-
-func (s *DockerSuite) TestPauseMultipleContainers(c *check.C) {
- testRequires(c, IsPausable)
-
- containers := []string{
- "testpausewithmorecontainers1",
- "testpausewithmorecontainers2",
- }
- for _, name := range containers {
- runSleepingContainer(c, "-d", "--name", name)
- }
- cli.DockerCmd(c, append([]string{"pause"}, containers...)...)
- pausedContainers := strings.Fields(
- cli.DockerCmd(c, "ps", "-f", "status=paused", "-q", "-a").Combined(),
- )
- c.Assert(len(pausedContainers), checker.Equals, len(containers))
-
- cli.DockerCmd(c, append([]string{"unpause"}, containers...)...)
-
- out := cli.DockerCmd(c, "events", "--since=0", "--until", daemonUnixTime(c)).Combined()
- events := strings.Split(strings.TrimSpace(out), "\n")
-
- for _, name := range containers {
- actions := eventActionsByIDAndType(c, events, name, "container")
-
- c.Assert(actions[len(actions)-2], checker.Equals, "pause")
- c.Assert(actions[len(actions)-1], checker.Equals, "unpause")
- }
-}
-
-func (s *DockerSuite) TestPauseFailsOnWindowsServerContainers(c *check.C) {
- testRequires(c, DaemonIsWindows, NotPausable)
- runSleepingContainer(c, "-d", "--name=test")
- out, _, _ := dockerCmdWithError("pause", "test")
- c.Assert(out, checker.Contains, "cannot pause Windows Server Containers")
-}
-
-func (s *DockerSuite) TestStopPausedContainer(c *check.C) {
- testRequires(c, DaemonIsLinux)
-
- id := runSleepingContainer(c)
- cli.WaitRun(c, id)
- cli.DockerCmd(c, "pause", id)
- cli.DockerCmd(c, "stop", id)
- cli.WaitForInspectResult(c, id, "{{.State.Running}}", "false", 30*time.Second)
-}
diff --git a/integration-cli/docker_cli_plugins_test.go b/integration-cli/docker_cli_plugins_test.go
index e49c428..8ca7254 100644
--- a/integration-cli/docker_cli_plugins_test.go
+++ b/integration-cli/docker_cli_plugins_test.go
@@ -15,7 +15,6 @@
"github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/daemon"
"github.com/docker/docker/integration-cli/fixtures/plugin"
- "github.com/docker/docker/integration-cli/request"
"github.com/go-check/check"
"github.com/gotestyourself/gotestyourself/icmd"
"golang.org/x/net/context"
@@ -159,9 +158,7 @@
}
func (ps *DockerPluginSuite) TestPluginSet(c *check.C) {
- // Create a new plugin with extra settings
- client, err := request.NewClient()
- c.Assert(err, checker.IsNil, check.Commentf("failed to create test client"))
+ client := testEnv.APIClient()
name := "test"
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
@@ -171,7 +168,8 @@
mntSrc := "foo"
devPath := "/dev/bar"
- err = plugin.Create(ctx, client, name, func(cfg *plugin.Config) {
+ // Create a new plugin with extra settings
+ err := plugin.Create(ctx, client, name, func(cfg *plugin.Config) {
cfg.Env = []types.PluginEnv{{Name: "DEBUG", Value: &initialValue, Settable: []string{"value"}}}
cfg.Mounts = []types.PluginMount{
{Name: "pmount1", Settable: []string{"source"}, Type: "none", Source: &mntSrc},
@@ -401,12 +399,11 @@
func (ps *DockerPluginSuite) TestPluginIDPrefix(c *check.C) {
name := "test"
- client, err := request.NewClient()
- c.Assert(err, checker.IsNil, check.Commentf("error creating test client"))
+ client := testEnv.APIClient()
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
initialValue := "0"
- err = plugin.Create(ctx, client, name, func(cfg *plugin.Config) {
+ err := plugin.Create(ctx, client, name, func(cfg *plugin.Config) {
cfg.Env = []types.PluginEnv{{Name: "DEBUG", Value: &initialValue, Settable: []string{"value"}}}
})
cancel()
@@ -466,8 +463,7 @@
c.Assert(err, check.IsNil)
name := "test:latest"
- client, err := request.NewClient()
- c.Assert(err, checker.IsNil, check.Commentf("error creating test client"))
+ client := testEnv.APIClient()
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
defer cancel()
diff --git a/integration-cli/docker_cli_ps_test.go b/integration-cli/docker_cli_ps_test.go
index 6fe91f6..509015d 100644
--- a/integration-cli/docker_cli_ps_test.go
+++ b/integration-cli/docker_cli_ps_test.go
@@ -2,9 +2,6 @@
import (
"fmt"
- "io/ioutil"
- "os"
- "path/filepath"
"sort"
"strconv"
"strings"
@@ -139,13 +136,6 @@
return true
}
-// FIXME(vdemeester) Move this into a unit test in daemon package
-func (s *DockerSuite) TestPsListContainersInvalidFilterName(c *check.C) {
- out, _, err := dockerCmdWithError("ps", "-f", "invalidFilter=test")
- c.Assert(err, checker.NotNil)
- c.Assert(out, checker.Contains, "Invalid filter")
-}
-
func (s *DockerSuite) TestPsListContainersSize(c *check.C) {
// Problematic on Windows as it doesn't report the size correctly @swernli
testRequires(c, DaemonIsLinux)
@@ -519,48 +509,6 @@
}
}
-func (s *DockerSuite) TestPsLinkedWithNoTrunc(c *check.C) {
- // Problematic on Windows as it doesn't support links as of Jan 2016
- testRequires(c, DaemonIsLinux)
- existingContainers := ExistingContainerIDs(c)
- runSleepingContainer(c, "--name=first")
- runSleepingContainer(c, "--name=second", "--link=first:first")
-
- out, _ := dockerCmd(c, "ps", "--no-trunc")
- lines := strings.Split(strings.TrimSpace(string(out)), "\n")
- // strip header
- lines = lines[1:]
- lines = RemoveLinesForExistingElements(lines, existingContainers)
- expected := []string{"second", "first,second/first"}
- var names []string
- for _, l := range lines {
- fields := strings.Fields(l)
- names = append(names, fields[len(fields)-1])
- }
- c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array: %v, got: %v", expected, names))
-}
-
-func (s *DockerSuite) TestPsGroupPortRange(c *check.C) {
- // Problematic on Windows as it doesn't support port ranges as of Jan 2016
- testRequires(c, DaemonIsLinux)
- portRange := "3850-3900"
- dockerCmd(c, "run", "-d", "--name", "porttest", "-p", portRange+":"+portRange, "busybox", "top")
-
- out, _ := dockerCmd(c, "ps")
-
- c.Assert(string(out), checker.Contains, portRange, check.Commentf("docker ps output should have had the port range %q: %s", portRange, string(out)))
-
-}
-
-func (s *DockerSuite) TestPsWithSize(c *check.C) {
- // Problematic on Windows as it doesn't report the size correctly @swernli
- testRequires(c, DaemonIsLinux)
- dockerCmd(c, "run", "-d", "--name", "sizetest", "busybox", "top")
-
- out, _ := dockerCmd(c, "ps", "--size")
- c.Assert(out, checker.Contains, "virtual", check.Commentf("docker ps with --size should show virtual size of container"))
-}
-
func (s *DockerSuite) TestPsListContainersFilterCreated(c *check.C) {
// create a container
out, _ := dockerCmd(c, "create", "busybox")
@@ -591,69 +539,6 @@
c.Assert(cID, checker.HasPrefix, containerOut)
}
-func (s *DockerSuite) TestPsFormatMultiNames(c *check.C) {
- // Problematic on Windows as it doesn't support link as of Jan 2016
- testRequires(c, DaemonIsLinux)
- existingContainers := ExistingContainerNames(c)
- //create 2 containers and link them
- dockerCmd(c, "run", "--name=child", "-d", "busybox", "top")
- dockerCmd(c, "run", "--name=parent", "--link=child:linkedone", "-d", "busybox", "top")
-
- //use the new format capabilities to only list the names and --no-trunc to get all names
- out, _ := dockerCmd(c, "ps", "--format", "{{.Names}}", "--no-trunc")
- out = RemoveOutputForExistingElements(out, existingContainers)
- lines := strings.Split(strings.TrimSpace(string(out)), "\n")
- expected := []string{"parent", "child,parent/linkedone"}
- var names []string
- names = append(names, lines...)
- c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with non-truncated names: %v, got: %v", expected, names))
-
- //now list without turning off truncation and make sure we only get the non-link names
- out, _ = dockerCmd(c, "ps", "--format", "{{.Names}}")
- out = RemoveOutputForExistingElements(out, existingContainers)
- lines = strings.Split(strings.TrimSpace(string(out)), "\n")
- expected = []string{"parent", "child"}
- var truncNames []string
- truncNames = append(truncNames, lines...)
- c.Assert(expected, checker.DeepEquals, truncNames, check.Commentf("Expected array with truncated names: %v, got: %v", expected, truncNames))
-}
-
-// Test for GitHub issue #21772
-func (s *DockerSuite) TestPsNamesMultipleTime(c *check.C) {
- existingContainers := ExistingContainerNames(c)
- runSleepingContainer(c, "--name=test1")
- runSleepingContainer(c, "--name=test2")
-
- //use the new format capabilities to list the names twice
- out, _ := dockerCmd(c, "ps", "--format", "{{.Names}} {{.Names}}")
- lines := strings.Split(strings.TrimSpace(string(out)), "\n")
- lines = RemoveLinesForExistingElements(lines, existingContainers)
- expected := []string{"test2 test2", "test1 test1"}
- var names []string
- names = append(names, lines...)
- c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with names displayed twice: %v, got: %v", expected, names))
-}
-
-func (s *DockerSuite) TestPsDefaultFormatAndQuiet(c *check.C) {
- existingContainers := ExistingContainerIDs(c)
- config := `{
- "psFormat": "default {{ .ID }}"
-}`
- d, err := ioutil.TempDir("", "integration-cli-")
- c.Assert(err, checker.IsNil)
- defer os.RemoveAll(d)
-
- err = ioutil.WriteFile(filepath.Join(d, "config.json"), []byte(config), 0644)
- c.Assert(err, checker.IsNil)
-
- out := runSleepingContainer(c, "--name=test")
- id := strings.TrimSpace(out)
-
- out, _ = dockerCmd(c, "--config", d, "ps", "-q")
- out = RemoveOutputForExistingElements(out, existingContainers)
- c.Assert(id, checker.HasPrefix, strings.TrimSpace(out), check.Commentf("Expected to print only the container id, got %v\n", out))
-}
-
// Test for GitHub issue #12595
func (s *DockerSuite) TestPsImageIDAfterUpdate(c *check.C) {
// TODO: Investigate why this fails on Windows to Windows CI further.
@@ -822,23 +707,6 @@
c.Assert(strings.TrimSpace(string(out)), checker.HasLen, 0)
}
-func (s *DockerSuite) TestPsFormatSize(c *check.C) {
- testRequires(c, DaemonIsLinux)
- runSleepingContainer(c)
-
- out, _ := dockerCmd(c, "ps", "--format", "table {{.Size}}")
- lines := strings.Split(out, "\n")
- c.Assert(lines[1], checker.Not(checker.Equals), "0 B", check.Commentf("Should not display a size of 0 B"))
-
- out, _ = dockerCmd(c, "ps", "--size", "--format", "table {{.Size}}")
- lines = strings.Split(out, "\n")
- c.Assert(lines[0], checker.Equals, "SIZE", check.Commentf("Should only have one size column"))
-
- out, _ = dockerCmd(c, "ps", "--size", "--format", "raw")
- lines = strings.Split(out, "\n")
- c.Assert(lines[8], checker.HasPrefix, "size:", check.Commentf("Size should be appended on a newline"))
-}
-
func (s *DockerSuite) TestPsListContainersFilterNetwork(c *check.C) {
existing := ExistingContainerIDs(c)
@@ -943,20 +811,6 @@
c.Assert(strings.TrimSpace(out), checker.Equals, fmt.Sprintf("%s\n%s", container2, container1))
}
-func (s *DockerSuite) TestPsFilterMissingArgErrorCode(c *check.C) {
- _, errCode, _ := dockerCmdWithError("ps", "--filter")
- c.Assert(errCode, checker.Equals, 125)
-}
-
-// Test case for 30291
-func (s *DockerSuite) TestPsFormatTemplateWithArg(c *check.C) {
- existingContainers := ExistingContainerNames(c)
- runSleepingContainer(c, "-d", "--name", "top", "--label", "some.label=label.foo-bar")
- out, _ := dockerCmd(c, "ps", "--format", `{{.Names}} {{.Label "some.label"}}`)
- out = RemoveOutputForExistingElements(out, existingContainers)
- c.Assert(strings.TrimSpace(out), checker.Equals, "top label.foo-bar")
-}
-
func (s *DockerSuite) TestPsListContainersFilterPorts(c *check.C) {
testRequires(c, DaemonIsLinux)
existingContainers := ExistingContainerIDs(c)
diff --git a/integration-cli/docker_cli_rename_test.go b/integration-cli/docker_cli_rename_test.go
deleted file mode 100644
index e9d6368..0000000
--- a/integration-cli/docker_cli_rename_test.go
+++ /dev/null
@@ -1,127 +0,0 @@
-package main
-
-import (
- "strings"
-
- "github.com/docker/docker/integration-cli/checker"
- "github.com/docker/docker/pkg/stringid"
- "github.com/go-check/check"
- "github.com/gotestyourself/gotestyourself/icmd"
-)
-
-func (s *DockerSuite) TestRenameStoppedContainer(c *check.C) {
- out, _ := dockerCmd(c, "run", "--name", "first_name", "-d", "busybox", "sh")
-
- cleanedContainerID := strings.TrimSpace(out)
- dockerCmd(c, "wait", cleanedContainerID)
-
- name := inspectField(c, cleanedContainerID, "Name")
- newName := "new_name" + stringid.GenerateNonCryptoID()
- dockerCmd(c, "rename", "first_name", newName)
-
- name = inspectField(c, cleanedContainerID, "Name")
- c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container %s", name))
-
-}
-
-func (s *DockerSuite) TestRenameRunningContainer(c *check.C) {
- out, _ := dockerCmd(c, "run", "--name", "first_name", "-d", "busybox", "sh")
-
- newName := "new_name" + stringid.GenerateNonCryptoID()
- cleanedContainerID := strings.TrimSpace(out)
- dockerCmd(c, "rename", "first_name", newName)
-
- name := inspectField(c, cleanedContainerID, "Name")
- c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container %s", name))
-}
-
-func (s *DockerSuite) TestRenameRunningContainerAndReuse(c *check.C) {
- out := runSleepingContainer(c, "--name", "first_name")
- c.Assert(waitRun("first_name"), check.IsNil)
-
- newName := "new_name"
- ContainerID := strings.TrimSpace(out)
- dockerCmd(c, "rename", "first_name", newName)
-
- name := inspectField(c, ContainerID, "Name")
- c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container"))
-
- out = runSleepingContainer(c, "--name", "first_name")
- c.Assert(waitRun("first_name"), check.IsNil)
- newContainerID := strings.TrimSpace(out)
- name = inspectField(c, newContainerID, "Name")
- c.Assert(name, checker.Equals, "/first_name", check.Commentf("Failed to reuse container name"))
-}
-
-func (s *DockerSuite) TestRenameCheckNames(c *check.C) {
- dockerCmd(c, "run", "--name", "first_name", "-d", "busybox", "sh")
-
- newName := "new_name" + stringid.GenerateNonCryptoID()
- dockerCmd(c, "rename", "first_name", newName)
-
- name := inspectField(c, newName, "Name")
- c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container %s", name))
-
- result := dockerCmdWithResult("inspect", "-f={{.Name}}", "--type=container", "first_name")
- result.Assert(c, icmd.Expected{
- ExitCode: 1,
- Err: "No such container: first_name",
- })
-}
-
-// TODO: move to unit test
-func (s *DockerSuite) TestRenameInvalidName(c *check.C) {
- runSleepingContainer(c, "--name", "myname")
-
- out, _, err := dockerCmdWithError("rename", "myname", "new:invalid")
- c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
- c.Assert(out, checker.Contains, "Invalid container name", check.Commentf("%v", err))
-
- out, _ = dockerCmd(c, "ps", "-a")
- c.Assert(out, checker.Contains, "myname", check.Commentf("Output of docker ps should have included 'myname': %s", out))
-}
-
-func (s *DockerSuite) TestRenameAnonymousContainer(c *check.C) {
- testRequires(c, DaemonIsLinux)
-
- dockerCmd(c, "network", "create", "network1")
- out, _ := dockerCmd(c, "create", "-it", "--net", "network1", "busybox", "top")
-
- anonymousContainerID := strings.TrimSpace(out)
-
- dockerCmd(c, "rename", anonymousContainerID, "container1")
- dockerCmd(c, "start", "container1")
-
- count := "-c"
- if testEnv.OSType == "windows" {
- count = "-n"
- }
-
- _, _, err := dockerCmdWithError("run", "--net", "network1", "busybox", "ping", count, "1", "container1")
- c.Assert(err, check.IsNil, check.Commentf("Embedded DNS lookup fails after renaming anonymous container: %v", err))
-}
-
-func (s *DockerSuite) TestRenameContainerWithSameName(c *check.C) {
- out := runSleepingContainer(c, "--name", "old")
- ContainerID := strings.TrimSpace(out)
-
- out, _, err := dockerCmdWithError("rename", "old", "old")
- c.Assert(err, checker.NotNil, check.Commentf("Renaming a container with the same name should have failed"))
- c.Assert(out, checker.Contains, "Renaming a container with the same name", check.Commentf("%v", err))
-
- out, _, err = dockerCmdWithError("rename", ContainerID, "old")
- c.Assert(err, checker.NotNil, check.Commentf("Renaming a container with the same name should have failed"))
- c.Assert(out, checker.Contains, "Renaming a container with the same name", check.Commentf("%v", err))
-}
-
-// Test case for #23973
-func (s *DockerSuite) TestRenameContainerWithLinkedContainer(c *check.C) {
- testRequires(c, DaemonIsLinux)
-
- db1, _ := dockerCmd(c, "run", "--name", "db1", "-d", "busybox", "top")
- dockerCmd(c, "run", "--name", "app1", "-d", "--link", "db1:/mysql", "busybox", "top")
- dockerCmd(c, "rename", "app1", "app2")
- out, _, err := dockerCmdWithError("inspect", "--format={{ .Id }}", "app2/mysql")
- c.Assert(err, checker.IsNil)
- c.Assert(strings.TrimSpace(out), checker.Equals, strings.TrimSpace(db1))
-}
diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go
index bf0cb0d..776f0e5 100644
--- a/integration-cli/docker_cli_run_test.go
+++ b/integration-cli/docker_cli_run_test.go
@@ -2239,14 +2239,7 @@
// alternate to /dev/zero and /dev/stdout.
testRequires(c, DaemonIsLinux)
- // TODO will remove this if issue #35963 fixed
- var args []string
- if runtime.GOARCH == "amd64" {
- args = []string{"run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | catv"}
- } else {
- args = []string{"run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | cat -v"}
- }
-
+ args := []string{"run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | cat -v"}
cont := exec.Command(dockerBinary, args...)
stdout, err := cont.StdoutPipe()
@@ -4002,7 +3995,7 @@
v, err := kernel.GetKernelVersion()
c.Assert(err, checker.IsNil)
build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
- if build >= 16292 { // @jhowardmsft TODO - replace with final RS3 build and ==
+ if build == 16299 {
c.Skip("Temporarily disabled on RS3 builds")
}
}
diff --git a/integration-cli/docker_cli_secret_ls_test.go b/integration-cli/docker_cli_secret_ls_test.go
deleted file mode 100644
index f3201f7..0000000
--- a/integration-cli/docker_cli_secret_ls_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// +build !windows
-
-package main
-
-import (
- "strings"
-
- "github.com/docker/docker/api/types/swarm"
- "github.com/docker/docker/integration-cli/checker"
- "github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestSecretList(c *check.C) {
- d := s.AddDaemon(c, true, true)
-
- testName0 := "test0"
- testName1 := "test1"
-
- // create secret test0
- id0 := d.CreateSecret(c, swarm.SecretSpec{
- Annotations: swarm.Annotations{
- Name: testName0,
- Labels: map[string]string{"type": "test"},
- },
- Data: []byte("TESTINGDATA0"),
- })
- c.Assert(id0, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id0))
-
- secret := d.GetSecret(c, id0)
- c.Assert(secret.Spec.Name, checker.Equals, testName0)
-
- // create secret test1
- id1 := d.CreateSecret(c, swarm.SecretSpec{
- Annotations: swarm.Annotations{
- Name: testName1,
- Labels: map[string]string{"type": "production"},
- },
- Data: []byte("TESTINGDATA1"),
- })
- c.Assert(id1, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id1))
-
- secret = d.GetSecret(c, id1)
- c.Assert(secret.Spec.Name, checker.Equals, testName1)
-
- // test by command `docker secret ls`
- out, err := d.Cmd("secret", "ls")
- c.Assert(err, checker.IsNil, check.Commentf(out))
- c.Assert(strings.TrimSpace(out), checker.Contains, testName0)
- c.Assert(strings.TrimSpace(out), checker.Contains, testName1)
-
- // test filter by name `docker secret ls --filter name=xxx`
- args := []string{
- "secret",
- "ls",
- "--filter",
- "name=test0",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Contains, testName0)
- c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), testName1)
-
- // test filter by id `docker secret ls --filter id=xxx`
- args = []string{
- "secret",
- "ls",
- "--filter",
- "id=" + id1,
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), testName0)
- c.Assert(strings.TrimSpace(out), checker.Contains, testName1)
-
- // test filter by label `docker secret ls --filter label=xxx`
- args = []string{
- "secret",
- "ls",
- "--filter",
- "label=type",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Contains, testName0)
- c.Assert(strings.TrimSpace(out), checker.Contains, testName1)
-
- args = []string{
- "secret",
- "ls",
- "--filter",
- "label=type=test",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Contains, testName0)
- c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), testName1)
-
- args = []string{
- "secret",
- "ls",
- "--filter",
- "label=type=production",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.IsNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), testName0)
- c.Assert(strings.TrimSpace(out), checker.Contains, testName1)
-
- // test invalid filter `docker secret ls --filter noexisttype=xxx`
- args = []string{
- "secret",
- "ls",
- "--filter",
- "noexisttype=test0",
- }
- out, err = d.Cmd(args...)
- c.Assert(err, checker.NotNil, check.Commentf(out))
-
- c.Assert(strings.TrimSpace(out), checker.Contains, "Error response from daemon: Invalid filter 'noexisttype'")
-}
diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go
index 283f576..4a5ec9a 100644
--- a/integration-cli/docker_cli_swarm_test.go
+++ b/integration-cli/docker_cli_swarm_test.go
@@ -4,7 +4,6 @@
import (
"bytes"
- "crypto/x509"
"encoding/json"
"encoding/pem"
"fmt"
@@ -25,6 +24,7 @@
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/ipamapi"
remoteipam "github.com/docker/libnetwork/ipams/remote/api"
+ "github.com/docker/swarmkit/ca/keyutils"
"github.com/go-check/check"
"github.com/gotestyourself/gotestyourself/fs"
"github.com/gotestyourself/gotestyourself/icmd"
@@ -1007,7 +1007,7 @@
return fmt.Errorf("invalid PEM-encoded private key"), nil
}
- return x509.IsEncryptedPEMBlock(keyBlock), nil
+ return keyutils.IsEncryptedPEMBlock(keyBlock), nil
}
}
diff --git a/integration-cli/docker_cli_update_test.go b/integration-cli/docker_cli_update_test.go
deleted file mode 100644
index dce137e..0000000
--- a/integration-cli/docker_cli_update_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package main
-
-import (
- "strings"
- "time"
-
- "github.com/docker/docker/integration-cli/checker"
- "github.com/docker/docker/integration-cli/cli"
- "github.com/go-check/check"
- "github.com/gotestyourself/gotestyourself/icmd"
-)
-
-func (s *DockerSuite) TestUpdateRestartPolicy(c *check.C) {
- out := cli.DockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "sh", "-c", "sleep 1 && false").Combined()
- timeout := 60 * time.Second
- if testEnv.OSType == "windows" {
- timeout = 180 * time.Second
- }
-
- id := strings.TrimSpace(string(out))
-
- // update restart policy to on-failure:5
- cli.DockerCmd(c, "update", "--restart=on-failure:5", id)
-
- cli.WaitExited(c, id, timeout)
-
- count := inspectField(c, id, "RestartCount")
- c.Assert(count, checker.Equals, "5")
-
- maximumRetryCount := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
- c.Assert(maximumRetryCount, checker.Equals, "5")
-}
-
-func (s *DockerSuite) TestUpdateRestartWithAutoRemoveFlag(c *check.C) {
- out := runSleepingContainer(c, "--rm")
- id := strings.TrimSpace(out)
-
- // update restart policy for an AutoRemove container
- cli.Docker(cli.Args("update", "--restart=always", id)).Assert(c, icmd.Expected{
- ExitCode: 1,
- Err: "Restart policy cannot be updated because AutoRemove is enabled for the container",
- })
-}
diff --git a/integration-cli/fixtures/load/frozen.go b/integration-cli/fixtures/load/frozen.go
index 5701a21..7e104fe 100644
--- a/integration-cli/fixtures/load/frozen.go
+++ b/integration-cli/fixtures/load/frozen.go
@@ -37,6 +37,9 @@
if img == "hello-world:frozen" {
srcName = "hello-world:latest"
}
+ if img == "busybox:1.27-glibc" {
+ img = "busybox:latest"
+ }
loadImages = append(loadImages, struct{ srcName, destName string }{
srcName: srcName,
destName: img,
diff --git a/integration-cli/request/request.go b/integration-cli/request/request.go
index e4a1e3e..4e61e09 100644
--- a/integration-cli/request/request.go
+++ b/integration-cli/request/request.go
@@ -1,16 +1,13 @@
package request // import "github.com/docker/docker/integration-cli/request"
import (
- "bufio"
"bytes"
"crypto/tls"
"encoding/json"
- "fmt"
"io"
"io/ioutil"
"net"
"net/http"
- "net/http/httputil"
"net/url"
"os"
"path/filepath"
@@ -95,11 +92,11 @@
// DoOnHost creates and execute a request on the specified host and endpoint, with the specified request modifiers
func DoOnHost(host, endpoint string, modifiers ...func(*http.Request) error) (*http.Response, io.ReadCloser, error) {
- req, err := New(host, endpoint, modifiers...)
+ req, err := newRequest(host, endpoint, modifiers...)
if err != nil {
return nil, nil, err
}
- client, err := NewHTTPClient(host)
+ client, err := newHTTPClient(host)
if err != nil {
return nil, nil, err
}
@@ -114,18 +111,15 @@
return resp, body, err
}
-// New creates a new http Request to the specified host and endpoint, with the specified request modifiers
-func New(host, endpoint string, modifiers ...func(*http.Request) error) (*http.Request, error) {
- _, addr, _, err := dclient.ParseHost(host)
+// newRequest creates a new http Request to the specified host and endpoint, with the specified request modifiers
+func newRequest(host, endpoint string, modifiers ...func(*http.Request) error) (*http.Request, error) {
+ hostUrl, err := dclient.ParseHostURL(host)
if err != nil {
- return nil, err
- }
- if err != nil {
- return nil, errors.Wrapf(err, "could not parse url %q", host)
+ return nil, errors.Wrapf(err, "failed parsing url %q", host)
}
req, err := http.NewRequest("GET", endpoint, nil)
if err != nil {
- return nil, fmt.Errorf("could not create new request: %v", err)
+ return nil, errors.Wrap(err, "failed to create request")
}
if os.Getenv("DOCKER_TLS_VERIFY") != "" {
@@ -133,7 +127,7 @@
} else {
req.URL.Scheme = "http"
}
- req.URL.Host = addr
+ req.URL.Host = hostUrl.Host
for _, config := range modifiers {
if err := config(req); err != nil {
@@ -143,15 +137,16 @@
return req, nil
}
-// NewHTTPClient creates an http client for the specific host
-func NewHTTPClient(host string) (*http.Client, error) {
+// newHTTPClient creates an http client for the specific host
+// TODO: Share more code with client.defaultHTTPClient
+func newHTTPClient(host string) (*http.Client, error) {
// FIXME(vdemeester) 10*time.Second timeout of SockRequest… ?
- proto, addr, _, err := dclient.ParseHost(host)
+ hostUrl, err := dclient.ParseHostURL(host)
if err != nil {
return nil, err
}
transport := new(http.Transport)
- if proto == "tcp" && os.Getenv("DOCKER_TLS_VERIFY") != "" {
+ if hostUrl.Scheme == "tcp" && os.Getenv("DOCKER_TLS_VERIFY") != "" {
// Setup the socket TLS configuration.
tlsConfig, err := getTLSConfig()
if err != nil {
@@ -160,102 +155,22 @@
transport = &http.Transport{TLSClientConfig: tlsConfig}
}
transport.DisableKeepAlives = true
- err = sockets.ConfigureTransport(transport, proto, addr)
- return &http.Client{
- Transport: transport,
- }, err
+ err = sockets.ConfigureTransport(transport, hostUrl.Scheme, hostUrl.Host)
+ return &http.Client{Transport: transport}, err
}
// NewClient returns a new Docker API client
+// Deprecated: Use Execution.APIClient()
func NewClient() (dclient.APIClient, error) {
return dclient.NewClientWithOpts(dclient.WithHost(DaemonHost()))
}
-// FIXME(vdemeester) httputil.ClientConn is deprecated, use http.Client instead (closer to actual client)
-// Deprecated: Use New instead of NewRequestClient
-// Deprecated: use request.Do (or Get, Delete, Post) instead
-func newRequestClient(method, endpoint string, data io.Reader, ct, daemon string, modifiers ...func(*http.Request)) (*http.Request, *httputil.ClientConn, error) {
- c, err := SockConn(time.Duration(10*time.Second), daemon)
- if err != nil {
- return nil, nil, fmt.Errorf("could not dial docker daemon: %v", err)
- }
-
- client := httputil.NewClientConn(c, nil)
-
- req, err := http.NewRequest(method, endpoint, data)
- if err != nil {
- client.Close()
- return nil, nil, fmt.Errorf("could not create new request: %v", err)
- }
-
- for _, opt := range modifiers {
- opt(req)
- }
-
- if ct != "" {
- req.Header.Set("Content-Type", ct)
- }
- return req, client, nil
-}
-
-// SockRequest create a request against the specified host (with method, endpoint and other request modifier) and
-// returns the status code, and the content as an byte slice
-// Deprecated: use request.Do instead
-func SockRequest(method, endpoint string, data interface{}, daemon string, modifiers ...func(*http.Request)) (int, []byte, error) {
- jsonData := bytes.NewBuffer(nil)
- if err := json.NewEncoder(jsonData).Encode(data); err != nil {
- return -1, nil, err
- }
-
- res, body, err := SockRequestRaw(method, endpoint, jsonData, "application/json", daemon, modifiers...)
- if err != nil {
- return -1, nil, err
- }
- b, err := ReadBody(body)
- return res.StatusCode, b, err
-}
-
// ReadBody read the specified ReadCloser content and returns it
func ReadBody(b io.ReadCloser) ([]byte, error) {
defer b.Close()
return ioutil.ReadAll(b)
}
-// SockRequestRaw create a request against the specified host (with method, endpoint and other request modifier) and
-// returns the http response, the output as a io.ReadCloser
-// Deprecated: use request.Do (or Get, Delete, Post) instead
-func SockRequestRaw(method, endpoint string, data io.Reader, ct, daemon string, modifiers ...func(*http.Request)) (*http.Response, io.ReadCloser, error) {
- req, client, err := newRequestClient(method, endpoint, data, ct, daemon, modifiers...)
- if err != nil {
- return nil, nil, err
- }
-
- resp, err := client.Do(req)
- if err != nil {
- client.Close()
- return resp, nil, err
- }
- body := ioutils.NewReadCloserWrapper(resp.Body, func() error {
- defer resp.Body.Close()
- return client.Close()
- })
-
- return resp, body, err
-}
-
-// SockRequestHijack creates a connection to specified host (with method, contenttype, …) and returns a hijacked connection
-// and the output as a `bufio.Reader`
-func SockRequestHijack(method, endpoint string, data io.Reader, ct string, daemon string, modifiers ...func(*http.Request)) (net.Conn, *bufio.Reader, error) {
- req, client, err := newRequestClient(method, endpoint, data, ct, daemon, modifiers...)
- if err != nil {
- return nil, nil, err
- }
-
- client.Do(req)
- conn, br := client.Hijack()
- return conn, br, nil
-}
-
// SockConn opens a connection on the specified socket
func SockConn(timeout time.Duration, daemon string) (net.Conn, error) {
daemonURL, err := url.Parse(daemon)
diff --git a/integration-cli/trust_server_test.go b/integration-cli/trust_server_test.go
index 19abe87..f312083 100644
--- a/integration-cli/trust_server_test.go
+++ b/integration-cli/trust_server_test.go
@@ -17,7 +17,6 @@
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/fixtures/plugin"
- "github.com/docker/docker/integration-cli/request"
"github.com/docker/go-connections/tlsconfig"
"github.com/go-check/check"
"github.com/gotestyourself/gotestyourself/icmd"
@@ -230,11 +229,10 @@
func (s *DockerTrustSuite) setupTrustedplugin(c *check.C, source, name string) string {
repoName := fmt.Sprintf("%v/dockercli/%s:latest", privateRegistryURL, name)
- client, err := request.NewClient()
- c.Assert(err, checker.IsNil, check.Commentf("could not create test client"))
+ client := testEnv.APIClient()
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
- err = plugin.Create(ctx, client, repoName)
+ err := plugin.Create(ctx, client, repoName)
cancel()
c.Assert(err, checker.IsNil, check.Commentf("could not create test plugin"))
diff --git a/integration/build/build_test.go b/integration/build/build_test.go
index 6b936ba..3f7b1dc 100644
--- a/integration/build/build_test.go
+++ b/integration/build/build_test.go
@@ -13,7 +13,7 @@
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/integration-cli/cli/build/fakecontext"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -244,6 +244,75 @@
assert.Contains(t, image.Config.Env, "bar=baz")
}
+// #35403 #36122
+func TestBuildUncleanTarFilenames(t *testing.T) {
+ ctx := context.TODO()
+ defer setupTest(t)()
+
+ dockerfile := `FROM scratch
+COPY foo /
+FROM scratch
+COPY bar /`
+
+ buf := bytes.NewBuffer(nil)
+ w := tar.NewWriter(buf)
+ writeTarRecord(t, w, "Dockerfile", dockerfile)
+ writeTarRecord(t, w, "../foo", "foocontents0")
+ writeTarRecord(t, w, "/bar", "barcontents0")
+ err := w.Close()
+ require.NoError(t, err)
+
+ apiclient := testEnv.APIClient()
+ resp, err := apiclient.ImageBuild(ctx,
+ buf,
+ types.ImageBuildOptions{
+ Remove: true,
+ ForceRemove: true,
+ })
+
+ out := bytes.NewBuffer(nil)
+ require.NoError(t, err)
+ _, err = io.Copy(out, resp.Body)
+ resp.Body.Close()
+ require.NoError(t, err)
+
+ // repeat with changed data should not cause cache hits
+
+ buf = bytes.NewBuffer(nil)
+ w = tar.NewWriter(buf)
+ writeTarRecord(t, w, "Dockerfile", dockerfile)
+ writeTarRecord(t, w, "../foo", "foocontents1")
+ writeTarRecord(t, w, "/bar", "barcontents1")
+ err = w.Close()
+ require.NoError(t, err)
+
+ resp, err = apiclient.ImageBuild(ctx,
+ buf,
+ types.ImageBuildOptions{
+ Remove: true,
+ ForceRemove: true,
+ })
+
+ out = bytes.NewBuffer(nil)
+ require.NoError(t, err)
+ _, err = io.Copy(out, resp.Body)
+ resp.Body.Close()
+ require.NoError(t, err)
+ require.NotContains(t, out.String(), "Using cache")
+}
+
+func writeTarRecord(t *testing.T, w *tar.Writer, fn, contents string) {
+ err := w.WriteHeader(&tar.Header{
+ Name: fn,
+ Mode: 0600,
+ Size: int64(len(contents)),
+ Typeflag: '0',
+ })
+ require.NoError(t, err)
+ _, err = w.Write([]byte(contents))
+ require.NoError(t, err)
+}
+
type buildLine struct {
Stream string
Aux struct {
diff --git a/integration/config/config_test.go b/integration/config/config_test.go
new file mode 100644
index 0000000..c152be5
--- /dev/null
+++ b/integration/config/config_test.go
@@ -0,0 +1,329 @@
+package config
+
+import (
+ "bytes"
+ "sort"
+ "testing"
+ "time"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/filters"
+ swarmtypes "github.com/docker/docker/api/types/swarm"
+ "github.com/docker/docker/client"
+ "github.com/docker/docker/integration/internal/swarm"
+ "github.com/docker/docker/internal/testutil"
+ "github.com/docker/docker/pkg/stdcopy"
+ "github.com/gotestyourself/gotestyourself/skip"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "golang.org/x/net/context"
+)
+
+func TestConfigList(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+ client, err := client.NewClientWithOpts(client.WithHost((d.Sock())))
+ require.NoError(t, err)
+
+ ctx := context.Background()
+
+ // This test case is ported from the original TestConfigsEmptyList
+ configs, err := client.ConfigList(ctx, types.ConfigListOptions{})
+ require.NoError(t, err)
+ assert.Equal(t, len(configs), 0)
+
+ testName0 := "test0"
+ testName1 := "test1"
+ testNames := []string{testName0, testName1}
+ sort.Strings(testNames)
+
+ // create config test0
+ createConfig(ctx, t, client, testName0, []byte("TESTINGDATA0"), map[string]string{"type": "test"})
+
+ config1ID := createConfig(ctx, t, client, testName1, []byte("TESTINGDATA1"), map[string]string{"type": "production"})
+
+ names := func(entries []swarmtypes.Config) []string {
+ values := []string{}
+ for _, entry := range entries {
+ values = append(values, entry.Spec.Name)
+ }
+ sort.Strings(values)
+ return values
+ }
+
+ // test by `config ls`
+ entries, err := client.ConfigList(ctx, types.ConfigListOptions{})
+ require.NoError(t, err)
+ assert.Equal(t, names(entries), testNames)
+
+ testCases := []struct {
+ filters filters.Args
+ expected []string
+ }{
+ // test filter by name `config ls --filter name=xxx`
+ {
+ filters: filters.NewArgs(filters.Arg("name", testName0)),
+ expected: []string{testName0},
+ },
+ // test filter by id `config ls --filter id=xxx`
+ {
+ filters: filters.NewArgs(filters.Arg("id", config1ID)),
+ expected: []string{testName1},
+ },
+ // test filter by label `config ls --filter label=xxx`
+ {
+ filters: filters.NewArgs(filters.Arg("label", "type")),
+ expected: testNames,
+ },
+ {
+ filters: filters.NewArgs(filters.Arg("label", "type=test")),
+ expected: []string{testName0},
+ },
+ {
+ filters: filters.NewArgs(filters.Arg("label", "type=production")),
+ expected: []string{testName1},
+ },
+ }
+ for _, tc := range testCases {
+ entries, err = client.ConfigList(ctx, types.ConfigListOptions{
+ Filters: tc.filters,
+ })
+ require.NoError(t, err)
+ assert.Equal(t, names(entries), tc.expected)
+
+ }
+}
+
+func createConfig(ctx context.Context, t *testing.T, client client.APIClient, name string, data []byte, labels map[string]string) string {
+ config, err := client.ConfigCreate(ctx, swarmtypes.ConfigSpec{
+ Annotations: swarmtypes.Annotations{
+ Name: name,
+ Labels: labels,
+ },
+ Data: data,
+ })
+ require.NoError(t, err)
+ assert.NotEqual(t, config.ID, "")
+ return config.ID
+}
+
+func TestConfigsCreateAndDelete(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+ client, err := client.NewClientWithOpts(client.WithHost((d.Sock())))
+ require.NoError(t, err)
+
+ ctx := context.Background()
+
+ testName := "test_config"
+
+ // This test case is ported from the original TestConfigsCreate
+ configID := createConfig(ctx, t, client, testName, []byte("TESTINGDATA"), nil)
+
+ insp, _, err := client.ConfigInspectWithRaw(ctx, configID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.Spec.Name, testName)
+
+ // This test case is ported from the original TestConfigsDelete
+ err = client.ConfigRemove(ctx, configID)
+ require.NoError(t, err)
+
+ insp, _, err = client.ConfigInspectWithRaw(ctx, configID)
+ testutil.ErrorContains(t, err, "No such config")
+}
+
+func TestConfigsUpdate(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+ client, err := client.NewClientWithOpts(client.WithHost((d.Sock())))
+ require.NoError(t, err)
+
+ ctx := context.Background()
+
+ testName := "test_config"
+
+ // This test case is ported from the original TestConfigsCreate
+ configID := createConfig(ctx, t, client, testName, []byte("TESTINGDATA"), nil)
+
+ insp, _, err := client.ConfigInspectWithRaw(ctx, configID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.ID, configID)
+
+ // test UpdateConfig with full ID
+ insp.Spec.Labels = map[string]string{"test": "test1"}
+ err = client.ConfigUpdate(ctx, configID, insp.Version, insp.Spec)
+ require.NoError(t, err)
+
+ insp, _, err = client.ConfigInspectWithRaw(ctx, configID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.Spec.Labels["test"], "test1")
+
+ // test UpdateConfig with full name
+ insp.Spec.Labels = map[string]string{"test": "test2"}
+ err = client.ConfigUpdate(ctx, testName, insp.Version, insp.Spec)
+ require.NoError(t, err)
+
+ insp, _, err = client.ConfigInspectWithRaw(ctx, configID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.Spec.Labels["test"], "test2")
+
+ // test UpdateConfig with prefix ID
+ insp.Spec.Labels = map[string]string{"test": "test3"}
+ err = client.ConfigUpdate(ctx, configID[:1], insp.Version, insp.Spec)
+ require.NoError(t, err)
+
+ insp, _, err = client.ConfigInspectWithRaw(ctx, configID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.Spec.Labels["test"], "test3")
+
+ // test UpdateConfig in updating Data which is not supported in daemon
+ // this test will produce an error in func UpdateConfig
+ insp.Spec.Data = []byte("TESTINGDATA2")
+ err = client.ConfigUpdate(ctx, configID, insp.Version, insp.Spec)
+ testutil.ErrorContains(t, err, "only updates to Labels are allowed")
+}
+
+func TestTemplatedConfig(t *testing.T) {
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+
+ ctx := context.Background()
+ client := swarm.GetClient(t, d)
+
+ referencedSecretSpec := swarmtypes.SecretSpec{
+ Annotations: swarmtypes.Annotations{
+ Name: "referencedsecret",
+ },
+ Data: []byte("this is a secret"),
+ }
+ referencedSecret, err := client.SecretCreate(ctx, referencedSecretSpec)
+ assert.NoError(t, err)
+
+ referencedConfigSpec := swarmtypes.ConfigSpec{
+ Annotations: swarmtypes.Annotations{
+ Name: "referencedconfig",
+ },
+ Data: []byte("this is a config"),
+ }
+ referencedConfig, err := client.ConfigCreate(ctx, referencedConfigSpec)
+ assert.NoError(t, err)
+
+ configSpec := swarmtypes.ConfigSpec{
+ Annotations: swarmtypes.Annotations{
+ Name: "templated_config",
+ },
+ Templating: &swarmtypes.Driver{
+ Name: "golang",
+ },
+ Data: []byte("SERVICE_NAME={{.Service.Name}}\n" +
+ "{{secret \"referencedsecrettarget\"}}\n" +
+ "{{config \"referencedconfigtarget\"}}\n"),
+ }
+
+ templatedConfig, err := client.ConfigCreate(ctx, configSpec)
+ assert.NoError(t, err)
+
+ serviceID := swarm.CreateService(t, d,
+ swarm.ServiceWithConfig(
+ &swarmtypes.ConfigReference{
+ File: &swarmtypes.ConfigReferenceFileTarget{
+ Name: "/templated_config",
+ UID: "0",
+ GID: "0",
+ Mode: 0600,
+ },
+ ConfigID: templatedConfig.ID,
+ ConfigName: "templated_config",
+ },
+ ),
+ swarm.ServiceWithConfig(
+ &swarmtypes.ConfigReference{
+ File: &swarmtypes.ConfigReferenceFileTarget{
+ Name: "referencedconfigtarget",
+ UID: "0",
+ GID: "0",
+ Mode: 0600,
+ },
+ ConfigID: referencedConfig.ID,
+ ConfigName: "referencedconfig",
+ },
+ ),
+ swarm.ServiceWithSecret(
+ &swarmtypes.SecretReference{
+ File: &swarmtypes.SecretReferenceFileTarget{
+ Name: "referencedsecrettarget",
+ UID: "0",
+ GID: "0",
+ Mode: 0600,
+ },
+ SecretID: referencedSecret.ID,
+ SecretName: "referencedsecret",
+ },
+ ),
+ swarm.ServiceWithName("svc"),
+ )
+
+ var tasks []swarmtypes.Task
+ waitAndAssert(t, 60*time.Second, func(t *testing.T) bool {
+ tasks = swarm.GetRunningTasks(t, d, serviceID)
+ return len(tasks) > 0
+ })
+
+ task := tasks[0]
+ waitAndAssert(t, 60*time.Second, func(t *testing.T) bool {
+ if task.NodeID == "" || (task.Status.ContainerStatus == nil || task.Status.ContainerStatus.ContainerID == "") {
+ task, _, _ = client.TaskInspectWithRaw(context.Background(), task.ID)
+ }
+ return task.NodeID != "" && task.Status.ContainerStatus != nil && task.Status.ContainerStatus.ContainerID != ""
+ })
+
+ attach := swarm.ExecTask(t, d, task, types.ExecConfig{
+ Cmd: []string{"/bin/cat", "/templated_config"},
+ AttachStdout: true,
+ AttachStderr: true,
+ })
+
+ expect := "SERVICE_NAME=svc\n" +
+ "this is a secret\n" +
+ "this is a config\n"
+ assertAttachedStream(t, attach, expect)
+
+ attach = swarm.ExecTask(t, d, task, types.ExecConfig{
+ Cmd: []string{"mount"},
+ AttachStdout: true,
+ AttachStderr: true,
+ })
+ assertAttachedStream(t, attach, "tmpfs on /templated_config type tmpfs")
+}
+
+func assertAttachedStream(t *testing.T, attach types.HijackedResponse, expect string) {
+ buf := bytes.NewBuffer(nil)
+ _, err := stdcopy.StdCopy(buf, buf, attach.Reader)
+ require.NoError(t, err)
+ assert.Contains(t, buf.String(), expect)
+}
+
+func waitAndAssert(t *testing.T, timeout time.Duration, f func(*testing.T) bool) {
+ t.Helper()
+ after := time.After(timeout)
+ for {
+ select {
+ case <-after:
+ t.Fatalf("timed out waiting for condition")
+ default:
+ }
+ if f(t) {
+ return
+ }
+ time.Sleep(100 * time.Millisecond)
+ }
+}
diff --git a/integration/config/main_test.go b/integration/config/main_test.go
new file mode 100644
index 0000000..32df97d
--- /dev/null
+++ b/integration/config/main_test.go
@@ -0,0 +1,33 @@
+package config
+
+import (
+ "fmt"
+ "os"
+ "testing"
+
+ "github.com/docker/docker/internal/test/environment"
+)
+
+var testEnv *environment.Execution
+
+func TestMain(m *testing.M) {
+ var err error
+ testEnv, err = environment.New()
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
+ err = environment.EnsureFrozenImagesLinux(testEnv)
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
+
+ testEnv.Print()
+ os.Exit(m.Run())
+}
+
+func setupTest(t *testing.T) func() {
+ environment.ProtectAll(t, testEnv)
+ return func() { testEnv.Clean(t) }
+}
diff --git a/integration/container/create_test.go b/integration/container/create_test.go
index ace9070..5bacd01 100644
--- a/integration/container/create_test.go
+++ b/integration/container/create_test.go
@@ -7,7 +7,7 @@
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/internal/testutil"
"github.com/gotestyourself/gotestyourself/skip"
)
diff --git a/integration/container/daemon_linux_test.go b/integration/container/daemon_linux_test.go
new file mode 100644
index 0000000..872c7ab
--- /dev/null
+++ b/integration/container/daemon_linux_test.go
@@ -0,0 +1,84 @@
+package container
+
+import (
+ "context"
+ "fmt"
+ "io/ioutil"
+ "strconv"
+ "strings"
+ "testing"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/integration-cli/daemon"
+ "github.com/stretchr/testify/assert"
+ "golang.org/x/sys/unix"
+)
+
+// This is a regression test for #36145
+// It ensures that a container can be started when the daemon was improperly
+// shutdown when the daemon is brought back up.
+//
+// The regression is due to improper error handling preventing a container from
+// being restored and as such have the resources cleaned up.
+//
+// To test this, we need to kill dockerd, then kill both the containerd-shim and
+// the container process, then start dockerd back up and attempt to start the
+// container again.
+func TestContainerStartOnDaemonRestart(t *testing.T) {
+ t.Parallel()
+
+ d := daemon.New(t, "", "dockerd", daemon.Config{})
+ d.StartWithBusybox(t, "--iptables=false")
+ defer d.Stop(t)
+
+ client, err := d.NewClient()
+ assert.NoError(t, err, "error creating client")
+
+ ctx := context.Background()
+ c, err := client.ContainerCreate(ctx,
+ &container.Config{
+ Image: "busybox",
+ Cmd: []string{"top"},
+ },
+ nil,
+ nil,
+ "",
+ )
+ assert.NoError(t, err, "error creating test container")
+ defer client.ContainerRemove(ctx, c.ID, types.ContainerRemoveOptions{Force: true})
+
+ err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
+ assert.NoError(t, err, "error starting test container")
+
+ inspect, err := client.ContainerInspect(ctx, c.ID)
+ assert.NoError(t, err, "error getting inspect data")
+
+ ppid := getContainerdShimPid(t, inspect)
+
+ err = d.Kill()
+ assert.NoError(t, err, "failed to kill test daemon")
+
+ err = unix.Kill(inspect.State.Pid, unix.SIGKILL)
+ assert.NoError(t, err, "failed to kill container process")
+
+ err = unix.Kill(ppid, unix.SIGKILL)
+ assert.NoError(t, err, "failed to kill containerd-shim")
+
+ d.Start(t, "--iptables=false")
+
+ err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
+ assert.NoError(t, err, "failed to start test container")
+}
+
+func getContainerdShimPid(t *testing.T, c types.ContainerJSON) int {
+ statB, err := ioutil.ReadFile(fmt.Sprintf("/proc/%d/stat", c.State.Pid))
+ assert.NoError(t, err, "error looking up containerd-shim pid")
+
+ // ppid is the 4th entry in `/proc/pid/stat`
+ ppid, err := strconv.Atoi(strings.Fields(string(statB))[3])
+ assert.NoError(t, err, "error converting ppid field to int")
+
+ assert.NotEqual(t, ppid, 1, "got unexpected ppid")
+ return ppid
+}
diff --git a/integration/container/diff_test.go b/integration/container/diff_test.go
new file mode 100644
index 0000000..63ac19e
--- /dev/null
+++ b/integration/container/diff_test.go
@@ -0,0 +1,98 @@
+package container // import "github.com/docker/docker/integration/container"
+
+import (
+ "context"
+ "testing"
+ "time"
+
+ containertypes "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
+ "github.com/docker/docker/pkg/archive"
+ "github.com/gotestyourself/gotestyourself/poll"
+ "github.com/gotestyourself/gotestyourself/skip"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+// ensure that an added file shows up in docker diff
+func TestDiffFilenameShownInOutput(t *testing.T) {
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
+
+ // Wait for it to exit as cannot diff a running container on Windows, and
+ // it will take a few seconds to exit. Also there's no way in Windows to
+ // differentiate between an Add or a Modify, and all files are under
+ // a "Files/" prefix.
+ lookingFor := containertypes.ContainerChangeResponseItem{Kind: archive.ChangeAdd, Path: "/foo/bar"}
+ if testEnv.OSType == "windows" {
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(60*time.Second))
+ lookingFor = containertypes.ContainerChangeResponseItem{Kind: archive.ChangeModify, Path: "Files/foo/bar"}
+ }
+
+ items, err := client.ContainerDiff(ctx, cID)
+ require.NoError(t, err)
+ assert.Contains(t, items, lookingFor)
+}
+
+// test to ensure GH #3840 doesn't occur any more
+func TestDiffEnsureInitLayerFilesAreIgnored(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ // this is a list of files which shouldn't show up in `docker diff`
+ initLayerFiles := []string{"/etc/resolv.conf", "/etc/hostname", "/etc/hosts", "/.dockerenv"}
+ containerCount := 5
+
+ // we might not run into this problem from the first run, so start a few containers
+ for i := 0; i < containerCount; i++ {
+ cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", `echo foo > /root/bar`))
+
+ items, err := client.ContainerDiff(ctx, cID)
+ require.NoError(t, err)
+ for _, item := range items {
+ assert.NotContains(t, initLayerFiles, item.Path)
+ }
+ }
+}
+
+func TestDiffEnsureDefaultDevs(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ cID := container.Run(t, ctx, client, container.WithCmd("sleep", "0"))
+
+ items, err := client.ContainerDiff(ctx, cID)
+ require.NoError(t, err)
+
+ expected := []containertypes.ContainerChangeResponseItem{
+ {Kind: archive.ChangeModify, Path: "/dev"},
+ {Kind: archive.ChangeAdd, Path: "/dev/full"}, // busybox
+ {Kind: archive.ChangeModify, Path: "/dev/ptmx"}, // libcontainer
+ {Kind: archive.ChangeAdd, Path: "/dev/mqueue"},
+ {Kind: archive.ChangeAdd, Path: "/dev/kmsg"},
+ {Kind: archive.ChangeAdd, Path: "/dev/fd"},
+ {Kind: archive.ChangeAdd, Path: "/dev/ptmx"},
+ {Kind: archive.ChangeAdd, Path: "/dev/null"},
+ {Kind: archive.ChangeAdd, Path: "/dev/random"},
+ {Kind: archive.ChangeAdd, Path: "/dev/stdout"},
+ {Kind: archive.ChangeAdd, Path: "/dev/stderr"},
+ {Kind: archive.ChangeAdd, Path: "/dev/tty1"},
+ {Kind: archive.ChangeAdd, Path: "/dev/stdin"},
+ {Kind: archive.ChangeAdd, Path: "/dev/tty"},
+ {Kind: archive.ChangeAdd, Path: "/dev/urandom"},
+ }
+
+ for _, item := range items {
+ assert.Contains(t, expected, item)
+ }
+}
diff --git a/integration/container/exec_test.go b/integration/container/exec_test.go
index 589f0ab..0683567 100644
--- a/integration/container/exec_test.go
+++ b/integration/container/exec_test.go
@@ -6,10 +6,9 @@
"testing"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/require"
)
@@ -18,22 +17,9 @@
ctx := context.Background()
client := request.NewAPIClient(t)
- container, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Tty: true,
- WorkingDir: "/root",
- Cmd: strslice.StrSlice([]string{"top"}),
- },
- &container.HostConfig{},
- &network.NetworkingConfig{},
- "foo",
- )
- require.NoError(t, err)
- err = client.ContainerStart(ctx, container.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/root"))
- id, err := client.ContainerExecCreate(ctx, container.ID,
+ id, err := client.ContainerExecCreate(ctx, cID,
types.ExecConfig{
WorkingDir: "/tmp",
Env: strslice.StrSlice([]string{"FOO=BAR"}),
diff --git a/integration/container/health_test.go b/integration/container/health_test.go
index 6185174..651cb2b 100644
--- a/integration/container/health_test.go
+++ b/integration/container/health_test.go
@@ -6,13 +6,11 @@
"time"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/network"
- "github.com/docker/docker/api/types/strslice"
+ containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/poll"
- "github.com/stretchr/testify/require"
)
// TestHealthCheckWorkdir verifies that health-checks inherit the containers'
@@ -22,27 +20,15 @@
ctx := context.Background()
client := request.NewAPIClient(t)
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Tty: true,
- WorkingDir: "/foo",
- Cmd: strslice.StrSlice([]string{"top"}),
- Healthcheck: &container.HealthConfig{
- Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
- Interval: 50 * time.Millisecond,
- Retries: 3,
- },
- },
- &container.HostConfig{},
- &network.NetworkingConfig{},
- "healthtest",
- )
- require.NoError(t, err)
- err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ cID := container.Run(t, ctx, client, container.WithTty(true), container.WithWorkingDir("/foo"), func(c *container.TestContainerConfig) {
+ c.Config.Healthcheck = &containertypes.HealthConfig{
+ Test: []string{"CMD-SHELL", "if [ \"$PWD\" = \"/foo\" ]; then exit 0; else exit 1; fi;"},
+ Interval: 50 * time.Millisecond,
+ Retries: 3,
+ }
+ })
- poll.WaitOn(t, pollForHealthStatus(ctx, client, c.ID, types.Healthy), poll.WithDelay(100*time.Millisecond))
+ poll.WaitOn(t, pollForHealthStatus(ctx, client, cID, types.Healthy), poll.WithDelay(100*time.Millisecond))
}
func pollForHealthStatus(ctx context.Context, client client.APIClient, containerID string, healthStatus string) func(log poll.LogT) poll.Result {
diff --git a/integration/container/inspect_test.go b/integration/container/inspect_test.go
new file mode 100644
index 0000000..5ecd287
--- /dev/null
+++ b/integration/container/inspect_test.go
@@ -0,0 +1,48 @@
+package container // import "github.com/docker/docker/integration/container"
+
+import (
+ "context"
+ "encoding/json"
+ "testing"
+ "time"
+
+ "github.com/docker/docker/client"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
+ "github.com/gotestyourself/gotestyourself/poll"
+ "github.com/gotestyourself/gotestyourself/skip"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestInspectCpusetInConfigPre120(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux" || !testEnv.DaemonInfo.CPUSet)
+
+ defer setupTest(t)()
+ client := request.NewAPIClient(t, client.WithVersion("1.19"))
+ ctx := context.Background()
+
+ name := "cpusetinconfig-pre120"
+ // Create container with up to-date-API
+ container.Run(t, ctx, request.NewAPIClient(t), container.WithName(name),
+ container.WithCmd("true"),
+ func(c *container.TestContainerConfig) {
+ c.HostConfig.Resources.CpusetCpus = "0"
+ },
+ )
+ poll.WaitOn(t, containerIsInState(ctx, client, name, "exited"), poll.WithDelay(100*time.Millisecond))
+
+ _, body, err := client.ContainerInspectWithRaw(ctx, name, false)
+ require.NoError(t, err)
+
+ var inspectJSON map[string]interface{}
+ err = json.Unmarshal(body, &inspectJSON)
+ require.NoError(t, err, "unable to unmarshal body for version 1.19: %s", err)
+
+ config, ok := inspectJSON["Config"]
+ assert.Equal(t, ok, true, "Unable to find 'Config'")
+
+ cfg := config.(map[string]interface{})
+ _, ok = cfg["Cpuset"]
+ assert.Equal(t, ok, true, "API version 1.19 expected to include Cpuset in 'Config'")
+}
diff --git a/integration/container/kill_test.go b/integration/container/kill_test.go
index 5734394..d399213 100644
--- a/integration/container/kill_test.go
+++ b/integration/container/kill_test.go
@@ -5,14 +5,13 @@
"testing"
"time"
- "github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/network"
- "github.com/docker/docker/api/types/strslice"
+ containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip"
+ "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -20,25 +19,15 @@
defer setupTest(t)()
client := request.NewAPIClient(t)
ctx := context.Background()
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Cmd: strslice.StrSlice([]string{"top"}),
- },
- &container.HostConfig{},
- &network.NetworkingConfig{},
- "")
- require.NoError(t, err)
- err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ id := container.Run(t, ctx, client)
- err = client.ContainerKill(ctx, c.ID, "0")
+ err := client.ContainerKill(ctx, id, "0")
require.EqualError(t, err, "Error response from daemon: Invalid signal: 0")
- poll.WaitOn(t, containerIsInState(ctx, client, c.ID, "running"), poll.WithDelay(100*time.Millisecond))
+ poll.WaitOn(t, containerIsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
- err = client.ContainerKill(ctx, c.ID, "SIG42")
+ err = client.ContainerKill(ctx, id, "SIG42")
require.EqualError(t, err, "Error response from daemon: Invalid signal: SIG42")
- poll.WaitOn(t, containerIsInState(ctx, client, c.ID, "running"), poll.WithDelay(100*time.Millisecond))
+ poll.WaitOn(t, containerIsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
}
func TestKillContainer(t *testing.T) {
@@ -71,21 +60,11 @@
tc := tc
t.Run(tc.doc, func(t *testing.T) {
ctx := context.Background()
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Cmd: strslice.StrSlice([]string{"top"}),
- },
- &container.HostConfig{},
- &network.NetworkingConfig{},
- "")
- require.NoError(t, err)
- err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
- err = client.ContainerKill(ctx, c.ID, tc.signal)
+ id := container.Run(t, ctx, client)
+ err := client.ContainerKill(ctx, id, tc.signal)
require.NoError(t, err)
- poll.WaitOn(t, containerIsInState(ctx, client, c.ID, tc.status), poll.WithDelay(100*time.Millisecond))
+ poll.WaitOn(t, containerIsInState(ctx, client, id, tc.status), poll.WithDelay(100*time.Millisecond))
})
}
}
@@ -116,25 +95,16 @@
tc := tc
t.Run(tc.doc, func(t *testing.T) {
ctx := context.Background()
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Cmd: strslice.StrSlice([]string{"top"}),
- StopSignal: tc.stopsignal,
- },
- &container.HostConfig{
- RestartPolicy: container.RestartPolicy{
- Name: "always",
- }},
- &network.NetworkingConfig{},
- "")
- require.NoError(t, err)
- err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
- err = client.ContainerKill(ctx, c.ID, "TERM")
+ id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
+ c.Config.StopSignal = tc.stopsignal
+ c.HostConfig.RestartPolicy = containertypes.RestartPolicy{
+ Name: "always",
+ }
+ })
+ err := client.ContainerKill(ctx, id, "TERM")
require.NoError(t, err)
- poll.WaitOn(t, containerIsInState(ctx, client, c.ID, tc.status), poll.WithDelay(100*time.Millisecond))
+ poll.WaitOn(t, containerIsInState(ctx, client, id, tc.status), poll.WithDelay(100*time.Millisecond))
})
}
}
@@ -144,16 +114,8 @@
defer setupTest(t)()
ctx := context.Background()
client := request.NewAPIClient(t)
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Cmd: strslice.StrSlice([]string{"top"}),
- },
- &container.HostConfig{},
- &network.NetworkingConfig{},
- "")
- require.NoError(t, err)
- err = client.ContainerKill(ctx, c.ID, "SIGKILL")
+ id := container.Create(t, ctx, client)
+ err := client.ContainerKill(ctx, id, "SIGKILL")
require.Error(t, err)
require.Contains(t, err.Error(), "is not running")
}
@@ -163,15 +125,61 @@
defer setupTest(t)()
ctx := context.Background()
client := request.NewAPIClient(t, client.WithVersion("1.19"))
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Cmd: strslice.StrSlice([]string{"top"}),
- },
- &container.HostConfig{},
- &network.NetworkingConfig{},
- "")
+ id := container.Create(t, ctx, client)
+ err := client.ContainerKill(ctx, id, "SIGKILL")
require.NoError(t, err)
- err = client.ContainerKill(ctx, c.ID, "SIGKILL")
+}
+
+func TestKillDifferentUserContainer(t *testing.T) {
+ // TODO Windows: Windows does not yet support -u (Feb 2016).
+ skip.If(t, testEnv.OSType != "linux", "User containers (container.Config.User) are not yet supported on %q platform", testEnv.OSType)
+
+ defer setupTest(t)()
+ ctx := context.Background()
+ client := request.NewAPIClient(t, client.WithVersion("1.19"))
+
+ id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
+ c.Config.User = "daemon"
+ })
+ poll.WaitOn(t, containerIsInState(ctx, client, id, "running"), poll.WithDelay(100*time.Millisecond))
+
+ err := client.ContainerKill(ctx, id, "SIGKILL")
require.NoError(t, err)
+ poll.WaitOn(t, containerIsInState(ctx, client, id, "exited"), poll.WithDelay(100*time.Millisecond))
+}
+
+func TestInspectOomKilledTrue(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux" || !testEnv.DaemonInfo.MemoryLimit || !testEnv.DaemonInfo.SwapLimit)
+
+ defer setupTest(t)()
+ ctx := context.Background()
+ client := request.NewAPIClient(t)
+
+ name := "testoomkilled"
+ cID := container.Run(t, ctx, client, container.WithName(name), container.WithCmd("sh", "-c", "x=a; while true; do x=$x$x$x$x; done"), func(c *container.TestContainerConfig) {
+ c.HostConfig.Resources.Memory = 32 * 1024 * 1024
+ })
+
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))
+
+ inspect, err := client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.State.OOMKilled, true)
+}
+
+func TestInspectOomKilledFalse(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux" || !testEnv.DaemonInfo.MemoryLimit || !testEnv.DaemonInfo.SwapLimit)
+
+ defer setupTest(t)()
+ ctx := context.Background()
+ client := request.NewAPIClient(t)
+
+ name := "testoomkilled"
+ cID := container.Run(t, ctx, client, container.WithName(name), container.WithCmd("sh", "-c", "echo hello world"))
+
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))
+
+ inspect, err := client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.State.OOMKilled, false)
}
diff --git a/integration/container/links_linux_test.go b/integration/container/links_linux_test.go
index 4959689..e2e0b9d 100644
--- a/integration/container/links_linux_test.go
+++ b/integration/container/links_linux_test.go
@@ -9,8 +9,9 @@
"time"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/api/types/filters"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/pkg/stdcopy"
"github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip"
@@ -28,24 +29,11 @@
client := request.NewAPIClient(t)
ctx := context.Background()
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Cmd: []string{"cat", "/etc/hosts"},
- },
- &container.HostConfig{
- NetworkMode: "host",
- },
- nil,
- "")
- require.NoError(t, err)
+ cID := container.Run(t, ctx, client, container.WithCmd("cat", "/etc/hosts"), container.WithNetworkMode("host"))
- err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ poll.WaitOn(t, containerIsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))
- poll.WaitOn(t, containerIsStopped(ctx, client, c.ID), poll.WithDelay(100*time.Millisecond))
-
- body, err := client.ContainerLogs(ctx, c.ID, types.ContainerLogsOptions{
+ body, err := client.ContainerLogs(ctx, cID, types.ContainerLogsOptions{
ShowStdout: true,
})
require.NoError(t, err)
@@ -57,3 +45,23 @@
assert.Equal(t, string(hosts), b.String())
}
+
+func TestLinksContainerNames(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ container.Run(t, ctx, client, container.WithName("first"))
+ container.Run(t, ctx, client, container.WithName("second"), container.WithLinks("first:first"))
+
+ f := filters.NewArgs(filters.Arg("name", "first"))
+
+ containers, err := client.ContainerList(ctx, types.ContainerListOptions{
+ Filters: f,
+ })
+ require.NoError(t, err)
+ assert.Equal(t, 1, len(containers))
+ assert.Equal(t, []string{"/first", "/second/first"}, containers[0].Names)
+}
diff --git a/integration/container/logs_test.go b/integration/container/logs_test.go
new file mode 100644
index 0000000..1157da1
--- /dev/null
+++ b/integration/container/logs_test.go
@@ -0,0 +1,33 @@
+package container
+
+import (
+ "context"
+ "io/ioutil"
+ "testing"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
+ "github.com/docker/docker/pkg/stdcopy"
+ "github.com/stretchr/testify/assert"
+)
+
+// Regression test for #35370
+// Makes sure that when following we don't get an EOF error when there are no logs
+func TestLogsFollowTailEmpty(t *testing.T) {
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
+ defer client.ContainerRemove(ctx, id, types.ContainerRemoveOptions{Force: true})
+
+ logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
+ if logs != nil {
+ defer logs.Close()
+ }
+ assert.NoError(t, err)
+
+ _, err = stdcopy.StdCopy(ioutil.Discard, ioutil.Discard, logs)
+ assert.NoError(t, err)
+}
diff --git a/integration/container/main_test.go b/integration/container/main_test.go
index bc482ce..fb87fdd 100644
--- a/integration/container/main_test.go
+++ b/integration/container/main_test.go
@@ -1,17 +1,11 @@
package container // import "github.com/docker/docker/integration/container"
import (
- "context"
"fmt"
"os"
"testing"
- "github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/network"
- "github.com/docker/docker/client"
"github.com/docker/docker/internal/test/environment"
- "github.com/stretchr/testify/require"
)
var testEnv *environment.Execution
@@ -37,32 +31,3 @@
environment.ProtectAll(t, testEnv)
return func() { testEnv.Clean(t) }
}
-
-type containerConstructor func(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig)
-
-func createSimpleContainer(ctx context.Context, t *testing.T, client client.APIClient, name string, f ...containerConstructor) string {
- config := &container.Config{
- Cmd: []string{"top"},
- Image: "busybox",
- }
- hostConfig := &container.HostConfig{}
- networkingConfig := &network.NetworkingConfig{}
-
- for _, fn := range f {
- fn(config, hostConfig, networkingConfig)
- }
-
- c, err := client.ContainerCreate(ctx, config, hostConfig, networkingConfig, name)
- require.NoError(t, err)
-
- return c.ID
-}
-
-func runSimpleContainer(ctx context.Context, t *testing.T, client client.APIClient, name string, f ...containerConstructor) string {
- cID := createSimpleContainer(ctx, t, client, name, f...)
-
- err := client.ContainerStart(ctx, cID, types.ContainerStartOptions{})
- require.NoError(t, err)
-
- return cID
-}
diff --git a/integration/container/mounts_linux_test.go b/integration/container/mounts_linux_test.go
index 9f4288d..ceec706 100644
--- a/integration/container/mounts_linux_test.go
+++ b/integration/container/mounts_linux_test.go
@@ -4,6 +4,7 @@
"bytes"
"context"
"fmt"
+ "path/filepath"
"testing"
"github.com/docker/docker/api/types"
@@ -12,6 +13,7 @@
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"github.com/docker/docker/integration-cli/daemon"
+ "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/pkg/system"
"github.com/gotestyourself/gotestyourself/fs"
@@ -51,10 +53,10 @@
hc := container.HostConfig{
Mounts: []mount.Mount{
{
- Type: mount.TypeBind,
- Source: d.Root,
- Target: "/testdaemonroot",
- BindOptions: &mount.BindOptions{Propagation: mount.PropagationRPrivate}},
+ Type: mount.TypeBind,
+ Source: d.Root,
+ Target: "/testdaemonroot",
+ },
},
}
cfg.Cmd = []string{"/bin/sh", "-c", fmt.Sprintf("mount | grep testdaemonroot | grep containers | grep %s", ctr.ID)}
@@ -136,8 +138,143 @@
err = cli.ContainerStart(ctx, ctrCreate.ID, types.ContainerStartOptions{})
require.NoError(t, err)
- // check that host-located bind mount network file did not change ownership when the container was started
+ // Check that host-located bind mount network file did not change ownership when the container was started
+ // Note: If the user specifies a mountpath from the host, we should not be
+ // attempting to chown files outside the daemon's metadata directory
+ // (represented by `daemon.repository` at init time).
+ // This forces users who want to use user namespaces to handle the
+ // ownership needs of any external files mounted as network files
+ // (/etc/resolv.conf, /etc/hosts, /etc/hostname) separately from the
+ // daemon. In all other volume/bind mount situations we have taken this
+ // same line--we don't chown host file content.
+ // See GitHub PR 34224 for details.
statT, err := system.Stat(tmpNWFileMount)
require.NoError(t, err)
assert.Equal(t, uint32(0), statT.UID(), "bind mounted network file should not change ownership from root")
}
+
+func TestMountDaemonRoot(t *testing.T) {
+ t.Parallel()
+
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+ info, err := client.Info(ctx)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ for _, test := range []struct {
+ desc string
+ propagation mount.Propagation
+ expected mount.Propagation
+ }{
+ {
+ desc: "default",
+ propagation: "",
+ expected: mount.PropagationRSlave,
+ },
+ {
+ desc: "private",
+ propagation: mount.PropagationPrivate,
+ },
+ {
+ desc: "rprivate",
+ propagation: mount.PropagationRPrivate,
+ },
+ {
+ desc: "slave",
+ propagation: mount.PropagationSlave,
+ },
+ {
+ desc: "rslave",
+ propagation: mount.PropagationRSlave,
+ expected: mount.PropagationRSlave,
+ },
+ {
+ desc: "shared",
+ propagation: mount.PropagationShared,
+ },
+ {
+ desc: "rshared",
+ propagation: mount.PropagationRShared,
+ expected: mount.PropagationRShared,
+ },
+ } {
+ t.Run(test.desc, func(t *testing.T) {
+ test := test
+ t.Parallel()
+
+ propagationSpec := fmt.Sprintf(":%s", test.propagation)
+ if test.propagation == "" {
+ propagationSpec = ""
+ }
+ bindSpecRoot := info.DockerRootDir + ":" + "/foo" + propagationSpec
+ bindSpecSub := filepath.Join(info.DockerRootDir, "containers") + ":/foo" + propagationSpec
+
+ for name, hc := range map[string]*container.HostConfig{
+ "bind root": {Binds: []string{bindSpecRoot}},
+ "bind subpath": {Binds: []string{bindSpecSub}},
+ "mount root": {
+ Mounts: []mount.Mount{
+ {
+ Type: mount.TypeBind,
+ Source: info.DockerRootDir,
+ Target: "/foo",
+ BindOptions: &mount.BindOptions{Propagation: test.propagation},
+ },
+ },
+ },
+ "mount subpath": {
+ Mounts: []mount.Mount{
+ {
+ Type: mount.TypeBind,
+ Source: filepath.Join(info.DockerRootDir, "containers"),
+ Target: "/foo",
+ BindOptions: &mount.BindOptions{Propagation: test.propagation},
+ },
+ },
+ },
+ } {
+ t.Run(name, func(t *testing.T) {
+ hc := hc
+ t.Parallel()
+
+ c, err := client.ContainerCreate(ctx, &container.Config{
+ Image: "busybox",
+ Cmd: []string{"true"},
+ }, hc, nil, "")
+
+ if err != nil {
+ if test.expected != "" {
+ t.Fatal(err)
+ }
+ // expected an error, so this is ok and should not continue
+ return
+ }
+ if test.expected == "" {
+ t.Fatal("expected create to fail")
+ }
+
+ defer func() {
+ if err := client.ContainerRemove(ctx, c.ID, types.ContainerRemoveOptions{Force: true}); err != nil {
+ panic(err)
+ }
+ }()
+
+ inspect, err := client.ContainerInspect(ctx, c.ID)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if len(inspect.Mounts) != 1 {
+ t.Fatalf("unexpected number of mounts: %+v", inspect.Mounts)
+ }
+
+ m := inspect.Mounts[0]
+ if m.Propagation != test.expected {
+ t.Fatalf("got unexpected propagation mode, expected %q, got: %v", test.expected, m.Propagation)
+ }
+ })
+ }
+ })
+ }
+}
diff --git a/integration/container/nat_test.go b/integration/container/nat_test.go
index 5ac838a..df3451f 100644
--- a/integration/container/nat_test.go
+++ b/integration/container/nat_test.go
@@ -12,9 +12,8 @@
"time"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/network"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/docker/go-connections/nat"
"github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip"
@@ -67,25 +66,12 @@
client := request.NewAPIClient(t)
ctx := context.Background()
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Cmd: []string{"sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())},
- Tty: true,
- },
- &container.HostConfig{
- NetworkMode: "container:server",
- },
- nil,
- "")
- require.NoError(t, err)
- err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String())), container.WithTty(true), container.WithNetworkMode("container:server"))
- poll.WaitOn(t, containerIsStopped(ctx, client, c.ID), poll.WithDelay(100*time.Millisecond))
+ poll.WaitOn(t, containerIsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))
- body, err := client.ContainerLogs(ctx, c.ID, types.ContainerLogsOptions{
+ body, err := client.ContainerLogs(ctx, cID, types.ContainerLogsOptions{
ShowStdout: true,
})
require.NoError(t, err)
@@ -102,34 +88,19 @@
client := request.NewAPIClient(t)
ctx := context.Background()
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Cmd: []string{"sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)},
- ExposedPorts: map[nat.Port]struct{}{
- nat.Port(fmt.Sprintf("%d/tcp", port)): {},
- },
- },
- &container.HostConfig{
- PortBindings: nat.PortMap{
- nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
- {
- HostPort: fmt.Sprintf("%d", port),
- },
+ cID := container.Run(t, ctx, client, container.WithName("server"), container.WithCmd("sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port)), container.WithExposedPorts(fmt.Sprintf("%d/tcp", port)), func(c *container.TestContainerConfig) {
+ c.HostConfig.PortBindings = nat.PortMap{
+ nat.Port(fmt.Sprintf("%d/tcp", port)): []nat.PortBinding{
+ {
+ HostPort: fmt.Sprintf("%d", port),
},
},
- },
- &network.NetworkingConfig{},
- "server",
- )
- require.NoError(t, err)
+ }
+ })
- err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
- poll.WaitOn(t, containerIsInState(ctx, client, c.ID, "running"), poll.WithDelay(100*time.Millisecond))
-
- return c.ID
+ return cID
}
func getExternalAddress(t *testing.T) net.IP {
diff --git a/integration/container/pause_test.go b/integration/container/pause_test.go
new file mode 100644
index 0000000..4e64357
--- /dev/null
+++ b/integration/container/pause_test.go
@@ -0,0 +1,98 @@
+package container // import "github.com/docker/docker/integration/container"
+
+import (
+ "context"
+ "io"
+ "testing"
+ "time"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/events"
+ "github.com/docker/docker/api/types/filters"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
+ "github.com/docker/docker/internal/testutil"
+ "github.com/gotestyourself/gotestyourself/poll"
+ "github.com/gotestyourself/gotestyourself/skip"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestPause(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType == "windows" && testEnv.DaemonInfo.Isolation == "process")
+
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ name := "testeventpause"
+ cID := container.Run(t, ctx, client, container.WithName(name))
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ since := request.DaemonUnixTime(ctx, t, client, testEnv)
+
+ err := client.ContainerPause(ctx, name)
+ require.NoError(t, err)
+
+ inspect, err := client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.State.Paused, true)
+
+ err = client.ContainerUnpause(ctx, name)
+ require.NoError(t, err)
+
+ until := request.DaemonUnixTime(ctx, t, client, testEnv)
+
+ messages, errs := client.Events(ctx, types.EventsOptions{
+ Since: since,
+ Until: until,
+ Filters: filters.NewArgs(filters.Arg("container", name)),
+ })
+ assert.Equal(t, getEventActions(t, messages, errs), []string{"pause", "unpause"})
+}
+
+func TestPauseFailsOnWindowsServerContainers(t *testing.T) {
+ skip.If(t, (testEnv.DaemonInfo.OSType != "windows" || testEnv.DaemonInfo.Isolation != "process"))
+
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ cID := container.Run(t, ctx, client)
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ err := client.ContainerPause(ctx, cID)
+ testutil.ErrorContains(t, err, "cannot pause Windows Server Containers")
+}
+
+func TestPauseStopPausedContainer(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ cID := container.Run(t, ctx, client)
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ err := client.ContainerPause(ctx, cID)
+ require.NoError(t, err)
+
+ err = client.ContainerStop(ctx, cID, nil)
+ require.NoError(t, err)
+
+ poll.WaitOn(t, containerIsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))
+}
+
+func getEventActions(t *testing.T, messages <-chan events.Message, errs <-chan error) []string {
+ actions := []string{}
+ for {
+ select {
+ case err := <-errs:
+ assert.Equal(t, err == nil || err == io.EOF, true)
+ return actions
+ case e := <-messages:
+ actions = append(actions, e.Status)
+ }
+ }
+}
diff --git a/integration/container/ps_test.go b/integration/container/ps_test.go
index 24113e5..dfcb0e2 100644
--- a/integration/container/ps_test.go
+++ b/integration/container/ps_test.go
@@ -8,7 +8,7 @@
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/network"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/integration/container/rename_test.go b/integration/container/rename_test.go
index 9d223b5..da2bed1 100644
--- a/integration/container/rename_test.go
+++ b/integration/container/rename_test.go
@@ -3,11 +3,16 @@
import (
"context"
"testing"
+ "time"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
+ "github.com/docker/docker/internal/testutil"
+ "github.com/docker/docker/pkg/stringid"
+ "github.com/gotestyourself/gotestyourself/poll"
+ "github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -21,25 +26,171 @@
ctx := context.Background()
client := request.NewAPIClient(t)
- aID := runSimpleContainer(ctx, t, client, "a0")
-
- bID := runSimpleContainer(ctx, t, client, "b0", func(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig) {
- hostConfig.Links = []string{"a0"}
- })
+ aID := container.Run(t, ctx, client, container.WithName("a0"))
+ bID := container.Run(t, ctx, client, container.WithName("b0"), container.WithLinks("a0"))
err := client.ContainerRename(ctx, aID, "a1")
require.NoError(t, err)
- runSimpleContainer(ctx, t, client, "a0")
+ container.Run(t, ctx, client, container.WithName("a0"))
err = client.ContainerRemove(ctx, bID, types.ContainerRemoveOptions{Force: true})
require.NoError(t, err)
- bID = runSimpleContainer(ctx, t, client, "b0", func(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig) {
- hostConfig.Links = []string{"a0"}
- })
+ bID = container.Run(t, ctx, client, container.WithName("b0"), container.WithLinks("a0"))
inspect, err := client.ContainerInspect(ctx, bID)
require.NoError(t, err)
assert.Equal(t, []string{"/a0:/b0/a0"}, inspect.HostConfig.Links)
}
+
+func TestRenameStoppedContainer(t *testing.T) {
+ defer setupTest(t)()
+ ctx := context.Background()
+ client := request.NewAPIClient(t)
+
+ oldName := "first_name"
+ cID := container.Run(t, ctx, client, container.WithName(oldName), container.WithCmd("sh"))
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))
+
+ inspect, err := client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.Name, "/"+oldName)
+
+ newName := "new_name" + stringid.GenerateNonCryptoID()
+ err = client.ContainerRename(ctx, oldName, newName)
+ require.NoError(t, err)
+
+ inspect, err = client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.Name, "/"+newName)
+}
+
+func TestRenameRunningContainerAndReuse(t *testing.T) {
+ defer setupTest(t)()
+ ctx := context.Background()
+ client := request.NewAPIClient(t)
+
+ oldName := "first_name"
+ cID := container.Run(t, ctx, client, container.WithName(oldName))
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ newName := "new_name" + stringid.GenerateNonCryptoID()
+ err := client.ContainerRename(ctx, oldName, newName)
+ require.NoError(t, err)
+
+ inspect, err := client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.Name, "/"+newName)
+
+ _, err = client.ContainerInspect(ctx, oldName)
+ testutil.ErrorContains(t, err, "No such container: "+oldName)
+
+ cID = container.Run(t, ctx, client, container.WithName(oldName))
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ inspect, err = client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.Name, "/"+oldName)
+}
+
+func TestRenameInvalidName(t *testing.T) {
+ defer setupTest(t)()
+ ctx := context.Background()
+ client := request.NewAPIClient(t)
+
+ oldName := "first_name"
+ cID := container.Run(t, ctx, client, container.WithName(oldName))
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ err := client.ContainerRename(ctx, oldName, "new:invalid")
+ testutil.ErrorContains(t, err, "Invalid container name")
+
+ inspect, err := client.ContainerInspect(ctx, oldName)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.ID, cID)
+}
+
+// Test case for GitHub issue 22466
+// Docker's service discovery works for named containers so
+// ping to a named container should work, and an anonymous
+// container without a name does not work with service discovery.
+// However, an anonymous could be renamed to a named container.
+// This test is to make sure once the container has been renamed,
+// the service discovery for the (re)named container works.
+func TestRenameAnonymousContainer(t *testing.T) {
+ defer setupTest(t)()
+ ctx := context.Background()
+ client := request.NewAPIClient(t)
+
+ _, err := client.NetworkCreate(ctx, "network1", types.NetworkCreate{})
+ require.NoError(t, err)
+ cID := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
+ c.NetworkingConfig.EndpointsConfig = map[string]*network.EndpointSettings{
+ "network1": {},
+ }
+ c.HostConfig.NetworkMode = "network1"
+ })
+ err = client.ContainerRename(ctx, cID, "container1")
+ require.NoError(t, err)
+ err = client.ContainerStart(ctx, "container1", types.ContainerStartOptions{})
+ require.NoError(t, err)
+
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ count := "-c"
+ if testEnv.OSType == "windows" {
+ count = "-n"
+ }
+ cID = container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
+ c.NetworkingConfig.EndpointsConfig = map[string]*network.EndpointSettings{
+ "network1": {},
+ }
+ c.HostConfig.NetworkMode = "network1"
+ }, container.WithCmd("ping", count, "1", "container1"))
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))
+
+ inspect, err := client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.State.ExitCode, 0)
+}
+
+// TODO: should be a unit test
+func TestRenameContainerWithSameName(t *testing.T) {
+ defer setupTest(t)()
+ ctx := context.Background()
+ client := request.NewAPIClient(t)
+
+ cID := container.Run(t, ctx, client, container.WithName("old"))
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+ err := client.ContainerRename(ctx, "old", "old")
+ testutil.ErrorContains(t, err, "Renaming a container with the same name")
+ err = client.ContainerRename(ctx, cID, "old")
+ testutil.ErrorContains(t, err, "Renaming a container with the same name")
+}
+
+// Test case for GitHub issue 23973
+// When a container is being renamed, the container might
+// be linked to another container. In that case, the meta data
+// of the linked container should be updated so that the other
+// container could still reference to the container that is renamed.
+func TestRenameContainerWithLinkedContainer(t *testing.T) {
+ skip.If(t, !testEnv.IsLocalDaemon())
+
+ defer setupTest(t)()
+ ctx := context.Background()
+ client := request.NewAPIClient(t)
+
+ db1ID := container.Run(t, ctx, client, container.WithName("db1"))
+ poll.WaitOn(t, containerIsInState(ctx, client, db1ID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ app1ID := container.Run(t, ctx, client, container.WithName("app1"), container.WithLinks("db1:/mysql"))
+ poll.WaitOn(t, containerIsInState(ctx, client, app1ID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ err := client.ContainerRename(ctx, "app1", "app2")
+ require.NoError(t, err)
+
+ inspect, err := client.ContainerInspect(ctx, "app2/mysql")
+ require.NoError(t, err)
+ assert.Equal(t, inspect.ID, db1ID)
+}
diff --git a/integration/container/resize_test.go b/integration/container/resize_test.go
index b1422f8..0ada5c3 100644
--- a/integration/container/resize_test.go
+++ b/integration/container/resize_test.go
@@ -7,10 +7,9 @@
"time"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/network"
req "github.com/docker/docker/integration-cli/request"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/internal/testutil"
"github.com/gotestyourself/gotestyourself/poll"
"github.com/stretchr/testify/assert"
@@ -22,7 +21,7 @@
client := request.NewAPIClient(t)
ctx := context.Background()
- cID := runSimpleContainer(ctx, t, client, "")
+ cID := container.Run(t, ctx, client)
poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
@@ -38,7 +37,7 @@
client := request.NewAPIClient(t)
ctx := context.Background()
- cID := runSimpleContainer(ctx, t, client, "")
+ cID := container.Run(t, ctx, client)
poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
@@ -53,9 +52,7 @@
client := request.NewAPIClient(t)
ctx := context.Background()
- cID := runSimpleContainer(ctx, t, client, "", func(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig) {
- config.Cmd = []string{"echo"}
- })
+ cID := container.Run(t, ctx, client, container.WithCmd("echo"))
poll.WaitOn(t, containerIsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond))
diff --git a/integration/container/stats_test.go b/integration/container/stats_test.go
index f06407e..fdf85f4 100644
--- a/integration/container/stats_test.go
+++ b/integration/container/stats_test.go
@@ -8,9 +8,8 @@
"time"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/network"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert"
@@ -27,23 +26,11 @@
info, err := client.Info(ctx)
require.NoError(t, err)
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Cmd: []string{"top"},
- Image: "busybox",
- },
- &container.HostConfig{},
- &network.NetworkingConfig{},
- "",
- )
- require.NoError(t, err)
+ cID := container.Run(t, ctx, client)
- err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
- poll.WaitOn(t, containerIsInState(ctx, client, c.ID, "running"), poll.WithDelay(100*time.Millisecond))
-
- resp, err := client.ContainerStats(context.Background(), c.ID, false)
+ resp, err := client.ContainerStats(ctx, cID, false)
require.NoError(t, err)
defer resp.Body.Close()
diff --git a/integration/container/stop_test.go b/integration/container/stop_test.go
index a66e70f..305596a 100644
--- a/integration/container/stop_test.go
+++ b/integration/container/stop_test.go
@@ -8,10 +8,9 @@
"time"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/icmd"
"github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip"
@@ -25,23 +24,9 @@
names := []string{"verifyRestart1", "verifyRestart2"}
for _, name := range names {
- resp, err := client.ContainerCreate(ctx,
- &container.Config{
- Cmd: []string{"false"},
- Image: "busybox",
- },
- &container.HostConfig{
- RestartPolicy: container.RestartPolicy{
- Name: "always",
- },
- },
- &network.NetworkingConfig{},
- name,
- )
- require.NoError(t, err)
-
- err = client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ container.Run(t, ctx, client, container.WithName(name), container.WithCmd("false"), func(c *container.TestContainerConfig) {
+ c.HostConfig.RestartPolicy.Name = "always"
+ })
}
for _, name := range names {
@@ -65,25 +50,13 @@
client := request.NewAPIClient(t)
ctx := context.Background()
- foo, err := client.ContainerCreate(ctx,
- &container.Config{
- Cmd: []string{"echo"},
- Image: "busybox",
- },
- &container.HostConfig{},
- &network.NetworkingConfig{},
- "foo",
- )
- require.NoError(t, err)
+ id := container.Run(t, ctx, client, container.WithName("foo"), container.WithCmd("echo"))
- err = client.ContainerStart(ctx, foo.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ poll.WaitOn(t, containerIsStopped(ctx, client, id), poll.WithDelay(100*time.Millisecond))
- inspect, err := client.ContainerInspect(ctx, foo.ID)
+ inspect, err := client.ContainerInspect(ctx, id)
require.NoError(t, err)
- poll.WaitOn(t, containerIsStopped(ctx, client, foo.ID), poll.WithDelay(100*time.Millisecond))
-
deviceID := inspect.GraphDriver.Data["DeviceId"]
// Find pool name from device name
@@ -94,7 +67,7 @@
result := icmd.RunCommand("dmsetup", "message", devicePool, "0", fmt.Sprintf("delete %s", deviceID))
result.Assert(t, icmd.Success)
- err = client.ContainerRemove(ctx, foo.ID, types.ContainerRemoveOptions{})
+ err = client.ContainerRemove(ctx, id, types.ContainerRemoveOptions{})
require.NoError(t, err)
}
diff --git a/integration/container/update_linux_test.go b/integration/container/update_linux_test.go
index d1238e7..9028f30 100644
--- a/integration/container/update_linux_test.go
+++ b/integration/container/update_linux_test.go
@@ -1,21 +1,15 @@
package container // import "github.com/docker/docker/integration/container"
import (
- "bytes"
"context"
- "fmt"
- "io/ioutil"
"strconv"
"strings"
"testing"
"time"
- "github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/strslice"
- "github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/request"
- "github.com/docker/docker/pkg/stdcopy"
+ containertypes "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert"
@@ -31,70 +25,55 @@
client := request.NewAPIClient(t)
ctx := context.Background()
- c, err := client.ContainerCreate(ctx,
- &container.Config{
- Cmd: []string{"top"},
- Image: "busybox",
- },
- &container.HostConfig{
- Resources: container.Resources{
- Memory: 200 * 1024 * 1024,
- },
- },
- nil,
- "",
+ cID := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
+ c.HostConfig.Resources = containertypes.Resources{
+ Memory: 200 * 1024 * 1024,
+ }
+ })
+
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
+
+ const (
+ setMemory int64 = 314572800
+ setMemorySwap int64 = 524288000
)
- require.NoError(t, err)
- err = client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
-
- poll.WaitOn(t, containerIsInState(ctx, client, c.ID, "running"), poll.WithDelay(100*time.Millisecond))
-
- _, err = client.ContainerUpdate(ctx, c.ID, container.UpdateConfig{
- Resources: container.Resources{
- Memory: 314572800,
- MemorySwap: 524288000,
+ _, err := client.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
+ Resources: containertypes.Resources{
+ Memory: setMemory,
+ MemorySwap: setMemorySwap,
},
})
require.NoError(t, err)
- inspect, err := client.ContainerInspect(ctx, c.ID)
+ inspect, err := client.ContainerInspect(ctx, cID)
require.NoError(t, err)
- assert.Equal(t, inspect.HostConfig.Memory, int64(314572800))
- assert.Equal(t, inspect.HostConfig.MemorySwap, int64(524288000))
+ assert.Equal(t, setMemory, inspect.HostConfig.Memory)
+ assert.Equal(t, setMemorySwap, inspect.HostConfig.MemorySwap)
- body, err := getContainerSysFSValue(ctx, client, c.ID, "/sys/fs/cgroup/memory/memory.limit_in_bytes")
+ res, err := container.Exec(ctx, client, cID,
+ []string{"cat", "/sys/fs/cgroup/memory/memory.limit_in_bytes"})
require.NoError(t, err)
- assert.Equal(t, strings.TrimSpace(body), "314572800")
+ require.Empty(t, res.Stderr())
+ require.Equal(t, 0, res.ExitCode)
+ assert.Equal(t, strconv.FormatInt(setMemory, 10), strings.TrimSpace(res.Stdout()))
- body, err = getContainerSysFSValue(ctx, client, c.ID, "/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes")
+ res, err = container.Exec(ctx, client, cID,
+ []string{"cat", "/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes"})
require.NoError(t, err)
- assert.Equal(t, strings.TrimSpace(body), "524288000")
+ require.Empty(t, res.Stderr())
+ require.Equal(t, 0, res.ExitCode)
+ assert.Equal(t, strconv.FormatInt(setMemorySwap, 10), strings.TrimSpace(res.Stdout()))
}
-func TestUpdateCPUQUota(t *testing.T) {
+func TestUpdateCPUQuota(t *testing.T) {
t.Parallel()
+ defer setupTest(t)()
client := request.NewAPIClient(t)
ctx := context.Background()
- c, err := client.ContainerCreate(ctx, &container.Config{
- Image: "busybox",
- Cmd: []string{"top"},
- }, nil, nil, "")
- if err != nil {
- t.Fatal(err)
- }
- defer func() {
- if err := client.ContainerRemove(ctx, c.ID, types.ContainerRemoveOptions{Force: true}); err != nil {
- panic(fmt.Sprintf("failed to clean up after test: %v", err))
- }
- }()
-
- if err := client.ContainerStart(ctx, c.ID, types.ContainerStartOptions{}); err != nil {
- t.Fatal(err)
- }
+ cID := container.Run(t, ctx, client)
for _, test := range []struct {
desc string
@@ -105,92 +84,24 @@
{desc: "a lower value", update: 10000},
{desc: "unset value", update: -1},
} {
- if _, err := client.ContainerUpdate(ctx, c.ID, container.UpdateConfig{
- Resources: container.Resources{
+ if _, err := client.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
+ Resources: containertypes.Resources{
CPUQuota: test.update,
},
}); err != nil {
t.Fatal(err)
}
- inspect, err := client.ContainerInspect(ctx, c.ID)
- if err != nil {
- t.Fatal(err)
- }
+ inspect, err := client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, test.update, inspect.HostConfig.CPUQuota)
- if inspect.HostConfig.CPUQuota != test.update {
- t.Fatalf("quota not updated in the API, expected %d, got: %d", test.update, inspect.HostConfig.CPUQuota)
- }
+ res, err := container.Exec(ctx, client, cID,
+ []string{"/bin/cat", "/sys/fs/cgroup/cpu/cpu.cfs_quota_us"})
+ require.NoError(t, err)
+ require.Empty(t, res.Stderr())
+ require.Equal(t, 0, res.ExitCode)
- execCreate, err := client.ContainerExecCreate(ctx, c.ID, types.ExecConfig{
- Cmd: []string{"/bin/cat", "/sys/fs/cgroup/cpu/cpu.cfs_quota_us"},
- AttachStdout: true,
- AttachStderr: true,
- })
- if err != nil {
- t.Fatal(err)
- }
-
- attach, err := client.ContainerExecAttach(ctx, execCreate.ID, types.ExecStartCheck{})
- if err != nil {
- t.Fatal(err)
- }
-
- if err := client.ContainerExecStart(ctx, execCreate.ID, types.ExecStartCheck{}); err != nil {
- t.Fatal(err)
- }
-
- buf := bytes.NewBuffer(nil)
- ready := make(chan error)
-
- go func() {
- _, err := stdcopy.StdCopy(buf, buf, attach.Reader)
- ready <- err
- }()
-
- select {
- case <-time.After(60 * time.Second):
- t.Fatal("timeout waiting for exec to complete")
- case err := <-ready:
- if err != nil {
- t.Fatal(err)
- }
- }
-
- actual := strings.TrimSpace(buf.String())
- if actual != strconv.Itoa(int(test.update)) {
- t.Fatalf("expected cgroup value %d, got: %s", test.update, actual)
- }
+ assert.Equal(t, strconv.FormatInt(test.update, 10), strings.TrimSpace(res.Stdout()))
}
-
-}
-
-func getContainerSysFSValue(ctx context.Context, client client.APIClient, cID string, path string) (string, error) {
- var b bytes.Buffer
-
- ex, err := client.ContainerExecCreate(ctx, cID,
- types.ExecConfig{
- AttachStdout: true,
- Cmd: strslice.StrSlice([]string{"cat", path}),
- },
- )
- if err != nil {
- return "", err
- }
-
- resp, err := client.ContainerExecAttach(ctx, ex.ID,
- types.ExecStartCheck{
- Detach: false,
- Tty: false,
- },
- )
- if err != nil {
- return "", err
- }
-
- defer resp.Close()
-
- b.Reset()
- _, err = stdcopy.StdCopy(&b, ioutil.Discard, resp.Reader)
- return b.String(), err
}
diff --git a/integration/container/update_test.go b/integration/container/update_test.go
new file mode 100644
index 0000000..aee9580
--- /dev/null
+++ b/integration/container/update_test.go
@@ -0,0 +1,65 @@
+package container // import "github.com/docker/docker/integration/container"
+
+import (
+ "context"
+ "testing"
+ "time"
+
+ containertypes "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
+ "github.com/docker/docker/internal/testutil"
+ "github.com/gotestyourself/gotestyourself/poll"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestUpdateRestartPolicy(t *testing.T) {
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ cID := container.Run(t, ctx, client, container.WithCmd("sh", "-c", "sleep 1 && false"), func(c *container.TestContainerConfig) {
+ c.HostConfig.RestartPolicy = containertypes.RestartPolicy{
+ Name: "on-failure",
+ MaximumRetryCount: 3,
+ }
+ })
+
+ _, err := client.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
+ RestartPolicy: containertypes.RestartPolicy{
+ Name: "on-failure",
+ MaximumRetryCount: 5,
+ },
+ })
+ require.NoError(t, err)
+
+ timeout := 60 * time.Second
+ if testEnv.OSType == "windows" {
+ timeout = 180 * time.Second
+ }
+
+ poll.WaitOn(t, containerIsInState(ctx, client, cID, "exited"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(timeout))
+
+ inspect, err := client.ContainerInspect(ctx, cID)
+ require.NoError(t, err)
+ assert.Equal(t, inspect.RestartCount, 5)
+ assert.Equal(t, inspect.HostConfig.RestartPolicy.MaximumRetryCount, 5)
+}
+
+func TestUpdateRestartWithAutoRemove(t *testing.T) {
+ defer setupTest(t)()
+ client := request.NewAPIClient(t)
+ ctx := context.Background()
+
+ cID := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
+ c.HostConfig.AutoRemove = true
+ })
+
+ _, err := client.ContainerUpdate(ctx, cID, containertypes.UpdateConfig{
+ RestartPolicy: containertypes.RestartPolicy{
+ Name: "always",
+ },
+ })
+ testutil.ErrorContains(t, err, "Restart policy cannot be updated because AutoRemove is enabled for the container")
+}
diff --git a/integration/image/commit_test.go b/integration/image/commit_test.go
index b5dd38a..a515b70 100644
--- a/integration/image/commit_test.go
+++ b/integration/image/commit_test.go
@@ -6,7 +6,7 @@
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/integration/image/import_test.go b/integration/image/import_test.go
index 4521a8a..b3a0c7c 100644
--- a/integration/image/import_test.go
+++ b/integration/image/import_test.go
@@ -9,7 +9,7 @@
"testing"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/internal/testutil"
)
diff --git a/integration/internal/container/container.go b/integration/internal/container/container.go
new file mode 100644
index 0000000..8d8fe28
--- /dev/null
+++ b/integration/internal/container/container.go
@@ -0,0 +1,54 @@
+package container
+
+import (
+ "context"
+ "testing"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/api/types/network"
+ "github.com/docker/docker/client"
+ "github.com/stretchr/testify/require"
+)
+
+// TestContainerConfig holds container configuration struct that
+// are used in api calls.
+type TestContainerConfig struct {
+ Name string
+ Config *container.Config
+ HostConfig *container.HostConfig
+ NetworkingConfig *network.NetworkingConfig
+}
+
+// Create creates a container with the specified options
+func Create(t *testing.T, ctx context.Context, client client.APIClient, ops ...func(*TestContainerConfig)) string { // nolint: golint
+ t.Helper()
+ config := &TestContainerConfig{
+ Config: &container.Config{
+ Image: "busybox",
+ Cmd: []string{"top"},
+ },
+ HostConfig: &container.HostConfig{},
+ NetworkingConfig: &network.NetworkingConfig{},
+ }
+
+ for _, op := range ops {
+ op(config)
+ }
+
+ c, err := client.ContainerCreate(ctx, config.Config, config.HostConfig, config.NetworkingConfig, config.Name)
+ require.NoError(t, err)
+
+ return c.ID
+}
+
+// Run creates and start a container with the specified options
+func Run(t *testing.T, ctx context.Context, client client.APIClient, ops ...func(*TestContainerConfig)) string { // nolint: golint
+ t.Helper()
+ id := Create(t, ctx, client, ops...)
+
+ err := client.ContainerStart(ctx, id, types.ContainerStartOptions{})
+ require.NoError(t, err)
+
+ return id
+}
diff --git a/integration/internal/container/exec.go b/integration/internal/container/exec.go
new file mode 100644
index 0000000..2af0b90
--- /dev/null
+++ b/integration/internal/container/exec.go
@@ -0,0 +1,86 @@
+package container
+
+import (
+ "bytes"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/client"
+ "github.com/docker/docker/pkg/stdcopy"
+ "golang.org/x/net/context"
+)
+
+// ExecResult represents a result returned from Exec()
+type ExecResult struct {
+ ExitCode int
+ outBuffer *bytes.Buffer
+ errBuffer *bytes.Buffer
+}
+
+// Stdout returns stdout output of a command run by Exec()
+func (res *ExecResult) Stdout() string {
+ return res.outBuffer.String()
+}
+
+// Stderr returns stderr output of a command run by Exec()
+func (res *ExecResult) Stderr() string {
+ return res.errBuffer.String()
+}
+
+// Combined returns combined stdout and stderr output of a command run by Exec()
+func (res *ExecResult) Combined() string {
+ return res.outBuffer.String() + res.errBuffer.String()
+}
+
+// Exec executes a command inside a container, returning the result
+// containing stdout, stderr, and exit code. Note:
+// - this is a synchronous operation;
+// - cmd stdin is closed.
+func Exec(ctx context.Context, cli client.APIClient, id string, cmd []string) (ExecResult, error) {
+ // prepare exec
+ execConfig := types.ExecConfig{
+ AttachStdout: true,
+ AttachStderr: true,
+ Cmd: cmd,
+ }
+ cresp, err := cli.ContainerExecCreate(ctx, id, execConfig)
+ if err != nil {
+ return ExecResult{}, err
+ }
+ execID := cresp.ID
+
+ // run it, with stdout/stderr attached
+ aresp, err := cli.ContainerExecAttach(ctx, execID, types.ExecStartCheck{})
+ if err != nil {
+ return ExecResult{}, err
+ }
+ defer aresp.Close()
+
+ // read the output
+ var outBuf, errBuf bytes.Buffer
+ outputDone := make(chan error)
+
+ go func() {
+ // StdCopy demultiplexes the stream into two buffers
+ _, err = stdcopy.StdCopy(&outBuf, &errBuf, aresp.Reader)
+ outputDone <- err
+ }()
+
+ select {
+ case err := <-outputDone:
+ if err != nil {
+ return ExecResult{}, err
+ }
+ break
+
+ case <-ctx.Done():
+ return ExecResult{}, ctx.Err()
+ }
+
+ // get the exit code
+ iresp, err := cli.ContainerExecInspect(ctx, execID)
+ if err != nil {
+ return ExecResult{}, err
+ }
+
+ return ExecResult{ExitCode: iresp.ExitCode, outBuffer: &outBuf, errBuffer: &errBuf}, nil
+}
diff --git a/integration/internal/container/ops.go b/integration/internal/container/ops.go
new file mode 100644
index 0000000..e3d538b
--- /dev/null
+++ b/integration/internal/container/ops.go
@@ -0,0 +1,59 @@
+package container
+
+import (
+ containertypes "github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/api/types/strslice"
+ "github.com/docker/go-connections/nat"
+)
+
+// WithName sets the name of the container
+func WithName(name string) func(*TestContainerConfig) {
+ return func(c *TestContainerConfig) {
+ c.Name = name
+ }
+}
+
+// WithLinks sets the links of the container
+func WithLinks(links ...string) func(*TestContainerConfig) {
+ return func(c *TestContainerConfig) {
+ c.HostConfig.Links = links
+ }
+}
+
+// WithCmd sets the comannds of the container
+func WithCmd(cmds ...string) func(*TestContainerConfig) {
+ return func(c *TestContainerConfig) {
+ c.Config.Cmd = strslice.StrSlice(cmds)
+ }
+}
+
+// WithNetworkMode sets the network mode of the container
+func WithNetworkMode(mode string) func(*TestContainerConfig) {
+ return func(c *TestContainerConfig) {
+ c.HostConfig.NetworkMode = containertypes.NetworkMode(mode)
+ }
+}
+
+// WithExposedPorts sets the exposed ports of the container
+func WithExposedPorts(ports ...string) func(*TestContainerConfig) {
+ return func(c *TestContainerConfig) {
+ c.Config.ExposedPorts = map[nat.Port]struct{}{}
+ for _, port := range ports {
+ c.Config.ExposedPorts[nat.Port(port)] = struct{}{}
+ }
+ }
+}
+
+// WithTty sets the TTY mode of the container
+func WithTty(tty bool) func(*TestContainerConfig) {
+ return func(c *TestContainerConfig) {
+ c.Config.Tty = tty
+ }
+}
+
+// WithWorkingDir sets the working dir of the container
+func WithWorkingDir(dir string) func(*TestContainerConfig) {
+ return func(c *TestContainerConfig) {
+ c.Config.WorkingDir = dir
+ }
+}
diff --git a/integration/internal/request/client.go b/integration/internal/request/client.go
new file mode 100644
index 0000000..367db14
--- /dev/null
+++ b/integration/internal/request/client.go
@@ -0,0 +1,42 @@
+package request // import "github.com/docker/docker/integration/internal/request"
+
+import (
+ "fmt"
+ "testing"
+ "time"
+
+ "golang.org/x/net/context"
+
+ "github.com/docker/docker/client"
+ "github.com/docker/docker/internal/test/environment"
+ "github.com/stretchr/testify/require"
+)
+
+// NewAPIClient returns a docker API client configured from environment variables
+func NewAPIClient(t *testing.T, ops ...func(*client.Client) error) client.APIClient {
+ ops = append([]func(*client.Client) error{client.FromEnv}, ops...)
+ clt, err := client.NewClientWithOpts(ops...)
+ require.NoError(t, err)
+ return clt
+}
+
+// daemonTime provides the current time on the daemon host
+func daemonTime(ctx context.Context, t *testing.T, client client.APIClient, testEnv *environment.Execution) time.Time {
+ if testEnv.IsLocalDaemon() {
+ return time.Now()
+ }
+
+ info, err := client.Info(ctx)
+ require.NoError(t, err)
+
+ dt, err := time.Parse(time.RFC3339Nano, info.SystemTime)
+ require.NoError(t, err, "invalid time format in GET /info response")
+ return dt
+}
+
+// DaemonUnixTime returns the current time on the daemon host with nanoseconds precision.
+// It return the time formatted how the client sends timestamps to the server.
+func DaemonUnixTime(ctx context.Context, t *testing.T, client client.APIClient, testEnv *environment.Execution) string {
+ dt := daemonTime(ctx, t, client, testEnv)
+ return fmt.Sprintf("%d.%09d", dt.Unix(), int64(dt.Nanosecond()))
+}
diff --git a/integration/util/requirement/requirement.go b/integration/internal/requirement/requirement.go
similarity index 95%
rename from integration/util/requirement/requirement.go
rename to integration/internal/requirement/requirement.go
index 07035de..f89eb03 100644
--- a/integration/util/requirement/requirement.go
+++ b/integration/internal/requirement/requirement.go
@@ -1,4 +1,4 @@
-package requirement // import "github.com/docker/docker/integration/util/requirement"
+package requirement // import "github.com/docker/docker/integration/internal/requirement"
import (
"net/http"
diff --git a/integration/internal/swarm/service.go b/integration/internal/swarm/service.go
new file mode 100644
index 0000000..a46b02e
--- /dev/null
+++ b/integration/internal/swarm/service.go
@@ -0,0 +1,158 @@
+package swarm
+
+import (
+ "context"
+ "fmt"
+ "testing"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/filters"
+ swarmtypes "github.com/docker/docker/api/types/swarm"
+ "github.com/docker/docker/client"
+ "github.com/docker/docker/integration-cli/daemon"
+ "github.com/docker/docker/internal/test/environment"
+ "github.com/stretchr/testify/require"
+)
+
+const (
+ dockerdBinary = "dockerd"
+ defaultSwarmPort = 2477
+)
+
+// NewSwarm creates a swarm daemon for testing
+func NewSwarm(t *testing.T, testEnv *environment.Execution) *daemon.Swarm {
+ d := &daemon.Swarm{
+ Daemon: daemon.New(t, "", dockerdBinary, daemon.Config{
+ Experimental: testEnv.DaemonInfo.ExperimentalBuild,
+ }),
+ // TODO: better method of finding an unused port
+ Port: defaultSwarmPort,
+ }
+ // TODO: move to a NewSwarm constructor
+ d.ListenAddr = fmt.Sprintf("0.0.0.0:%d", d.Port)
+
+ // avoid networking conflicts
+ args := []string{"--iptables=false", "--swarm-default-advertise-addr=lo"}
+ d.StartWithBusybox(t, args...)
+
+ require.NoError(t, d.Init(swarmtypes.InitRequest{}))
+ return d
+}
+
+// ServiceSpecOpt is used with `CreateService` to pass in service spec modifiers
+type ServiceSpecOpt func(*swarmtypes.ServiceSpec)
+
+// CreateService creates a service on the passed in swarm daemon.
+func CreateService(t *testing.T, d *daemon.Swarm, opts ...ServiceSpecOpt) string {
+ spec := defaultServiceSpec()
+ for _, o := range opts {
+ o(&spec)
+ }
+
+ client := GetClient(t, d)
+
+ resp, err := client.ServiceCreate(context.Background(), spec, types.ServiceCreateOptions{})
+ require.NoError(t, err, "error creating service")
+ return resp.ID
+}
+
+func defaultServiceSpec() swarmtypes.ServiceSpec {
+ var spec swarmtypes.ServiceSpec
+ ServiceWithImage("busybox:latest")(&spec)
+ ServiceWithCommand([]string{"/bin/top"})(&spec)
+ ServiceWithReplicas(1)(&spec)
+ return spec
+}
+
+// ServiceWithImage sets the image to use for the service
+func ServiceWithImage(image string) func(*swarmtypes.ServiceSpec) {
+ return func(spec *swarmtypes.ServiceSpec) {
+ ensureContainerSpec(spec)
+ spec.TaskTemplate.ContainerSpec.Image = image
+ }
+}
+
+// ServiceWithCommand sets the command to use for the service
+func ServiceWithCommand(cmd []string) ServiceSpecOpt {
+ return func(spec *swarmtypes.ServiceSpec) {
+ ensureContainerSpec(spec)
+ spec.TaskTemplate.ContainerSpec.Command = cmd
+ }
+}
+
+// ServiceWithConfig adds the config reference to the service
+func ServiceWithConfig(configRef *swarmtypes.ConfigReference) ServiceSpecOpt {
+ return func(spec *swarmtypes.ServiceSpec) {
+ ensureContainerSpec(spec)
+ spec.TaskTemplate.ContainerSpec.Configs = append(spec.TaskTemplate.ContainerSpec.Configs, configRef)
+ }
+}
+
+// ServiceWithSecret adds the secret reference to the service
+func ServiceWithSecret(secretRef *swarmtypes.SecretReference) ServiceSpecOpt {
+ return func(spec *swarmtypes.ServiceSpec) {
+ ensureContainerSpec(spec)
+ spec.TaskTemplate.ContainerSpec.Secrets = append(spec.TaskTemplate.ContainerSpec.Secrets, secretRef)
+ }
+}
+
+// ServiceWithReplicas sets the replicas for the service
+func ServiceWithReplicas(n uint64) ServiceSpecOpt {
+ return func(spec *swarmtypes.ServiceSpec) {
+ spec.Mode = swarmtypes.ServiceMode{
+ Replicated: &swarmtypes.ReplicatedService{
+ Replicas: &n,
+ },
+ }
+ }
+}
+
+// ServiceWithName sets the name of the service
+func ServiceWithName(name string) ServiceSpecOpt {
+ return func(spec *swarmtypes.ServiceSpec) {
+ spec.Annotations.Name = name
+ }
+}
+
+// GetRunningTasks gets the list of running tasks for a service
+func GetRunningTasks(t *testing.T, d *daemon.Swarm, serviceID string) []swarmtypes.Task {
+ client := GetClient(t, d)
+
+ filterArgs := filters.NewArgs()
+ filterArgs.Add("desired-state", "running")
+ filterArgs.Add("service", serviceID)
+
+ options := types.TaskListOptions{
+ Filters: filterArgs,
+ }
+ tasks, err := client.TaskList(context.Background(), options)
+ require.NoError(t, err)
+ return tasks
+}
+
+// ExecTask runs the passed in exec config on the given task
+func ExecTask(t *testing.T, d *daemon.Swarm, task swarmtypes.Task, config types.ExecConfig) types.HijackedResponse {
+ client := GetClient(t, d)
+
+ ctx := context.Background()
+ resp, err := client.ContainerExecCreate(ctx, task.Status.ContainerStatus.ContainerID, config)
+ require.NoError(t, err, "error creating exec")
+
+ startCheck := types.ExecStartCheck{}
+ attach, err := client.ContainerExecAttach(ctx, resp.ID, startCheck)
+ require.NoError(t, err, "error attaching to exec")
+ return attach
+}
+
+func ensureContainerSpec(spec *swarmtypes.ServiceSpec) {
+ if spec.TaskTemplate.ContainerSpec == nil {
+ spec.TaskTemplate.ContainerSpec = &swarmtypes.ContainerSpec{}
+ }
+}
+
+// GetClient creates a new client for the passed in swarm daemon.
+func GetClient(t *testing.T, d *daemon.Swarm) client.APIClient {
+ client, err := client.NewClientWithOpts(client.WithHost((d.Sock())))
+ require.NoError(t, err)
+ return client
+}
diff --git a/integration/network/delete_test.go b/integration/network/delete_test.go
index 25a42c9..0877d8b 100644
--- a/integration/network/delete_test.go
+++ b/integration/network/delete_test.go
@@ -5,7 +5,7 @@
"testing"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/integration/network/inspect_test.go b/integration/network/inspect_test.go
index 94218af..df58622 100644
--- a/integration/network/inspect_test.go
+++ b/integration/network/inspect_test.go
@@ -47,7 +47,7 @@
require.NoError(t, err)
pollSettings := func(config *poll.Settings) {
- if runtime.GOARCH == "arm" {
+ if runtime.GOARCH == "arm64" || runtime.GOARCH == "arm" {
config.Timeout = 30 * time.Second
config.Delay = 100 * time.Millisecond
}
diff --git a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/authz/authz_plugin_test.go
index 0d78d4c..667fc3d 100644
--- a/integration/plugin/authz/authz_plugin_test.go
+++ b/integration/plugin/authz/authz_plugin_test.go
@@ -19,11 +19,9 @@
"time"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
eventtypes "github.com/docker/docker/api/types/events"
- networktypes "github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
"github.com/docker/docker/internal/test/environment"
"github.com/docker/docker/pkg/authorization"
"github.com/gotestyourself/gotestyourself/skip"
@@ -91,17 +89,15 @@
client, err := d.NewClient()
require.Nil(t, err)
- // Ensure command successful
- createResponse, err := client.ContainerCreate(context.Background(), &container.Config{Cmd: []string{"top"}, Image: "busybox"}, &container.HostConfig{}, &networktypes.NetworkingConfig{}, "")
- require.Nil(t, err)
+ ctx := context.Background()
- err = client.ContainerStart(context.Background(), createResponse.ID, types.ContainerStartOptions{})
- require.Nil(t, err)
+ // Ensure command successful
+ cID := container.Run(t, ctx, client)
assertURIRecorded(t, ctrl.requestsURIs, "/containers/create")
- assertURIRecorded(t, ctrl.requestsURIs, fmt.Sprintf("/containers/%s/start", createResponse.ID))
+ assertURIRecorded(t, ctrl.requestsURIs, fmt.Sprintf("/containers/%s/start", cID))
- _, err = client.ServerVersion(context.Background())
+ _, err = client.ServerVersion(ctx)
require.Nil(t, err)
require.Equal(t, 1, ctrl.versionReqCount)
require.Equal(t, 1, ctrl.versionResCount)
@@ -129,7 +125,7 @@
ctrl.reqRes.Allow = true
ctrl.resRes.Allow = true
- client, err := request.NewTLSAPIClient(t, testDaemonHTTPSAddr, cacertPath, clientCertPath, clientKeyPath)
+ client, err := newTLSAPIClient(testDaemonHTTPSAddr, cacertPath, clientCertPath, clientKeyPath)
require.Nil(t, err)
_, err = client.ServerVersion(context.Background())
@@ -139,6 +135,17 @@
require.Equal(t, "client", ctrl.resUser)
}
+func newTLSAPIClient(host, cacertPath, certPath, keyPath string) (client.APIClient, error) {
+ dialer := &net.Dialer{
+ KeepAlive: 30 * time.Second,
+ Timeout: 30 * time.Second,
+ }
+ return client.NewClientWithOpts(
+ client.WithTLSClientConfig(cacertPath, certPath, keyPath),
+ client.WithDialer(dialer),
+ client.WithHost(host))
+}
+
func TestAuthZPluginDenyRequest(t *testing.T) {
defer setupTestV1(t)()
d.Start(t, "--authorization-plugin="+testAuthZPlugin)
@@ -213,19 +220,17 @@
client, err := d.NewClient()
require.Nil(t, err)
+ ctx := context.Background()
+
startTime := strconv.FormatInt(systemTime(t, client, testEnv).Unix(), 10)
events, errs, cancel := systemEventsSince(client, startTime)
defer cancel()
// Create a container and wait for the creation events
- createResponse, err := client.ContainerCreate(context.Background(), &container.Config{Cmd: []string{"top"}, Image: "busybox"}, &container.HostConfig{}, &networktypes.NetworkingConfig{}, "")
- require.Nil(t, err)
-
- err = client.ContainerStart(context.Background(), createResponse.ID, types.ContainerStartOptions{})
- require.Nil(t, err)
+ cID := container.Run(t, ctx, client)
for i := 0; i < 100; i++ {
- c, err := client.ContainerInspect(context.Background(), createResponse.ID)
+ c, err := client.ContainerInspect(ctx, cID)
require.Nil(t, err)
if c.State.Running {
break
@@ -241,7 +246,7 @@
for !created && !started {
select {
case event := <-events:
- if event.Type == eventtypes.ContainerEventType && event.Actor.ID == createResponse.ID {
+ if event.Type == eventtypes.ContainerEventType && event.Actor.ID == cID {
if event.Action == "create" {
created = true
}
@@ -264,7 +269,7 @@
// authorization plugin
assertURIRecorded(t, ctrl.requestsURIs, "/events")
assertURIRecorded(t, ctrl.requestsURIs, "/containers/create")
- assertURIRecorded(t, ctrl.requestsURIs, fmt.Sprintf("/containers/%s/start", createResponse.ID))
+ assertURIRecorded(t, ctrl.requestsURIs, fmt.Sprintf("/containers/%s/start", cID))
}
func systemTime(t *testing.T, client client.APIClient, testEnv *environment.Execution) time.Time {
@@ -347,6 +352,8 @@
client, err := d.NewClient()
require.Nil(t, err)
+ ctx := context.Background()
+
tmp, err := ioutil.TempDir("", "test-authz-load-import")
require.Nil(t, err)
defer os.RemoveAll(tmp)
@@ -360,13 +367,9 @@
exportedImagePath := filepath.Join(tmp, "export.tar")
- createResponse, err := client.ContainerCreate(context.Background(), &container.Config{Cmd: []string{}, Image: "busybox"}, &container.HostConfig{}, &networktypes.NetworkingConfig{}, "")
- require.Nil(t, err)
+ cID := container.Run(t, ctx, client)
- err = client.ContainerStart(context.Background(), createResponse.ID, types.ContainerStartOptions{})
- require.Nil(t, err)
-
- responseReader, err := client.ContainerExport(context.Background(), createResponse.ID)
+ responseReader, err := client.ContainerExport(context.Background(), cID)
require.Nil(t, err)
defer responseReader.Close()
file, err := os.Create(exportedImagePath)
diff --git a/integration/plugin/authz/authz_plugin_v2_test.go b/integration/plugin/authz/authz_plugin_v2_test.go
index 6b7a9df..5efa421 100644
--- a/integration/plugin/authz/authz_plugin_v2_test.go
+++ b/integration/plugin/authz/authz_plugin_v2_test.go
@@ -11,12 +11,11 @@
"testing"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
- networktypes "github.com/docker/docker/api/types/network"
volumetypes "github.com/docker/docker/api/types/volume"
"github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/requirement"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/requirement"
"github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/require"
)
@@ -47,6 +46,8 @@
client, err := d.NewClient()
require.Nil(t, err)
+ ctx := context.Background()
+
// Install authz plugin
err = pluginInstallGrantAllPermissions(client, authzPluginNameWithTag)
require.Nil(t, err)
@@ -56,13 +57,9 @@
d.LoadBusybox(t)
// Ensure docker run command and accompanying docker ps are successful
- createResponse, err := client.ContainerCreate(context.Background(), &container.Config{Cmd: []string{"top"}, Image: "busybox"}, &container.HostConfig{}, &networktypes.NetworkingConfig{}, "")
- require.Nil(t, err)
+ cID := container.Run(t, ctx, client)
- err = client.ContainerStart(context.Background(), createResponse.ID, types.ContainerStartOptions{})
- require.Nil(t, err)
-
- _, err = client.ContainerInspect(context.Background(), createResponse.ID)
+ _, err = client.ContainerInspect(ctx, cID)
require.Nil(t, err)
}
diff --git a/integration/plugin/logging/cmd/cmd_test.go b/integration/plugin/logging/cmd/cmd_test.go
new file mode 100644
index 0000000..1d619dd
--- /dev/null
+++ b/integration/plugin/logging/cmd/cmd_test.go
@@ -0,0 +1 @@
+package cmd
diff --git a/integration/plugin/logging/cmd/dummy/main.go b/integration/plugin/logging/cmd/dummy/main.go
new file mode 100644
index 0000000..f91b4f3
--- /dev/null
+++ b/integration/plugin/logging/cmd/dummy/main.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+ "net"
+ "net/http"
+)
+
+func main() {
+ l, err := net.Listen("unix", "/run/docker/plugins/plugin.sock")
+ if err != nil {
+ panic(err)
+ }
+
+ server := http.Server{
+ Addr: l.Addr().String(),
+ Handler: http.NewServeMux(),
+ }
+ server.Serve(l)
+}
diff --git a/integration/plugin/logging/cmd/dummy/main_test.go b/integration/plugin/logging/cmd/dummy/main_test.go
new file mode 100644
index 0000000..06ab7d0
--- /dev/null
+++ b/integration/plugin/logging/cmd/dummy/main_test.go
@@ -0,0 +1 @@
+package main
diff --git a/integration/plugin/logging/helpers_test.go b/integration/plugin/logging/helpers_test.go
new file mode 100644
index 0000000..61b2f35
--- /dev/null
+++ b/integration/plugin/logging/helpers_test.go
@@ -0,0 +1,69 @@
+package logging
+
+import (
+ "context"
+ "os"
+ "os/exec"
+ "path/filepath"
+ "testing"
+ "time"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/integration-cli/fixtures/plugin"
+ "github.com/docker/docker/pkg/locker"
+ "github.com/pkg/errors"
+)
+
+const dockerdBinary = "dockerd"
+
+var pluginBuildLock = locker.New()
+
+func ensurePlugin(t *testing.T, name string) string {
+ pluginBuildLock.Lock(name)
+ defer pluginBuildLock.Unlock(name)
+
+ installPath := filepath.Join(os.Getenv("GOPATH"), "bin", name)
+ if _, err := os.Stat(installPath); err == nil {
+ return installPath
+ }
+
+ goBin, err := exec.LookPath("go")
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ cmd := exec.Command(goBin, "build", "-o", installPath, "./"+filepath.Join("cmd", name))
+ cmd.Env = append(cmd.Env, "CGO_ENABLED=0")
+ if out, err := cmd.CombinedOutput(); err != nil {
+ t.Fatal(errors.Wrapf(err, "error building basic plugin bin: %s", string(out)))
+ }
+
+ return installPath
+}
+
+func withSockPath(name string) func(*plugin.Config) {
+ return func(cfg *plugin.Config) {
+ cfg.Interface.Socket = name
+ }
+}
+
+func createPlugin(t *testing.T, client plugin.CreateClient, alias, bin string, opts ...plugin.CreateOpt) {
+ pluginBin := ensurePlugin(t, bin)
+
+ opts = append(opts, withSockPath("plugin.sock"))
+ opts = append(opts, plugin.WithBinary(pluginBin))
+
+ ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+ err := plugin.Create(ctx, client, alias, opts...)
+ cancel()
+
+ if err != nil {
+ t.Fatal(err)
+ }
+}
+
+func asLogDriver(cfg *plugin.Config) {
+ cfg.Interface.Types = []types.PluginInterfaceType{
+ {Capability: "logdriver", Prefix: "docker", Version: "1.0"},
+ }
+}
diff --git a/integration/plugin/logging/validation_test.go b/integration/plugin/logging/validation_test.go
new file mode 100644
index 0000000..6607321
--- /dev/null
+++ b/integration/plugin/logging/validation_test.go
@@ -0,0 +1,33 @@
+package logging
+
+import (
+ "context"
+ "testing"
+
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/integration-cli/daemon"
+ "github.com/stretchr/testify/assert"
+)
+
+// Regression test for #35553
+// Ensure that a daemon with a log plugin set as the default logger for containers
+// does not keep the daemon from starting.
+func TestDaemonStartWithLogOpt(t *testing.T) {
+ t.Parallel()
+
+ d := daemon.New(t, "", dockerdBinary, daemon.Config{})
+ d.Start(t, "--iptables=false")
+ defer d.Stop(t)
+
+ client, err := d.NewClient()
+ assert.NoError(t, err)
+ ctx := context.Background()
+
+ createPlugin(t, client, "test", "dummy", asLogDriver)
+ err = client.PluginEnable(ctx, "test", types.PluginEnableOptions{Timeout: 30})
+ assert.NoError(t, err)
+ defer client.PluginRemove(ctx, "test", types.PluginRemoveOptions{Force: true})
+
+ d.Stop(t)
+ d.Start(t, "--iptables=false", "--log-driver=test", "--log-opt=foo=bar")
+}
diff --git a/integration/secret/secret_test.go b/integration/secret/secret_test.go
index 922fd33..3b5e66a 100644
--- a/integration/secret/secret_test.go
+++ b/integration/secret/secret_test.go
@@ -1,11 +1,18 @@
package secret
import (
+ "bytes"
+ "sort"
"testing"
+ "time"
+ "github.com/docker/docker/api/types"
+ "github.com/docker/docker/api/types/filters"
swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/swarm"
+ "github.com/docker/docker/integration/internal/swarm"
+ "github.com/docker/docker/internal/testutil"
+ "github.com/docker/docker/pkg/stdcopy"
"github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -24,20 +31,343 @@
ctx := context.Background()
testName := "test_secret"
- secretResp, err := client.SecretCreate(ctx, swarmtypes.SecretSpec{
- Annotations: swarmtypes.Annotations{
- Name: testName,
- },
- Data: []byte("TESTINGDATA"),
- })
- require.NoError(t, err)
- assert.NotEqual(t, secretResp.ID, "")
+ secretID := createSecret(ctx, t, client, testName, []byte("TESTINGDATA"), nil)
- secret, _, err := client.SecretInspectWithRaw(context.Background(), secretResp.ID)
+ secret, _, err := client.SecretInspectWithRaw(context.Background(), secretID)
require.NoError(t, err)
assert.Equal(t, secret.Spec.Name, testName)
secret, _, err = client.SecretInspectWithRaw(context.Background(), testName)
require.NoError(t, err)
- assert.Equal(t, secret.ID, secretResp.ID)
+ assert.Equal(t, secretID, secretID)
+}
+
+func TestSecretList(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+ client, err := client.NewClientWithOpts(client.WithHost((d.Sock())))
+ require.NoError(t, err)
+
+ ctx := context.Background()
+
+ testName0 := "test0"
+ testName1 := "test1"
+ testNames := []string{testName0, testName1}
+ sort.Strings(testNames)
+
+ // create secret test0
+ createSecret(ctx, t, client, testName0, []byte("TESTINGDATA0"), map[string]string{"type": "test"})
+
+ // create secret test1
+ secret1ID := createSecret(ctx, t, client, testName1, []byte("TESTINGDATA1"), map[string]string{"type": "production"})
+
+ names := func(entries []swarmtypes.Secret) []string {
+ values := []string{}
+ for _, entry := range entries {
+ values = append(values, entry.Spec.Name)
+ }
+ sort.Strings(values)
+ return values
+ }
+
+ // test by `secret ls`
+ entries, err := client.SecretList(ctx, types.SecretListOptions{})
+ require.NoError(t, err)
+ assert.Equal(t, names(entries), testNames)
+
+ testCases := []struct {
+ filters filters.Args
+ expected []string
+ }{
+ // test filter by name `secret ls --filter name=xxx`
+ {
+ filters: filters.NewArgs(filters.Arg("name", testName0)),
+ expected: []string{testName0},
+ },
+ // test filter by id `secret ls --filter id=xxx`
+ {
+ filters: filters.NewArgs(filters.Arg("id", secret1ID)),
+ expected: []string{testName1},
+ },
+ // test filter by label `secret ls --filter label=xxx`
+ {
+ filters: filters.NewArgs(filters.Arg("label", "type")),
+ expected: testNames,
+ },
+ {
+ filters: filters.NewArgs(filters.Arg("label", "type=test")),
+ expected: []string{testName0},
+ },
+ {
+ filters: filters.NewArgs(filters.Arg("label", "type=production")),
+ expected: []string{testName1},
+ },
+ }
+ for _, tc := range testCases {
+ entries, err = client.SecretList(ctx, types.SecretListOptions{
+ Filters: tc.filters,
+ })
+ require.NoError(t, err)
+ assert.Equal(t, names(entries), tc.expected)
+
+ }
+}
+
+func createSecret(ctx context.Context, t *testing.T, client client.APIClient, name string, data []byte, labels map[string]string) string {
+ secret, err := client.SecretCreate(ctx, swarmtypes.SecretSpec{
+ Annotations: swarmtypes.Annotations{
+ Name: name,
+ Labels: labels,
+ },
+ Data: data,
+ })
+ require.NoError(t, err)
+ assert.NotEqual(t, secret.ID, "")
+ return secret.ID
+}
+
+func TestSecretsCreate(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+ client, err := client.NewClientWithOpts(client.WithHost((d.Sock())))
+ require.NoError(t, err)
+
+ ctx := context.Background()
+
+ testName := "test_secret"
+ createSecret(ctx, t, client, testName, []byte("TESTINGDATA"), nil)
+ require.NoError(t, err)
+
+ // create an already existin secret, daemon should return a status code of 409
+ _, err = client.SecretCreate(ctx, swarmtypes.SecretSpec{
+ Annotations: swarmtypes.Annotations{
+ Name: testName,
+ },
+ Data: []byte("TESTINGDATA"),
+ })
+ testutil.ErrorContains(t, err, "already exists")
+}
+
+func TestSecretsDelete(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+ client, err := client.NewClientWithOpts(client.WithHost((d.Sock())))
+ require.NoError(t, err)
+
+ ctx := context.Background()
+
+ testName := "test_secret"
+ secretID := createSecret(ctx, t, client, testName, []byte("TESTINGDATA"), nil)
+ require.NoError(t, err)
+
+ insp, _, err := client.SecretInspectWithRaw(ctx, secretID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.ID, secretID)
+
+ err = client.SecretRemove(ctx, secretID)
+ require.NoError(t, err)
+
+ _, _, err = client.SecretInspectWithRaw(ctx, secretID)
+ testutil.ErrorContains(t, err, "No such secret")
+
+ err = client.SecretRemove(ctx, "non-existin")
+ testutil.ErrorContains(t, err, "No such secret: non-existin")
+}
+
+func TestSecretsUpdate(t *testing.T) {
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+
+ defer setupTest(t)()
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+ client, err := client.NewClientWithOpts(client.WithHost((d.Sock())))
+ require.NoError(t, err)
+
+ ctx := context.Background()
+
+ testName := "test_secret"
+ secretID := createSecret(ctx, t, client, testName, []byte("TESTINGDATA"), nil)
+ require.NoError(t, err)
+
+ insp, _, err := client.SecretInspectWithRaw(ctx, secretID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.ID, secretID)
+
+ // test UpdateSecret with full ID
+ insp.Spec.Labels = map[string]string{"test": "test1"}
+ err = client.SecretUpdate(ctx, secretID, insp.Version, insp.Spec)
+ require.NoError(t, err)
+
+ insp, _, err = client.SecretInspectWithRaw(ctx, secretID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.Spec.Labels["test"], "test1")
+
+ // test UpdateSecret with full name
+ insp.Spec.Labels = map[string]string{"test": "test2"}
+ err = client.SecretUpdate(ctx, testName, insp.Version, insp.Spec)
+ require.NoError(t, err)
+
+ insp, _, err = client.SecretInspectWithRaw(ctx, secretID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.Spec.Labels["test"], "test2")
+
+ // test UpdateSecret with prefix ID
+ insp.Spec.Labels = map[string]string{"test": "test3"}
+ err = client.SecretUpdate(ctx, secretID[:1], insp.Version, insp.Spec)
+ require.NoError(t, err)
+
+ insp, _, err = client.SecretInspectWithRaw(ctx, secretID)
+ require.NoError(t, err)
+ assert.Equal(t, insp.Spec.Labels["test"], "test3")
+
+ // test UpdateSecret in updating Data which is not supported in daemon
+ // this test will produce an error in func UpdateSecret
+ insp.Spec.Data = []byte("TESTINGDATA2")
+ err = client.SecretUpdate(ctx, secretID, insp.Version, insp.Spec)
+ testutil.ErrorContains(t, err, "only updates to Labels are allowed")
+}
+
+func TestTemplatedSecret(t *testing.T) {
+ d := swarm.NewSwarm(t, testEnv)
+ defer d.Stop(t)
+
+ ctx := context.Background()
+ client := swarm.GetClient(t, d)
+
+ referencedSecretSpec := swarmtypes.SecretSpec{
+ Annotations: swarmtypes.Annotations{
+ Name: "referencedsecret",
+ },
+ Data: []byte("this is a secret"),
+ }
+ referencedSecret, err := client.SecretCreate(ctx, referencedSecretSpec)
+ assert.NoError(t, err)
+
+ referencedConfigSpec := swarmtypes.ConfigSpec{
+ Annotations: swarmtypes.Annotations{
+ Name: "referencedconfig",
+ },
+ Data: []byte("this is a config"),
+ }
+ referencedConfig, err := client.ConfigCreate(ctx, referencedConfigSpec)
+ assert.NoError(t, err)
+
+ secretSpec := swarmtypes.SecretSpec{
+ Annotations: swarmtypes.Annotations{
+ Name: "templated_secret",
+ },
+ Templating: &swarmtypes.Driver{
+ Name: "golang",
+ },
+ Data: []byte("SERVICE_NAME={{.Service.Name}}\n" +
+ "{{secret \"referencedsecrettarget\"}}\n" +
+ "{{config \"referencedconfigtarget\"}}\n"),
+ }
+
+ templatedSecret, err := client.SecretCreate(ctx, secretSpec)
+ assert.NoError(t, err)
+
+ serviceID := swarm.CreateService(t, d,
+ swarm.ServiceWithSecret(
+ &swarmtypes.SecretReference{
+ File: &swarmtypes.SecretReferenceFileTarget{
+ Name: "templated_secret",
+ UID: "0",
+ GID: "0",
+ Mode: 0600,
+ },
+ SecretID: templatedSecret.ID,
+ SecretName: "templated_secret",
+ },
+ ),
+ swarm.ServiceWithConfig(
+ &swarmtypes.ConfigReference{
+ File: &swarmtypes.ConfigReferenceFileTarget{
+ Name: "referencedconfigtarget",
+ UID: "0",
+ GID: "0",
+ Mode: 0600,
+ },
+ ConfigID: referencedConfig.ID,
+ ConfigName: "referencedconfig",
+ },
+ ),
+ swarm.ServiceWithSecret(
+ &swarmtypes.SecretReference{
+ File: &swarmtypes.SecretReferenceFileTarget{
+ Name: "referencedsecrettarget",
+ UID: "0",
+ GID: "0",
+ Mode: 0600,
+ },
+ SecretID: referencedSecret.ID,
+ SecretName: "referencedsecret",
+ },
+ ),
+ swarm.ServiceWithName("svc"),
+ )
+
+ var tasks []swarmtypes.Task
+ waitAndAssert(t, 60*time.Second, func(t *testing.T) bool {
+ tasks = swarm.GetRunningTasks(t, d, serviceID)
+ return len(tasks) > 0
+ })
+
+ task := tasks[0]
+ waitAndAssert(t, 60*time.Second, func(t *testing.T) bool {
+ if task.NodeID == "" || (task.Status.ContainerStatus == nil || task.Status.ContainerStatus.ContainerID == "") {
+ task, _, _ = client.TaskInspectWithRaw(context.Background(), task.ID)
+ }
+ return task.NodeID != "" && task.Status.ContainerStatus != nil && task.Status.ContainerStatus.ContainerID != ""
+ })
+
+ attach := swarm.ExecTask(t, d, task, types.ExecConfig{
+ Cmd: []string{"/bin/cat", "/run/secrets/templated_secret"},
+ AttachStdout: true,
+ AttachStderr: true,
+ })
+
+ expect := "SERVICE_NAME=svc\n" +
+ "this is a secret\n" +
+ "this is a config\n"
+ assertAttachedStream(t, attach, expect)
+
+ attach = swarm.ExecTask(t, d, task, types.ExecConfig{
+ Cmd: []string{"mount"},
+ AttachStdout: true,
+ AttachStderr: true,
+ })
+ assertAttachedStream(t, attach, "tmpfs on /run/secrets/templated_secret type tmpfs")
+}
+
+func assertAttachedStream(t *testing.T, attach types.HijackedResponse, expect string) {
+ buf := bytes.NewBuffer(nil)
+ _, err := stdcopy.StdCopy(buf, buf, attach.Reader)
+ require.NoError(t, err)
+ assert.Contains(t, buf.String(), expect)
+}
+
+func waitAndAssert(t *testing.T, timeout time.Duration, f func(*testing.T) bool) {
+ t.Helper()
+ after := time.After(timeout)
+ for {
+ select {
+ case <-after:
+ t.Fatalf("timed out waiting for condition")
+ default:
+ }
+ if f(t) {
+ return
+ }
+ time.Sleep(100 * time.Millisecond)
+ }
}
diff --git a/integration/service/create_test.go b/integration/service/create_test.go
index c74c8fb..eb66cfc 100644
--- a/integration/service/create_test.go
+++ b/integration/service/create_test.go
@@ -10,7 +10,7 @@
"github.com/docker/docker/api/types/filters"
swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/swarm"
+ "github.com/docker/docker/integration/internal/swarm"
"github.com/gotestyourself/gotestyourself/poll"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/integration/service/inspect_test.go b/integration/service/inspect_test.go
index 8fe97d9..fdb22cf 100644
--- a/integration/service/inspect_test.go
+++ b/integration/service/inspect_test.go
@@ -9,7 +9,7 @@
"github.com/docker/docker/api/types/filters"
swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/swarm"
+ "github.com/docker/docker/integration/internal/swarm"
"github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert"
diff --git a/integration/service/network_test.go b/integration/service/network_test.go
index 1a9297c..09b0a1f 100644
--- a/integration/service/network_test.go
+++ b/integration/service/network_test.go
@@ -5,10 +5,10 @@
"testing"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
- "github.com/docker/docker/integration/util/swarm"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/swarm"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -27,20 +27,15 @@
Attachable: true,
})
require.NoError(t, err)
- _, err = client.ContainerCreate(ctx,
- &container.Config{
- Cmd: []string{"top"},
- Image: "busybox",
- },
- &container.HostConfig{},
- &network.NetworkingConfig{
- EndpointsConfig: map[string]*network.EndpointSettings{
+
+ container.Create(t, ctx, client, container.WithName("ng1"), func(c *container.TestContainerConfig) {
+ c.NetworkingConfig = &network.NetworkingConfig{
+ map[string]*network.EndpointSettings{
name: {},
},
- },
- "ng1",
- )
- require.NoError(t, err)
+ }
+ })
+
err = client.NetworkConnect(ctx, name, "ng1", &network.EndpointSettings{
Aliases: []string{
"aaa",
@@ -56,20 +51,14 @@
assert.Equal(t, len(ng1.NetworkSettings.Networks[name].Aliases), 2)
assert.Equal(t, ng1.NetworkSettings.Networks[name].Aliases[0], "aaa")
- _, err = client.ContainerCreate(ctx,
- &container.Config{
- Cmd: []string{"top"},
- Image: "busybox",
- },
- &container.HostConfig{},
- &network.NetworkingConfig{
- EndpointsConfig: map[string]*network.EndpointSettings{
+ container.Create(t, ctx, client, container.WithName("ng2"), func(c *container.TestContainerConfig) {
+ c.NetworkingConfig = &network.NetworkingConfig{
+ map[string]*network.EndpointSettings{
name: {},
},
- },
- "ng2",
- )
- require.NoError(t, err)
+ }
+ })
+
err = client.NetworkConnect(ctx, name, "ng2", &network.EndpointSettings{
Aliases: []string{
"bbb",
diff --git a/integration/session/main_test.go b/integration/session/main_test.go
new file mode 100644
index 0000000..fc33025
--- /dev/null
+++ b/integration/session/main_test.go
@@ -0,0 +1,33 @@
+package session // import "github.com/docker/docker/integration/session"
+
+import (
+ "fmt"
+ "os"
+ "testing"
+
+ "github.com/docker/docker/internal/test/environment"
+)
+
+var testEnv *environment.Execution
+
+func TestMain(m *testing.M) {
+ var err error
+ testEnv, err = environment.New()
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
+ err = environment.EnsureFrozenImagesLinux(testEnv)
+ if err != nil {
+ fmt.Println(err)
+ os.Exit(1)
+ }
+
+ testEnv.Print()
+ os.Exit(m.Run())
+}
+
+func setupTest(t *testing.T) func() {
+ environment.ProtectAll(t, testEnv)
+ return func() { testEnv.Clean(t) }
+}
diff --git a/integration/session/session_test.go b/integration/session/session_test.go
new file mode 100644
index 0000000..310f544
--- /dev/null
+++ b/integration/session/session_test.go
@@ -0,0 +1,48 @@
+package session // import "github.com/docker/docker/integration/session"
+
+import (
+ "net/http"
+ "testing"
+
+ req "github.com/docker/docker/integration-cli/request"
+ "github.com/gotestyourself/gotestyourself/skip"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestSessionCreate(t *testing.T) {
+ skip.If(t, !testEnv.DaemonInfo.ExperimentalBuild)
+
+ defer setupTest(t)()
+
+ res, body, err := req.Post("/session", func(r *http.Request) error {
+ r.Header.Set("X-Docker-Expose-Session-Uuid", "testsessioncreate") // so we don't block default name if something else is using it
+ r.Header.Set("Upgrade", "h2c")
+ return nil
+ })
+ require.NoError(t, err)
+ require.NoError(t, body.Close())
+ assert.Equal(t, res.StatusCode, http.StatusSwitchingProtocols)
+ assert.Equal(t, res.Header.Get("Upgrade"), "h2c")
+}
+
+func TestSessionCreateWithBadUpgrade(t *testing.T) {
+ skip.If(t, !testEnv.DaemonInfo.ExperimentalBuild)
+
+ res, body, err := req.Post("/session")
+ require.NoError(t, err)
+ assert.Equal(t, res.StatusCode, http.StatusBadRequest)
+ buf, err := req.ReadBody(body)
+ require.NoError(t, err)
+ assert.Contains(t, string(buf), "no upgrade")
+
+ res, body, err = req.Post("/session", func(r *http.Request) error {
+ r.Header.Set("Upgrade", "foo")
+ return nil
+ })
+ require.NoError(t, err)
+ assert.Equal(t, res.StatusCode, http.StatusBadRequest)
+ buf, err = req.ReadBody(body)
+ require.NoError(t, err)
+ assert.Contains(t, string(buf), "not supported")
+}
diff --git a/integration/system/event_test.go b/integration/system/event_test.go
index f9364cd..7f04195 100644
--- a/integration/system/event_test.go
+++ b/integration/system/event_test.go
@@ -7,11 +7,10 @@
"time"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
- "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/container"
+ "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/require"
)
@@ -20,22 +19,9 @@
ctx := context.Background()
client := request.NewAPIClient(t)
- container, err := client.ContainerCreate(ctx,
- &container.Config{
- Image: "busybox",
- Tty: true,
- WorkingDir: "/root",
- Cmd: strslice.StrSlice([]string{"top"}),
- },
- &container.HostConfig{},
- &network.NetworkingConfig{},
- "foo",
- )
- require.NoError(t, err)
- err = client.ContainerStart(ctx, container.ID, types.ContainerStartOptions{})
- require.NoError(t, err)
+ cID := container.Run(t, ctx, client)
- id, err := client.ContainerExecCreate(ctx, container.ID,
+ id, err := client.ContainerExecCreate(ctx, cID,
types.ExecConfig{
Cmd: strslice.StrSlice([]string{"echo", "hello"}),
},
@@ -43,7 +29,7 @@
require.NoError(t, err)
filters := filters.NewArgs(
- filters.Arg("container", container.ID),
+ filters.Arg("container", cID),
filters.Arg("event", "exec_die"),
)
msg, errors := client.Events(ctx, types.EventsOptions{
@@ -61,7 +47,7 @@
select {
case m := <-msg:
require.Equal(t, m.Type, "container")
- require.Equal(t, m.Actor.ID, container.ID)
+ require.Equal(t, m.Actor.ID, cID)
require.Equal(t, m.Action, "exec_die")
require.Equal(t, m.Actor.Attributes["execID"], id.ID)
require.Equal(t, m.Actor.Attributes["exitCode"], "0")
diff --git a/integration/system/info_linux_test.go b/integration/system/info_linux_test.go
index 513cef8..8f0271e 100644
--- a/integration/system/info_linux_test.go
+++ b/integration/system/info_linux_test.go
@@ -7,7 +7,7 @@
"testing"
req "github.com/docker/docker/integration-cli/request"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
diff --git a/integration/system/info_test.go b/integration/system/info_test.go
index 4b90b5c..47c46cb 100644
--- a/integration/system/info_test.go
+++ b/integration/system/info_test.go
@@ -4,7 +4,7 @@
"fmt"
"testing"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
diff --git a/integration/system/login_test.go b/integration/system/login_test.go
index 295f37c..c075109 100644
--- a/integration/system/login_test.go
+++ b/integration/system/login_test.go
@@ -4,8 +4,8 @@
"testing"
"github.com/docker/docker/api/types"
- "github.com/docker/docker/integration/util/request"
- "github.com/docker/docker/integration/util/requirement"
+ "github.com/docker/docker/integration/internal/request"
+ "github.com/docker/docker/integration/internal/requirement"
"github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
diff --git a/integration/system/version_test.go b/integration/system/version_test.go
index 605ab50..04888a6 100644
--- a/integration/system/version_test.go
+++ b/integration/system/version_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "github.com/docker/docker/integration/util/request"
+ "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
diff --git a/integration/util/request/client.go b/integration/util/request/client.go
deleted file mode 100644
index 5c1ec08..0000000
--- a/integration/util/request/client.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package request // import "github.com/docker/docker/integration/util/request"
-
-import (
- "net"
- "net/http"
- "testing"
- "time"
-
- "github.com/docker/docker/client"
- "github.com/docker/go-connections/sockets"
- "github.com/docker/go-connections/tlsconfig"
- "github.com/stretchr/testify/require"
-)
-
-// NewAPIClient returns a docker API client configured from environment variables
-func NewAPIClient(t *testing.T, ops ...func(*client.Client) error) client.APIClient {
- ops = append([]func(*client.Client) error{client.FromEnv}, ops...)
- clt, err := client.NewClientWithOpts(ops...)
- require.NoError(t, err)
- return clt
-}
-
-// NewTLSAPIClient returns a docker API client configured with the
-// provided TLS settings
-func NewTLSAPIClient(t *testing.T, host, cacertPath, certPath, keyPath string) (client.APIClient, error) {
- opts := tlsconfig.Options{
- CAFile: cacertPath,
- CertFile: certPath,
- KeyFile: keyPath,
- ExclusiveRootPools: true,
- }
- config, err := tlsconfig.Client(opts)
- require.Nil(t, err)
- tr := &http.Transport{
- TLSClientConfig: config,
- DialContext: (&net.Dialer{
- KeepAlive: 30 * time.Second,
- Timeout: 30 * time.Second,
- }).DialContext,
- }
- proto, addr, _, err := client.ParseHost(host)
- require.Nil(t, err)
-
- sockets.ConfigureTransport(tr, proto, addr)
-
- httpClient := &http.Client{
- Transport: tr,
- CheckRedirect: client.CheckRedirect,
- }
- return client.NewClientWithOpts(client.WithHost(host), client.WithHTTPClient(httpClient))
-}
diff --git a/integration/util/swarm/service.go b/integration/util/swarm/service.go
deleted file mode 100644
index bd001ba..0000000
--- a/integration/util/swarm/service.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package swarm
-
-import (
- "fmt"
- "testing"
-
- swarmtypes "github.com/docker/docker/api/types/swarm"
- "github.com/docker/docker/integration-cli/daemon"
- "github.com/docker/docker/internal/test/environment"
- "github.com/stretchr/testify/require"
-)
-
-const (
- dockerdBinary = "dockerd"
- defaultSwarmPort = 2477
-)
-
-// NewSwarm creates a swarm daemon for testing
-func NewSwarm(t *testing.T, testEnv *environment.Execution) *daemon.Swarm {
- d := &daemon.Swarm{
- Daemon: daemon.New(t, "", dockerdBinary, daemon.Config{
- Experimental: testEnv.DaemonInfo.ExperimentalBuild,
- }),
- // TODO: better method of finding an unused port
- Port: defaultSwarmPort,
- }
- // TODO: move to a NewSwarm constructor
- d.ListenAddr = fmt.Sprintf("0.0.0.0:%d", d.Port)
-
- // avoid networking conflicts
- args := []string{"--iptables=false", "--swarm-default-advertise-addr=lo"}
- d.StartWithBusybox(t, args...)
-
- require.NoError(t, d.Init(swarmtypes.InitRequest{}))
- return d
-}
diff --git a/internal/test/environment/protect.go b/internal/test/environment/protect.go
index 9aa6fdd..482dde6 100644
--- a/internal/test/environment/protect.go
+++ b/internal/test/environment/protect.go
@@ -9,7 +9,7 @@
"github.com/stretchr/testify/require"
)
-var frozenImages = []string{"busybox:latest", "hello-world:frozen", "debian:jessie"}
+var frozenImages = []string{"busybox:1.27-glibc", "hello-world:frozen", "debian:jessie"}
type protectedElements struct {
containers map[string]struct{}
diff --git a/libcontainerd/client_daemon.go b/libcontainerd/client_daemon.go
index eef3a48..2c91446 100644
--- a/libcontainerd/client_daemon.go
+++ b/libcontainerd/client_daemon.go
@@ -159,7 +159,7 @@
return attachStdio(dio)
}
t, err := ctr.Task(ctx, attachIO)
- if err != nil && !errdefs.IsNotFound(errors.Cause(err)) {
+ if err != nil && !containerderrors.IsNotFound(err) {
return false, -1, err
}
diff --git a/libcontainerd/client_local_windows.go b/libcontainerd/client_local_windows.go
index 51475b4..34ad0d7 100644
--- a/libcontainerd/client_local_windows.go
+++ b/libcontainerd/client_local_windows.go
@@ -223,7 +223,7 @@
if configuration.HvPartition {
// We don't currently support setting the utility VM image explicitly.
- // TODO @swernli/jhowardmsft circa RS3/4, this may be re-locatable.
+ // TODO @swernli/jhowardmsft circa RS5, this may be re-locatable.
if spec.Windows.HyperV.UtilityVMPath != "" {
return errors.New("runtime does not support an explicit utility VM path for Hyper-V containers")
}
@@ -303,7 +303,7 @@
}
}
configuration.MappedDirectories = mds
- if len(mps) > 0 && system.GetOSVersion().Build < 16210 { // replace with Win10 RS3 build number at RTM
+ if len(mps) > 0 && system.GetOSVersion().Build < 16299 { // RS3
return errors.New("named pipe mounts are not supported on this version of Windows")
}
configuration.MappedPipes = mps
diff --git a/oci/defaults.go b/oci/defaults.go
index 578da3a..4145412 100644
--- a/oci/defaults.go
+++ b/oci/defaults.go
@@ -115,6 +115,7 @@
s.Linux = &specs.Linux{
MaskedPaths: []string{
"/proc/kcore",
+ "/proc/keys",
"/proc/latency_stats",
"/proc/timer_list",
"/proc/timer_stats",
diff --git a/pkg/plugingetter/getter.go b/pkg/plugingetter/getter.go
index e0a3256..0e1699d 100644
--- a/pkg/plugingetter/getter.go
+++ b/pkg/plugingetter/getter.go
@@ -17,7 +17,7 @@
type CompatPlugin interface {
Client() *plugins.Client
Name() string
- BasePath() string
+ ScopedPath(string) string
IsV1() bool
}
diff --git a/pkg/plugins/plugins_unix.go b/pkg/plugins/plugins_unix.go
index 9d8b51d..cdfbe93 100644
--- a/pkg/plugins/plugins_unix.go
+++ b/pkg/plugins/plugins_unix.go
@@ -2,8 +2,8 @@
package plugins // import "github.com/docker/docker/pkg/plugins"
-// BasePath returns the path to which all paths returned by the plugin are relative to.
-// For v1 plugins, this always returns the host's root directory.
-func (p *Plugin) BasePath() string {
- return "/"
+// ScopedPath returns the path scoped to the plugin's rootfs.
+// For v1 plugins, this always returns the path unchanged as v1 plugins run directly on the host.
+func (p *Plugin) ScopedPath(s string) string {
+ return s
}
diff --git a/pkg/plugins/plugins_windows.go b/pkg/plugins/plugins_windows.go
index c27b4c6..ddf1d78 100644
--- a/pkg/plugins/plugins_windows.go
+++ b/pkg/plugins/plugins_windows.go
@@ -1,8 +1,7 @@
package plugins // import "github.com/docker/docker/pkg/plugins"
-// BasePath returns the path to which all paths returned by the plugin are relative to.
-// For Windows v1 plugins, this returns an empty string, since the plugin is already aware
-// of the absolute path of the mount.
-func (p *Plugin) BasePath() string {
- return ""
+// ScopedPath returns the path scoped to the plugin's rootfs.
+// For v1 plugins, this always returns the path unchanged as v1 plugins run directly on the host.
+func (p *Plugin) ScopedPath(s string) string {
+ return s
}
diff --git a/pkg/system/path.go b/pkg/system/path.go
index 3d209b1..a3d957a 100644
--- a/pkg/system/path.go
+++ b/pkg/system/path.go
@@ -35,7 +35,7 @@
// This is used, for example, when validating a user provided path in docker cp.
// If a drive letter is supplied, it must be the system drive. The drive letter
// is always removed. Also, it translates it to OS semantics (IOW / to \). We
-// need the path in this syntax so that it can ultimately be contatenated with
+// need the path in this syntax so that it can ultimately be concatenated with
// a Windows long-path which doesn't support drive-letters. Examples:
// C: --> Fail
// C:\ --> \
diff --git a/pkg/tailfile/tailfile.go b/pkg/tailfile/tailfile.go
index a223f66..e835893 100644
--- a/pkg/tailfile/tailfile.go
+++ b/pkg/tailfile/tailfile.go
@@ -16,7 +16,7 @@
// ErrNonPositiveLinesNumber is an error returned if the lines number was negative.
var ErrNonPositiveLinesNumber = errors.New("The number of lines to extract from the file must be positive")
-//TailFile returns last n lines of reader f (could be a fil).
+//TailFile returns last n lines of reader f (could be a nil).
func TailFile(f io.ReadSeeker, n int) ([][]byte, error) {
if n <= 0 {
return nil, ErrNonPositiveLinesNumber
diff --git a/pkg/tarsum/tarsum.go b/pkg/tarsum/tarsum.go
index 6ad152a..8c8478a 100644
--- a/pkg/tarsum/tarsum.go
+++ b/pkg/tarsum/tarsum.go
@@ -236,7 +236,7 @@
}
return n, err
}
- ts.currentFile = path.Clean(currentHeader.Name)
+ ts.currentFile = path.Join(".", path.Join("/", currentHeader.Name))
if err := ts.encodeHeader(currentHeader); err != nil {
return 0, err
}
diff --git a/plugin/defs.go b/plugin/defs.go
index beb8801..c158bbb 100644
--- a/plugin/defs.go
+++ b/plugin/defs.go
@@ -5,12 +5,14 @@
"github.com/docker/docker/pkg/plugins"
"github.com/docker/docker/plugin/v2"
+ specs "github.com/opencontainers/runtime-spec/specs-go"
)
// Store manages the plugin inventory in memory and on-disk
type Store struct {
sync.RWMutex
- plugins map[string]*v2.Plugin
+ plugins map[string]*v2.Plugin
+ specOpts map[string][]SpecOpt
/* handlers are necessary for transition path of legacy plugins
* to the new model. Legacy plugins use Handle() for registering an
* activation callback.*/
@@ -21,10 +23,14 @@
func NewStore() *Store {
return &Store{
plugins: make(map[string]*v2.Plugin),
+ specOpts: make(map[string][]SpecOpt),
handlers: make(map[string][]func(string, *plugins.Client)),
}
}
+// SpecOpt is used for subsystems that need to modify the runtime spec of a plugin
+type SpecOpt func(*specs.Spec)
+
// CreateOpt is used to configure specific plugin details when created
type CreateOpt func(p *v2.Plugin)
@@ -35,3 +41,10 @@
p.SwarmServiceID = id
}
}
+
+// WithSpecMounts is a SpecOpt which appends the provided mounts to the runtime spec
+func WithSpecMounts(mounts []specs.Mount) SpecOpt {
+ return func(s *specs.Spec) {
+ s.Mounts = append(s.Mounts, mounts...)
+ }
+}
diff --git a/plugin/manager.go b/plugin/manager.go
index b2051cb..1879a78 100644
--- a/plugin/manager.go
+++ b/plugin/manager.go
@@ -112,11 +112,6 @@
return nil, errors.Wrapf(err, "failed to mkdir %v", dirName)
}
}
-
- if err := setupRoot(manager.config.Root); err != nil {
- return nil, err
- }
-
var err error
manager.executor, err = config.CreateExecutor(manager)
if err != nil {
@@ -151,16 +146,6 @@
os.RemoveAll(filepath.Join(pm.config.ExecRoot, id))
- if p.PropagatedMount != "" {
- if err := mount.Unmount(p.PropagatedMount); err != nil {
- logrus.Warnf("Could not unmount %s: %v", p.PropagatedMount, err)
- }
- propRoot := filepath.Join(filepath.Dir(p.Rootfs), "propagated-mount")
- if err := mount.Unmount(propRoot); err != nil {
- logrus.Warn("Could not unmount %s: %v", propRoot, err)
- }
- }
-
pm.mu.RLock()
c := pm.cMap[p]
if c.exitChan != nil {
@@ -171,6 +156,10 @@
if restart {
pm.enable(p, c, true)
+ } else {
+ if err := mount.RecursiveUnmount(filepath.Join(pm.config.Root, id)); err != nil {
+ return errors.Wrap(err, "error cleaning up plugin mounts")
+ }
}
return nil
}
@@ -239,28 +228,17 @@
// check if we need to migrate an older propagated mount from before
// these mounts were stored outside the plugin rootfs
if _, err := os.Stat(propRoot); os.IsNotExist(err) {
- if _, err := os.Stat(p.PropagatedMount); err == nil {
- // make sure nothing is mounted here
- // don't care about errors
- mount.Unmount(p.PropagatedMount)
- if err := os.Rename(p.PropagatedMount, propRoot); err != nil {
+ rootfsProp := filepath.Join(p.Rootfs, p.PluginObj.Config.PropagatedMount)
+ if _, err := os.Stat(rootfsProp); err == nil {
+ if err := os.Rename(rootfsProp, propRoot); err != nil {
logrus.WithError(err).WithField("dir", propRoot).Error("error migrating propagated mount storage")
}
- if err := os.MkdirAll(p.PropagatedMount, 0755); err != nil {
- logrus.WithError(err).WithField("dir", p.PropagatedMount).Error("error migrating propagated mount storage")
- }
}
}
if err := os.MkdirAll(propRoot, 0755); err != nil {
logrus.Errorf("failed to create PropagatedMount directory at %s: %v", propRoot, err)
}
- // TODO: sanitize PropagatedMount and prevent breakout
- p.PropagatedMount = filepath.Join(p.Rootfs, p.PluginObj.Config.PropagatedMount)
- if err := os.MkdirAll(p.PropagatedMount, 0755); err != nil {
- logrus.Errorf("failed to create PropagatedMount directory at %s: %v", p.PropagatedMount, err)
- return
- }
}
}
}
diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go
index 256b095..3fc6be4 100644
--- a/plugin/manager_linux.go
+++ b/plugin/manager_linux.go
@@ -22,7 +22,7 @@
"golang.org/x/sys/unix"
)
-func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) (err error) {
+func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error {
p.Rootfs = filepath.Join(pm.config.Root, p.PluginObj.ID, "rootfs")
if p.IsEnabled() && !force {
return errors.Wrap(enabledError(p.Name()), "plugin already enabled")
@@ -40,20 +40,16 @@
pm.mu.Unlock()
var propRoot string
- if p.PropagatedMount != "" {
+ if p.PluginObj.Config.PropagatedMount != "" {
propRoot = filepath.Join(filepath.Dir(p.Rootfs), "propagated-mount")
- if err = os.MkdirAll(propRoot, 0755); err != nil {
+ if err := os.MkdirAll(propRoot, 0755); err != nil {
logrus.Errorf("failed to create PropagatedMount directory at %s: %v", propRoot, err)
}
- if err = mount.MakeRShared(propRoot); err != nil {
+ if err := mount.MakeRShared(propRoot); err != nil {
return errors.Wrap(err, "error setting up propagated mount dir")
}
-
- if err = mount.Mount(propRoot, p.PropagatedMount, "none", "rbind"); err != nil {
- return errors.Wrap(err, "error creating mount for propagated mount")
- }
}
rootFS := containerfs.NewLocalContainerFS(filepath.Join(pm.config.Root, p.PluginObj.ID, rootFSFileName))
@@ -63,16 +59,12 @@
stdout, stderr := makeLoggerStreams(p.GetID())
if err := pm.executor.Create(p.GetID(), *spec, stdout, stderr); err != nil {
- if p.PropagatedMount != "" {
- if err := mount.Unmount(p.PropagatedMount); err != nil {
- logrus.Warnf("Could not unmount %s: %v", p.PropagatedMount, err)
- }
+ if p.PluginObj.Config.PropagatedMount != "" {
if err := mount.Unmount(propRoot); err != nil {
logrus.Warnf("Could not unmount %s: %v", propRoot, err)
}
}
}
-
return pm.pluginPostStart(p, c)
}
@@ -167,13 +159,6 @@
}
}
-func setupRoot(root string) error {
- if err := mount.MakePrivate(root); err != nil {
- return errors.Wrap(err, "error setting plugin manager root to private")
- }
- return nil
-}
-
func (pm *Manager) disable(p *v2.Plugin, c *controller) error {
if !p.IsEnabled() {
return errors.Wrap(errDisabled(p.Name()), "plugin is already disabled")
@@ -202,7 +187,9 @@
shutdownPlugin(p, c, pm.executor)
}
}
- mount.Unmount(pm.config.Root)
+ if err := mount.RecursiveUnmount(pm.config.Root); err != nil {
+ logrus.WithError(err).Warn("error cleaning up plugin mounts")
+ }
}
func (pm *Manager) upgradePlugin(p *v2.Plugin, configDigest digest.Digest, blobsums []digest.Digest, tmpRootFSDir string, privileges *types.PluginPrivileges) (err error) {
diff --git a/plugin/manager_windows.go b/plugin/manager_windows.go
index 309a31c..9fafea5 100644
--- a/plugin/manager_windows.go
+++ b/plugin/manager_windows.go
@@ -26,5 +26,3 @@
// Shutdown plugins
func (pm *Manager) Shutdown() {
}
-
-func setupRoot(root string) error { return nil }
diff --git a/plugin/store.go b/plugin/store.go
index 735eea4..5cb994b 100644
--- a/plugin/store.go
+++ b/plugin/store.go
@@ -9,6 +9,7 @@
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugins"
"github.com/docker/docker/plugin/v2"
+ specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
@@ -64,6 +65,10 @@
func (ps *Store) SetAll(plugins map[string]*v2.Plugin) {
ps.Lock()
defer ps.Unlock()
+
+ for _, p := range plugins {
+ ps.setSpecOpts(p)
+ }
ps.plugins = plugins
}
@@ -90,6 +95,22 @@
p.PluginObj.Enabled = state
}
+func (ps *Store) setSpecOpts(p *v2.Plugin) {
+ var specOpts []SpecOpt
+ for _, typ := range p.GetTypes() {
+ opts, ok := ps.specOpts[typ.String()]
+ if ok {
+ specOpts = append(specOpts, opts...)
+ }
+ }
+
+ p.SetSpecOptModifier(func(s *specs.Spec) {
+ for _, o := range specOpts {
+ o(s)
+ }
+ })
+}
+
// Add adds a plugin to memory and plugindb.
// An error will be returned if there is a collision.
func (ps *Store) Add(p *v2.Plugin) error {
@@ -99,6 +120,9 @@
if v, exist := ps.plugins[p.GetID()]; exist {
return fmt.Errorf("plugin %q has the same ID %s as %q", p.Name(), p.GetID(), v.Name())
}
+
+ ps.setSpecOpts(p)
+
ps.plugins[p.GetID()] = p
return nil
}
@@ -182,20 +206,24 @@
return result, nil
}
+func pluginType(cap string) string {
+ return fmt.Sprintf("docker.%s/%s", strings.ToLower(cap), defaultAPIVersion)
+}
+
// Handle sets a callback for a given capability. It is only used by network
// and ipam drivers during plugin registration. The callback registers the
// driver with the subsystem (network, ipam).
func (ps *Store) Handle(capability string, callback func(string, *plugins.Client)) {
- pluginType := fmt.Sprintf("docker.%s/%s", strings.ToLower(capability), defaultAPIVersion)
+ typ := pluginType(capability)
// Register callback with new plugin model.
ps.Lock()
- handlers, ok := ps.handlers[pluginType]
+ handlers, ok := ps.handlers[typ]
if !ok {
handlers = []func(string, *plugins.Client){}
}
handlers = append(handlers, callback)
- ps.handlers[pluginType] = handlers
+ ps.handlers[typ] = handlers
ps.Unlock()
// Register callback with legacy plugin model.
@@ -204,6 +232,15 @@
}
}
+// RegisterRuntimeOpt stores a list of SpecOpts for the provided capability.
+// These options are applied to the runtime spec before a plugin is started for the specified capability.
+func (ps *Store) RegisterRuntimeOpt(cap string, opts ...SpecOpt) {
+ ps.Lock()
+ defer ps.Unlock()
+ typ := pluginType(cap)
+ ps.specOpts[typ] = append(ps.specOpts[typ], opts...)
+}
+
// CallHandler calls the registered callback. It is invoked during plugin enable.
func (ps *Store) CallHandler(p *v2.Plugin) {
for _, typ := range p.GetTypes() {
diff --git a/plugin/v2/plugin.go b/plugin/v2/plugin.go
index 42028be..c00a9d0 100644
--- a/plugin/v2/plugin.go
+++ b/plugin/v2/plugin.go
@@ -2,6 +2,7 @@
import (
"fmt"
+ "path/filepath"
"strings"
"sync"
@@ -9,20 +10,22 @@
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/docker/pkg/plugins"
"github.com/opencontainers/go-digest"
+ specs "github.com/opencontainers/runtime-spec/specs-go"
)
// Plugin represents an individual plugin.
type Plugin struct {
- mu sync.RWMutex
- PluginObj types.Plugin `json:"plugin"` // todo: embed struct
- pClient *plugins.Client
- refCount int
- PropagatedMount string // TODO: make private
- Rootfs string // TODO: make private
+ mu sync.RWMutex
+ PluginObj types.Plugin `json:"plugin"` // todo: embed struct
+ pClient *plugins.Client
+ refCount int
+ Rootfs string // TODO: make private
Config digest.Digest
Blobsums []digest.Digest
+ modifyRuntimeSpec func(*specs.Spec)
+
SwarmServiceID string
}
@@ -37,10 +40,13 @@
return fmt.Sprintf("plugin does not provide %q capability", e.cap)
}
-// BasePath returns the path to which all paths returned by the plugin are relative to.
-// For Plugin objects this returns the host path of the plugin container's rootfs.
-func (p *Plugin) BasePath() string {
- return p.Rootfs
+// ScopedPath returns the path scoped to the plugin rootfs
+func (p *Plugin) ScopedPath(s string) string {
+ if p.PluginObj.Config.PropagatedMount != "" && strings.HasPrefix(s, p.PluginObj.Config.PropagatedMount) {
+ // re-scope to the propagated mount path on the host
+ return filepath.Join(filepath.Dir(p.Rootfs), "propagated-mount", strings.TrimPrefix(s, p.PluginObj.Config.PropagatedMount))
+ }
+ return filepath.Join(p.Rootfs, s)
}
// Client returns the plugin client.
@@ -250,3 +256,11 @@
func (p *Plugin) Release() {
p.AddRefCount(plugingetter.Release)
}
+
+// SetSpecOptModifier sets the function to use to modify the the generated
+// runtime spec.
+func (p *Plugin) SetSpecOptModifier(f func(*specs.Spec)) {
+ p.mu.Lock()
+ p.modifyRuntimeSpec = f
+ p.mu.Unlock()
+}
diff --git a/plugin/v2/plugin_linux.go b/plugin/v2/plugin_linux.go
index 05d0f0e..d0fc972 100644
--- a/plugin/v2/plugin_linux.go
+++ b/plugin/v2/plugin_linux.go
@@ -4,6 +4,7 @@
"os"
"path/filepath"
"runtime"
+ "sort"
"strings"
"github.com/docker/docker/api/types"
@@ -16,6 +17,7 @@
// InitSpec creates an OCI spec from the plugin's config.
func (p *Plugin) InitSpec(execRoot string) (*specs.Spec, error) {
s := oci.DefaultSpec()
+
s.Root = &specs.Root{
Path: p.Rootfs,
Readonly: false, // TODO: all plugins should be readonly? settable in config?
@@ -31,6 +33,17 @@
return nil, errors.WithStack(err)
}
+ if p.PluginObj.Config.PropagatedMount != "" {
+ pRoot := filepath.Join(filepath.Dir(p.Rootfs), "propagated-mount")
+ s.Mounts = append(s.Mounts, specs.Mount{
+ Source: pRoot,
+ Destination: p.PluginObj.Config.PropagatedMount,
+ Type: "bind",
+ Options: []string{"rbind", "rw", "rshared"},
+ })
+ s.Linux.RootfsPropagation = "rshared"
+ }
+
mounts := append(p.PluginObj.Config.Mounts, types.PluginMount{
Source: &execRoot,
Destination: defaultPluginRuntimeDestination,
@@ -88,11 +101,6 @@
}
}
- if p.PluginObj.Config.PropagatedMount != "" {
- p.PropagatedMount = filepath.Join(p.Rootfs, p.PluginObj.Config.PropagatedMount)
- s.Linux.RootfsPropagation = "rshared"
- }
-
if p.PluginObj.Config.Linux.AllowAllDevices {
s.Linux.Resources.Devices = []specs.LinuxDeviceCgroup{{Allow: true, Access: "rwm"}}
}
@@ -126,5 +134,13 @@
caps.Inheritable = append(caps.Inheritable, p.PluginObj.Config.Linux.Capabilities...)
caps.Effective = append(caps.Effective, p.PluginObj.Config.Linux.Capabilities...)
+ if p.modifyRuntimeSpec != nil {
+ p.modifyRuntimeSpec(&s)
+ }
+
+ sort.Slice(s.Mounts, func(i, j int) bool {
+ return s.Mounts[i].Destination < s.Mounts[j].Destination
+ })
+
return &s, nil
}
diff --git a/poule.yml b/poule.yml
index 2abf0df..7afb79e 100644
--- a/poule.yml
+++ b/poule.yml
@@ -107,16 +107,13 @@
users: [
"aaronlehmann",
"akihirosuda",
- "aluzzardi",
"coolljt0725",
"cpuguy83",
"crosbymichael",
"dnephin",
"duglin",
- "ehazlett",
"johnstep",
"justincormack",
- "lk4d4",
"mhbauer",
"mlaventure",
"runcom",
diff --git a/vendor.conf b/vendor.conf
index e0d2791..42fbd52 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -14,9 +14,9 @@
github.com/tchap/go-patricia v2.2.6
github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
-golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce
+golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd
github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
-github.com/docker/go-connections 98e7d807e5d804e4e42a98d74d1dd695321224ef
+github.com/docker/go-connections 7beb39f0b969b075d1325fecb092faf27fd357b6
golang.org/x/text f72d8390a633d5dfb0cc84043294db9f6c935756
github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
github.com/pmezard/go-difflib v1.0.0
@@ -31,7 +31,9 @@
github.com/tonistiigi/fsutil dea3a0da73aee887fc02142d995be764106ac5e2
#get libnetwork packages
-github.com/docker/libnetwork 20dd462e0a0e883437a274bd61df4bc4de980830
+
+# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/binaries-commits accordingly
+github.com/docker/libnetwork ed2130d117c11c542327b4d5216a5db36770bc65
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
@@ -44,6 +46,8 @@
github.com/docker/libkv 1d8431073ae03cdaedb198a89722f3aab6d418ef
github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25
github.com/vishvananda/netlink b2de5d10e38ecce8607e6b438b6d174f389a004e
+
+# When updating, consider updating TOMLV_COMMIT in hack/dockerfile/binaries-commits accordingly
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374
github.com/deckarep/golang-set ef32fa3046d9f249d399f98ebaf9be944430fd1d
@@ -53,6 +57,7 @@
github.com/hashicorp/consul v0.5.2
github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904
github.com/miekg/dns 75e6e86cc601825c5dbcd4e0c209eab180997cd7
+github.com/ishidawataru/sctp 07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb
# get graph and distribution packages
github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c
@@ -66,7 +71,7 @@
google.golang.org/grpc v1.3.0
# When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly
-github.com/opencontainers/runc 9f9c96235cc97674e935002fc3d78361b696a69e
+github.com/opencontainers/runc 6c55f98695e902427906eed2c799e566e3d3dfb5
github.com/opencontainers/runtime-spec v1.0.1
github.com/opencontainers/image-spec v1.0.1
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
@@ -106,16 +111,16 @@
# containerd
github.com/containerd/containerd 3fa104f843ec92328912e042b767d26825f202aa
github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
-github.com/containerd/continuity 35d55c5e8dd23b32037d56cf97174aff3efdfa83
-github.com/containerd/cgroups 29da22c6171a4316169f9205ab6c49f59b5b852f
+github.com/containerd/continuity d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371
+github.com/containerd/cgroups c0710c92e8b3a44681d1321dcfd1360fc5c6c089
github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e
-github.com/containerd/go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7
+github.com/containerd/go-runc 4f6e87ae043f859a38255247b49c9abc262d002f
github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
github.com/dmcgowan/go-tar go1.10
-github.com/stevvooe/ttrpc 76e68349ad9ab4d03d764c713826d31216715e4f
+github.com/stevvooe/ttrpc d4528379866b0ce7e9d71f3eb96f0582fc374577
# cluster
-github.com/docker/swarmkit 68a376dc30d8c4001767c39456b990dbd821371b
+github.com/docker/swarmkit f74983e7c015a38a81c8642803a78b8322cf7eac
github.com/gogo/protobuf v0.4
github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e
diff --git a/vendor/github.com/containerd/cgroups/blkio.go b/vendor/github.com/containerd/cgroups/blkio.go
index 078d12b..9b15b8a 100644
--- a/vendor/github.com/containerd/cgroups/blkio.go
+++ b/vendor/github.com/containerd/cgroups/blkio.go
@@ -3,12 +3,12 @@
import (
"bufio"
"fmt"
+ "io"
"io/ioutil"
"os"
"path/filepath"
"strconv"
"strings"
- "syscall"
specs "github.com/opencontainers/runtime-spec/specs-go"
)
@@ -105,8 +105,13 @@
},
)
}
+ f, err := os.Open("/proc/diskstats")
+ if err != nil {
+ return err
+ }
+ defer f.Close()
- devices, err := getDevices("/dev")
+ devices, err := getDevices(f)
if err != nil {
return err
}
@@ -268,50 +273,32 @@
// getDevices makes a best effort attempt to read all the devices into a map
// keyed by major and minor number. Since devices may be mapped multiple times,
// we err on taking the first occurrence.
-func getDevices(path string) (map[deviceKey]string, error) {
- // TODO(stevvooe): We are ignoring lots of errors. It might be kind of
- // challenging to debug this if we aren't mapping devices correctly.
- // Consider logging these errors.
- devices := map[deviceKey]string{}
- if err := filepath.Walk(path, func(p string, fi os.FileInfo, err error) error {
+func getDevices(r io.Reader) (map[deviceKey]string, error) {
+
+ var (
+ s = bufio.NewScanner(r)
+ devices = make(map[deviceKey]string)
+ )
+ for s.Scan() {
+ fields := strings.Fields(s.Text())
+ major, err := strconv.Atoi(fields[0])
if err != nil {
- return err
+ return nil, err
}
- switch {
- case fi.IsDir():
- switch fi.Name() {
- case "pts", "shm", "fd", "mqueue", ".lxc", ".lxd-mounts":
- return filepath.SkipDir
- default:
- return nil
- }
- case fi.Name() == "console":
- return nil
- default:
- if fi.Mode()&os.ModeDevice == 0 {
- // skip non-devices
- return nil
- }
-
- st, ok := fi.Sys().(*syscall.Stat_t)
- if !ok {
- return fmt.Errorf("%s: unable to convert to system stat", p)
- }
-
- key := deviceKey{major(st.Rdev), minor(st.Rdev)}
- if _, ok := devices[key]; ok {
- return nil // skip it if we have already populated the path.
- }
-
- devices[key] = p
+ minor, err := strconv.Atoi(fields[1])
+ if err != nil {
+ return nil, err
}
-
- return nil
- }); err != nil {
- return nil, err
+ key := deviceKey{
+ major: uint64(major),
+ minor: uint64(minor),
+ }
+ if _, ok := devices[key]; ok {
+ continue
+ }
+ devices[key] = filepath.Join("/dev", fields[2])
}
-
- return devices, nil
+ return devices, s.Err()
}
func major(devNumber uint64) uint64 {
diff --git a/vendor/github.com/containerd/cgroups/errors.go b/vendor/github.com/containerd/cgroups/errors.go
index d18b4b1..a5824fe 100644
--- a/vendor/github.com/containerd/cgroups/errors.go
+++ b/vendor/github.com/containerd/cgroups/errors.go
@@ -12,7 +12,7 @@
ErrFreezerNotSupported = errors.New("cgroups: freezer cgroup not supported on this system")
ErrMemoryNotSupported = errors.New("cgroups: memory cgroup not supported on this system")
ErrCgroupDeleted = errors.New("cgroups: cgroup deleted")
- ErrNoCgroupMountDestination = errors.New("cgroups: cannot found cgroup mount destination")
+ ErrNoCgroupMountDestination = errors.New("cgroups: cannot find cgroup mount destination")
)
// ErrorHandler is a function that handles and acts on errors
diff --git a/vendor/github.com/containerd/continuity/devices/devices_darwin.go b/vendor/github.com/containerd/continuity/devices/devices_darwin.go
deleted file mode 100644
index 5041e66..0000000
--- a/vendor/github.com/containerd/continuity/devices/devices_darwin.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package devices
-
-// from /usr/include/sys/types.h
-
-func getmajor(dev int32) uint64 {
- return (uint64(dev) >> 24) & 0xff
-}
-
-func getminor(dev int32) uint64 {
- return uint64(dev) & 0xffffff
-}
-
-func makedev(major int, minor int) int {
- return ((major << 24) | minor)
-}
diff --git a/vendor/github.com/containerd/continuity/devices/devices_dummy.go b/vendor/github.com/containerd/continuity/devices/devices_dummy.go
deleted file mode 100644
index 9a48330..0000000
--- a/vendor/github.com/containerd/continuity/devices/devices_dummy.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// +build solaris,!cgo
-
-//
-// Implementing the functions below requires cgo support. Non-cgo stubs
-// versions are defined below to enable cross-compilation of source code
-// that depends on these functions, but the resultant cross-compiled
-// binaries cannot actually be used. If the stub function(s) below are
-// actually invoked they will cause the calling process to exit.
-//
-
-package devices
-
-func getmajor(dev uint64) uint64 {
- panic("getmajor() support requires cgo.")
-}
-
-func getminor(dev uint64) uint64 {
- panic("getminor() support requires cgo.")
-}
-
-func makedev(major int, minor int) int {
- panic("makedev() support requires cgo.")
-}
diff --git a/vendor/github.com/containerd/continuity/devices/devices_freebsd.go b/vendor/github.com/containerd/continuity/devices/devices_freebsd.go
deleted file mode 100644
index a5c7b93..0000000
--- a/vendor/github.com/containerd/continuity/devices/devices_freebsd.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package devices
-
-// from /usr/include/sys/types.h
-
-func getmajor(dev uint32) uint64 {
- return (uint64(dev) >> 24) & 0xff
-}
-
-func getminor(dev uint32) uint64 {
- return uint64(dev) & 0xffffff
-}
-
-func makedev(major int, minor int) int {
- return ((major << 24) | minor)
-}
diff --git a/vendor/github.com/containerd/continuity/devices/devices_linux.go b/vendor/github.com/containerd/continuity/devices/devices_linux.go
deleted file mode 100644
index 454cf66..0000000
--- a/vendor/github.com/containerd/continuity/devices/devices_linux.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package devices
-
-// from /usr/include/linux/kdev_t.h
-
-func getmajor(dev uint64) uint64 {
- return dev >> 8
-}
-
-func getminor(dev uint64) uint64 {
- return dev & 0xff
-}
-
-func makedev(major int, minor int) int {
- return ((major << 8) | minor)
-}
diff --git a/vendor/github.com/containerd/continuity/devices/devices_solaris.go b/vendor/github.com/containerd/continuity/devices/devices_solaris.go
deleted file mode 100644
index 8819ac8..0000000
--- a/vendor/github.com/containerd/continuity/devices/devices_solaris.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build cgo
-
-package devices
-
-//#include <sys/mkdev.h>
-import "C"
-
-func getmajor(dev uint64) uint64 {
- return uint64(C.major(C.dev_t(dev)))
-}
-
-func getminor(dev uint64) uint64 {
- return uint64(C.minor(C.dev_t(dev)))
-}
-
-func makedev(major int, minor int) int {
- return int(C.makedev(C.major_t(major), C.minor_t(minor)))
-}
diff --git a/vendor/github.com/containerd/continuity/devices/devices_unix.go b/vendor/github.com/containerd/continuity/devices/devices_unix.go
index 85e9a68..97fe6b1 100644
--- a/vendor/github.com/containerd/continuity/devices/devices_unix.go
+++ b/vendor/github.com/containerd/continuity/devices/devices_unix.go
@@ -6,6 +6,8 @@
"fmt"
"os"
"syscall"
+
+ "golang.org/x/sys/unix"
)
func DeviceInfo(fi os.FileInfo) (uint64, uint64, error) {
@@ -14,42 +16,43 @@
return 0, 0, fmt.Errorf("cannot extract device from os.FileInfo")
}
- return getmajor(sys.Rdev), getminor(sys.Rdev), nil
+ dev := uint64(sys.Rdev)
+ return uint64(unix.Major(dev)), uint64(unix.Minor(dev)), nil
}
// mknod provides a shortcut for syscall.Mknod
func Mknod(p string, mode os.FileMode, maj, min int) error {
var (
m = syscallMode(mode.Perm())
- dev int
+ dev uint64
)
if mode&os.ModeDevice != 0 {
- dev = makedev(maj, min)
+ dev = unix.Mkdev(uint32(maj), uint32(min))
if mode&os.ModeCharDevice != 0 {
- m |= syscall.S_IFCHR
+ m |= unix.S_IFCHR
} else {
- m |= syscall.S_IFBLK
+ m |= unix.S_IFBLK
}
} else if mode&os.ModeNamedPipe != 0 {
- m |= syscall.S_IFIFO
+ m |= unix.S_IFIFO
}
- return syscall.Mknod(p, m, dev)
+ return unix.Mknod(p, m, int(dev))
}
// syscallMode returns the syscall-specific mode bits from Go's portable mode bits.
func syscallMode(i os.FileMode) (o uint32) {
o |= uint32(i.Perm())
if i&os.ModeSetuid != 0 {
- o |= syscall.S_ISUID
+ o |= unix.S_ISUID
}
if i&os.ModeSetgid != 0 {
- o |= syscall.S_ISGID
+ o |= unix.S_ISGID
}
if i&os.ModeSticky != 0 {
- o |= syscall.S_ISVTX
+ o |= unix.S_ISVTX
}
return
}
diff --git a/vendor/github.com/containerd/continuity/fs/copy.go b/vendor/github.com/containerd/continuity/fs/copy.go
new file mode 100644
index 0000000..e8f4528
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/copy.go
@@ -0,0 +1,119 @@
+package fs
+
+import (
+ "io/ioutil"
+ "os"
+ "path/filepath"
+ "sync"
+
+ "github.com/pkg/errors"
+)
+
+var bufferPool = &sync.Pool{
+ New: func() interface{} {
+ buffer := make([]byte, 32*1024)
+ return &buffer
+ },
+}
+
+// CopyDir copies the directory from src to dst.
+// Most efficient copy of files is attempted.
+func CopyDir(dst, src string) error {
+ inodes := map[uint64]string{}
+ return copyDirectory(dst, src, inodes)
+}
+
+func copyDirectory(dst, src string, inodes map[uint64]string) error {
+ stat, err := os.Stat(src)
+ if err != nil {
+ return errors.Wrapf(err, "failed to stat %s", src)
+ }
+ if !stat.IsDir() {
+ return errors.Errorf("source is not directory")
+ }
+
+ if st, err := os.Stat(dst); err != nil {
+ if err := os.Mkdir(dst, stat.Mode()); err != nil {
+ return errors.Wrapf(err, "failed to mkdir %s", dst)
+ }
+ } else if !st.IsDir() {
+ return errors.Errorf("cannot copy to non-directory: %s", dst)
+ } else {
+ if err := os.Chmod(dst, stat.Mode()); err != nil {
+ return errors.Wrapf(err, "failed to chmod on %s", dst)
+ }
+ }
+
+ fis, err := ioutil.ReadDir(src)
+ if err != nil {
+ return errors.Wrapf(err, "failed to read %s", src)
+ }
+
+ if err := copyFileInfo(stat, dst); err != nil {
+ return errors.Wrapf(err, "failed to copy file info for %s", dst)
+ }
+
+ for _, fi := range fis {
+ source := filepath.Join(src, fi.Name())
+ target := filepath.Join(dst, fi.Name())
+
+ switch {
+ case fi.IsDir():
+ if err := copyDirectory(target, source, inodes); err != nil {
+ return err
+ }
+ continue
+ case (fi.Mode() & os.ModeType) == 0:
+ link, err := getLinkSource(target, fi, inodes)
+ if err != nil {
+ return errors.Wrap(err, "failed to get hardlink")
+ }
+ if link != "" {
+ if err := os.Link(link, target); err != nil {
+ return errors.Wrap(err, "failed to create hard link")
+ }
+ } else if err := copyFile(source, target); err != nil {
+ return errors.Wrap(err, "failed to copy files")
+ }
+ case (fi.Mode() & os.ModeSymlink) == os.ModeSymlink:
+ link, err := os.Readlink(source)
+ if err != nil {
+ return errors.Wrapf(err, "failed to read link: %s", source)
+ }
+ if err := os.Symlink(link, target); err != nil {
+ return errors.Wrapf(err, "failed to create symlink: %s", target)
+ }
+ case (fi.Mode() & os.ModeDevice) == os.ModeDevice:
+ if err := copyDevice(target, fi); err != nil {
+ return errors.Wrapf(err, "failed to create device")
+ }
+ default:
+ // TODO: Support pipes and sockets
+ return errors.Wrapf(err, "unsupported mode %s", fi.Mode())
+ }
+ if err := copyFileInfo(fi, target); err != nil {
+ return errors.Wrap(err, "failed to copy file info")
+ }
+
+ if err := copyXAttrs(target, source); err != nil {
+ return errors.Wrap(err, "failed to copy xattrs")
+ }
+ }
+
+ return nil
+}
+
+func copyFile(source, target string) error {
+ src, err := os.Open(source)
+ if err != nil {
+ return errors.Wrapf(err, "failed to open source %s", source)
+ }
+ defer src.Close()
+ tgt, err := os.Create(target)
+ if err != nil {
+ return errors.Wrapf(err, "failed to open target %s", target)
+ }
+ defer tgt.Close()
+
+ return copyFileContent(tgt, src)
+}
diff --git a/vendor/github.com/containerd/continuity/fs/copy_linux.go b/vendor/github.com/containerd/continuity/fs/copy_linux.go
new file mode 100644
index 0000000..cfab675
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/copy_linux.go
@@ -0,0 +1,95 @@
+package fs
+
+import (
+ "io"
+ "os"
+ "syscall"
+
+ "github.com/containerd/continuity/sysx"
+ "github.com/pkg/errors"
+ "golang.org/x/sys/unix"
+)
+
+func copyFileInfo(fi os.FileInfo, name string) error {
+ st := fi.Sys().(*syscall.Stat_t)
+ if err := os.Lchown(name, int(st.Uid), int(st.Gid)); err != nil {
+ if os.IsPermission(err) {
+ // Normally if uid/gid are the same this would be a no-op, but some
+ // filesystems may still return EPERM... for instance NFS does this.
+ // In such a case, this is not an error.
+ if dstStat, err2 := os.Lstat(name); err2 == nil {
+ st2 := dstStat.Sys().(*syscall.Stat_t)
+ if st.Uid == st2.Uid && st.Gid == st2.Gid {
+ err = nil
+ }
+ }
+ }
+ if err != nil {
+ return errors.Wrapf(err, "failed to chown %s", name)
+ }
+ }
+
+ if (fi.Mode() & os.ModeSymlink) != os.ModeSymlink {
+ if err := os.Chmod(name, fi.Mode()); err != nil {
+ return errors.Wrapf(err, "failed to chmod %s", name)
+ }
+ }
+
+ timespec := []unix.Timespec{unix.Timespec(StatAtime(st)), unix.Timespec(StatMtime(st))}
+ if err := unix.UtimesNanoAt(unix.AT_FDCWD, name, timespec, unix.AT_SYMLINK_NOFOLLOW); err != nil {
+ return errors.Wrapf(err, "failed to utime %s", name)
+ }
+
+ return nil
+}
+
+func copyFileContent(dst, src *os.File) error {
+ st, err := src.Stat()
+ if err != nil {
+ return errors.Wrap(err, "unable to stat source")
+ }
+
+ n, err := unix.CopyFileRange(int(src.Fd()), nil, int(dst.Fd()), nil, int(st.Size()), 0)
+ if err != nil {
+ if err != unix.ENOSYS && err != unix.EXDEV {
+ return errors.Wrap(err, "copy file range failed")
+ }
+
+ buf := bufferPool.Get().(*[]byte)
+ _, err = io.CopyBuffer(dst, src, *buf)
+ bufferPool.Put(buf)
+ return err
+ }
+
+ if int64(n) != st.Size() {
+ return errors.Wrapf(err, "short copy: %d of %d", int64(n), st.Size())
+ }
+
+ return nil
+}
+
+func copyXAttrs(dst, src string) error {
+ xattrKeys, err := sysx.LListxattr(src)
+ if err != nil {
+ return errors.Wrapf(err, "failed to list xattrs on %s", src)
+ }
+ for _, xattr := range xattrKeys {
+ data, err := sysx.LGetxattr(src, xattr)
+ if err != nil {
+ return errors.Wrapf(err, "failed to get xattr %q on %s", xattr, src)
+ }
+ if err := sysx.LSetxattr(dst, xattr, data, 0); err != nil {
+ return errors.Wrapf(err, "failed to set xattr %q on %s", xattr, dst)
+ }
+ }
+
+ return nil
+}
+
+func copyDevice(dst string, fi os.FileInfo) error {
+ st, ok := fi.Sys().(*syscall.Stat_t)
+ if !ok {
+ return errors.New("unsupported stat type")
+ }
+ return unix.Mknod(dst, uint32(fi.Mode()), int(st.Rdev))
+}
diff --git a/vendor/github.com/containerd/continuity/fs/copy_unix.go b/vendor/github.com/containerd/continuity/fs/copy_unix.go
new file mode 100644
index 0000000..29cbb81
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/copy_unix.go
@@ -0,0 +1,80 @@
+// +build solaris darwin freebsd
+
+package fs
+
+import (
+ "io"
+ "os"
+ "syscall"
+
+ "github.com/containerd/continuity/sysx"
+ "github.com/pkg/errors"
+ "golang.org/x/sys/unix"
+)
+
+func copyFileInfo(fi os.FileInfo, name string) error {
+ st := fi.Sys().(*syscall.Stat_t)
+ if err := os.Lchown(name, int(st.Uid), int(st.Gid)); err != nil {
+ if os.IsPermission(err) {
+ // Normally if uid/gid are the same this would be a no-op, but some
+ // filesystems may still return EPERM... for instance NFS does this.
+ // In such a case, this is not an error.
+ if dstStat, err2 := os.Lstat(name); err2 == nil {
+ st2 := dstStat.Sys().(*syscall.Stat_t)
+ if st.Uid == st2.Uid && st.Gid == st2.Gid {
+ err = nil
+ }
+ }
+ }
+ if err != nil {
+ return errors.Wrapf(err, "failed to chown %s", name)
+ }
+ }
+
+ if (fi.Mode() & os.ModeSymlink) != os.ModeSymlink {
+ if err := os.Chmod(name, fi.Mode()); err != nil {
+ return errors.Wrapf(err, "failed to chmod %s", name)
+ }
+ }
+
+ timespec := []syscall.Timespec{StatAtime(st), StatMtime(st)}
+ if err := syscall.UtimesNano(name, timespec); err != nil {
+ return errors.Wrapf(err, "failed to utime %s", name)
+ }
+
+ return nil
+}
+
+func copyFileContent(dst, src *os.File) error {
+ buf := bufferPool.Get().(*[]byte)
+ _, err := io.CopyBuffer(dst, src, *buf)
+ bufferPool.Put(buf)
+
+ return err
+}
+
+func copyXAttrs(dst, src string) error {
+ xattrKeys, err := sysx.LListxattr(src)
+ if err != nil {
+ return errors.Wrapf(err, "failed to list xattrs on %s", src)
+ }
+ for _, xattr := range xattrKeys {
+ data, err := sysx.LGetxattr(src, xattr)
+ if err != nil {
+ return errors.Wrapf(err, "failed to get xattr %q on %s", xattr, src)
+ }
+ if err := sysx.LSetxattr(dst, xattr, data, 0); err != nil {
+ return errors.Wrapf(err, "failed to set xattr %q on %s", xattr, dst)
+ }
+ }
+
+ return nil
+}
+
+func copyDevice(dst string, fi os.FileInfo) error {
+ st, ok := fi.Sys().(*syscall.Stat_t)
+ if !ok {
+ return errors.New("unsupported stat type")
+ }
+ return unix.Mknod(dst, uint32(fi.Mode()), int(st.Rdev))
+}
diff --git a/vendor/github.com/containerd/continuity/fs/copy_windows.go b/vendor/github.com/containerd/continuity/fs/copy_windows.go
new file mode 100644
index 0000000..6fb3de5
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/copy_windows.go
@@ -0,0 +1,33 @@
+package fs
+
+import (
+ "io"
+ "os"
+
+ "github.com/pkg/errors"
+)
+
+func copyFileInfo(fi os.FileInfo, name string) error {
+ if err := os.Chmod(name, fi.Mode()); err != nil {
+ return errors.Wrapf(err, "failed to chmod %s", name)
+ }
+
+ // TODO: copy windows specific metadata
+
+ return nil
+}
+
+func copyFileContent(dst, src *os.File) error {
+ buf := bufferPool.Get().(*[]byte)
+ _, err := io.CopyBuffer(dst, src, *buf)
+ bufferPool.Put(buf)
+ return err
+}
+
+func copyXAttrs(dst, src string) error {
+ return nil
+}
+
+func copyDevice(dst string, fi os.FileInfo) error {
+ return errors.New("device copy not supported")
+}
diff --git a/vendor/github.com/containerd/continuity/fs/diff.go b/vendor/github.com/containerd/continuity/fs/diff.go
new file mode 100644
index 0000000..f2300e8
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/diff.go
@@ -0,0 +1,310 @@
+package fs
+
+import (
+ "context"
+ "os"
+ "path/filepath"
+ "strings"
+
+ "golang.org/x/sync/errgroup"
+
+ "github.com/sirupsen/logrus"
+)
+
+// ChangeKind is the type of modification that
+// a change is making.
+type ChangeKind int
+
+const (
+ // ChangeKindUnmodified represents an unmodified
+ // file
+ ChangeKindUnmodified = iota
+
+ // ChangeKindAdd represents an addition of
+ // a file
+ ChangeKindAdd
+
+ // ChangeKindModify represents a change to
+ // an existing file
+ ChangeKindModify
+
+ // ChangeKindDelete represents a delete of
+ // a file
+ ChangeKindDelete
+)
+
+func (k ChangeKind) String() string {
+ switch k {
+ case ChangeKindUnmodified:
+ return "unmodified"
+ case ChangeKindAdd:
+ return "add"
+ case ChangeKindModify:
+ return "modify"
+ case ChangeKindDelete:
+ return "delete"
+ default:
+ return ""
+ }
+}
+
+// Change represents single change between a diff and its parent.
+type Change struct {
+ Kind ChangeKind
+ Path string
+}
+
+// ChangeFunc is the type of function called for each change
+// computed during a directory changes calculation.
+type ChangeFunc func(ChangeKind, string, os.FileInfo, error) error
+
+// Changes computes changes between two directories calling the
+// given change function for each computed change. The first
+// directory is intended to the base directory and second
+// directory the changed directory.
+//
+// The change callback is called by the order of path names and
+// should be appliable in that order.
+// Due to this apply ordering, the following is true
+// - Removed directory trees only create a single change for the root
+// directory removed. Remaining changes are implied.
+// - A directory which is modified to become a file will not have
+// delete entries for sub-path items, their removal is implied
+// by the removal of the parent directory.
+//
+// Opaque directories will not be treated specially and each file
+// removed from the base directory will show up as a removal.
+//
+// File content comparisons will be done on files which have timestamps
+// which may have been truncated. If either of the files being compared
+// has a zero value nanosecond value, each byte will be compared for
+// differences. If 2 files have the same seconds value but different
+// nanosecond values where one of those values is zero, the files will
+// be considered unchanged if the content is the same. This behavior
+// is to account for timestamp truncation during archiving.
+func Changes(ctx context.Context, a, b string, changeFn ChangeFunc) error {
+ if a == "" {
+ logrus.Debugf("Using single walk diff for %s", b)
+ return addDirChanges(ctx, changeFn, b)
+ } else if diffOptions := detectDirDiff(b, a); diffOptions != nil {
+ logrus.Debugf("Using single walk diff for %s from %s", diffOptions.diffDir, a)
+ return diffDirChanges(ctx, changeFn, a, diffOptions)
+ }
+
+ logrus.Debugf("Using double walk diff for %s from %s", b, a)
+ return doubleWalkDiff(ctx, changeFn, a, b)
+}
+
+func addDirChanges(ctx context.Context, changeFn ChangeFunc, root string) error {
+ return filepath.Walk(root, func(path string, f os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+
+ // Rebase path
+ path, err = filepath.Rel(root, path)
+ if err != nil {
+ return err
+ }
+
+ path = filepath.Join(string(os.PathSeparator), path)
+
+ // Skip root
+ if path == string(os.PathSeparator) {
+ return nil
+ }
+
+ return changeFn(ChangeKindAdd, path, f, nil)
+ })
+}
+
+// diffDirOptions is used when the diff can be directly calculated from
+// a diff directory to its base, without walking both trees.
+type diffDirOptions struct {
+ diffDir string
+ skipChange func(string) (bool, error)
+ deleteChange func(string, string, os.FileInfo) (string, error)
+}
+
+// diffDirChanges walks the diff directory and compares changes against the base.
+func diffDirChanges(ctx context.Context, changeFn ChangeFunc, base string, o *diffDirOptions) error {
+ changedDirs := make(map[string]struct{})
+ return filepath.Walk(o.diffDir, func(path string, f os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+
+ // Rebase path
+ path, err = filepath.Rel(o.diffDir, path)
+ if err != nil {
+ return err
+ }
+
+ path = filepath.Join(string(os.PathSeparator), path)
+
+ // Skip root
+ if path == string(os.PathSeparator) {
+ return nil
+ }
+
+ // TODO: handle opaqueness, start new double walker at this
+ // location to get deletes, and skip tree in single walker
+
+ if o.skipChange != nil {
+ if skip, err := o.skipChange(path); skip {
+ return err
+ }
+ }
+
+ var kind ChangeKind
+
+ deletedFile, err := o.deleteChange(o.diffDir, path, f)
+ if err != nil {
+ return err
+ }
+
+ // Find out what kind of modification happened
+ if deletedFile != "" {
+ path = deletedFile
+ kind = ChangeKindDelete
+ f = nil
+ } else {
+ // Otherwise, the file was added
+ kind = ChangeKindAdd
+
+ // ...Unless it already existed in a base, in which case, it's a modification
+ stat, err := os.Stat(filepath.Join(base, path))
+ if err != nil && !os.IsNotExist(err) {
+ return err
+ }
+ if err == nil {
+ // The file existed in the base, so that's a modification
+
+ // However, if it's a directory, maybe it wasn't actually modified.
+ // If you modify /foo/bar/baz, then /foo will be part of the changed files only because it's the parent of bar
+ if stat.IsDir() && f.IsDir() {
+ if f.Size() == stat.Size() && f.Mode() == stat.Mode() && sameFsTime(f.ModTime(), stat.ModTime()) {
+ // Both directories are the same, don't record the change
+ return nil
+ }
+ }
+ kind = ChangeKindModify
+ }
+ }
+
+ // If /foo/bar/file.txt is modified, then /foo/bar must be part of the changed files.
+ // This block is here to ensure the change is recorded even if the
+ // modify time, mode and size of the parent directory in the rw and ro layers are all equal.
+ // Check https://github.com/docker/docker/pull/13590 for details.
+ if f.IsDir() {
+ changedDirs[path] = struct{}{}
+ }
+ if kind == ChangeKindAdd || kind == ChangeKindDelete {
+ parent := filepath.Dir(path)
+ if _, ok := changedDirs[parent]; !ok && parent != "/" {
+ pi, err := os.Stat(filepath.Join(o.diffDir, parent))
+ if err := changeFn(ChangeKindModify, parent, pi, err); err != nil {
+ return err
+ }
+ changedDirs[parent] = struct{}{}
+ }
+ }
+
+ return changeFn(kind, path, f, nil)
+ })
+}
+
+// doubleWalkDiff walks both directories to create a diff
+func doubleWalkDiff(ctx context.Context, changeFn ChangeFunc, a, b string) (err error) {
+ g, ctx := errgroup.WithContext(ctx)
+
+ var (
+ c1 = make(chan *currentPath)
+ c2 = make(chan *currentPath)
+
+ f1, f2 *currentPath
+ rmdir string
+ )
+ g.Go(func() error {
+ defer close(c1)
+ return pathWalk(ctx, a, c1)
+ })
+ g.Go(func() error {
+ defer close(c2)
+ return pathWalk(ctx, b, c2)
+ })
+ g.Go(func() error {
+ for c1 != nil || c2 != nil {
+ if f1 == nil && c1 != nil {
+ f1, err = nextPath(ctx, c1)
+ if err != nil {
+ return err
+ }
+ if f1 == nil {
+ c1 = nil
+ }
+ }
+
+ if f2 == nil && c2 != nil {
+ f2, err = nextPath(ctx, c2)
+ if err != nil {
+ return err
+ }
+ if f2 == nil {
+ c2 = nil
+ }
+ }
+ if f1 == nil && f2 == nil {
+ continue
+ }
+
+ var f os.FileInfo
+ k, p := pathChange(f1, f2)
+ switch k {
+ case ChangeKindAdd:
+ if rmdir != "" {
+ rmdir = ""
+ }
+ f = f2.f
+ f2 = nil
+ case ChangeKindDelete:
+ // Check if this file is already removed by being
+ // under of a removed directory
+ if rmdir != "" && strings.HasPrefix(f1.path, rmdir) {
+ f1 = nil
+ continue
+ } else if f1.f.IsDir() {
+ rmdir = f1.path + string(os.PathSeparator)
+ } else if rmdir != "" {
+ rmdir = ""
+ }
+ f1 = nil
+ case ChangeKindModify:
+ same, err := sameFile(f1, f2)
+ if err != nil {
+ return err
+ }
+ if f1.f.IsDir() && !f2.f.IsDir() {
+ rmdir = f1.path + string(os.PathSeparator)
+ } else if rmdir != "" {
+ rmdir = ""
+ }
+ f = f2.f
+ f1 = nil
+ f2 = nil
+ if same {
+ if !isLinked(f) {
+ continue
+ }
+ k = ChangeKindUnmodified
+ }
+ }
+ if err := changeFn(k, p, f, nil); err != nil {
+ return err
+ }
+ }
+ return nil
+ })
+
+ return g.Wait()
+}
diff --git a/vendor/github.com/containerd/continuity/fs/diff_unix.go b/vendor/github.com/containerd/continuity/fs/diff_unix.go
new file mode 100644
index 0000000..3751814
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/diff_unix.go
@@ -0,0 +1,58 @@
+// +build !windows
+
+package fs
+
+import (
+ "bytes"
+ "os"
+ "syscall"
+
+ "github.com/containerd/continuity/sysx"
+ "github.com/pkg/errors"
+)
+
+// detectDirDiff returns diff dir options if a directory could
+// be found in the mount info for upper which is the direct
+// diff with the provided lower directory
+func detectDirDiff(upper, lower string) *diffDirOptions {
+ // TODO: get mount options for upper
+ // TODO: detect AUFS
+ // TODO: detect overlay
+ return nil
+}
+
+// compareSysStat returns whether the stats are equivalent,
+// whether the files are considered the same file, and
+// an error
+func compareSysStat(s1, s2 interface{}) (bool, error) {
+ ls1, ok := s1.(*syscall.Stat_t)
+ if !ok {
+ return false, nil
+ }
+ ls2, ok := s2.(*syscall.Stat_t)
+ if !ok {
+ return false, nil
+ }
+
+ return ls1.Mode == ls2.Mode && ls1.Uid == ls2.Uid && ls1.Gid == ls2.Gid && ls1.Rdev == ls2.Rdev, nil
+}
+
+func compareCapabilities(p1, p2 string) (bool, error) {
+ c1, err := sysx.LGetxattr(p1, "security.capability")
+ if err != nil && err != sysx.ENODATA {
+ return false, errors.Wrapf(err, "failed to get xattr for %s", p1)
+ }
+ c2, err := sysx.LGetxattr(p2, "security.capability")
+ if err != nil && err != sysx.ENODATA {
+ return false, errors.Wrapf(err, "failed to get xattr for %s", p2)
+ }
+ return bytes.Equal(c1, c2), nil
+}
+
+func isLinked(f os.FileInfo) bool {
+ s, ok := f.Sys().(*syscall.Stat_t)
+ if !ok {
+ return false
+ }
+ return !f.IsDir() && s.Nlink > 1
+}
diff --git a/vendor/github.com/containerd/continuity/fs/diff_windows.go b/vendor/github.com/containerd/continuity/fs/diff_windows.go
new file mode 100644
index 0000000..8eed365
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/diff_windows.go
@@ -0,0 +1,32 @@
+package fs
+
+import (
+ "os"
+
+ "golang.org/x/sys/windows"
+)
+
+func detectDirDiff(upper, lower string) *diffDirOptions {
+ return nil
+}
+
+func compareSysStat(s1, s2 interface{}) (bool, error) {
+ f1, ok := s1.(windows.Win32FileAttributeData)
+ if !ok {
+ return false, nil
+ }
+ f2, ok := s2.(windows.Win32FileAttributeData)
+ if !ok {
+ return false, nil
+ }
+ return f1.FileAttributes == f2.FileAttributes, nil
+}
+
+func compareCapabilities(p1, p2 string) (bool, error) {
+ // TODO: Use windows equivalent
+ return true, nil
+}
+
+func isLinked(os.FileInfo) bool {
+ return false
+}
diff --git a/vendor/github.com/containerd/continuity/fs/dtype_linux.go b/vendor/github.com/containerd/continuity/fs/dtype_linux.go
new file mode 100644
index 0000000..cc06573
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/dtype_linux.go
@@ -0,0 +1,87 @@
+// +build linux
+
+package fs
+
+import (
+ "fmt"
+ "io/ioutil"
+ "os"
+ "syscall"
+ "unsafe"
+)
+
+func locateDummyIfEmpty(path string) (string, error) {
+ children, err := ioutil.ReadDir(path)
+ if err != nil {
+ return "", err
+ }
+ if len(children) != 0 {
+ return "", nil
+ }
+ dummyFile, err := ioutil.TempFile(path, "fsutils-dummy")
+ if err != nil {
+ return "", err
+ }
+ name := dummyFile.Name()
+ err = dummyFile.Close()
+ return name, err
+}
+
+// SupportsDType returns whether the filesystem mounted on path supports d_type
+func SupportsDType(path string) (bool, error) {
+ // locate dummy so that we have at least one dirent
+ dummy, err := locateDummyIfEmpty(path)
+ if err != nil {
+ return false, err
+ }
+ if dummy != "" {
+ defer os.Remove(dummy)
+ }
+
+ visited := 0
+ supportsDType := true
+ fn := func(ent *syscall.Dirent) bool {
+ visited++
+ if ent.Type == syscall.DT_UNKNOWN {
+ supportsDType = false
+ // stop iteration
+ return true
+ }
+ // continue iteration
+ return false
+ }
+ if err = iterateReadDir(path, fn); err != nil {
+ return false, err
+ }
+ if visited == 0 {
+ return false, fmt.Errorf("did not hit any dirent during iteration %s", path)
+ }
+ return supportsDType, nil
+}
+
+func iterateReadDir(path string, fn func(*syscall.Dirent) bool) error {
+ d, err := os.Open(path)
+ if err != nil {
+ return err
+ }
+ defer d.Close()
+ fd := int(d.Fd())
+ buf := make([]byte, 4096)
+ for {
+ nbytes, err := syscall.ReadDirent(fd, buf)
+ if err != nil {
+ return err
+ }
+ if nbytes == 0 {
+ break
+ }
+ for off := 0; off < nbytes; {
+ ent := (*syscall.Dirent)(unsafe.Pointer(&buf[off]))
+ if stop := fn(ent); stop {
+ return nil
+ }
+ off += int(ent.Reclen)
+ }
+ }
+ return nil
+}
diff --git a/vendor/github.com/containerd/continuity/fs/du.go b/vendor/github.com/containerd/continuity/fs/du.go
new file mode 100644
index 0000000..26f5333
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/du.go
@@ -0,0 +1,22 @@
+package fs
+
+import "context"
+
+// Usage of disk information
+type Usage struct {
+ Inodes int64
+ Size int64
+}
+
+// DiskUsage counts the number of inodes and disk usage for the resources under
+// path.
+func DiskUsage(roots ...string) (Usage, error) {
+ return diskUsage(roots...)
+}
+
+// DiffUsage counts the numbers of inodes and disk usage in the
+// diff between the 2 directories. The first path is intended
+// as the base directory and the second as the changed directory.
+func DiffUsage(ctx context.Context, a, b string) (Usage, error) {
+ return diffUsage(ctx, a, b)
+}
diff --git a/vendor/github.com/containerd/continuity/fs/du_unix.go b/vendor/github.com/containerd/continuity/fs/du_unix.go
new file mode 100644
index 0000000..fe3426d
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/du_unix.go
@@ -0,0 +1,88 @@
+// +build !windows
+
+package fs
+
+import (
+ "context"
+ "os"
+ "path/filepath"
+ "syscall"
+)
+
+type inode struct {
+ // TODO(stevvooe): Can probably reduce memory usage by not tracking
+ // device, but we can leave this right for now.
+ dev, ino uint64
+}
+
+func newInode(stat *syscall.Stat_t) inode {
+ return inode{
+ // Dev is uint32 on darwin/bsd, uint64 on linux/solaris
+ dev: uint64(stat.Dev), // nolint: unconvert
+ // Ino is uint32 on bsd, uint64 on darwin/linux/solaris
+ ino: uint64(stat.Ino), // nolint: unconvert
+ }
+}
+
+func diskUsage(roots ...string) (Usage, error) {
+
+ var (
+ size int64
+ inodes = map[inode]struct{}{} // expensive!
+ )
+
+ for _, root := range roots {
+ if err := filepath.Walk(root, func(path string, fi os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+
+ inoKey := newInode(fi.Sys().(*syscall.Stat_t))
+ if _, ok := inodes[inoKey]; !ok {
+ inodes[inoKey] = struct{}{}
+ size += fi.Size()
+ }
+
+ return nil
+ }); err != nil {
+ return Usage{}, err
+ }
+ }
+
+ return Usage{
+ Inodes: int64(len(inodes)),
+ Size: size,
+ }, nil
+}
+
+func diffUsage(ctx context.Context, a, b string) (Usage, error) {
+ var (
+ size int64
+ inodes = map[inode]struct{}{} // expensive!
+ )
+
+ if err := Changes(ctx, a, b, func(kind ChangeKind, _ string, fi os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+
+ if kind == ChangeKindAdd || kind == ChangeKindModify {
+ inoKey := newInode(fi.Sys().(*syscall.Stat_t))
+ if _, ok := inodes[inoKey]; !ok {
+ inodes[inoKey] = struct{}{}
+ size += fi.Size()
+ }
+
+ return nil
+
+ }
+ return nil
+ }); err != nil {
+ return Usage{}, err
+ }
+
+ return Usage{
+ Inodes: int64(len(inodes)),
+ Size: size,
+ }, nil
+}
diff --git a/vendor/github.com/containerd/continuity/fs/du_windows.go b/vendor/github.com/containerd/continuity/fs/du_windows.go
new file mode 100644
index 0000000..3f852fc
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/du_windows.go
@@ -0,0 +1,60 @@
+// +build windows
+
+package fs
+
+import (
+ "context"
+ "os"
+ "path/filepath"
+)
+
+func diskUsage(roots ...string) (Usage, error) {
+ var (
+ size int64
+ )
+
+ // TODO(stevvooe): Support inodes (or equivalent) for windows.
+
+ for _, root := range roots {
+ if err := filepath.Walk(root, func(path string, fi os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+
+ size += fi.Size()
+ return nil
+ }); err != nil {
+ return Usage{}, err
+ }
+ }
+
+ return Usage{
+ Size: size,
+ }, nil
+}
+
+func diffUsage(ctx context.Context, a, b string) (Usage, error) {
+ var (
+ size int64
+ )
+
+ if err := Changes(ctx, a, b, func(kind ChangeKind, _ string, fi os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+
+ if kind == ChangeKindAdd || kind == ChangeKindModify {
+ size += fi.Size()
+
+ return nil
+
+ }
+ return nil
+ }); err != nil {
+ return Usage{}, err
+ }
+
+ return Usage{
+ Size: size,
+ }, nil
+}
diff --git a/vendor/github.com/containerd/continuity/fs/hardlink.go b/vendor/github.com/containerd/continuity/fs/hardlink.go
new file mode 100644
index 0000000..38da938
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/hardlink.go
@@ -0,0 +1,27 @@
+package fs
+
+import "os"
+
+// GetLinkInfo returns an identifier representing the node a hardlink is pointing
+// to. If the file is not hard linked then 0 will be returned.
+func GetLinkInfo(fi os.FileInfo) (uint64, bool) {
+ return getLinkInfo(fi)
+}
+
+// getLinkSource returns a path for the given name and
+// file info to its link source in the provided inode
+// map. If the given file name is not in the map and
+// has other links, it is added to the inode map
+// to be a source for other link locations.
+func getLinkSource(name string, fi os.FileInfo, inodes map[uint64]string) (string, error) {
+ inode, isHardlink := getLinkInfo(fi)
+ if !isHardlink {
+ return "", nil
+ }
+
+ path, ok := inodes[inode]
+ if !ok {
+ inodes[inode] = name
+ }
+ return path, nil
+}
diff --git a/vendor/github.com/containerd/continuity/fs/hardlink_unix.go b/vendor/github.com/containerd/continuity/fs/hardlink_unix.go
new file mode 100644
index 0000000..a6f9977
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/hardlink_unix.go
@@ -0,0 +1,18 @@
+// +build !windows
+
+package fs
+
+import (
+ "os"
+ "syscall"
+)
+
+func getLinkInfo(fi os.FileInfo) (uint64, bool) {
+ s, ok := fi.Sys().(*syscall.Stat_t)
+ if !ok {
+ return 0, false
+ }
+
+ // Ino is uint32 on bsd, uint64 on darwin/linux/solaris
+ return uint64(s.Ino), !fi.IsDir() && s.Nlink > 1 // nolint: unconvert
+}
diff --git a/vendor/github.com/containerd/continuity/fs/hardlink_windows.go b/vendor/github.com/containerd/continuity/fs/hardlink_windows.go
new file mode 100644
index 0000000..ad8845a
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/hardlink_windows.go
@@ -0,0 +1,7 @@
+package fs
+
+import "os"
+
+func getLinkInfo(fi os.FileInfo) (uint64, bool) {
+ return 0, false
+}
diff --git a/vendor/github.com/containerd/continuity/fs/path.go b/vendor/github.com/containerd/continuity/fs/path.go
new file mode 100644
index 0000000..13fb826
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/path.go
@@ -0,0 +1,276 @@
+package fs
+
+import (
+ "bytes"
+ "context"
+ "io"
+ "os"
+ "path/filepath"
+ "strings"
+
+ "github.com/pkg/errors"
+)
+
+var (
+ errTooManyLinks = errors.New("too many links")
+)
+
+type currentPath struct {
+ path string
+ f os.FileInfo
+ fullPath string
+}
+
+func pathChange(lower, upper *currentPath) (ChangeKind, string) {
+ if lower == nil {
+ if upper == nil {
+ panic("cannot compare nil paths")
+ }
+ return ChangeKindAdd, upper.path
+ }
+ if upper == nil {
+ return ChangeKindDelete, lower.path
+ }
+ // TODO: compare by directory
+
+ switch i := strings.Compare(lower.path, upper.path); {
+ case i < 0:
+ // File in lower that is not in upper
+ return ChangeKindDelete, lower.path
+ case i > 0:
+ // File in upper that is not in lower
+ return ChangeKindAdd, upper.path
+ default:
+ return ChangeKindModify, upper.path
+ }
+}
+
+func sameFile(f1, f2 *currentPath) (bool, error) {
+ if os.SameFile(f1.f, f2.f) {
+ return true, nil
+ }
+
+ equalStat, err := compareSysStat(f1.f.Sys(), f2.f.Sys())
+ if err != nil || !equalStat {
+ return equalStat, err
+ }
+
+ if eq, err := compareCapabilities(f1.fullPath, f2.fullPath); err != nil || !eq {
+ return eq, err
+ }
+
+ // If not a directory also check size, modtime, and content
+ if !f1.f.IsDir() {
+ if f1.f.Size() != f2.f.Size() {
+ return false, nil
+ }
+ t1 := f1.f.ModTime()
+ t2 := f2.f.ModTime()
+
+ if t1.Unix() != t2.Unix() {
+ return false, nil
+ }
+
+ // If the timestamp may have been truncated in both of the
+ // files, check content of file to determine difference
+ if t1.Nanosecond() == 0 && t2.Nanosecond() == 0 {
+ var eq bool
+ if (f1.f.Mode() & os.ModeSymlink) == os.ModeSymlink {
+ eq, err = compareSymlinkTarget(f1.fullPath, f2.fullPath)
+ } else if f1.f.Size() > 0 {
+ eq, err = compareFileContent(f1.fullPath, f2.fullPath)
+ }
+ if err != nil || !eq {
+ return eq, err
+ }
+ } else if t1.Nanosecond() != t2.Nanosecond() {
+ return false, nil
+ }
+ }
+
+ return true, nil
+}
+
+func compareSymlinkTarget(p1, p2 string) (bool, error) {
+ t1, err := os.Readlink(p1)
+ if err != nil {
+ return false, err
+ }
+ t2, err := os.Readlink(p2)
+ if err != nil {
+ return false, err
+ }
+ return t1 == t2, nil
+}
+
+const compareChuckSize = 32 * 1024
+
+// compareFileContent compares the content of 2 same sized files
+// by comparing each byte.
+func compareFileContent(p1, p2 string) (bool, error) {
+ f1, err := os.Open(p1)
+ if err != nil {
+ return false, err
+ }
+ defer f1.Close()
+ f2, err := os.Open(p2)
+ if err != nil {
+ return false, err
+ }
+ defer f2.Close()
+
+ b1 := make([]byte, compareChuckSize)
+ b2 := make([]byte, compareChuckSize)
+ for {
+ n1, err1 := f1.Read(b1)
+ if err1 != nil && err1 != io.EOF {
+ return false, err1
+ }
+ n2, err2 := f2.Read(b2)
+ if err2 != nil && err2 != io.EOF {
+ return false, err2
+ }
+ if n1 != n2 || !bytes.Equal(b1[:n1], b2[:n2]) {
+ return false, nil
+ }
+ if err1 == io.EOF && err2 == io.EOF {
+ return true, nil
+ }
+ }
+}
+
+func pathWalk(ctx context.Context, root string, pathC chan<- *currentPath) error {
+ return filepath.Walk(root, func(path string, f os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+
+ // Rebase path
+ path, err = filepath.Rel(root, path)
+ if err != nil {
+ return err
+ }
+
+ path = filepath.Join(string(os.PathSeparator), path)
+
+ // Skip root
+ if path == string(os.PathSeparator) {
+ return nil
+ }
+
+ p := ¤tPath{
+ path: path,
+ f: f,
+ fullPath: filepath.Join(root, path),
+ }
+
+ select {
+ case <-ctx.Done():
+ return ctx.Err()
+ case pathC <- p:
+ return nil
+ }
+ })
+}
+
+func nextPath(ctx context.Context, pathC <-chan *currentPath) (*currentPath, error) {
+ select {
+ case <-ctx.Done():
+ return nil, ctx.Err()
+ case p := <-pathC:
+ return p, nil
+ }
+}
+
+// RootPath joins a path with a root, evaluating and bounding any
+// symlink to the root directory.
+func RootPath(root, path string) (string, error) {
+ if path == "" {
+ return root, nil
+ }
+ var linksWalked int // to protect against cycles
+ for {
+ i := linksWalked
+ newpath, err := walkLinks(root, path, &linksWalked)
+ if err != nil {
+ return "", err
+ }
+ path = newpath
+ if i == linksWalked {
+ newpath = filepath.Join("/", newpath)
+ if path == newpath {
+ return filepath.Join(root, newpath), nil
+ }
+ path = newpath
+ }
+ }
+}
+
+func walkLink(root, path string, linksWalked *int) (newpath string, islink bool, err error) {
+ if *linksWalked > 255 {
+ return "", false, errTooManyLinks
+ }
+
+ path = filepath.Join("/", path)
+ if path == "/" {
+ return path, false, nil
+ }
+ realPath := filepath.Join(root, path)
+
+ fi, err := os.Lstat(realPath)
+ if err != nil {
+ // If path does not yet exist, treat as non-symlink
+ if os.IsNotExist(err) {
+ return path, false, nil
+ }
+ return "", false, err
+ }
+ if fi.Mode()&os.ModeSymlink == 0 {
+ return path, false, nil
+ }
+ newpath, err = os.Readlink(realPath)
+ if err != nil {
+ return "", false, err
+ }
+ if filepath.IsAbs(newpath) && strings.HasPrefix(newpath, root) {
+ newpath = newpath[:len(root)]
+ if !strings.HasPrefix(newpath, "/") {
+ newpath = "/" + newpath
+ }
+ }
+ *linksWalked++
+ return newpath, true, nil
+}
+
+func walkLinks(root, path string, linksWalked *int) (string, error) {
+ switch dir, file := filepath.Split(path); {
+ case dir == "":
+ newpath, _, err := walkLink(root, file, linksWalked)
+ return newpath, err
+ case file == "":
+ if os.IsPathSeparator(dir[len(dir)-1]) {
+ if dir == "/" {
+ return dir, nil
+ }
+ return walkLinks(root, dir[:len(dir)-1], linksWalked)
+ }
+ newpath, _, err := walkLink(root, dir, linksWalked)
+ return newpath, err
+ default:
+ newdir, err := walkLinks(root, dir, linksWalked)
+ if err != nil {
+ return "", err
+ }
+ newpath, islink, err := walkLink(root, filepath.Join(newdir, file), linksWalked)
+ if err != nil {
+ return "", err
+ }
+ if !islink {
+ return newpath, nil
+ }
+ if filepath.IsAbs(newpath) {
+ return newpath, nil
+ }
+ return filepath.Join(newdir, newpath), nil
+ }
+}
diff --git a/vendor/github.com/containerd/continuity/fs/stat_bsd.go b/vendor/github.com/containerd/continuity/fs/stat_bsd.go
new file mode 100644
index 0000000..a1b776f
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/stat_bsd.go
@@ -0,0 +1,28 @@
+// +build darwin freebsd
+
+package fs
+
+import (
+ "syscall"
+ "time"
+)
+
+// StatAtime returns the access time from a stat struct
+func StatAtime(st *syscall.Stat_t) syscall.Timespec {
+ return st.Atimespec
+}
+
+// StatCtime returns the created time from a stat struct
+func StatCtime(st *syscall.Stat_t) syscall.Timespec {
+ return st.Ctimespec
+}
+
+// StatMtime returns the modified time from a stat struct
+func StatMtime(st *syscall.Stat_t) syscall.Timespec {
+ return st.Mtimespec
+}
+
+// StatATimeAsTime returns the access time as a time.Time
+func StatATimeAsTime(st *syscall.Stat_t) time.Time {
+ return time.Unix(int64(st.Atimespec.Sec), int64(st.Atimespec.Nsec)) // nolint: unconvert
+}
diff --git a/vendor/github.com/containerd/continuity/fs/stat_linux.go b/vendor/github.com/containerd/continuity/fs/stat_linux.go
new file mode 100644
index 0000000..1dbb021
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/stat_linux.go
@@ -0,0 +1,27 @@
+package fs
+
+import (
+ "syscall"
+ "time"
+)
+
+// StatAtime returns the Atim
+func StatAtime(st *syscall.Stat_t) syscall.Timespec {
+ return st.Atim
+}
+
+// StatCtime returns the Ctim
+func StatCtime(st *syscall.Stat_t) syscall.Timespec {
+ return st.Ctim
+}
+
+// StatMtime returns the Mtim
+func StatMtime(st *syscall.Stat_t) syscall.Timespec {
+ return st.Mtim
+}
+
+// StatATimeAsTime returns st.Atim as a time.Time
+func StatATimeAsTime(st *syscall.Stat_t) time.Time {
+ // The int64 conversions ensure the line compiles for 32-bit systems as well.
+ return time.Unix(int64(st.Atim.Sec), int64(st.Atim.Nsec)) // nolint: unconvert
+}
diff --git a/vendor/github.com/containerd/continuity/fs/time.go b/vendor/github.com/containerd/continuity/fs/time.go
new file mode 100644
index 0000000..c336f4d
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/fs/time.go
@@ -0,0 +1,13 @@
+package fs
+
+import "time"
+
+// Gnu tar and the go tar writer don't have sub-second mtime
+// precision, which is problematic when we apply changes via tar
+// files, we handle this by comparing for exact times, *or* same
+// second count and either a or b having exactly 0 nanoseconds
+func sameFsTime(a, b time.Time) bool {
+ return a == b ||
+ (a.Unix() == b.Unix() &&
+ (a.Nanosecond() == 0 || b.Nanosecond() == 0))
+}
diff --git a/vendor/github.com/containerd/continuity/sysx/copy_linux.go b/vendor/github.com/containerd/continuity/sysx/copy_linux.go
deleted file mode 100644
index 4d85812..0000000
--- a/vendor/github.com/containerd/continuity/sysx/copy_linux.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package sysx
-
-// These functions will be generated by generate.sh
-// $ GOOS=linux GOARCH=386 ./generate.sh copy
-// $ GOOS=linux GOARCH=amd64 ./generate.sh copy
-// $ GOOS=linux GOARCH=arm ./generate.sh copy
-// $ GOOS=linux GOARCH=arm64 ./generate.sh copy
-// $ GOOS=linux GOARCH=ppc64le ./generate.sh copy
-// $ GOOS=linux GOARCH=s390x ./generate.sh copy
-
-//sys CopyFileRange(fdin uintptr, offin *int64, fdout uintptr, offout *int64, len int, flags int) (n int, err error)
diff --git a/vendor/github.com/containerd/continuity/sysx/copy_linux_386.go b/vendor/github.com/containerd/continuity/sysx/copy_linux_386.go
deleted file mode 100644
index c1368c5..0000000
--- a/vendor/github.com/containerd/continuity/sysx/copy_linux_386.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// mksyscall.pl -l32 copy_linux.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package sysx
-
-import (
- "syscall"
- "unsafe"
-)
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func CopyFileRange(fdin uintptr, offin *int64, fdout uintptr, offout *int64, len int, flags int) (n int, err error) {
- r0, _, e1 := syscall.Syscall6(SYS_COPY_FILE_RANGE, uintptr(fdin), uintptr(unsafe.Pointer(offin)), uintptr(fdout), uintptr(unsafe.Pointer(offout)), uintptr(len), uintptr(flags))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
diff --git a/vendor/github.com/containerd/continuity/sysx/copy_linux_amd64.go b/vendor/github.com/containerd/continuity/sysx/copy_linux_amd64.go
deleted file mode 100644
index 9941b01..0000000
--- a/vendor/github.com/containerd/continuity/sysx/copy_linux_amd64.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// mksyscall.pl copy_linux.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package sysx
-
-import (
- "syscall"
- "unsafe"
-)
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func CopyFileRange(fdin uintptr, offin *int64, fdout uintptr, offout *int64, len int, flags int) (n int, err error) {
- r0, _, e1 := syscall.Syscall6(SYS_COPY_FILE_RANGE, uintptr(fdin), uintptr(unsafe.Pointer(offin)), uintptr(fdout), uintptr(unsafe.Pointer(offout)), uintptr(len), uintptr(flags))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
diff --git a/vendor/github.com/containerd/continuity/sysx/copy_linux_arm.go b/vendor/github.com/containerd/continuity/sysx/copy_linux_arm.go
deleted file mode 100644
index c1368c5..0000000
--- a/vendor/github.com/containerd/continuity/sysx/copy_linux_arm.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// mksyscall.pl -l32 copy_linux.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package sysx
-
-import (
- "syscall"
- "unsafe"
-)
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func CopyFileRange(fdin uintptr, offin *int64, fdout uintptr, offout *int64, len int, flags int) (n int, err error) {
- r0, _, e1 := syscall.Syscall6(SYS_COPY_FILE_RANGE, uintptr(fdin), uintptr(unsafe.Pointer(offin)), uintptr(fdout), uintptr(unsafe.Pointer(offout)), uintptr(len), uintptr(flags))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
diff --git a/vendor/github.com/containerd/continuity/sysx/copy_linux_arm64.go b/vendor/github.com/containerd/continuity/sysx/copy_linux_arm64.go
deleted file mode 100644
index 9941b01..0000000
--- a/vendor/github.com/containerd/continuity/sysx/copy_linux_arm64.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// mksyscall.pl copy_linux.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package sysx
-
-import (
- "syscall"
- "unsafe"
-)
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func CopyFileRange(fdin uintptr, offin *int64, fdout uintptr, offout *int64, len int, flags int) (n int, err error) {
- r0, _, e1 := syscall.Syscall6(SYS_COPY_FILE_RANGE, uintptr(fdin), uintptr(unsafe.Pointer(offin)), uintptr(fdout), uintptr(unsafe.Pointer(offout)), uintptr(len), uintptr(flags))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
diff --git a/vendor/github.com/containerd/continuity/sysx/copy_linux_ppc64le.go b/vendor/github.com/containerd/continuity/sysx/copy_linux_ppc64le.go
deleted file mode 100644
index 9941b01..0000000
--- a/vendor/github.com/containerd/continuity/sysx/copy_linux_ppc64le.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// mksyscall.pl copy_linux.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package sysx
-
-import (
- "syscall"
- "unsafe"
-)
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func CopyFileRange(fdin uintptr, offin *int64, fdout uintptr, offout *int64, len int, flags int) (n int, err error) {
- r0, _, e1 := syscall.Syscall6(SYS_COPY_FILE_RANGE, uintptr(fdin), uintptr(unsafe.Pointer(offin)), uintptr(fdout), uintptr(unsafe.Pointer(offout)), uintptr(len), uintptr(flags))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
diff --git a/vendor/github.com/containerd/continuity/sysx/copy_linux_s390x.go b/vendor/github.com/containerd/continuity/sysx/copy_linux_s390x.go
deleted file mode 100644
index 9941b01..0000000
--- a/vendor/github.com/containerd/continuity/sysx/copy_linux_s390x.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// mksyscall.pl copy_linux.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package sysx
-
-import (
- "syscall"
- "unsafe"
-)
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func CopyFileRange(fdin uintptr, offin *int64, fdout uintptr, offout *int64, len int, flags int) (n int, err error) {
- r0, _, e1 := syscall.Syscall6(SYS_COPY_FILE_RANGE, uintptr(fdin), uintptr(unsafe.Pointer(offin)), uintptr(fdout), uintptr(unsafe.Pointer(offout)), uintptr(len), uintptr(flags))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
diff --git a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_386.go b/vendor/github.com/containerd/continuity/sysx/sysnum_linux_386.go
deleted file mode 100644
index 0063f8a..0000000
--- a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_386.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package sysx
-
-const (
- // SYS_COPYFILERANGE defined in Kernel 4.5+
- // Number defined in /usr/include/asm/unistd_32.h
- SYS_COPY_FILE_RANGE = 377
-)
diff --git a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_amd64.go b/vendor/github.com/containerd/continuity/sysx/sysnum_linux_amd64.go
deleted file mode 100644
index 4170540..0000000
--- a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_amd64.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package sysx
-
-const (
- // SYS_COPYFILERANGE defined in Kernel 4.5+
- // Number defined in /usr/include/asm/unistd_64.h
- SYS_COPY_FILE_RANGE = 326
-)
diff --git a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_arm.go b/vendor/github.com/containerd/continuity/sysx/sysnum_linux_arm.go
deleted file mode 100644
index a05dcbb..0000000
--- a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_arm.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package sysx
-
-const (
- // SYS_COPY_FILE_RANGE defined in Kernel 4.5+
- // Number defined in /usr/include/arm-linux-gnueabihf/asm/unistd.h
- SYS_COPY_FILE_RANGE = 391
-)
diff --git a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_arm64.go b/vendor/github.com/containerd/continuity/sysx/sysnum_linux_arm64.go
deleted file mode 100644
index da31bbd..0000000
--- a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_arm64.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package sysx
-
-const (
- // SYS_COPY_FILE_RANGE defined in Kernel 4.5+
- // Number defined in /usr/include/asm-generic/unistd.h
- SYS_COPY_FILE_RANGE = 285
-)
diff --git a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_ppc64le.go b/vendor/github.com/containerd/continuity/sysx/sysnum_linux_ppc64le.go
deleted file mode 100644
index 5dea25a..0000000
--- a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_ppc64le.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package sysx
-
-const (
- // SYS_COPYFILERANGE defined in Kernel 4.5+
- // Number defined in /usr/include/asm/unistd_64.h
- SYS_COPY_FILE_RANGE = 379
-)
diff --git a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_s390x.go b/vendor/github.com/containerd/continuity/sysx/sysnum_linux_s390x.go
deleted file mode 100644
index 8a6f2a7..0000000
--- a/vendor/github.com/containerd/continuity/sysx/sysnum_linux_s390x.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package sysx
-
-const (
- // SYS_COPYFILERANGE defined in Kernel 4.5+
- // Number defined in /usr/include/asm/unistd_64.h
- SYS_COPY_FILE_RANGE = 375
-)
diff --git a/vendor/github.com/containerd/continuity/sysx/xattr_openbsd.go b/vendor/github.com/containerd/continuity/sysx/xattr_openbsd.go
new file mode 100644
index 0000000..7236199
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/sysx/xattr_openbsd.go
@@ -0,0 +1,7 @@
+package sysx
+
+import (
+ "errors"
+)
+
+var unsupported = errors.New("extended attributes unsupported on OpenBSD")
diff --git a/vendor/github.com/containerd/continuity/sysx/xattr_unsupported.go b/vendor/github.com/containerd/continuity/sysx/xattr_unsupported.go
index a8dd9f2..c8389bc 100644
--- a/vendor/github.com/containerd/continuity/sysx/xattr_unsupported.go
+++ b/vendor/github.com/containerd/continuity/sysx/xattr_unsupported.go
@@ -1,4 +1,4 @@
-// +build freebsd solaris
+// +build freebsd openbsd solaris
package sysx
diff --git a/vendor/github.com/containerd/continuity/vendor.conf b/vendor/github.com/containerd/continuity/vendor.conf
new file mode 100644
index 0000000..7c80dee
--- /dev/null
+++ b/vendor/github.com/containerd/continuity/vendor.conf
@@ -0,0 +1,13 @@
+bazil.org/fuse 371fbbdaa8987b715bdd21d6adc4c9b20155f748
+github.com/dustin/go-humanize bb3d318650d48840a39aa21a027c6630e198e626
+github.com/golang/protobuf 1e59b77b52bf8e4b449a57e6f79f21226d571845
+github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
+github.com/opencontainers/go-digest 279bed98673dd5bef374d3b6e4b09e2af76183bf
+github.com/pkg/errors f15c970de5b76fac0b59abb32d62c17cc7bed265
+github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b
+github.com/spf13/cobra 2da4a54c5ceefcee7ca5dd0eea1e18a3b6366489
+github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea
+golang.org/x/crypto 9f005a07e0d31d45e6656d241bb5c0f2efd4bc94
+golang.org/x/net a337091b0525af65de94df2eb7e98bd9962dcbe2
+golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
+golang.org/x/sys 665f6529cca930e27b831a0d1dafffbe1c172924
diff --git a/vendor/github.com/containerd/go-runc/runc.go b/vendor/github.com/containerd/go-runc/runc.go
index c5a66a1..df76ad7 100644
--- a/vendor/github.com/containerd/go-runc/runc.go
+++ b/vendor/github.com/containerd/go-runc/runc.go
@@ -1,7 +1,6 @@
package runc
import (
- "bytes"
"context"
"encoding/json"
"errors"
@@ -532,7 +531,9 @@
// Update updates the current container with the provided resource spec
func (r *Runc) Update(context context.Context, id string, resources *specs.LinuxResources) error {
- buf := bytes.NewBuffer(nil)
+ buf := getBuf()
+ defer putBuf(buf)
+
if err := json.NewEncoder(buf).Encode(resources); err != nil {
return err
}
@@ -638,11 +639,12 @@
}
func cmdOutput(cmd *exec.Cmd, combined bool) ([]byte, error) {
- var b bytes.Buffer
+ b := getBuf()
+ defer putBuf(b)
- cmd.Stdout = &b
+ cmd.Stdout = b
if combined {
- cmd.Stderr = &b
+ cmd.Stderr = b
}
ec, err := Monitor.Start(cmd)
if err != nil {
diff --git a/vendor/github.com/containerd/go-runc/utils.go b/vendor/github.com/containerd/go-runc/utils.go
index 81fcd3f..8cb241a 100644
--- a/vendor/github.com/containerd/go-runc/utils.go
+++ b/vendor/github.com/containerd/go-runc/utils.go
@@ -1,8 +1,10 @@
package runc
import (
+ "bytes"
"io/ioutil"
"strconv"
+ "sync"
"syscall"
)
@@ -26,3 +28,18 @@
}
return status.ExitStatus()
}
+
+var bytesBufferPool = sync.Pool{
+ New: func() interface{} {
+ return bytes.NewBuffer(nil)
+ },
+}
+
+func getBuf() *bytes.Buffer {
+ return bytesBufferPool.Get().(*bytes.Buffer)
+}
+
+func putBuf(b *bytes.Buffer) {
+ b.Reset()
+ bytesBufferPool.Put(b)
+}
diff --git a/vendor/github.com/docker/go-connections/nat/nat.go b/vendor/github.com/docker/go-connections/nat/nat.go
index 4d5f5ae..bb7e4e3 100644
--- a/vendor/github.com/docker/go-connections/nat/nat.go
+++ b/vendor/github.com/docker/go-connections/nat/nat.go
@@ -113,7 +113,7 @@
}
func validateProto(proto string) bool {
- for _, availableProto := range []string{"tcp", "udp"} {
+ for _, availableProto := range []string{"tcp", "udp", "sctp"} {
if availableProto == proto {
return true
}
diff --git a/vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go b/vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go
index 9ca9745..1ff81c3 100644
--- a/vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go
+++ b/vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go
@@ -4,7 +4,6 @@
import (
"crypto/x509"
-
)
// SystemCertPool returns an new empty cert pool,
diff --git a/vendor/github.com/docker/libnetwork/agent.pb.go b/vendor/github.com/docker/libnetwork/agent.pb.go
index 5b96923..54a4611 100644
--- a/vendor/github.com/docker/libnetwork/agent.pb.go
+++ b/vendor/github.com/docker/libnetwork/agent.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-gogo.
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: agent.proto
-// DO NOT EDIT!
/*
Package libnetwork is a generated protocol buffer package.
@@ -20,9 +19,6 @@
import _ "github.com/gogo/protobuf/gogoproto"
import strings "strings"
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
-import sort "sort"
-import strconv "strconv"
import reflect "reflect"
import io "io"
@@ -34,22 +30,27 @@
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type PortConfig_Protocol int32
const (
- ProtocolTCP PortConfig_Protocol = 0
- ProtocolUDP PortConfig_Protocol = 1
+ ProtocolTCP PortConfig_Protocol = 0
+ ProtocolUDP PortConfig_Protocol = 1
+ ProtocolSCTP PortConfig_Protocol = 2
)
var PortConfig_Protocol_name = map[int32]string{
0: "TCP",
1: "UDP",
+ 2: "SCTP",
}
var PortConfig_Protocol_value = map[string]int32{
- "TCP": 0,
- "UDP": 1,
+ "TCP": 0,
+ "UDP": 1,
+ "SCTP": 2,
}
func (x PortConfig_Protocol) String() string {
@@ -60,7 +61,7 @@
// EndpointRecord specifies all the endpoint specific information that
// needs to gossiped to nodes participating in the network.
type EndpointRecord struct {
- // Name of the endpoint
+ // Name of the container
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
// Service name of the service to which this endpoint belongs.
ServiceName string `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"`
@@ -82,6 +83,41 @@
func (*EndpointRecord) ProtoMessage() {}
func (*EndpointRecord) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{0} }
+func (m *EndpointRecord) GetName() string {
+ if m != nil {
+ return m.Name
+ }
+ return ""
+}
+
+func (m *EndpointRecord) GetServiceName() string {
+ if m != nil {
+ return m.ServiceName
+ }
+ return ""
+}
+
+func (m *EndpointRecord) GetServiceID() string {
+ if m != nil {
+ return m.ServiceID
+ }
+ return ""
+}
+
+func (m *EndpointRecord) GetVirtualIP() string {
+ if m != nil {
+ return m.VirtualIP
+ }
+ return ""
+}
+
+func (m *EndpointRecord) GetEndpointIP() string {
+ if m != nil {
+ return m.EndpointIP
+ }
+ return ""
+}
+
func (m *EndpointRecord) GetIngressPorts() []*PortConfig {
if m != nil {
return m.IngressPorts
@@ -89,6 +125,20 @@
return nil
}
+func (m *EndpointRecord) GetAliases() []string {
+ if m != nil {
+ return m.Aliases
+ }
+ return nil
+}
+
+func (m *EndpointRecord) GetTaskAliases() []string {
+ if m != nil {
+ return m.TaskAliases
+ }
+ return nil
+}
+
// PortConfig specifies an exposed port which can be
// addressed using the given name. This can be later queried
// using a service discovery api or a DNS SRV query. The node
@@ -115,6 +165,34 @@
func (*PortConfig) ProtoMessage() {}
func (*PortConfig) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{1} }
+func (m *PortConfig) GetName() string {
+ if m != nil {
+ return m.Name
+ }
+ return ""
+}
+
+func (m *PortConfig) GetProtocol() PortConfig_Protocol {
+ if m != nil {
+ return m.Protocol
+ }
+ return ProtocolTCP
+}
+
+func (m *PortConfig) GetTargetPort() uint32 {
+ if m != nil {
+ return m.TargetPort
+ }
+ return 0
+}
+
+func (m *PortConfig) GetPublishedPort() uint32 {
+ if m != nil {
+ return m.PublishedPort
+ }
+ return 0
+}
+
func init() {
proto.RegisterType((*EndpointRecord)(nil), "libnetwork.EndpointRecord")
proto.RegisterType((*PortConfig)(nil), "libnetwork.PortConfig")
@@ -160,74 +238,57 @@
pv := reflect.Indirect(rv).Interface()
return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
}
-func extensionToGoStringAgent(e map[int32]github_com_gogo_protobuf_proto.Extension) string {
- if e == nil {
- return "nil"
- }
- s := "map[int32]proto.Extension{"
- keys := make([]int, 0, len(e))
- for k := range e {
- keys = append(keys, int(k))
- }
- sort.Ints(keys)
- ss := []string{}
- for _, k := range keys {
- ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
- }
- s += strings.Join(ss, ",") + "}"
- return s
-}
-func (m *EndpointRecord) Marshal() (data []byte, err error) {
+func (m *EndpointRecord) Marshal() (dAtA []byte, err error) {
size := m.Size()
- data = make([]byte, size)
- n, err := m.MarshalTo(data)
+ dAtA = make([]byte, size)
+ n, err := m.MarshalTo(dAtA)
if err != nil {
return nil, err
}
- return data[:n], nil
+ return dAtA[:n], nil
}
-func (m *EndpointRecord) MarshalTo(data []byte) (int, error) {
+func (m *EndpointRecord) MarshalTo(dAtA []byte) (int, error) {
var i int
_ = i
var l int
_ = l
if len(m.Name) > 0 {
- data[i] = 0xa
+ dAtA[i] = 0xa
i++
- i = encodeVarintAgent(data, i, uint64(len(m.Name)))
- i += copy(data[i:], m.Name)
+ i = encodeVarintAgent(dAtA, i, uint64(len(m.Name)))
+ i += copy(dAtA[i:], m.Name)
}
if len(m.ServiceName) > 0 {
- data[i] = 0x12
+ dAtA[i] = 0x12
i++
- i = encodeVarintAgent(data, i, uint64(len(m.ServiceName)))
- i += copy(data[i:], m.ServiceName)
+ i = encodeVarintAgent(dAtA, i, uint64(len(m.ServiceName)))
+ i += copy(dAtA[i:], m.ServiceName)
}
if len(m.ServiceID) > 0 {
- data[i] = 0x1a
+ dAtA[i] = 0x1a
i++
- i = encodeVarintAgent(data, i, uint64(len(m.ServiceID)))
- i += copy(data[i:], m.ServiceID)
+ i = encodeVarintAgent(dAtA, i, uint64(len(m.ServiceID)))
+ i += copy(dAtA[i:], m.ServiceID)
}
if len(m.VirtualIP) > 0 {
- data[i] = 0x22
+ dAtA[i] = 0x22
i++
- i = encodeVarintAgent(data, i, uint64(len(m.VirtualIP)))
- i += copy(data[i:], m.VirtualIP)
+ i = encodeVarintAgent(dAtA, i, uint64(len(m.VirtualIP)))
+ i += copy(dAtA[i:], m.VirtualIP)
}
if len(m.EndpointIP) > 0 {
- data[i] = 0x2a
+ dAtA[i] = 0x2a
i++
- i = encodeVarintAgent(data, i, uint64(len(m.EndpointIP)))
- i += copy(data[i:], m.EndpointIP)
+ i = encodeVarintAgent(dAtA, i, uint64(len(m.EndpointIP)))
+ i += copy(dAtA[i:], m.EndpointIP)
}
if len(m.IngressPorts) > 0 {
for _, msg := range m.IngressPorts {
- data[i] = 0x32
+ dAtA[i] = 0x32
i++
- i = encodeVarintAgent(data, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(data[i:])
+ i = encodeVarintAgent(dAtA, i, uint64(msg.Size()))
+ n, err := msg.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
@@ -236,101 +297,101 @@
}
if len(m.Aliases) > 0 {
for _, s := range m.Aliases {
- data[i] = 0x3a
+ dAtA[i] = 0x3a
i++
l = len(s)
for l >= 1<<7 {
- data[i] = uint8(uint64(l)&0x7f | 0x80)
+ dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
l >>= 7
i++
}
- data[i] = uint8(l)
+ dAtA[i] = uint8(l)
i++
- i += copy(data[i:], s)
+ i += copy(dAtA[i:], s)
}
}
if len(m.TaskAliases) > 0 {
for _, s := range m.TaskAliases {
- data[i] = 0x42
+ dAtA[i] = 0x42
i++
l = len(s)
for l >= 1<<7 {
- data[i] = uint8(uint64(l)&0x7f | 0x80)
+ dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
l >>= 7
i++
}
- data[i] = uint8(l)
+ dAtA[i] = uint8(l)
i++
- i += copy(data[i:], s)
+ i += copy(dAtA[i:], s)
}
}
return i, nil
}
-func (m *PortConfig) Marshal() (data []byte, err error) {
+func (m *PortConfig) Marshal() (dAtA []byte, err error) {
size := m.Size()
- data = make([]byte, size)
- n, err := m.MarshalTo(data)
+ dAtA = make([]byte, size)
+ n, err := m.MarshalTo(dAtA)
if err != nil {
return nil, err
}
- return data[:n], nil
+ return dAtA[:n], nil
}
-func (m *PortConfig) MarshalTo(data []byte) (int, error) {
+func (m *PortConfig) MarshalTo(dAtA []byte) (int, error) {
var i int
_ = i
var l int
_ = l
if len(m.Name) > 0 {
- data[i] = 0xa
+ dAtA[i] = 0xa
i++
- i = encodeVarintAgent(data, i, uint64(len(m.Name)))
- i += copy(data[i:], m.Name)
+ i = encodeVarintAgent(dAtA, i, uint64(len(m.Name)))
+ i += copy(dAtA[i:], m.Name)
}
if m.Protocol != 0 {
- data[i] = 0x10
+ dAtA[i] = 0x10
i++
- i = encodeVarintAgent(data, i, uint64(m.Protocol))
+ i = encodeVarintAgent(dAtA, i, uint64(m.Protocol))
}
if m.TargetPort != 0 {
- data[i] = 0x18
+ dAtA[i] = 0x18
i++
- i = encodeVarintAgent(data, i, uint64(m.TargetPort))
+ i = encodeVarintAgent(dAtA, i, uint64(m.TargetPort))
}
if m.PublishedPort != 0 {
- data[i] = 0x20
+ dAtA[i] = 0x20
i++
- i = encodeVarintAgent(data, i, uint64(m.PublishedPort))
+ i = encodeVarintAgent(dAtA, i, uint64(m.PublishedPort))
}
return i, nil
}
-func encodeFixed64Agent(data []byte, offset int, v uint64) int {
- data[offset] = uint8(v)
- data[offset+1] = uint8(v >> 8)
- data[offset+2] = uint8(v >> 16)
- data[offset+3] = uint8(v >> 24)
- data[offset+4] = uint8(v >> 32)
- data[offset+5] = uint8(v >> 40)
- data[offset+6] = uint8(v >> 48)
- data[offset+7] = uint8(v >> 56)
+func encodeFixed64Agent(dAtA []byte, offset int, v uint64) int {
+ dAtA[offset] = uint8(v)
+ dAtA[offset+1] = uint8(v >> 8)
+ dAtA[offset+2] = uint8(v >> 16)
+ dAtA[offset+3] = uint8(v >> 24)
+ dAtA[offset+4] = uint8(v >> 32)
+ dAtA[offset+5] = uint8(v >> 40)
+ dAtA[offset+6] = uint8(v >> 48)
+ dAtA[offset+7] = uint8(v >> 56)
return offset + 8
}
-func encodeFixed32Agent(data []byte, offset int, v uint32) int {
- data[offset] = uint8(v)
- data[offset+1] = uint8(v >> 8)
- data[offset+2] = uint8(v >> 16)
- data[offset+3] = uint8(v >> 24)
+func encodeFixed32Agent(dAtA []byte, offset int, v uint32) int {
+ dAtA[offset] = uint8(v)
+ dAtA[offset+1] = uint8(v >> 8)
+ dAtA[offset+2] = uint8(v >> 16)
+ dAtA[offset+3] = uint8(v >> 24)
return offset + 4
}
-func encodeVarintAgent(data []byte, offset int, v uint64) int {
+func encodeVarintAgent(dAtA []byte, offset int, v uint64) int {
for v >= 1<<7 {
- data[offset] = uint8(v&0x7f | 0x80)
+ dAtA[offset] = uint8(v&0x7f | 0x80)
v >>= 7
offset++
}
- data[offset] = uint8(v)
+ dAtA[offset] = uint8(v)
return offset + 1
}
func (m *EndpointRecord) Size() (n int) {
@@ -447,8 +508,8 @@
pv := reflect.Indirect(rv).Interface()
return fmt.Sprintf("*%v", pv)
}
-func (m *EndpointRecord) Unmarshal(data []byte) error {
- l := len(data)
+func (m *EndpointRecord) Unmarshal(dAtA []byte) error {
+ l := len(dAtA)
iNdEx := 0
for iNdEx < l {
preIndex := iNdEx
@@ -460,7 +521,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
wire |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -488,7 +549,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -503,7 +564,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.Name = string(data[iNdEx:postIndex])
+ m.Name = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
@@ -517,7 +578,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -532,7 +593,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.ServiceName = string(data[iNdEx:postIndex])
+ m.ServiceName = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@@ -546,7 +607,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -561,7 +622,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.ServiceID = string(data[iNdEx:postIndex])
+ m.ServiceID = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 4:
if wireType != 2 {
@@ -575,7 +636,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -590,7 +651,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.VirtualIP = string(data[iNdEx:postIndex])
+ m.VirtualIP = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 5:
if wireType != 2 {
@@ -604,7 +665,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -619,7 +680,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.EndpointIP = string(data[iNdEx:postIndex])
+ m.EndpointIP = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 6:
if wireType != 2 {
@@ -633,7 +694,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
msglen |= (int(b) & 0x7F) << shift
if b < 0x80 {
@@ -648,7 +709,7 @@
return io.ErrUnexpectedEOF
}
m.IngressPorts = append(m.IngressPorts, &PortConfig{})
- if err := m.IngressPorts[len(m.IngressPorts)-1].Unmarshal(data[iNdEx:postIndex]); err != nil {
+ if err := m.IngressPorts[len(m.IngressPorts)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -664,7 +725,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -679,7 +740,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.Aliases = append(m.Aliases, string(data[iNdEx:postIndex]))
+ m.Aliases = append(m.Aliases, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
case 8:
if wireType != 2 {
@@ -693,7 +754,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -708,11 +769,11 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.TaskAliases = append(m.TaskAliases, string(data[iNdEx:postIndex]))
+ m.TaskAliases = append(m.TaskAliases, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
default:
iNdEx = preIndex
- skippy, err := skipAgent(data[iNdEx:])
+ skippy, err := skipAgent(dAtA[iNdEx:])
if err != nil {
return err
}
@@ -731,8 +792,8 @@
}
return nil
}
-func (m *PortConfig) Unmarshal(data []byte) error {
- l := len(data)
+func (m *PortConfig) Unmarshal(dAtA []byte) error {
+ l := len(dAtA)
iNdEx := 0
for iNdEx < l {
preIndex := iNdEx
@@ -744,7 +805,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
wire |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -772,7 +833,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -787,7 +848,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.Name = string(data[iNdEx:postIndex])
+ m.Name = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 0 {
@@ -801,7 +862,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
m.Protocol |= (PortConfig_Protocol(b) & 0x7F) << shift
if b < 0x80 {
@@ -820,7 +881,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
m.TargetPort |= (uint32(b) & 0x7F) << shift
if b < 0x80 {
@@ -839,7 +900,7 @@
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
m.PublishedPort |= (uint32(b) & 0x7F) << shift
if b < 0x80 {
@@ -848,7 +909,7 @@
}
default:
iNdEx = preIndex
- skippy, err := skipAgent(data[iNdEx:])
+ skippy, err := skipAgent(dAtA[iNdEx:])
if err != nil {
return err
}
@@ -867,8 +928,8 @@
}
return nil
}
-func skipAgent(data []byte) (n int, err error) {
- l := len(data)
+func skipAgent(dAtA []byte) (n int, err error) {
+ l := len(dAtA)
iNdEx := 0
for iNdEx < l {
var wire uint64
@@ -879,7 +940,7 @@
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
wire |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -897,7 +958,7 @@
return 0, io.ErrUnexpectedEOF
}
iNdEx++
- if data[iNdEx-1] < 0x80 {
+ if dAtA[iNdEx-1] < 0x80 {
break
}
}
@@ -914,7 +975,7 @@
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
length |= (int(b) & 0x7F) << shift
if b < 0x80 {
@@ -937,7 +998,7 @@
if iNdEx >= l {
return 0, io.ErrUnexpectedEOF
}
- b := data[iNdEx]
+ b := dAtA[iNdEx]
iNdEx++
innerWire |= (uint64(b) & 0x7F) << shift
if b < 0x80 {
@@ -948,7 +1009,7 @@
if innerWireType == 4 {
break
}
- next, err := skipAgent(data[start:])
+ next, err := skipAgent(dAtA[start:])
if err != nil {
return 0, err
}
@@ -972,32 +1033,36 @@
ErrIntOverflowAgent = fmt.Errorf("proto: integer overflow")
)
+func init() { proto.RegisterFile("agent.proto", fileDescriptorAgent) }
+
var fileDescriptorAgent = []byte{
- // 413 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x90, 0xbf, 0xae, 0xd3, 0x30,
- 0x14, 0x87, 0x9b, 0xdb, 0x70, 0x6f, 0x73, 0x72, 0x13, 0xae, 0x2c, 0x84, 0xa2, 0x0e, 0x69, 0xa9,
- 0x84, 0x74, 0x07, 0x94, 0x2b, 0x95, 0xb1, 0x13, 0x6d, 0x19, 0xb2, 0xa0, 0xc8, 0xfc, 0x59, 0xa3,
- 0xb4, 0x31, 0xc1, 0x6a, 0x88, 0x23, 0xdb, 0x2d, 0x2b, 0x23, 0xe2, 0x1d, 0x98, 0x78, 0x19, 0x26,
- 0xc4, 0xc8, 0x84, 0x68, 0x57, 0x16, 0x1e, 0x01, 0xdb, 0x49, 0x5a, 0x21, 0x75, 0x38, 0x92, 0xf3,
- 0xfd, 0xbe, 0xe3, 0x1c, 0x1f, 0x70, 0xb3, 0x82, 0x54, 0x32, 0xaa, 0x39, 0x93, 0x0c, 0x41, 0x49,
- 0x57, 0x15, 0x91, 0x1f, 0x18, 0xdf, 0x0c, 0x1f, 0x14, 0xac, 0x60, 0x06, 0xdf, 0xe9, 0x53, 0x63,
- 0x4c, 0xbe, 0x5f, 0x80, 0xff, 0xbc, 0xca, 0x6b, 0x46, 0x2b, 0x89, 0xc9, 0x9a, 0xf1, 0x1c, 0x21,
- 0xb0, 0xab, 0xec, 0x3d, 0x09, 0xac, 0xb1, 0x75, 0xeb, 0x60, 0x73, 0x46, 0x8f, 0xe0, 0x5a, 0x10,
- 0xbe, 0xa3, 0x6b, 0x92, 0x9a, 0xec, 0xc2, 0x64, 0x6e, 0xcb, 0x5e, 0x68, 0xe5, 0x09, 0x40, 0xa7,
- 0xd0, 0x3c, 0xe8, 0x6b, 0x61, 0xee, 0x1d, 0x7e, 0x8d, 0x9c, 0x97, 0x0d, 0x8d, 0x97, 0xd8, 0x69,
- 0x85, 0x38, 0xd7, 0xf6, 0x8e, 0x72, 0xb9, 0xcd, 0xca, 0x94, 0xd6, 0x81, 0x7d, 0xb2, 0xdf, 0x34,
- 0x34, 0x4e, 0xb0, 0xd3, 0x0a, 0x71, 0x8d, 0xee, 0xc0, 0x25, 0xed, 0x90, 0x5a, 0xbf, 0x67, 0x74,
- 0x5f, 0xe9, 0xd0, 0xcd, 0xae, 0x7c, 0xe8, 0x14, 0xd5, 0x30, 0x03, 0x8f, 0x56, 0x05, 0x27, 0x42,
- 0xa4, 0x35, 0xe3, 0x52, 0x04, 0x97, 0xe3, 0xfe, 0xad, 0x3b, 0x7d, 0x18, 0x9d, 0x16, 0x12, 0x25,
- 0x2a, 0x58, 0xb0, 0xea, 0x2d, 0x2d, 0xf0, 0x75, 0x2b, 0x6b, 0x24, 0x50, 0x00, 0x57, 0x59, 0x49,
- 0x33, 0x41, 0x44, 0x70, 0xa5, 0xda, 0x1c, 0xdc, 0x7d, 0xea, 0x35, 0xc8, 0x4c, 0x6c, 0xd2, 0x2e,
- 0x1e, 0x98, 0xd8, 0xd5, 0xec, 0x59, 0x83, 0x26, 0x7f, 0x2c, 0x80, 0xd3, 0xcd, 0x67, 0x97, 0x39,
- 0x83, 0x81, 0x59, 0xfe, 0x9a, 0x95, 0x66, 0x91, 0xfe, 0x74, 0x74, 0x7e, 0xae, 0x28, 0x69, 0x35,
- 0x7c, 0x6c, 0x40, 0x23, 0x50, 0xbf, 0xe3, 0x05, 0x91, 0xe6, 0x61, 0x66, 0xcf, 0x1e, 0x86, 0x06,
- 0xe9, 0x4e, 0xf4, 0x18, 0xfc, 0x7a, 0xbb, 0x2a, 0xa9, 0x78, 0x47, 0xf2, 0xc6, 0xb1, 0x8d, 0xe3,
- 0x1d, 0xa9, 0xd6, 0x26, 0x4b, 0x18, 0x74, 0xb7, 0xab, 0x07, 0xf7, 0x5f, 0x2d, 0x92, 0x9b, 0xde,
- 0xf0, 0xfe, 0xe7, 0x2f, 0x63, 0xb7, 0xc3, 0x0a, 0xe9, 0xe4, 0xf5, 0x32, 0xb9, 0xb1, 0xfe, 0x4f,
- 0x14, 0x1a, 0xda, 0x9f, 0xbe, 0x86, 0xbd, 0x79, 0xf0, 0x73, 0x1f, 0xf6, 0xfe, 0xee, 0x43, 0xeb,
- 0xe3, 0x21, 0xb4, 0xbe, 0xa9, 0xfa, 0xa1, 0xea, 0xb7, 0xaa, 0xd5, 0xa5, 0x99, 0xf8, 0xe9, 0xbf,
- 0x00, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x63, 0x1a, 0x0f, 0x90, 0x02, 0x00, 0x00,
+ // 437 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xc1, 0x6e, 0xd3, 0x30,
+ 0x18, 0xc7, 0x9b, 0x36, 0x6c, 0xcd, 0x97, 0xb6, 0x54, 0x16, 0x42, 0x51, 0x0e, 0x69, 0xa8, 0x84,
+ 0xd4, 0x03, 0xea, 0xa4, 0x71, 0xdc, 0x89, 0xb5, 0x1c, 0x72, 0x41, 0x96, 0xd7, 0x71, 0x0d, 0x69,
+ 0x63, 0x82, 0xb5, 0x10, 0x47, 0xb6, 0x37, 0xae, 0xdc, 0x40, 0x7b, 0x87, 0x9d, 0x78, 0x19, 0x4e,
+ 0x88, 0x23, 0xa7, 0x89, 0xe5, 0x09, 0x78, 0x04, 0x64, 0x27, 0x5e, 0x35, 0x69, 0x37, 0xfb, 0xf7,
+ 0xff, 0xd9, 0xfa, 0xbe, 0x3f, 0xf8, 0x59, 0x41, 0x2b, 0xb5, 0xac, 0x05, 0x57, 0x1c, 0x41, 0xc9,
+ 0xb6, 0x15, 0x55, 0x5f, 0xb8, 0xb8, 0x08, 0x9f, 0x15, 0xbc, 0xe0, 0x06, 0x1f, 0xe9, 0x53, 0x6b,
+ 0xcc, 0x7f, 0xf5, 0x61, 0xf2, 0xb6, 0xca, 0x6b, 0xce, 0x2a, 0x45, 0xe8, 0x8e, 0x8b, 0x1c, 0x21,
+ 0x70, 0xab, 0xec, 0x33, 0x0d, 0x9c, 0xd8, 0x59, 0x78, 0xc4, 0x9c, 0xd1, 0x0b, 0x18, 0x49, 0x2a,
+ 0xae, 0xd8, 0x8e, 0xa6, 0x26, 0xeb, 0x9b, 0xcc, 0xef, 0xd8, 0x3b, 0xad, 0xbc, 0x02, 0xb0, 0x0a,
+ 0xcb, 0x83, 0x81, 0x16, 0x4e, 0xc7, 0xcd, 0xed, 0xcc, 0x3b, 0x6b, 0x69, 0xb2, 0x26, 0x5e, 0x27,
+ 0x24, 0xb9, 0xb6, 0xaf, 0x98, 0x50, 0x97, 0x59, 0x99, 0xb2, 0x3a, 0x70, 0xf7, 0xf6, 0xfb, 0x96,
+ 0x26, 0x98, 0x78, 0x9d, 0x90, 0xd4, 0xe8, 0x08, 0x7c, 0xda, 0x0d, 0xa9, 0xf5, 0x27, 0x46, 0x9f,
+ 0x34, 0xb7, 0x33, 0xb0, 0xb3, 0x27, 0x98, 0x80, 0x55, 0x92, 0x1a, 0x9d, 0xc0, 0x98, 0x55, 0x85,
+ 0xa0, 0x52, 0xa6, 0x35, 0x17, 0x4a, 0x06, 0x07, 0xf1, 0x60, 0xe1, 0x1f, 0x3f, 0x5f, 0xee, 0x0b,
+ 0x59, 0x62, 0x2e, 0xd4, 0x8a, 0x57, 0x1f, 0x59, 0x41, 0x46, 0x9d, 0xac, 0x91, 0x44, 0x01, 0x1c,
+ 0x66, 0x25, 0xcb, 0x24, 0x95, 0xc1, 0x61, 0x3c, 0x58, 0x78, 0xc4, 0x5e, 0x75, 0x0d, 0x2a, 0x93,
+ 0x17, 0xa9, 0x8d, 0x87, 0x26, 0xf6, 0x35, 0x7b, 0xd3, 0xa2, 0xf9, 0xb7, 0x3e, 0xc0, 0xfe, 0xe7,
+ 0x47, 0xcb, 0x3c, 0x81, 0xa1, 0x29, 0x7f, 0xc7, 0x4b, 0x53, 0xe4, 0xe4, 0x78, 0xf6, 0xf8, 0x5c,
+ 0x4b, 0xdc, 0x69, 0xe4, 0xfe, 0x01, 0x9a, 0x81, 0xaf, 0x32, 0x51, 0x50, 0x65, 0x16, 0x33, 0x3d,
+ 0x8f, 0x09, 0xb4, 0x48, 0xbf, 0x44, 0x2f, 0x61, 0x52, 0x5f, 0x6e, 0x4b, 0x26, 0x3f, 0xd1, 0xbc,
+ 0x75, 0x5c, 0xe3, 0x8c, 0xef, 0xa9, 0xd6, 0xe6, 0x1f, 0x60, 0x68, 0x7f, 0x47, 0x01, 0x0c, 0x36,
+ 0x2b, 0x3c, 0xed, 0x85, 0x4f, 0xaf, 0x6f, 0x62, 0xdf, 0xe2, 0xcd, 0x0a, 0xeb, 0xe4, 0x7c, 0x8d,
+ 0xa7, 0xce, 0xc3, 0xe4, 0x7c, 0x8d, 0x51, 0x08, 0xee, 0xd9, 0x6a, 0x83, 0xa7, 0xfd, 0x70, 0x7a,
+ 0x7d, 0x13, 0x8f, 0x6c, 0xa4, 0x59, 0xe8, 0x7e, 0xff, 0x11, 0xf5, 0x4e, 0x83, 0x3f, 0x77, 0x51,
+ 0xef, 0xdf, 0x5d, 0xe4, 0x7c, 0x6d, 0x22, 0xe7, 0x67, 0x13, 0x39, 0xbf, 0x9b, 0xc8, 0xf9, 0xdb,
+ 0x44, 0xce, 0xf6, 0xc0, 0x6c, 0xf3, 0xfa, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x12, 0x15,
+ 0x67, 0xac, 0x02, 0x00, 0x00,
}
diff --git a/vendor/github.com/docker/libnetwork/agent.proto b/vendor/github.com/docker/libnetwork/agent.proto
index 54c71c0..a069e98 100644
--- a/vendor/github.com/docker/libnetwork/agent.proto
+++ b/vendor/github.com/docker/libnetwork/agent.proto
@@ -51,6 +51,7 @@
TCP = 0 [(gogoproto.enumvalue_customname) = "ProtocolTCP"];
UDP = 1 [(gogoproto.enumvalue_customname) = "ProtocolUDP"];
+ SCTP = 2 [(gogoproto.enumvalue_customname) = "ProtocolSCTP"];
}
// Name for the port. If provided the port information can
diff --git a/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go b/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go
index 48010e9..853129f 100644
--- a/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go
+++ b/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go
@@ -7,6 +7,7 @@
"net"
"github.com/docker/libnetwork/types"
+ "github.com/ishidawataru/sctp"
"github.com/sirupsen/logrus"
)
@@ -92,6 +93,9 @@
case *net.UDPAddr:
bnd.HostPort = uint16(host.(*net.UDPAddr).Port)
return nil
+ case *sctp.SCTPAddr:
+ bnd.HostPort = uint16(host.(*sctp.SCTPAddr).Port)
+ return nil
default:
// For completeness
return ErrUnsupportedAddressType(fmt.Sprintf("%T", netAddr))
diff --git a/vendor/github.com/docker/libnetwork/drivers/windows/labels.go b/vendor/github.com/docker/libnetwork/drivers/windows/labels.go
index ead3ee6..a4b23c1 100644
--- a/vendor/github.com/docker/libnetwork/drivers/windows/labels.go
+++ b/vendor/github.com/docker/libnetwork/drivers/windows/labels.go
@@ -42,4 +42,10 @@
// DisableGatewayDNS label
DisableGatewayDNS = "com.docker.network.windowsshim.disable_gatewaydns"
+
+ // EnableOutboundNat label
+ EnableOutboundNat = "com.docker.network.windowsshim.enable_outboundnat"
+
+ // OutboundNatExceptions label
+ OutboundNatExceptions = "com.docker.network.windowsshim.outboundnat_exceptions"
)
diff --git a/vendor/github.com/docker/libnetwork/drivers/windows/windows.go b/vendor/github.com/docker/libnetwork/drivers/windows/windows.go
index 964099c..eabf590 100644
--- a/vendor/github.com/docker/libnetwork/drivers/windows/windows.go
+++ b/vendor/github.com/docker/libnetwork/drivers/windows/windows.go
@@ -20,6 +20,7 @@
"sync"
"github.com/Microsoft/hcsshim"
+ "github.com/docker/docker/pkg/system"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
@@ -30,21 +31,23 @@
// networkConfiguration for network specific configuration
type networkConfiguration struct {
- ID string
- Type string
- Name string
- HnsID string
- RDID string
- VLAN uint
- VSID uint
- DNSServers string
- MacPools []hcsshim.MacPool
- DNSSuffix string
- SourceMac string
- NetworkAdapterName string
- dbIndex uint64
- dbExists bool
- DisableGatewayDNS bool
+ ID string
+ Type string
+ Name string
+ HnsID string
+ RDID string
+ VLAN uint
+ VSID uint
+ DNSServers string
+ MacPools []hcsshim.MacPool
+ DNSSuffix string
+ SourceMac string
+ NetworkAdapterName string
+ dbIndex uint64
+ dbExists bool
+ DisableGatewayDNS bool
+ EnableOutboundNat bool
+ OutboundNatExceptions []string
}
// endpointConfiguration represents the user specified configuration for the sandbox endpoint
@@ -208,6 +211,18 @@
return nil, err
}
config.VSID = uint(vsid)
+ case EnableOutboundNat:
+ if system.GetOSVersion().Build <= 16236 {
+ return nil, fmt.Errorf("Invalid network option. OutboundNat is not supported on this OS version")
+ }
+ b, err := strconv.ParseBool(value)
+ if err != nil {
+ return nil, err
+ }
+ config.EnableOutboundNat = b
+ case OutboundNatExceptions:
+ s := strings.Split(value, ",")
+ config.OutboundNatExceptions = s
}
}
@@ -609,6 +624,19 @@
endpointStruct.DisableICC = epOption.DisableICC
+ // Inherit OutboundNat policy from the network
+ if n.config.EnableOutboundNat {
+ outboundNatPolicy, err := json.Marshal(hcsshim.OutboundNatPolicy{
+ Policy: hcsshim.Policy{Type: hcsshim.OutboundNat},
+ Exceptions: n.config.OutboundNatExceptions,
+ })
+
+ if err != nil {
+ return err
+ }
+ endpointStruct.Policies = append(endpointStruct.Policies, outboundNatPolicy)
+ }
+
configurationb, err := json.Marshal(endpointStruct)
if err != nil {
return err
diff --git a/vendor/github.com/docker/libnetwork/iptables/iptables.go b/vendor/github.com/docker/libnetwork/iptables/iptables.go
index 5518fcb..b812624 100644
--- a/vendor/github.com/docker/libnetwork/iptables/iptables.go
+++ b/vendor/github.com/docker/libnetwork/iptables/iptables.go
@@ -276,7 +276,31 @@
"--dport", strconv.Itoa(destPort),
"-j", "MASQUERADE",
}
- return ProgramRule(Nat, "POSTROUTING", action, args)
+
+ if err := ProgramRule(Nat, "POSTROUTING", action, args); err != nil {
+ return err
+ }
+
+ if proto == "sctp" {
+ // Linux kernel v4.9 and below enables NETIF_F_SCTP_CRC for veth by
+ // the following commit.
+ // This introduces a problem when conbined with a physical NIC without
+ // NETIF_F_SCTP_CRC. As for a workaround, here we add an iptables entry
+ // to fill the checksum.
+ //
+ // https://github.com/torvalds/linux/commit/c80fafbbb59ef9924962f83aac85531039395b18
+ args = []string{
+ "-p", proto,
+ "--sport", strconv.Itoa(destPort),
+ "-j", "CHECKSUM",
+ "--checksum-fill",
+ }
+ if err := ProgramRule(Mangle, "POSTROUTING", action, args); err != nil {
+ return err
+ }
+ }
+
+ return nil
}
// Link adds reciprocal ACCEPT rule for two supplied IP addresses.
diff --git a/vendor/github.com/docker/libnetwork/portallocator/portallocator.go b/vendor/github.com/docker/libnetwork/portallocator/portallocator.go
index b7f790b..9798d23 100644
--- a/vendor/github.com/docker/libnetwork/portallocator/portallocator.go
+++ b/vendor/github.com/docker/libnetwork/portallocator/portallocator.go
@@ -120,7 +120,7 @@
p.mutex.Lock()
defer p.mutex.Unlock()
- if proto != "tcp" && proto != "udp" {
+ if proto != "tcp" && proto != "udp" && proto != "sctp" {
return 0, ErrUnknownProtocol
}
@@ -131,8 +131,9 @@
protomap, ok := p.ipMap[ipstr]
if !ok {
protomap = protoMap{
- "tcp": p.newPortMap(),
- "udp": p.newPortMap(),
+ "tcp": p.newPortMap(),
+ "udp": p.newPortMap(),
+ "sctp": p.newPortMap(),
}
p.ipMap[ipstr] = protomap
diff --git a/vendor/github.com/docker/libnetwork/portmapper/mapper.go b/vendor/github.com/docker/libnetwork/portmapper/mapper.go
index f480eda..7fa37b1 100644
--- a/vendor/github.com/docker/libnetwork/portmapper/mapper.go
+++ b/vendor/github.com/docker/libnetwork/portmapper/mapper.go
@@ -8,6 +8,7 @@
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/portallocator"
+ "github.com/ishidawataru/sctp"
"github.com/sirupsen/logrus"
)
@@ -27,6 +28,8 @@
ErrPortMappedForIP = errors.New("port is already mapped to ip")
// ErrPortNotMapped refers to an unmapped port
ErrPortNotMapped = errors.New("port is not mapped")
+ // ErrSCTPAddrNoIP refers to a SCTP address without IP address.
+ ErrSCTPAddrNoIP = errors.New("sctp address does not contain any IP address")
)
// PortMapper manages the network address translation
@@ -98,7 +101,10 @@
return nil, err
}
} else {
- m.userlandProxy = newDummyProxy(proto, hostIP, allocatedHostPort)
+ m.userlandProxy, err = newDummyProxy(proto, hostIP, allocatedHostPort)
+ if err != nil {
+ return nil, err
+ }
}
case *net.UDPAddr:
proto = "udp"
@@ -118,7 +124,37 @@
return nil, err
}
} else {
- m.userlandProxy = newDummyProxy(proto, hostIP, allocatedHostPort)
+ m.userlandProxy, err = newDummyProxy(proto, hostIP, allocatedHostPort)
+ if err != nil {
+ return nil, err
+ }
+ }
+ case *sctp.SCTPAddr:
+ proto = "sctp"
+ if allocatedHostPort, err = pm.Allocator.RequestPortInRange(hostIP, proto, hostPortStart, hostPortEnd); err != nil {
+ return nil, err
+ }
+
+ m = &mapping{
+ proto: proto,
+ host: &sctp.SCTPAddr{IP: []net.IP{hostIP}, Port: allocatedHostPort},
+ container: container,
+ }
+
+ if useProxy {
+ sctpAddr := container.(*sctp.SCTPAddr)
+ if len(sctpAddr.IP) == 0 {
+ return nil, ErrSCTPAddrNoIP
+ }
+ m.userlandProxy, err = newProxy(proto, hostIP, allocatedHostPort, sctpAddr.IP[0], sctpAddr.Port, pm.proxyPath)
+ if err != nil {
+ return nil, err
+ }
+ } else {
+ m.userlandProxy, err = newDummyProxy(proto, hostIP, allocatedHostPort)
+ if err != nil {
+ return nil, err
+ }
}
default:
return nil, ErrUnknownBackendAddressType
@@ -195,8 +231,13 @@
return pm.Allocator.ReleasePort(a.IP, "tcp", a.Port)
case *net.UDPAddr:
return pm.Allocator.ReleasePort(a.IP, "udp", a.Port)
+ case *sctp.SCTPAddr:
+ if len(a.IP) == 0 {
+ return ErrSCTPAddrNoIP
+ }
+ return pm.Allocator.ReleasePort(a.IP[0], "sctp", a.Port)
}
- return nil
+ return ErrUnknownBackendAddressType
}
//ReMapAll will re-apply all port mappings
@@ -219,6 +260,12 @@
return fmt.Sprintf("%s:%d/%s", t.IP.String(), t.Port, "tcp")
case *net.UDPAddr:
return fmt.Sprintf("%s:%d/%s", t.IP.String(), t.Port, "udp")
+ case *sctp.SCTPAddr:
+ if len(t.IP) == 0 {
+ logrus.Error(ErrSCTPAddrNoIP)
+ return ""
+ }
+ return fmt.Sprintf("%s:%d/%s", t.IP[0].String(), t.Port, "sctp")
}
return ""
}
@@ -229,6 +276,12 @@
return t.IP, t.Port
case *net.UDPAddr:
return t.IP, t.Port
+ case *sctp.SCTPAddr:
+ if len(t.IP) == 0 {
+ logrus.Error(ErrSCTPAddrNoIP)
+ return nil, 0
+ }
+ return t.IP[0], t.Port
}
return nil, 0
}
diff --git a/vendor/github.com/docker/libnetwork/portmapper/proxy.go b/vendor/github.com/docker/libnetwork/portmapper/proxy.go
index 45df200..1183c33 100644
--- a/vendor/github.com/docker/libnetwork/portmapper/proxy.go
+++ b/vendor/github.com/docker/libnetwork/portmapper/proxy.go
@@ -8,6 +8,8 @@
"os"
"os/exec"
"time"
+
+ "github.com/ishidawataru/sctp"
)
var userlandProxyCommandName = "docker-proxy"
@@ -79,16 +81,20 @@
addr net.Addr
}
-func newDummyProxy(proto string, hostIP net.IP, hostPort int) userlandProxy {
+func newDummyProxy(proto string, hostIP net.IP, hostPort int) (userlandProxy, error) {
switch proto {
case "tcp":
addr := &net.TCPAddr{IP: hostIP, Port: hostPort}
- return &dummyProxy{addr: addr}
+ return &dummyProxy{addr: addr}, nil
case "udp":
addr := &net.UDPAddr{IP: hostIP, Port: hostPort}
- return &dummyProxy{addr: addr}
+ return &dummyProxy{addr: addr}, nil
+ case "sctp":
+ addr := &sctp.SCTPAddr{IP: []net.IP{hostIP}, Port: hostPort}
+ return &dummyProxy{addr: addr}, nil
+ default:
+ return nil, fmt.Errorf("Unknown addr type: %s", proto)
}
- return nil
}
func (p *dummyProxy) Start() error {
@@ -105,6 +111,12 @@
return err
}
p.listener = l
+ case *sctp.SCTPAddr:
+ l, err := sctp.ListenSCTP("sctp", addr)
+ if err != nil {
+ return err
+ }
+ p.listener = l
default:
return fmt.Errorf("Unknown addr type: %T", p.addr)
}
diff --git a/vendor/github.com/docker/libnetwork/service_linux.go b/vendor/github.com/docker/libnetwork/service_linux.go
index d8a95b2..f8de3a1 100644
--- a/vendor/github.com/docker/libnetwork/service_linux.go
+++ b/vendor/github.com/docker/libnetwork/service_linux.go
@@ -19,6 +19,7 @@
"github.com/docker/libnetwork/ipvs"
"github.com/docker/libnetwork/ns"
"github.com/gogo/protobuf/proto"
+ "github.com/ishidawataru/sctp"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netns"
@@ -503,6 +504,10 @@
l, err = net.ListenTCP("tcp", &net.TCPAddr{Port: int(iPort.PublishedPort)})
case ProtocolUDP:
l, err = net.ListenUDP("udp", &net.UDPAddr{Port: int(iPort.PublishedPort)})
+ case ProtocolSCTP:
+ l, err = sctp.ListenSCTP("sctp", &sctp.SCTPAddr{Port: int(iPort.PublishedPort)})
+ default:
+ err = fmt.Errorf("unknown protocol %v", iPort.Protocol)
}
if err != nil {
@@ -761,6 +766,7 @@
// Ensure blocking rules for anything else in/to ingress network
for _, rule := range [][]string{
+ {"-d", eIP.String(), "-p", "sctp", "-j", "DROP"},
{"-d", eIP.String(), "-p", "udp", "-j", "DROP"},
{"-d", eIP.String(), "-p", "tcp", "-j", "DROP"},
} {
diff --git a/vendor/github.com/docker/libnetwork/types/types.go b/vendor/github.com/docker/libnetwork/types/types.go
index 164b180..cb18f05 100644
--- a/vendor/github.com/docker/libnetwork/types/types.go
+++ b/vendor/github.com/docker/libnetwork/types/types.go
@@ -7,6 +7,8 @@
"net"
"strconv"
"strings"
+
+ "github.com/ishidawataru/sctp"
)
// constants for the IP address type
@@ -96,6 +98,8 @@
return &net.UDPAddr{IP: p.HostIP, Port: int(p.HostPort)}, nil
case TCP:
return &net.TCPAddr{IP: p.HostIP, Port: int(p.HostPort)}, nil
+ case SCTP:
+ return &sctp.SCTPAddr{IP: []net.IP{p.HostIP}, Port: int(p.HostPort)}, nil
default:
return nil, ErrInvalidProtocolBinding(p.Proto.String())
}
@@ -108,6 +112,8 @@
return &net.UDPAddr{IP: p.IP, Port: int(p.Port)}, nil
case TCP:
return &net.TCPAddr{IP: p.IP, Port: int(p.Port)}, nil
+ case SCTP:
+ return &sctp.SCTPAddr{IP: []net.IP{p.IP}, Port: int(p.Port)}, nil
default:
return nil, ErrInvalidProtocolBinding(p.Proto.String())
}
@@ -233,6 +239,8 @@
TCP = 6
// UDP is for the UDP ip protocol
UDP = 17
+ // SCTP is for the SCTP ip protocol
+ SCTP = 132
)
// Protocol represents an IP protocol number
@@ -246,6 +254,8 @@
return "tcp"
case UDP:
return "udp"
+ case SCTP:
+ return "sctp"
default:
return fmt.Sprintf("%d", p)
}
@@ -260,6 +270,8 @@
return UDP
case "tcp":
return TCP
+ case "sctp":
+ return SCTP
default:
return 0
}
diff --git a/vendor/github.com/docker/libnetwork/vendor.conf b/vendor/github.com/docker/libnetwork/vendor.conf
index 62ebec5..31dc0b9 100644
--- a/vendor/github.com/docker/libnetwork/vendor.conf
+++ b/vendor/github.com/docker/libnetwork/vendor.conf
@@ -51,3 +51,4 @@
golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
golang.org/x/sys 07c182904dbd53199946ba614a412c61d3c548f5
github.com/pkg/errors 839d9e913e063e28dfd0e6c7b7512793e0a48be9
+github.com/ishidawataru/sctp 07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb
diff --git a/vendor/github.com/docker/swarmkit/api/types.pb.go b/vendor/github.com/docker/swarmkit/api/types.pb.go
index 67243dc..f7d0cdd 100644
--- a/vendor/github.com/docker/swarmkit/api/types.pb.go
+++ b/vendor/github.com/docker/swarmkit/api/types.pb.go
@@ -443,17 +443,20 @@
type PortConfig_Protocol int32
const (
- ProtocolTCP PortConfig_Protocol = 0
- ProtocolUDP PortConfig_Protocol = 1
+ ProtocolTCP PortConfig_Protocol = 0
+ ProtocolUDP PortConfig_Protocol = 1
+ ProtocolSCTP PortConfig_Protocol = 2
)
var PortConfig_Protocol_name = map[int32]string{
0: "TCP",
1: "UDP",
+ 2: "SCTP",
}
var PortConfig_Protocol_value = map[string]int32{
- "TCP": 0,
- "UDP": 1,
+ "TCP": 0,
+ "UDP": 1,
+ "SCTP": 2,
}
func (x PortConfig_Protocol) String() string {
@@ -17040,321 +17043,321 @@
func init() { proto.RegisterFile("github.com/docker/swarmkit/api/types.proto", fileDescriptorTypes) }
var fileDescriptorTypes = []byte{
- // 5043 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x7a, 0x4d, 0x6c, 0x24, 0x49,
- 0x56, 0xbf, 0xeb, 0xd3, 0x55, 0xaf, 0xca, 0x76, 0x3a, 0xda, 0xdb, 0xe3, 0xae, 0xed, 0xb6, 0x6b,
- 0x72, 0xa6, 0x77, 0x66, 0x7b, 0xfb, 0x5f, 0xfd, 0xb5, 0xbb, 0xea, 0x99, 0xf9, 0xef, 0xce, 0xd4,
- 0x97, 0xed, 0xda, 0xb6, 0xab, 0x4a, 0x51, 0xe5, 0xee, 0x5d, 0x24, 0x48, 0xa5, 0x33, 0xc3, 0xe5,
- 0x1c, 0x67, 0x65, 0x14, 0x99, 0x59, 0x76, 0x17, 0x0b, 0xa2, 0xc5, 0x01, 0x90, 0x4f, 0x70, 0x62,
- 0x11, 0x32, 0x42, 0x82, 0x13, 0x42, 0xe2, 0x00, 0x12, 0x82, 0xd3, 0x20, 0x71, 0xd8, 0x1b, 0x2c,
- 0x48, 0x68, 0x05, 0x92, 0x61, 0x7d, 0xe0, 0xb6, 0x82, 0x0b, 0xe2, 0x02, 0x12, 0x8a, 0x8f, 0xcc,
- 0x4a, 0x57, 0xa7, 0xed, 0x1e, 0x66, 0x2f, 0x76, 0xc5, 0x7b, 0xbf, 0xf7, 0xe2, 0xc5, 0x8b, 0x88,
- 0x17, 0xef, 0x45, 0x24, 0xdc, 0x1b, 0x58, 0xfe, 0xc1, 0x78, 0xaf, 0x62, 0xd0, 0xe1, 0x03, 0x93,
- 0x1a, 0x87, 0xc4, 0x7d, 0xe0, 0x1d, 0xeb, 0xee, 0xf0, 0xd0, 0xf2, 0x1f, 0xe8, 0x23, 0xeb, 0x81,
- 0x3f, 0x19, 0x11, 0xaf, 0x32, 0x72, 0xa9, 0x4f, 0x11, 0x12, 0x80, 0x4a, 0x00, 0xa8, 0x1c, 0x3d,
- 0x2a, 0xad, 0x0f, 0x28, 0x1d, 0xd8, 0xe4, 0x01, 0x47, 0xec, 0x8d, 0xf7, 0x1f, 0xf8, 0xd6, 0x90,
- 0x78, 0xbe, 0x3e, 0x1c, 0x09, 0xa1, 0xd2, 0xda, 0x2c, 0xc0, 0x1c, 0xbb, 0xba, 0x6f, 0x51, 0x47,
- 0xf2, 0x57, 0x06, 0x74, 0x40, 0xf9, 0xcf, 0x07, 0xec, 0x97, 0xa0, 0xaa, 0xeb, 0x30, 0xff, 0x9c,
- 0xb8, 0x9e, 0x45, 0x1d, 0xb4, 0x02, 0x19, 0xcb, 0x31, 0xc9, 0xcb, 0xd5, 0x44, 0x39, 0xf1, 0x7e,
- 0x1a, 0x8b, 0x86, 0xfa, 0x10, 0xa0, 0xc5, 0x7e, 0x34, 0x1d, 0xdf, 0x9d, 0x20, 0x05, 0x52, 0x87,
- 0x64, 0xc2, 0x11, 0x79, 0xcc, 0x7e, 0x32, 0xca, 0x91, 0x6e, 0xaf, 0x26, 0x05, 0xe5, 0x48, 0xb7,
- 0xd5, 0x9f, 0x24, 0xa0, 0x50, 0x75, 0x1c, 0xea, 0xf3, 0xde, 0x3d, 0x84, 0x20, 0xed, 0xe8, 0x43,
- 0x22, 0x85, 0xf8, 0x6f, 0x54, 0x87, 0xac, 0xad, 0xef, 0x11, 0xdb, 0x5b, 0x4d, 0x96, 0x53, 0xef,
- 0x17, 0x1e, 0x7f, 0xad, 0xf2, 0xfa, 0x90, 0x2b, 0x11, 0x25, 0x95, 0x6d, 0x8e, 0xe6, 0x46, 0x60,
- 0x29, 0x8a, 0xbe, 0x0d, 0xf3, 0x96, 0x63, 0x5a, 0x06, 0xf1, 0x56, 0xd3, 0x5c, 0xcb, 0x5a, 0x9c,
- 0x96, 0xa9, 0xf5, 0xb5, 0xf4, 0x0f, 0xcf, 0xd6, 0xe7, 0x70, 0x20, 0x54, 0xfa, 0x00, 0x0a, 0x11,
- 0xb5, 0x31, 0x63, 0x5b, 0x81, 0xcc, 0x91, 0x6e, 0x8f, 0x89, 0x1c, 0x9d, 0x68, 0x7c, 0x98, 0x7c,
- 0x9a, 0x50, 0x3f, 0x81, 0x95, 0xb6, 0x3e, 0x24, 0xe6, 0x26, 0x71, 0x88, 0x6b, 0x19, 0x98, 0x78,
- 0x74, 0xec, 0x1a, 0x84, 0x8d, 0xf5, 0xd0, 0x72, 0xcc, 0x60, 0xac, 0xec, 0x77, 0xbc, 0x16, 0xb5,
- 0x0e, 0x6f, 0x35, 0x2c, 0xcf, 0x70, 0x89, 0x4f, 0x3e, 0xb7, 0x92, 0x54, 0xa0, 0xe4, 0x2c, 0x01,
- 0x4b, 0xb3, 0xd2, 0x3f, 0x07, 0x37, 0x98, 0x8b, 0x4d, 0xcd, 0x95, 0x14, 0xcd, 0x1b, 0x11, 0x83,
- 0x2b, 0x2b, 0x3c, 0x7e, 0x3f, 0xce, 0x43, 0x71, 0x23, 0xd9, 0x9a, 0xc3, 0xcb, 0x5c, 0x4d, 0x40,
- 0xe8, 0x8d, 0x88, 0x81, 0x0c, 0xb8, 0x69, 0x4a, 0xa3, 0x67, 0xd4, 0x27, 0xb9, 0xfa, 0xd8, 0x69,
- 0xbc, 0x64, 0x98, 0x5b, 0x73, 0x78, 0x25, 0x50, 0x16, 0xed, 0xa4, 0x06, 0x90, 0x0b, 0x74, 0xab,
- 0x3f, 0x48, 0x40, 0x3e, 0x60, 0x7a, 0xe8, 0xab, 0x90, 0x77, 0x74, 0x87, 0x6a, 0xc6, 0x68, 0xec,
- 0xf1, 0x01, 0xa5, 0x6a, 0xc5, 0xf3, 0xb3, 0xf5, 0x5c, 0x5b, 0x77, 0x68, 0xbd, 0xbb, 0xeb, 0xe1,
- 0x1c, 0x63, 0xd7, 0x47, 0x63, 0x0f, 0xbd, 0x0d, 0xc5, 0x21, 0x19, 0x52, 0x77, 0xa2, 0xed, 0x4d,
- 0x7c, 0xe2, 0x49, 0xb7, 0x15, 0x04, 0xad, 0xc6, 0x48, 0xe8, 0x5b, 0x30, 0x3f, 0x10, 0x26, 0xad,
- 0xa6, 0xf8, 0xf2, 0x79, 0x27, 0xce, 0xfa, 0x19, 0xab, 0x71, 0x20, 0xa3, 0xfe, 0x56, 0x02, 0x56,
- 0x42, 0x2a, 0xf9, 0xc5, 0xb1, 0xe5, 0x92, 0x21, 0x71, 0x7c, 0x0f, 0x7d, 0x03, 0xb2, 0xb6, 0x35,
- 0xb4, 0x7c, 0x4f, 0xfa, 0xfc, 0x4e, 0x9c, 0xda, 0x70, 0x50, 0x58, 0x82, 0x51, 0x15, 0x8a, 0x2e,
- 0xf1, 0x88, 0x7b, 0x24, 0x56, 0xbc, 0xf4, 0xe8, 0x35, 0xc2, 0x17, 0x44, 0xd4, 0x0d, 0xc8, 0x75,
- 0x6d, 0xdd, 0xdf, 0xa7, 0xee, 0x10, 0xa9, 0x50, 0xd4, 0x5d, 0xe3, 0xc0, 0xf2, 0x89, 0xe1, 0x8f,
- 0xdd, 0x60, 0xf7, 0x5d, 0xa0, 0xa1, 0x9b, 0x90, 0xa4, 0xa2, 0xa3, 0x7c, 0x2d, 0x7b, 0x7e, 0xb6,
- 0x9e, 0xec, 0xf4, 0x70, 0x92, 0x7a, 0xea, 0x47, 0xb0, 0xdc, 0xb5, 0xc7, 0x03, 0xcb, 0x69, 0x10,
- 0xcf, 0x70, 0xad, 0x11, 0xd3, 0xce, 0x56, 0x25, 0x8b, 0x51, 0xc1, 0xaa, 0x64, 0xbf, 0xc3, 0xad,
- 0x9d, 0x9c, 0x6e, 0x6d, 0xf5, 0x37, 0x92, 0xb0, 0xdc, 0x74, 0x06, 0x96, 0x43, 0xa2, 0xd2, 0x77,
- 0x61, 0x91, 0x70, 0xa2, 0x76, 0x24, 0xc2, 0x8d, 0xd4, 0xb3, 0x20, 0xa8, 0x41, 0x0c, 0x6a, 0xcd,
- 0xc4, 0x85, 0x47, 0x71, 0xc3, 0x7f, 0x4d, 0x7b, 0x6c, 0x74, 0x68, 0xc2, 0xfc, 0x88, 0x0f, 0xc2,
- 0x93, 0xd3, 0x7b, 0x37, 0x4e, 0xd7, 0x6b, 0xe3, 0x0c, 0x82, 0x84, 0x94, 0xfd, 0x22, 0x41, 0xe2,
- 0x4f, 0x92, 0xb0, 0xd4, 0xa6, 0xe6, 0x05, 0x3f, 0x94, 0x20, 0x77, 0x40, 0x3d, 0x3f, 0x12, 0x10,
- 0xc3, 0x36, 0x7a, 0x0a, 0xb9, 0x91, 0x9c, 0x3e, 0x39, 0xfb, 0xb7, 0xe3, 0x4d, 0x16, 0x18, 0x1c,
- 0xa2, 0xd1, 0x47, 0x90, 0x0f, 0xb6, 0x0c, 0x1b, 0xed, 0x1b, 0x2c, 0x9c, 0x29, 0x1e, 0x7d, 0x0b,
- 0xb2, 0x62, 0x12, 0x56, 0xd3, 0x5c, 0xf2, 0xee, 0x1b, 0xf9, 0x1c, 0x4b, 0x21, 0xb4, 0x09, 0x39,
- 0xdf, 0xf6, 0x34, 0xcb, 0xd9, 0xa7, 0xab, 0x19, 0xae, 0x60, 0x3d, 0x36, 0xc8, 0x50, 0x93, 0xf4,
- 0xb7, 0x7b, 0x2d, 0x67, 0x9f, 0xd6, 0x0a, 0xe7, 0x67, 0xeb, 0xf3, 0xb2, 0x81, 0xe7, 0x7d, 0xdb,
- 0x63, 0x3f, 0xd4, 0xdf, 0x4e, 0x40, 0x21, 0x82, 0x42, 0x77, 0x00, 0x7c, 0x77, 0xec, 0xf9, 0x9a,
- 0x4b, 0xa9, 0xcf, 0x9d, 0x55, 0xc4, 0x79, 0x4e, 0xc1, 0x94, 0xfa, 0xa8, 0x02, 0x37, 0x0c, 0xe2,
- 0xfa, 0x9a, 0xe5, 0x79, 0x63, 0xe2, 0x6a, 0xde, 0x78, 0xef, 0x53, 0x62, 0xf8, 0xdc, 0x71, 0x45,
- 0xbc, 0xcc, 0x58, 0x2d, 0xce, 0xe9, 0x09, 0x06, 0x7a, 0x02, 0x37, 0xa3, 0xf8, 0xd1, 0x78, 0xcf,
- 0xb6, 0x0c, 0x8d, 0x4d, 0x66, 0x8a, 0x8b, 0xdc, 0x98, 0x8a, 0x74, 0x39, 0xef, 0x19, 0x99, 0xa8,
- 0x3f, 0x4e, 0x80, 0x82, 0xf5, 0x7d, 0x7f, 0x87, 0x0c, 0xf7, 0x88, 0xdb, 0xf3, 0x75, 0x7f, 0xec,
- 0xa1, 0x9b, 0x90, 0xb5, 0x89, 0x6e, 0x12, 0x97, 0x1b, 0x95, 0xc3, 0xb2, 0x85, 0x76, 0xd9, 0x0e,
- 0xd6, 0x8d, 0x03, 0x7d, 0xcf, 0xb2, 0x2d, 0x7f, 0xc2, 0x4d, 0x59, 0x8c, 0x5f, 0xc2, 0xb3, 0x3a,
- 0x2b, 0x38, 0x22, 0x88, 0x2f, 0xa8, 0x41, 0xab, 0x30, 0x3f, 0x24, 0x9e, 0xa7, 0x0f, 0x08, 0xb7,
- 0x34, 0x8f, 0x83, 0xa6, 0xfa, 0x11, 0x14, 0xa3, 0x72, 0xa8, 0x00, 0xf3, 0xbb, 0xed, 0x67, 0xed,
- 0xce, 0x8b, 0xb6, 0x32, 0x87, 0x96, 0xa0, 0xb0, 0xdb, 0xc6, 0xcd, 0x6a, 0x7d, 0xab, 0x5a, 0xdb,
- 0x6e, 0x2a, 0x09, 0xb4, 0x00, 0xf9, 0x69, 0x33, 0xa9, 0xfe, 0x59, 0x02, 0x80, 0xb9, 0x5b, 0x0e,
- 0xea, 0x43, 0xc8, 0x78, 0xbe, 0xee, 0x8b, 0x55, 0xb9, 0xf8, 0xf8, 0xdd, 0xcb, 0xe6, 0x50, 0xda,
- 0xcb, 0xfe, 0x11, 0x2c, 0x44, 0xa2, 0x16, 0x26, 0x2f, 0x58, 0xc8, 0x02, 0x84, 0x6e, 0x9a, 0xae,
- 0x34, 0x9c, 0xff, 0x56, 0x3f, 0x82, 0x0c, 0x97, 0xbe, 0x68, 0x6e, 0x0e, 0xd2, 0x0d, 0xf6, 0x2b,
- 0x81, 0xf2, 0x90, 0xc1, 0xcd, 0x6a, 0xe3, 0x7b, 0x4a, 0x12, 0x29, 0x50, 0x6c, 0xb4, 0x7a, 0xf5,
- 0x4e, 0xbb, 0xdd, 0xac, 0xf7, 0x9b, 0x0d, 0x25, 0xa5, 0xde, 0x85, 0x4c, 0x6b, 0xc8, 0x34, 0xdf,
- 0x66, 0x4b, 0x7e, 0x9f, 0xb8, 0xc4, 0x31, 0x82, 0x9d, 0x34, 0x25, 0xa8, 0x3f, 0x2d, 0x40, 0x66,
- 0x87, 0x8e, 0x1d, 0x1f, 0x3d, 0x8e, 0x84, 0xad, 0xc5, 0xf8, 0x0c, 0x81, 0x03, 0x2b, 0xfd, 0xc9,
- 0x88, 0xc8, 0xb0, 0x76, 0x13, 0xb2, 0x62, 0x73, 0xc8, 0xe1, 0xc8, 0x16, 0xa3, 0xfb, 0xba, 0x3b,
- 0x20, 0xbe, 0x1c, 0x8f, 0x6c, 0xa1, 0xf7, 0xd9, 0x89, 0xa5, 0x9b, 0xd4, 0xb1, 0x27, 0x7c, 0x0f,
- 0xe5, 0xc4, 0xb1, 0x84, 0x89, 0x6e, 0x76, 0x1c, 0x7b, 0x82, 0x43, 0x2e, 0xda, 0x82, 0xe2, 0x9e,
- 0xe5, 0x98, 0x1a, 0x1d, 0x89, 0x20, 0x9f, 0xb9, 0x7c, 0xc7, 0x09, 0xab, 0x6a, 0x96, 0x63, 0x76,
- 0x04, 0x18, 0x17, 0xf6, 0xa6, 0x0d, 0xd4, 0x86, 0xc5, 0x23, 0x6a, 0x8f, 0x87, 0x24, 0xd4, 0x95,
- 0xe5, 0xba, 0xde, 0xbb, 0x5c, 0xd7, 0x73, 0x8e, 0x0f, 0xb4, 0x2d, 0x1c, 0x45, 0x9b, 0xe8, 0x19,
- 0x2c, 0xf8, 0xc3, 0xd1, 0xbe, 0x17, 0xaa, 0x9b, 0xe7, 0xea, 0xbe, 0x72, 0x85, 0xc3, 0x18, 0x3c,
- 0xd0, 0x56, 0xf4, 0x23, 0x2d, 0xb4, 0x09, 0x05, 0x83, 0x3a, 0x9e, 0xe5, 0xf9, 0xc4, 0x31, 0x26,
- 0xab, 0x39, 0xee, 0xfb, 0x2b, 0x46, 0x59, 0x9f, 0x82, 0x71, 0x54, 0xb2, 0xf4, 0x6b, 0x29, 0x28,
- 0x44, 0x5c, 0x80, 0x7a, 0x50, 0x18, 0xb9, 0x74, 0xa4, 0x0f, 0xf8, 0x89, 0x27, 0x27, 0xf5, 0xd1,
- 0x1b, 0xb9, 0xaf, 0xd2, 0x9d, 0x0a, 0xe2, 0xa8, 0x16, 0xf5, 0x34, 0x09, 0x85, 0x08, 0x13, 0xdd,
- 0x83, 0x1c, 0xee, 0xe2, 0xd6, 0xf3, 0x6a, 0xbf, 0xa9, 0xcc, 0x95, 0x6e, 0x9f, 0x9c, 0x96, 0x57,
- 0xb9, 0xb6, 0xa8, 0x82, 0xae, 0x6b, 0x1d, 0xb1, 0x35, 0xfc, 0x3e, 0xcc, 0x07, 0xd0, 0x44, 0xe9,
- 0xcb, 0x27, 0xa7, 0xe5, 0xb7, 0x66, 0xa1, 0x11, 0x24, 0xee, 0x6d, 0x55, 0x71, 0xb3, 0xa1, 0x24,
- 0xe3, 0x91, 0xb8, 0x77, 0xa0, 0xbb, 0xc4, 0x44, 0x5f, 0x81, 0xac, 0x04, 0xa6, 0x4a, 0xa5, 0x93,
- 0xd3, 0xf2, 0xcd, 0x59, 0xe0, 0x14, 0x87, 0x7b, 0xdb, 0xd5, 0xe7, 0x4d, 0x25, 0x1d, 0x8f, 0xc3,
- 0x3d, 0x5b, 0x3f, 0x22, 0xe8, 0x5d, 0xc8, 0x08, 0x58, 0xa6, 0x74, 0xeb, 0xe4, 0xb4, 0xfc, 0xa5,
- 0xd7, 0xd4, 0x31, 0x54, 0x69, 0xf5, 0x37, 0xff, 0x70, 0x6d, 0xee, 0xaf, 0xfe, 0x68, 0x4d, 0x99,
- 0x65, 0x97, 0xfe, 0x3b, 0x01, 0x0b, 0x17, 0xd6, 0x0e, 0x52, 0x21, 0xeb, 0x50, 0x83, 0x8e, 0xc4,
- 0x41, 0x98, 0xab, 0xc1, 0xf9, 0xd9, 0x7a, 0xb6, 0x4d, 0xeb, 0x74, 0x34, 0xc1, 0x92, 0x83, 0x9e,
- 0xcd, 0x1c, 0xe5, 0x4f, 0xde, 0x70, 0x61, 0xc6, 0x1e, 0xe6, 0x1f, 0xc3, 0x82, 0xe9, 0x5a, 0x47,
- 0xc4, 0xd5, 0x0c, 0xea, 0xec, 0x5b, 0x03, 0x79, 0xc8, 0x95, 0x62, 0xf3, 0x4d, 0x0e, 0xc4, 0x45,
- 0x21, 0x50, 0xe7, 0xf8, 0x2f, 0x70, 0x8c, 0x97, 0x9e, 0x43, 0x31, 0xba, 0xd4, 0xd9, 0xb9, 0xe4,
- 0x59, 0xbf, 0x44, 0x64, 0x62, 0xc9, 0xd3, 0x50, 0x9c, 0x67, 0x14, 0x91, 0x56, 0xbe, 0x07, 0xe9,
- 0x21, 0x35, 0x85, 0x9e, 0x85, 0xda, 0x0d, 0x96, 0x4d, 0xfc, 0xd3, 0xd9, 0x7a, 0x81, 0x7a, 0x95,
- 0x0d, 0xcb, 0x26, 0x3b, 0xd4, 0x24, 0x98, 0x03, 0xd4, 0x23, 0x48, 0xb3, 0x98, 0x83, 0xbe, 0x0c,
- 0xe9, 0x5a, 0xab, 0xdd, 0x50, 0xe6, 0x4a, 0xcb, 0x27, 0xa7, 0xe5, 0x05, 0xee, 0x12, 0xc6, 0x60,
- 0x6b, 0x17, 0xad, 0x43, 0xf6, 0x79, 0x67, 0x7b, 0x77, 0x87, 0x2d, 0xaf, 0x1b, 0x27, 0xa7, 0xe5,
- 0xa5, 0x90, 0x2d, 0x9c, 0x86, 0xee, 0x40, 0xa6, 0xbf, 0xd3, 0xdd, 0xe8, 0x29, 0xc9, 0x12, 0x3a,
- 0x39, 0x2d, 0x2f, 0x86, 0x7c, 0x6e, 0x73, 0x69, 0x59, 0xce, 0x6a, 0x3e, 0xa4, 0xab, 0x3f, 0x4a,
- 0x40, 0x21, 0xb2, 0xe1, 0xd8, 0xc2, 0x6c, 0x34, 0x37, 0xaa, 0xbb, 0xdb, 0x7d, 0x65, 0x2e, 0xb2,
- 0x30, 0x23, 0x90, 0x06, 0xd9, 0xd7, 0xc7, 0x36, 0x8b, 0x73, 0x50, 0xef, 0xb4, 0x7b, 0xad, 0x5e,
+ // 5054 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x5a, 0x4d, 0x6c, 0x24, 0x49,
+ 0x56, 0x76, 0xfd, 0xba, 0xea, 0x55, 0xd9, 0x4e, 0x47, 0x7b, 0x7b, 0xdc, 0xb5, 0xdd, 0x76, 0x4d,
+ 0xce, 0xf4, 0xce, 0x6c, 0x6f, 0x53, 0xfd, 0xb7, 0xbb, 0xea, 0x99, 0x61, 0x77, 0xa6, 0xfe, 0x6c,
+ 0xd7, 0xb6, 0x5d, 0x55, 0x8a, 0x2a, 0x77, 0xef, 0x22, 0x41, 0x92, 0xce, 0x0c, 0x97, 0x73, 0x9c,
+ 0x95, 0x51, 0x64, 0x66, 0xd9, 0x5d, 0x2c, 0x88, 0x16, 0x07, 0x40, 0x3e, 0xc1, 0x89, 0x45, 0xc8,
+ 0x08, 0x09, 0x8e, 0x48, 0x1c, 0x40, 0x42, 0x70, 0x1a, 0x24, 0x84, 0xf6, 0x06, 0x0b, 0x12, 0x5a,
+ 0x81, 0x64, 0x58, 0x1f, 0xb8, 0xad, 0xe0, 0x82, 0xb8, 0x80, 0x84, 0xe2, 0x27, 0xb3, 0xd2, 0xd5,
+ 0x69, 0xbb, 0x87, 0xdd, 0x8b, 0x5d, 0xf1, 0xde, 0xf7, 0x5e, 0x44, 0xbc, 0x88, 0x78, 0xf1, 0xde,
+ 0x8b, 0x84, 0x7b, 0x03, 0xcb, 0x3f, 0x18, 0xef, 0x55, 0x0c, 0x3a, 0x7c, 0x60, 0x52, 0xe3, 0x90,
+ 0xb8, 0x0f, 0xbc, 0x63, 0xdd, 0x1d, 0x1e, 0x5a, 0xfe, 0x03, 0x7d, 0x64, 0x3d, 0xf0, 0x27, 0x23,
+ 0xe2, 0x55, 0x46, 0x2e, 0xf5, 0x29, 0x42, 0x02, 0x50, 0x09, 0x00, 0x95, 0xa3, 0x47, 0xa5, 0xf5,
+ 0x01, 0xa5, 0x03, 0x9b, 0x3c, 0xe0, 0x88, 0xbd, 0xf1, 0xfe, 0x03, 0xdf, 0x1a, 0x12, 0xcf, 0xd7,
+ 0x87, 0x23, 0x21, 0x54, 0x5a, 0x9b, 0x05, 0x98, 0x63, 0x57, 0xf7, 0x2d, 0xea, 0x48, 0xfe, 0xca,
+ 0x80, 0x0e, 0x28, 0xff, 0xf9, 0x80, 0xfd, 0x12, 0x54, 0x75, 0x1d, 0xe6, 0x9f, 0x13, 0xd7, 0xb3,
+ 0xa8, 0x83, 0x56, 0x20, 0x63, 0x39, 0x26, 0x79, 0xb9, 0x9a, 0x28, 0x27, 0xde, 0x4f, 0x63, 0xd1,
+ 0x50, 0x1f, 0x02, 0xb4, 0xd8, 0x8f, 0xa6, 0xe3, 0xbb, 0x13, 0xa4, 0x40, 0xea, 0x90, 0x4c, 0x38,
+ 0x22, 0x8f, 0xd9, 0x4f, 0x46, 0x39, 0xd2, 0xed, 0xd5, 0xa4, 0xa0, 0x1c, 0xe9, 0xb6, 0xfa, 0xa3,
+ 0x04, 0x14, 0xaa, 0x8e, 0x43, 0x7d, 0xde, 0xbb, 0x87, 0x10, 0xa4, 0x1d, 0x7d, 0x48, 0xa4, 0x10,
+ 0xff, 0x8d, 0xea, 0x90, 0xb5, 0xf5, 0x3d, 0x62, 0x7b, 0xab, 0xc9, 0x72, 0xea, 0xfd, 0xc2, 0xe3,
+ 0xaf, 0x54, 0x5e, 0x9f, 0x72, 0x25, 0xa2, 0xa4, 0xb2, 0xcd, 0xd1, 0x7c, 0x10, 0x58, 0x8a, 0xa2,
+ 0x6f, 0xc2, 0xbc, 0xe5, 0x98, 0x96, 0x41, 0xbc, 0xd5, 0x34, 0xd7, 0xb2, 0x16, 0xa7, 0x65, 0x3a,
+ 0xfa, 0x5a, 0xfa, 0xfb, 0x67, 0xeb, 0x73, 0x38, 0x10, 0x2a, 0x7d, 0x00, 0x85, 0x88, 0xda, 0x98,
+ 0xb9, 0xad, 0x40, 0xe6, 0x48, 0xb7, 0xc7, 0x44, 0xce, 0x4e, 0x34, 0x3e, 0x4c, 0x3e, 0x4d, 0xa8,
+ 0x9f, 0xc0, 0x4a, 0x5b, 0x1f, 0x12, 0x73, 0x93, 0x38, 0xc4, 0xb5, 0x0c, 0x4c, 0x3c, 0x3a, 0x76,
+ 0x0d, 0xc2, 0xe6, 0x7a, 0x68, 0x39, 0x66, 0x30, 0x57, 0xf6, 0x3b, 0x5e, 0x8b, 0x5a, 0x87, 0xb7,
+ 0x1a, 0x96, 0x67, 0xb8, 0xc4, 0x27, 0x9f, 0x5b, 0x49, 0x2a, 0x50, 0x72, 0x96, 0x80, 0xa5, 0x59,
+ 0xe9, 0x9f, 0x83, 0x1b, 0xcc, 0xc4, 0xa6, 0xe6, 0x4a, 0x8a, 0xe6, 0x8d, 0x88, 0xc1, 0x95, 0x15,
+ 0x1e, 0xbf, 0x1f, 0x67, 0xa1, 0xb8, 0x99, 0x6c, 0xcd, 0xe1, 0x65, 0xae, 0x26, 0x20, 0xf4, 0x46,
+ 0xc4, 0x40, 0x06, 0xdc, 0x34, 0xe5, 0xa0, 0x67, 0xd4, 0x27, 0xb9, 0xfa, 0xd8, 0x65, 0xbc, 0x64,
+ 0x9a, 0x5b, 0x73, 0x78, 0x25, 0x50, 0x16, 0xed, 0xa4, 0x06, 0x90, 0x0b, 0x74, 0xab, 0xdf, 0x4b,
+ 0x40, 0x3e, 0x60, 0x7a, 0xe8, 0xcb, 0x90, 0x77, 0x74, 0x87, 0x6a, 0xc6, 0x68, 0xec, 0xf1, 0x09,
+ 0xa5, 0x6a, 0xc5, 0xf3, 0xb3, 0xf5, 0x5c, 0x5b, 0x77, 0x68, 0xbd, 0xbb, 0xeb, 0xe1, 0x1c, 0x63,
+ 0xd7, 0x47, 0x63, 0x0f, 0xbd, 0x0d, 0xc5, 0x21, 0x19, 0x52, 0x77, 0xa2, 0xed, 0x4d, 0x7c, 0xe2,
+ 0x49, 0xb3, 0x15, 0x04, 0xad, 0xc6, 0x48, 0xe8, 0x1b, 0x30, 0x3f, 0x10, 0x43, 0x5a, 0x4d, 0xf1,
+ 0xed, 0xf3, 0x4e, 0xdc, 0xe8, 0x67, 0x46, 0x8d, 0x03, 0x19, 0xf5, 0xb7, 0x13, 0xb0, 0x12, 0x52,
+ 0xc9, 0x2f, 0x8d, 0x2d, 0x97, 0x0c, 0x89, 0xe3, 0x7b, 0xe8, 0x6b, 0x90, 0xb5, 0xad, 0xa1, 0xe5,
+ 0x7b, 0xd2, 0xe6, 0x77, 0xe2, 0xd4, 0x86, 0x93, 0xc2, 0x12, 0x8c, 0xaa, 0x50, 0x74, 0x89, 0x47,
+ 0xdc, 0x23, 0xb1, 0xe3, 0xa5, 0x45, 0xaf, 0x11, 0xbe, 0x20, 0xa2, 0x6e, 0x40, 0xae, 0x6b, 0xeb,
+ 0xfe, 0x3e, 0x75, 0x87, 0x48, 0x85, 0xa2, 0xee, 0x1a, 0x07, 0x96, 0x4f, 0x0c, 0x7f, 0xec, 0x06,
+ 0xa7, 0xef, 0x02, 0x0d, 0xdd, 0x84, 0x24, 0x15, 0x1d, 0xe5, 0x6b, 0xd9, 0xf3, 0xb3, 0xf5, 0x64,
+ 0xa7, 0x87, 0x93, 0xd4, 0x53, 0x3f, 0x82, 0xe5, 0xae, 0x3d, 0x1e, 0x58, 0x4e, 0x83, 0x78, 0x86,
+ 0x6b, 0x8d, 0x98, 0x76, 0xb6, 0x2b, 0x99, 0x8f, 0x0a, 0x76, 0x25, 0xfb, 0x1d, 0x1e, 0xed, 0xe4,
+ 0xf4, 0x68, 0xab, 0xbf, 0x99, 0x84, 0xe5, 0xa6, 0x33, 0xb0, 0x1c, 0x12, 0x95, 0xbe, 0x0b, 0x8b,
+ 0x84, 0x13, 0xb5, 0x23, 0xe1, 0x6e, 0xa4, 0x9e, 0x05, 0x41, 0x0d, 0x7c, 0x50, 0x6b, 0xc6, 0x2f,
+ 0x3c, 0x8a, 0x9b, 0xfe, 0x6b, 0xda, 0x63, 0xbd, 0x43, 0x13, 0xe6, 0x47, 0x7c, 0x12, 0x9e, 0x5c,
+ 0xde, 0xbb, 0x71, 0xba, 0x5e, 0x9b, 0x67, 0xe0, 0x24, 0xa4, 0xec, 0x4f, 0xe2, 0x24, 0xfe, 0x24,
+ 0x09, 0x4b, 0x6d, 0x6a, 0x5e, 0xb0, 0x43, 0x09, 0x72, 0x07, 0xd4, 0xf3, 0x23, 0x0e, 0x31, 0x6c,
+ 0xa3, 0xa7, 0x90, 0x1b, 0xc9, 0xe5, 0x93, 0xab, 0x7f, 0x3b, 0x7e, 0xc8, 0x02, 0x83, 0x43, 0x34,
+ 0xfa, 0x08, 0xf2, 0xc1, 0x91, 0x61, 0xb3, 0x7d, 0x83, 0x8d, 0x33, 0xc5, 0xa3, 0x6f, 0x40, 0x56,
+ 0x2c, 0xc2, 0x6a, 0x9a, 0x4b, 0xde, 0x7d, 0x23, 0x9b, 0x63, 0x29, 0x84, 0x36, 0x21, 0xe7, 0xdb,
+ 0x9e, 0x66, 0x39, 0xfb, 0x74, 0x35, 0xc3, 0x15, 0xac, 0xc7, 0x3a, 0x19, 0x6a, 0x92, 0xfe, 0x76,
+ 0xaf, 0xe5, 0xec, 0xd3, 0x5a, 0xe1, 0xfc, 0x6c, 0x7d, 0x5e, 0x36, 0xf0, 0xbc, 0x6f, 0x7b, 0xec,
+ 0x87, 0xfa, 0x3b, 0x09, 0x28, 0x44, 0x50, 0xe8, 0x0e, 0x80, 0xef, 0x8e, 0x3d, 0x5f, 0x73, 0x29,
+ 0xf5, 0xb9, 0xb1, 0x8a, 0x38, 0xcf, 0x29, 0x98, 0x52, 0x1f, 0x55, 0xe0, 0x86, 0x41, 0x5c, 0x5f,
+ 0xb3, 0x3c, 0x6f, 0x4c, 0x5c, 0xcd, 0x1b, 0xef, 0x7d, 0x4a, 0x0c, 0x9f, 0x1b, 0xae, 0x88, 0x97,
+ 0x19, 0xab, 0xc5, 0x39, 0x3d, 0xc1, 0x40, 0x4f, 0xe0, 0x66, 0x14, 0x3f, 0x1a, 0xef, 0xd9, 0x96,
+ 0xa1, 0xb1, 0xc5, 0x4c, 0x71, 0x91, 0x1b, 0x53, 0x91, 0x2e, 0xe7, 0x3d, 0x23, 0x13, 0xf5, 0x87,
+ 0x09, 0x50, 0xb0, 0xbe, 0xef, 0xef, 0x90, 0xe1, 0x1e, 0x71, 0x7b, 0xbe, 0xee, 0x8f, 0x3d, 0x74,
+ 0x13, 0xb2, 0x36, 0xd1, 0x4d, 0xe2, 0xf2, 0x41, 0xe5, 0xb0, 0x6c, 0xa1, 0x5d, 0x76, 0x82, 0x75,
+ 0xe3, 0x40, 0xdf, 0xb3, 0x6c, 0xcb, 0x9f, 0xf0, 0xa1, 0x2c, 0xc6, 0x6f, 0xe1, 0x59, 0x9d, 0x15,
+ 0x1c, 0x11, 0xc4, 0x17, 0xd4, 0xa0, 0x55, 0x98, 0x1f, 0x12, 0xcf, 0xd3, 0x07, 0x84, 0x8f, 0x34,
+ 0x8f, 0x83, 0xa6, 0xfa, 0x11, 0x14, 0xa3, 0x72, 0xa8, 0x00, 0xf3, 0xbb, 0xed, 0x67, 0xed, 0xce,
+ 0x8b, 0xb6, 0x32, 0x87, 0x96, 0xa0, 0xb0, 0xdb, 0xc6, 0xcd, 0x6a, 0x7d, 0xab, 0x5a, 0xdb, 0x6e,
+ 0x2a, 0x09, 0xb4, 0x00, 0xf9, 0x69, 0x33, 0xa9, 0xfe, 0x59, 0x02, 0x80, 0x99, 0x5b, 0x4e, 0xea,
+ 0x43, 0xc8, 0x78, 0xbe, 0xee, 0x8b, 0x5d, 0xb9, 0xf8, 0xf8, 0xdd, 0xcb, 0xd6, 0x50, 0x8e, 0x97,
+ 0xfd, 0x23, 0x58, 0x88, 0x44, 0x47, 0x98, 0xbc, 0x30, 0x42, 0xe6, 0x20, 0x74, 0xd3, 0x74, 0xe5,
+ 0xc0, 0xf9, 0x6f, 0xf5, 0x23, 0xc8, 0x70, 0xe9, 0x8b, 0xc3, 0xcd, 0x41, 0xba, 0xc1, 0x7e, 0x25,
+ 0x50, 0x1e, 0x32, 0xb8, 0x59, 0x6d, 0x7c, 0x47, 0x49, 0x22, 0x05, 0x8a, 0x8d, 0x56, 0xaf, 0xde,
+ 0x69, 0xb7, 0x9b, 0xf5, 0x7e, 0xb3, 0xa1, 0xa4, 0xd4, 0xbb, 0x90, 0x69, 0x0d, 0x99, 0xe6, 0xdb,
+ 0x6c, 0xcb, 0xef, 0x13, 0x97, 0x38, 0x46, 0x70, 0x92, 0xa6, 0x04, 0xf5, 0xc7, 0x05, 0xc8, 0xec,
+ 0xd0, 0xb1, 0xe3, 0xa3, 0xc7, 0x11, 0xb7, 0xb5, 0x18, 0x1f, 0x21, 0x70, 0x60, 0xa5, 0x3f, 0x19,
+ 0x11, 0xe9, 0xd6, 0x6e, 0x42, 0x56, 0x1c, 0x0e, 0x39, 0x1d, 0xd9, 0x62, 0x74, 0x5f, 0x77, 0x07,
+ 0xc4, 0x97, 0xf3, 0x91, 0x2d, 0xf4, 0x3e, 0xbb, 0xb1, 0x74, 0x93, 0x3a, 0xf6, 0x84, 0x9f, 0xa1,
+ 0x9c, 0xb8, 0x96, 0x30, 0xd1, 0xcd, 0x8e, 0x63, 0x4f, 0x70, 0xc8, 0x45, 0x5b, 0x50, 0xdc, 0xb3,
+ 0x1c, 0x53, 0xa3, 0x23, 0xe1, 0xe4, 0x33, 0x97, 0x9f, 0x38, 0x31, 0xaa, 0x9a, 0xe5, 0x98, 0x1d,
+ 0x01, 0xc6, 0x85, 0xbd, 0x69, 0x03, 0xb5, 0x61, 0xf1, 0x88, 0xda, 0xe3, 0x21, 0x09, 0x75, 0x65,
+ 0xb9, 0xae, 0xf7, 0x2e, 0xd7, 0xf5, 0x9c, 0xe3, 0x03, 0x6d, 0x0b, 0x47, 0xd1, 0x26, 0x7a, 0x06,
+ 0x0b, 0xfe, 0x70, 0xb4, 0xef, 0x85, 0xea, 0xe6, 0xb9, 0xba, 0x2f, 0x5d, 0x61, 0x30, 0x06, 0x0f,
+ 0xb4, 0x15, 0xfd, 0x48, 0x0b, 0x6d, 0x42, 0xc1, 0xa0, 0x8e, 0x67, 0x79, 0x3e, 0x71, 0x8c, 0xc9,
+ 0x6a, 0x8e, 0xdb, 0xfe, 0x8a, 0x59, 0xd6, 0xa7, 0x60, 0x1c, 0x95, 0x2c, 0xfd, 0x7a, 0x0a, 0x0a,
+ 0x11, 0x13, 0xa0, 0x1e, 0x14, 0x46, 0x2e, 0x1d, 0xe9, 0x03, 0x7e, 0xe3, 0xc9, 0x45, 0x7d, 0xf4,
+ 0x46, 0xe6, 0xab, 0x74, 0xa7, 0x82, 0x38, 0xaa, 0x45, 0x3d, 0x4d, 0x42, 0x21, 0xc2, 0x44, 0xf7,
+ 0x20, 0x87, 0xbb, 0xb8, 0xf5, 0xbc, 0xda, 0x6f, 0x2a, 0x73, 0xa5, 0xdb, 0x27, 0xa7, 0xe5, 0x55,
+ 0xae, 0x2d, 0xaa, 0xa0, 0xeb, 0x5a, 0x47, 0x6c, 0x0f, 0xbf, 0x0f, 0xf3, 0x01, 0x34, 0x51, 0xfa,
+ 0xe2, 0xc9, 0x69, 0xf9, 0xad, 0x59, 0x68, 0x04, 0x89, 0x7b, 0x5b, 0x55, 0xdc, 0x6c, 0x28, 0xc9,
+ 0x78, 0x24, 0xee, 0x1d, 0xe8, 0x2e, 0x31, 0xd1, 0x97, 0x20, 0x2b, 0x81, 0xa9, 0x52, 0xe9, 0xe4,
+ 0xb4, 0x7c, 0x73, 0x16, 0x38, 0xc5, 0xe1, 0xde, 0x76, 0xf5, 0x79, 0x53, 0x49, 0xc7, 0xe3, 0x70,
+ 0xcf, 0xd6, 0x8f, 0x08, 0x7a, 0x17, 0x32, 0x02, 0x96, 0x29, 0xdd, 0x3a, 0x39, 0x2d, 0x7f, 0xe1,
+ 0x35, 0x75, 0x0c, 0x55, 0x5a, 0xfd, 0xad, 0x3f, 0x5a, 0x9b, 0xfb, 0xab, 0x3f, 0x5e, 0x53, 0x66,
+ 0xd9, 0xa5, 0xff, 0x49, 0xc0, 0xc2, 0x85, 0xbd, 0x83, 0x54, 0xc8, 0x3a, 0xd4, 0xa0, 0x23, 0x71,
+ 0x11, 0xe6, 0x6a, 0x70, 0x7e, 0xb6, 0x9e, 0x6d, 0xd3, 0x3a, 0x1d, 0x4d, 0xb0, 0xe4, 0xa0, 0x67,
+ 0x33, 0x57, 0xf9, 0x93, 0x37, 0xdc, 0x98, 0xb1, 0x97, 0xf9, 0xc7, 0xb0, 0x60, 0xba, 0xd6, 0x11,
+ 0x71, 0x35, 0x83, 0x3a, 0xfb, 0xd6, 0x40, 0x5e, 0x72, 0xa5, 0xd8, 0x78, 0x93, 0x03, 0x71, 0x51,
+ 0x08, 0xd4, 0x39, 0xfe, 0x27, 0xb8, 0xc6, 0x4b, 0xcf, 0xa1, 0x18, 0xdd, 0xea, 0xec, 0x5e, 0xf2,
+ 0xac, 0x5f, 0x26, 0x32, 0xb0, 0xe4, 0x61, 0x28, 0xce, 0x33, 0x8a, 0x08, 0x2b, 0xdf, 0x83, 0xf4,
+ 0x90, 0x9a, 0x42, 0xcf, 0x42, 0xed, 0x06, 0x8b, 0x26, 0xfe, 0xf9, 0x6c, 0xbd, 0x40, 0xbd, 0xca,
+ 0x86, 0x65, 0x93, 0x1d, 0x6a, 0x12, 0xcc, 0x01, 0xea, 0x11, 0xa4, 0x99, 0xcf, 0x41, 0x5f, 0x84,
+ 0x74, 0xad, 0xd5, 0x6e, 0x28, 0x73, 0xa5, 0xe5, 0x93, 0xd3, 0xf2, 0x02, 0x37, 0x09, 0x63, 0xb0,
+ 0xbd, 0x8b, 0xd6, 0x21, 0xfb, 0xbc, 0xb3, 0xbd, 0xbb, 0xc3, 0xb6, 0xd7, 0x8d, 0x93, 0xd3, 0xf2,
+ 0x52, 0xc8, 0x16, 0x46, 0x43, 0x77, 0x20, 0xd3, 0xdf, 0xe9, 0x6e, 0xf4, 0x94, 0x64, 0x09, 0x9d,
+ 0x9c, 0x96, 0x17, 0x43, 0x3e, 0x1f, 0x73, 0x69, 0x59, 0xae, 0x6a, 0x3e, 0xa4, 0xab, 0x3f, 0x48,
+ 0x40, 0x21, 0x72, 0xe0, 0xd8, 0xc6, 0x6c, 0x34, 0x37, 0xaa, 0xbb, 0xdb, 0x7d, 0x65, 0x2e, 0xb2,
+ 0x31, 0x23, 0x90, 0x06, 0xd9, 0xd7, 0xc7, 0x36, 0xf3, 0x73, 0x50, 0xef, 0xb4, 0x7b, 0xad, 0x5e,
0xbf, 0xd9, 0xee, 0x2b, 0x89, 0xd2, 0xea, 0xc9, 0x69, 0x79, 0x65, 0x16, 0xbc, 0x31, 0xb6, 0x6d,
- 0xb6, 0x34, 0xeb, 0xd5, 0xfa, 0x16, 0x5f, 0xeb, 0xd3, 0xa5, 0x19, 0x41, 0xd5, 0x75, 0xe3, 0x80,
- 0x98, 0xe8, 0x3e, 0xe4, 0x1b, 0xcd, 0xed, 0xe6, 0x66, 0x95, 0x47, 0xf7, 0xd2, 0x9d, 0x93, 0xd3,
- 0xf2, 0xad, 0xd7, 0x7b, 0xb7, 0xc9, 0x40, 0xf7, 0x89, 0x39, 0xb3, 0x44, 0x23, 0x10, 0xf5, 0x3f,
- 0x93, 0xb0, 0x80, 0x59, 0x39, 0xec, 0xfa, 0x5d, 0x6a, 0x5b, 0xc6, 0x04, 0x75, 0x21, 0x6f, 0x50,
- 0xc7, 0xb4, 0x22, 0x71, 0xe2, 0xf1, 0x25, 0x29, 0xd1, 0x54, 0x2a, 0x68, 0xd5, 0x03, 0x49, 0x3c,
- 0x55, 0x82, 0x1e, 0x40, 0xc6, 0x24, 0xb6, 0x3e, 0x91, 0xb9, 0xd9, 0xad, 0x8a, 0x28, 0xb8, 0x2b,
- 0x41, 0xc1, 0x5d, 0x69, 0xc8, 0x82, 0x1b, 0x0b, 0x1c, 0xaf, 0x41, 0xf4, 0x97, 0x9a, 0xee, 0xfb,
- 0x64, 0x38, 0xf2, 0x45, 0x62, 0x96, 0xc6, 0x85, 0xa1, 0xfe, 0xb2, 0x2a, 0x49, 0xe8, 0x11, 0x64,
- 0x8f, 0x2d, 0xc7, 0xa4, 0xc7, 0x32, 0xf7, 0xba, 0x42, 0xa9, 0x04, 0xaa, 0x27, 0x2c, 0x25, 0x99,
- 0x31, 0x93, 0xad, 0xa1, 0x76, 0xa7, 0xdd, 0x0c, 0xd6, 0x90, 0xe4, 0x77, 0x9c, 0x36, 0x75, 0xd8,
- 0xfe, 0x87, 0x4e, 0x5b, 0xdb, 0xa8, 0xb6, 0xb6, 0x77, 0x31, 0x5b, 0x47, 0x2b, 0x27, 0xa7, 0x65,
- 0x25, 0x84, 0x6c, 0xe8, 0x96, 0xcd, 0x8a, 0x81, 0x5b, 0x90, 0xaa, 0xb6, 0xbf, 0xa7, 0x24, 0x4b,
- 0xca, 0xc9, 0x69, 0xb9, 0x18, 0xb2, 0xab, 0xce, 0x64, 0xea, 0xf7, 0xd9, 0x7e, 0xd5, 0xbf, 0x4d,
- 0x41, 0x71, 0x77, 0x64, 0xea, 0x3e, 0x11, 0xfb, 0x0c, 0x95, 0xa1, 0x30, 0xd2, 0x5d, 0xdd, 0xb6,
- 0x89, 0x6d, 0x79, 0x43, 0x79, 0x95, 0x10, 0x25, 0xa1, 0x0f, 0xde, 0xd4, 0x8d, 0xb5, 0x1c, 0xdb,
- 0x3b, 0x3f, 0xf8, 0x97, 0xf5, 0x44, 0xe0, 0xd0, 0x5d, 0x58, 0xdc, 0x17, 0xd6, 0x6a, 0xba, 0xc1,
- 0x27, 0x36, 0xc5, 0x27, 0xb6, 0x12, 0x37, 0xb1, 0x51, 0xb3, 0x2a, 0x72, 0x90, 0x55, 0x2e, 0x85,
- 0x17, 0xf6, 0xa3, 0x4d, 0xf4, 0x04, 0xe6, 0x87, 0xd4, 0xb1, 0x7c, 0xea, 0x5e, 0x3f, 0x0b, 0x01,
- 0x12, 0xdd, 0x83, 0x65, 0x36, 0xb9, 0x81, 0x3d, 0x9c, 0xcd, 0x8f, 0xf3, 0x24, 0x5e, 0x1a, 0xea,
- 0x2f, 0x65, 0x87, 0x98, 0x91, 0x51, 0x0d, 0x32, 0xd4, 0x65, 0xf9, 0x62, 0x96, 0x9b, 0x7b, 0xff,
- 0x5a, 0x73, 0x45, 0xa3, 0xc3, 0x64, 0xb0, 0x10, 0x55, 0xbf, 0x09, 0x0b, 0x17, 0x06, 0xc1, 0xd2,
- 0xa4, 0x6e, 0x75, 0xb7, 0xd7, 0x54, 0xe6, 0x50, 0x11, 0x72, 0xf5, 0x4e, 0xbb, 0xdf, 0x6a, 0xef,
- 0xb2, 0x3c, 0xaf, 0x08, 0x39, 0xdc, 0xd9, 0xde, 0xae, 0x55, 0xeb, 0xcf, 0x94, 0xa4, 0x5a, 0x81,
- 0x42, 0x44, 0x1b, 0x5a, 0x04, 0xe8, 0xf5, 0x3b, 0x5d, 0x6d, 0xa3, 0x85, 0x7b, 0x7d, 0x91, 0x25,
- 0xf6, 0xfa, 0x55, 0xdc, 0x97, 0x84, 0x84, 0xfa, 0xef, 0xc9, 0x60, 0x46, 0x65, 0x62, 0x58, 0xbb,
- 0x98, 0x18, 0x5e, 0x61, 0xbc, 0x4c, 0x0d, 0xa7, 0x8d, 0x30, 0x41, 0xfc, 0x00, 0x80, 0x2f, 0x1c,
- 0x62, 0x6a, 0xba, 0x2f, 0x27, 0xbe, 0xf4, 0x9a, 0x93, 0xfb, 0xc1, 0x8d, 0x16, 0xce, 0x4b, 0x74,
- 0xd5, 0x47, 0xdf, 0x82, 0xa2, 0x41, 0x87, 0x23, 0x9b, 0x48, 0xe1, 0xd4, 0xb5, 0xc2, 0x85, 0x10,
- 0x5f, 0xf5, 0xa3, 0xa9, 0x69, 0xfa, 0x62, 0xf2, 0xfc, 0xeb, 0x89, 0xc0, 0x33, 0x31, 0xd9, 0x68,
- 0x11, 0x72, 0xbb, 0xdd, 0x46, 0xb5, 0xdf, 0x6a, 0x6f, 0x2a, 0x09, 0x04, 0x90, 0xe5, 0xae, 0x6e,
- 0x28, 0x49, 0x96, 0x45, 0xd7, 0x3b, 0x3b, 0xdd, 0xed, 0x26, 0x8f, 0x58, 0x68, 0x05, 0x94, 0xc0,
- 0xd9, 0x1a, 0x77, 0x64, 0xb3, 0xa1, 0xa4, 0xd1, 0x0d, 0x58, 0x0a, 0xa9, 0x52, 0x32, 0x83, 0x6e,
- 0x02, 0x0a, 0x89, 0x53, 0x15, 0x59, 0xf5, 0x57, 0x60, 0xa9, 0x4e, 0x1d, 0x5f, 0xb7, 0x9c, 0xb0,
- 0xc2, 0x78, 0xcc, 0x06, 0x2d, 0x49, 0x9a, 0x25, 0x6f, 0x82, 0x6a, 0x4b, 0xe7, 0x67, 0xeb, 0x85,
- 0x10, 0xda, 0x6a, 0xf0, 0x54, 0x49, 0x36, 0x4c, 0xb6, 0x7f, 0x47, 0x96, 0xc9, 0x9d, 0x9b, 0xa9,
- 0xcd, 0x9f, 0x9f, 0xad, 0xa7, 0xba, 0xad, 0x06, 0x66, 0x34, 0xf4, 0x65, 0xc8, 0x93, 0x97, 0x96,
- 0xaf, 0x19, 0xec, 0x5c, 0x62, 0x0e, 0xcc, 0xe0, 0x1c, 0x23, 0xd4, 0xd9, 0x31, 0x54, 0x03, 0xe8,
- 0x52, 0xd7, 0x97, 0x3d, 0x7f, 0x1d, 0x32, 0x23, 0xea, 0xf2, 0xbb, 0x8b, 0x4b, 0x6f, 0xd4, 0x18,
- 0x5c, 0x2c, 0x54, 0x2c, 0xc0, 0xea, 0xef, 0xa6, 0x00, 0xfa, 0xba, 0x77, 0x28, 0x95, 0x3c, 0x85,
- 0x7c, 0x78, 0x3b, 0x29, 0x2f, 0x41, 0xae, 0x9c, 0xed, 0x10, 0x8c, 0x9e, 0x04, 0x8b, 0x4d, 0xd4,
- 0x4e, 0xb1, 0x45, 0x6c, 0xd0, 0x51, 0x5c, 0xf9, 0x71, 0xb1, 0x40, 0x62, 0xc7, 0x3c, 0x71, 0x5d,
- 0x39, 0xf3, 0xec, 0x27, 0xaa, 0xf3, 0x63, 0x41, 0x38, 0x4d, 0x66, 0xdf, 0xb1, 0xd7, 0x3e, 0x33,
- 0x33, 0xb2, 0x35, 0x87, 0xa7, 0x72, 0xe8, 0x63, 0x28, 0xb0, 0x71, 0x6b, 0x1e, 0xe7, 0xc9, 0xc4,
- 0xfb, 0x52, 0x57, 0x09, 0x0d, 0x18, 0x46, 0x53, 0x2f, 0xdf, 0x01, 0xd0, 0x47, 0x23, 0xdb, 0x22,
- 0xa6, 0xb6, 0x37, 0xe1, 0x99, 0x76, 0x1e, 0xe7, 0x25, 0xa5, 0x36, 0x61, 0xdb, 0x25, 0x60, 0xeb,
- 0x3e, 0xcf, 0x9e, 0xaf, 0x71, 0xa0, 0x44, 0x57, 0xfd, 0x9a, 0x02, 0x8b, 0xee, 0xd8, 0x61, 0x0e,
- 0x95, 0xd6, 0xa9, 0x7f, 0x9a, 0x84, 0xb7, 0xda, 0xc4, 0x3f, 0xa6, 0xee, 0x61, 0xd5, 0xf7, 0x75,
- 0xe3, 0x60, 0x48, 0x1c, 0x39, 0x7d, 0x91, 0x82, 0x26, 0x71, 0xa1, 0xa0, 0x59, 0x85, 0x79, 0xdd,
- 0xb6, 0x74, 0x8f, 0x88, 0xe4, 0x2d, 0x8f, 0x83, 0x26, 0x2b, 0xbb, 0x58, 0x11, 0x47, 0x3c, 0x8f,
- 0x88, 0x7b, 0x15, 0x66, 0x78, 0x40, 0x40, 0xdf, 0x87, 0x9b, 0x32, 0x4d, 0xd3, 0xc3, 0xae, 0x58,
- 0x41, 0x11, 0x5c, 0xd0, 0x36, 0x63, 0xab, 0xca, 0x78, 0xe3, 0x64, 0x1e, 0x37, 0x25, 0x77, 0x46,
- 0xbe, 0xcc, 0x0a, 0x57, 0xcc, 0x18, 0x56, 0x69, 0x13, 0x6e, 0x5d, 0x2a, 0xf2, 0xb9, 0xee, 0x6d,
- 0xfe, 0x21, 0x09, 0xd0, 0xea, 0x56, 0x77, 0xa4, 0x93, 0x1a, 0x90, 0xdd, 0xd7, 0x87, 0x96, 0x3d,
- 0xb9, 0x2a, 0x02, 0x4e, 0xf1, 0x95, 0xaa, 0x70, 0xc7, 0x06, 0x97, 0xc1, 0x52, 0x96, 0xd7, 0x94,
- 0xe3, 0x3d, 0x87, 0xf8, 0x61, 0x4d, 0xc9, 0x5b, 0xcc, 0x0c, 0x57, 0x77, 0xc2, 0xa5, 0x2b, 0x1a,
- 0x6c, 0x02, 0x58, 0xca, 0x73, 0xac, 0x4f, 0x82, 0xb0, 0x25, 0x9b, 0x68, 0x8b, 0xdf, 0x8e, 0x12,
- 0xf7, 0x88, 0x98, 0xab, 0x19, 0xee, 0xd4, 0xeb, 0xec, 0xc1, 0x12, 0x2e, 0x7c, 0x17, 0x4a, 0x97,
- 0x3e, 0xe2, 0x29, 0xd3, 0x94, 0xf5, 0xb9, 0x7c, 0xf4, 0x10, 0x16, 0x2e, 0x8c, 0xf3, 0xb5, 0x62,
- 0xbe, 0xd5, 0x7d, 0xfe, 0x75, 0x25, 0x2d, 0x7f, 0x7d, 0x53, 0xc9, 0xaa, 0x7f, 0x9c, 0x12, 0x81,
- 0x46, 0x7a, 0x35, 0xfe, 0x55, 0x20, 0xc7, 0x57, 0xb7, 0x41, 0x6d, 0x19, 0x00, 0xde, 0xbb, 0x3a,
- 0xfe, 0xb0, 0x9a, 0x8e, 0xc3, 0x71, 0x28, 0x88, 0xd6, 0xa1, 0x20, 0x56, 0xb1, 0xc6, 0x36, 0x1c,
- 0x77, 0xeb, 0x02, 0x06, 0x41, 0x62, 0x92, 0xe8, 0x2e, 0x2c, 0xf2, 0xcb, 0x1f, 0xef, 0x80, 0x98,
- 0x02, 0x93, 0xe6, 0x98, 0x85, 0x90, 0xca, 0x61, 0x3b, 0x50, 0x94, 0x04, 0x8d, 0xe7, 0xf3, 0x19,
- 0x6e, 0xd0, 0xbd, 0xeb, 0x0c, 0x12, 0x22, 0x3c, 0xcd, 0x2f, 0x8c, 0xa6, 0x0d, 0xb5, 0x01, 0xb9,
- 0xc0, 0x58, 0xb4, 0x0a, 0xa9, 0x7e, 0xbd, 0xab, 0xcc, 0x95, 0x96, 0x4e, 0x4e, 0xcb, 0x85, 0x80,
- 0xdc, 0xaf, 0x77, 0x19, 0x67, 0xb7, 0xd1, 0x55, 0x12, 0x17, 0x39, 0xbb, 0x8d, 0x6e, 0x29, 0xcd,
- 0x72, 0x30, 0x75, 0x1f, 0x0a, 0x91, 0x1e, 0xd0, 0x3b, 0x30, 0xdf, 0x6a, 0x6f, 0xe2, 0x66, 0xaf,
- 0xa7, 0xcc, 0x95, 0x6e, 0x9e, 0x9c, 0x96, 0x51, 0x84, 0xdb, 0x72, 0x06, 0x6c, 0x7e, 0xd0, 0x1d,
- 0x48, 0x6f, 0x75, 0xd8, 0xd9, 0x2e, 0x0a, 0x88, 0x08, 0x62, 0x8b, 0x7a, 0x7e, 0xe9, 0x86, 0x4c,
- 0xee, 0xa2, 0x8a, 0xd5, 0xdf, 0x4b, 0x40, 0x56, 0x6c, 0xa6, 0xd8, 0x89, 0xaa, 0xc2, 0x7c, 0x70,
- 0x4d, 0x20, 0x8a, 0xbb, 0xf7, 0x2e, 0x2f, 0xc4, 0x2a, 0xb2, 0x6e, 0x12, 0xcb, 0x2f, 0x90, 0x2b,
- 0x7d, 0x08, 0xc5, 0x28, 0xe3, 0x73, 0x2d, 0xbe, 0xef, 0x43, 0x81, 0xad, 0xef, 0xa0, 0x20, 0x7b,
- 0x0c, 0x59, 0x11, 0x10, 0xc2, 0xb3, 0xe6, 0xf2, 0xaa, 0x50, 0x22, 0xd1, 0x53, 0x98, 0x17, 0x95,
- 0x64, 0x70, 0x3b, 0xbc, 0x76, 0xf5, 0x2e, 0xc2, 0x01, 0x5c, 0xfd, 0x18, 0xd2, 0x5d, 0x42, 0x5c,
- 0xe6, 0x7b, 0x87, 0x9a, 0x64, 0x7a, 0x3c, 0xcb, 0x22, 0xd8, 0x24, 0xad, 0x06, 0x2b, 0x82, 0x4d,
- 0xd2, 0x32, 0xc3, 0xfb, 0xaf, 0x64, 0xe4, 0xfe, 0xab, 0x0f, 0xc5, 0x17, 0xc4, 0x1a, 0x1c, 0xf8,
- 0xc4, 0xe4, 0x8a, 0xee, 0x43, 0x7a, 0x44, 0x42, 0xe3, 0x57, 0x63, 0x17, 0x18, 0x21, 0x2e, 0xe6,
- 0x28, 0x16, 0x47, 0x8e, 0xb9, 0xb4, 0x7c, 0xd2, 0x90, 0x2d, 0xf5, 0xef, 0x93, 0xb0, 0xd8, 0xf2,
- 0xbc, 0xb1, 0xee, 0x18, 0x41, 0xe6, 0xf6, 0xed, 0x8b, 0x99, 0x5b, 0xec, 0xdb, 0xcf, 0x45, 0x91,
- 0x8b, 0xd7, 0x7a, 0xf2, 0xf4, 0x4c, 0x86, 0xa7, 0xa7, 0xfa, 0xd3, 0x44, 0x70, 0x77, 0x77, 0x37,
- 0xb2, 0xdd, 0x45, 0x1d, 0x18, 0xd5, 0x44, 0x76, 0x9d, 0x43, 0x87, 0x1e, 0x3b, 0xe8, 0x6d, 0xc8,
- 0xe0, 0x66, 0xbb, 0xf9, 0x42, 0x49, 0x88, 0xe5, 0x79, 0x01, 0x84, 0x89, 0x43, 0x8e, 0x99, 0xa6,
- 0x6e, 0xb3, 0xdd, 0x60, 0x99, 0x56, 0x32, 0x46, 0x53, 0x97, 0x38, 0xa6, 0xe5, 0x0c, 0xd0, 0x3b,
- 0x90, 0x6d, 0xf5, 0x7a, 0xbb, 0xbc, 0x4c, 0x7c, 0xeb, 0xe4, 0xb4, 0x7c, 0xe3, 0x02, 0x8a, 0xdf,
- 0xdb, 0x9a, 0x0c, 0xc4, 0xca, 0x1c, 0x96, 0x83, 0xc5, 0x80, 0x58, 0xfe, 0x2c, 0x40, 0xb8, 0xd3,
- 0xaf, 0xf6, 0x9b, 0x4a, 0x26, 0x06, 0x84, 0x29, 0xfb, 0x2b, 0xb7, 0xdb, 0x3f, 0x27, 0x41, 0xa9,
- 0x1a, 0x06, 0x19, 0xf9, 0x8c, 0x2f, 0x2b, 0xcb, 0x3e, 0xe4, 0x46, 0xec, 0x97, 0x45, 0x82, 0x2c,
- 0xe9, 0x69, 0xec, 0xeb, 0xe5, 0x8c, 0x5c, 0x05, 0x53, 0x9b, 0x54, 0xcd, 0xa1, 0xe5, 0x79, 0x16,
- 0x75, 0x04, 0x0d, 0x87, 0x9a, 0x4a, 0xff, 0x91, 0x80, 0x1b, 0x31, 0x08, 0xf4, 0x10, 0xd2, 0x2e,
- 0xb5, 0x83, 0x39, 0xbc, 0x7d, 0xd9, 0xb5, 0x2c, 0x13, 0xc5, 0x1c, 0x89, 0xd6, 0x00, 0xf4, 0xb1,
- 0x4f, 0x75, 0xde, 0x3f, 0x9f, 0xbd, 0x1c, 0x8e, 0x50, 0xd0, 0x0b, 0xc8, 0x7a, 0xc4, 0x70, 0x49,
- 0x90, 0x4b, 0x7f, 0xfc, 0x7f, 0xb5, 0xbe, 0xd2, 0xe3, 0x6a, 0xb0, 0x54, 0x57, 0xaa, 0x40, 0x56,
- 0x50, 0xd8, 0xb2, 0x37, 0x75, 0x5f, 0x97, 0x97, 0xf6, 0xfc, 0x37, 0x5b, 0x4d, 0xba, 0x3d, 0x08,
- 0x56, 0x93, 0x6e, 0x0f, 0xd4, 0xbf, 0x49, 0x02, 0x34, 0x5f, 0xfa, 0xc4, 0x75, 0x74, 0xbb, 0x5e,
- 0x45, 0xcd, 0x48, 0xf4, 0x17, 0xa3, 0xfd, 0x6a, 0xec, 0x4b, 0x44, 0x28, 0x51, 0xa9, 0x57, 0x63,
- 0xe2, 0xff, 0x2d, 0x48, 0x8d, 0x5d, 0xf9, 0x20, 0x2d, 0xf2, 0xe0, 0x5d, 0xbc, 0x8d, 0x19, 0x0d,
- 0x35, 0xa7, 0x61, 0x2b, 0x75, 0xf9, 0xb3, 0x73, 0xa4, 0x83, 0xd8, 0xd0, 0xc5, 0x76, 0xbe, 0xa1,
- 0x6b, 0x06, 0x91, 0x27, 0x47, 0x51, 0xec, 0xfc, 0x7a, 0xb5, 0x4e, 0x5c, 0x1f, 0x67, 0x0d, 0x9d,
- 0xfd, 0xff, 0x42, 0xf1, 0xed, 0x3e, 0xc0, 0x74, 0x68, 0x68, 0x0d, 0x32, 0xf5, 0x8d, 0x5e, 0x6f,
- 0x5b, 0x99, 0x13, 0x01, 0x7c, 0xca, 0xe2, 0x64, 0xf5, 0x2f, 0x93, 0x90, 0xab, 0x57, 0xe5, 0xb1,
- 0x5a, 0x07, 0x85, 0x47, 0x25, 0xfe, 0xd4, 0x41, 0x5e, 0x8e, 0x2c, 0x77, 0x22, 0x03, 0xcb, 0x15,
- 0x45, 0xed, 0x22, 0x13, 0x61, 0x56, 0x37, 0xb9, 0x00, 0xc2, 0x50, 0x24, 0xd2, 0x09, 0x9a, 0xa1,
- 0x07, 0x31, 0x7e, 0xed, 0x6a, 0x67, 0x89, 0xf2, 0x64, 0xda, 0xf6, 0x70, 0x21, 0x50, 0x52, 0xd7,
- 0x3d, 0xf4, 0x01, 0x2c, 0x79, 0xd6, 0xc0, 0xb1, 0x9c, 0x81, 0x16, 0x38, 0x8f, 0xbf, 0xbb, 0xd4,
- 0x96, 0xcf, 0xcf, 0xd6, 0x17, 0x7a, 0x82, 0x25, 0x7d, 0xb8, 0x20, 0x91, 0x75, 0xee, 0x4a, 0xf4,
- 0x4d, 0x58, 0x8c, 0x88, 0x32, 0x2f, 0x0a, 0xb7, 0x2b, 0xe7, 0x67, 0xeb, 0xc5, 0x50, 0xf2, 0x19,
- 0x99, 0xe0, 0x62, 0x28, 0xf8, 0x8c, 0xf0, 0xfb, 0x97, 0x7d, 0xea, 0x1a, 0x44, 0x73, 0xf9, 0x9e,
- 0xe6, 0x27, 0x78, 0x1a, 0x17, 0x38, 0x4d, 0x6c, 0x73, 0xf5, 0x39, 0xdc, 0xe8, 0xb8, 0xc6, 0x01,
- 0xf1, 0x7c, 0xe1, 0x0a, 0xe9, 0xc5, 0x8f, 0xe1, 0xb6, 0xaf, 0x7b, 0x87, 0xda, 0x81, 0xe5, 0xf9,
- 0xd4, 0x9d, 0x68, 0x2e, 0xf1, 0x89, 0xc3, 0xf8, 0x1a, 0x7f, 0xac, 0x95, 0x97, 0x7e, 0xb7, 0x18,
- 0x66, 0x4b, 0x40, 0x70, 0x80, 0xd8, 0x66, 0x00, 0xb5, 0x05, 0x45, 0x56, 0xa6, 0xc8, 0x8b, 0x33,
- 0x36, 0x7a, 0xb0, 0xe9, 0x40, 0x7b, 0xe3, 0x63, 0x2a, 0x6f, 0xd3, 0x81, 0xf8, 0xa9, 0x7e, 0x17,
- 0x94, 0x86, 0xe5, 0x8d, 0x74, 0xdf, 0x38, 0x08, 0x6e, 0x33, 0x51, 0x03, 0x94, 0x03, 0xa2, 0xbb,
- 0xfe, 0x1e, 0xd1, 0x7d, 0x6d, 0x44, 0x5c, 0x8b, 0x9a, 0xd7, 0xcf, 0xf2, 0x52, 0x28, 0xd2, 0xe5,
- 0x12, 0xea, 0x7f, 0x25, 0x00, 0xb0, 0xbe, 0x1f, 0x64, 0x64, 0x5f, 0x83, 0x65, 0xcf, 0xd1, 0x47,
- 0xde, 0x01, 0xf5, 0x35, 0xcb, 0xf1, 0x89, 0x7b, 0xa4, 0xdb, 0xf2, 0x02, 0x47, 0x09, 0x18, 0x2d,
- 0x49, 0x47, 0xf7, 0x01, 0x1d, 0x12, 0x32, 0xd2, 0xa8, 0x6d, 0x6a, 0x01, 0x53, 0x3c, 0x25, 0xa7,
- 0xb1, 0xc2, 0x38, 0x1d, 0xdb, 0xec, 0x05, 0x74, 0x54, 0x83, 0x35, 0x36, 0x7c, 0xe2, 0xf8, 0xae,
- 0x45, 0x3c, 0x6d, 0x9f, 0xba, 0x9a, 0x67, 0xd3, 0x63, 0x6d, 0x9f, 0xda, 0x36, 0x3d, 0x26, 0x6e,
- 0x70, 0x37, 0x56, 0xb2, 0xe9, 0xa0, 0x29, 0x40, 0x1b, 0xd4, 0xed, 0xd9, 0xf4, 0x78, 0x23, 0x40,
- 0xb0, 0xb4, 0x6d, 0x3a, 0x66, 0xdf, 0x32, 0x0e, 0x83, 0xb4, 0x2d, 0xa4, 0xf6, 0x2d, 0xe3, 0x10,
- 0xbd, 0x03, 0x0b, 0xc4, 0x26, 0xfc, 0x8a, 0x44, 0xa0, 0x32, 0x1c, 0x55, 0x0c, 0x88, 0x0c, 0xa4,
- 0x7e, 0x02, 0x4a, 0xd3, 0x31, 0xdc, 0xc9, 0x28, 0x32, 0xe7, 0xf7, 0x01, 0xb1, 0x20, 0xa9, 0xd9,
- 0xd4, 0x38, 0xd4, 0x86, 0xba, 0xa3, 0x0f, 0x98, 0x5d, 0xe2, 0x85, 0x4f, 0x61, 0x9c, 0x6d, 0x6a,
- 0x1c, 0xee, 0x48, 0xba, 0xfa, 0x01, 0x40, 0x6f, 0xe4, 0x12, 0xdd, 0xec, 0xb0, 0x6c, 0x82, 0xb9,
- 0x8e, 0xb7, 0x34, 0x53, 0xbe, 0x90, 0x52, 0x57, 0x6e, 0x75, 0x45, 0x30, 0x1a, 0x21, 0x5d, 0xfd,
- 0x79, 0xb8, 0xd1, 0xb5, 0x75, 0x83, 0x7f, 0x2d, 0xd0, 0x0d, 0x9f, 0xac, 0xd0, 0x53, 0xc8, 0x0a,
- 0xa8, 0x9c, 0xc9, 0xd8, 0xed, 0x36, 0xed, 0x73, 0x6b, 0x0e, 0x4b, 0x7c, 0xad, 0x08, 0x30, 0xd5,
- 0xa3, 0xfe, 0x79, 0x02, 0xf2, 0xa1, 0x7e, 0x54, 0x16, 0x2f, 0x31, 0xbe, 0xab, 0x5b, 0x8e, 0xac,
- 0xea, 0xf3, 0x38, 0x4a, 0x42, 0x2d, 0x28, 0x8c, 0x42, 0xe9, 0x2b, 0xf3, 0xb9, 0x18, 0xab, 0x71,
- 0x54, 0x16, 0x7d, 0x08, 0xf9, 0xe0, 0x49, 0x3a, 0x88, 0xb0, 0x57, 0xbf, 0x60, 0x4f, 0xe1, 0xea,
- 0xb7, 0x01, 0xbe, 0x43, 0x2d, 0xa7, 0x4f, 0x0f, 0x89, 0xc3, 0x9f, 0x58, 0x59, 0x4d, 0x48, 0x02,
- 0x2f, 0xca, 0x16, 0x2f, 0xf5, 0xc5, 0x14, 0x84, 0x2f, 0x8d, 0xa2, 0xa9, 0xfe, 0x75, 0x12, 0xb2,
- 0x98, 0x52, 0xbf, 0x5e, 0x45, 0x65, 0xc8, 0xca, 0x38, 0xc1, 0xcf, 0x9f, 0x5a, 0xfe, 0xfc, 0x6c,
- 0x3d, 0x23, 0x02, 0x44, 0xc6, 0xe0, 0x91, 0x21, 0x12, 0xc1, 0x93, 0x97, 0x45, 0x70, 0xf4, 0x10,
- 0x8a, 0x12, 0xa4, 0x1d, 0xe8, 0xde, 0x81, 0x28, 0xd0, 0x6a, 0x8b, 0xe7, 0x67, 0xeb, 0x20, 0x90,
- 0x5b, 0xba, 0x77, 0x80, 0x41, 0xa0, 0xd9, 0x6f, 0xd4, 0x84, 0xc2, 0xa7, 0xd4, 0x72, 0x34, 0x9f,
- 0x0f, 0x42, 0x5e, 0x26, 0xc6, 0xce, 0xe3, 0x74, 0xa8, 0xf2, 0x7b, 0x03, 0xf8, 0x74, 0x3a, 0xf8,
- 0x26, 0x2c, 0xb8, 0x94, 0xfa, 0x22, 0x6c, 0x59, 0xd4, 0x91, 0xf7, 0x14, 0xe5, 0xd8, 0xeb, 0x6b,
- 0x4a, 0x7d, 0x2c, 0x71, 0xb8, 0xe8, 0x46, 0x5a, 0xe8, 0x21, 0xac, 0xd8, 0xba, 0xe7, 0x6b, 0x3c,
- 0xde, 0x99, 0x53, 0x6d, 0x59, 0xbe, 0xd5, 0x10, 0xe3, 0x6d, 0x70, 0x56, 0x20, 0xa1, 0xfe, 0x63,
- 0x02, 0x0a, 0x6c, 0x30, 0xd6, 0xbe, 0x65, 0xb0, 0x24, 0xef, 0xf3, 0xe7, 0x1e, 0xb7, 0x20, 0x65,
- 0x78, 0xae, 0x74, 0x2a, 0x3f, 0x7c, 0xeb, 0x3d, 0x8c, 0x19, 0x0d, 0x7d, 0x02, 0x59, 0x79, 0x5f,
- 0x22, 0xd2, 0x0e, 0xf5, 0xfa, 0x74, 0x54, 0xfa, 0x46, 0xca, 0xf1, 0xb5, 0x3c, 0xb5, 0x4e, 0x1c,
- 0x02, 0x38, 0x4a, 0x42, 0x37, 0x21, 0x69, 0x08, 0x77, 0xc9, 0x0f, 0x5a, 0xea, 0x6d, 0x9c, 0x34,
- 0x1c, 0xf5, 0x47, 0x09, 0x58, 0x98, 0x6e, 0x78, 0xb6, 0x02, 0x6e, 0x43, 0xde, 0x1b, 0xef, 0x79,
- 0x13, 0xcf, 0x27, 0xc3, 0xe0, 0xf9, 0x38, 0x24, 0xa0, 0x16, 0xe4, 0x75, 0x7b, 0x40, 0x5d, 0xcb,
- 0x3f, 0x18, 0xca, 0x4a, 0x34, 0x3e, 0x55, 0x88, 0xea, 0xac, 0x54, 0x03, 0x11, 0x3c, 0x95, 0x0e,
- 0xce, 0x7d, 0xf1, 0x8d, 0x01, 0x3f, 0xf7, 0xdf, 0x86, 0xa2, 0xad, 0x0f, 0xf9, 0x05, 0x92, 0x6f,
- 0x0d, 0xc5, 0x38, 0xd2, 0xb8, 0x20, 0x69, 0x7d, 0x6b, 0x48, 0x54, 0x15, 0xf2, 0xa1, 0x32, 0xb4,
- 0x04, 0x85, 0x6a, 0xb3, 0xa7, 0x3d, 0x7a, 0xfc, 0x54, 0xdb, 0xac, 0xef, 0x28, 0x73, 0x32, 0x37,
- 0xfd, 0x8b, 0x04, 0x2c, 0xc8, 0x70, 0x24, 0xf3, 0xfd, 0x77, 0x60, 0xde, 0xd5, 0xf7, 0xfd, 0xa0,
- 0x22, 0x49, 0x8b, 0x55, 0xcd, 0x22, 0x3c, 0xab, 0x48, 0x18, 0x2b, 0xbe, 0x22, 0x89, 0x7c, 0xd0,
- 0x90, 0xba, 0xf2, 0x83, 0x86, 0xf4, 0xcf, 0xe4, 0x83, 0x06, 0xf5, 0x57, 0x01, 0x36, 0x2c, 0x9b,
- 0xf4, 0xc5, 0x5d, 0x53, 0x5c, 0x7d, 0xc9, 0x72, 0x38, 0x79, 0x97, 0x19, 0xe4, 0x70, 0xad, 0x06,
- 0x66, 0x34, 0xc6, 0x1a, 0x58, 0xa6, 0xdc, 0x8c, 0x9c, 0xb5, 0xc9, 0x58, 0x03, 0xcb, 0x0c, 0x5f,
- 0xde, 0xd2, 0xd7, 0xbd, 0xbc, 0x9d, 0x26, 0x60, 0x49, 0xe6, 0xae, 0x61, 0xf8, 0xfd, 0x2a, 0xe4,
- 0x45, 0x1a, 0x3b, 0x2d, 0xe8, 0xf8, 0x23, 0xbe, 0xc0, 0xb5, 0x1a, 0x38, 0x27, 0xd8, 0x2d, 0x13,
- 0xad, 0x43, 0x41, 0x42, 0x23, 0x1f, 0x3f, 0x81, 0x20, 0xb5, 0x99, 0xf9, 0x5f, 0x87, 0xf4, 0xbe,
- 0x65, 0x13, 0xb9, 0xd0, 0x63, 0x03, 0xc0, 0xd4, 0x01, 0x5b, 0x73, 0x98, 0xa3, 0x6b, 0xb9, 0xe0,
- 0x32, 0x8e, 0xdb, 0x27, 0xcb, 0xce, 0xa8, 0x7d, 0xa2, 0x02, 0x9d, 0xb1, 0x4f, 0xe0, 0x98, 0x7d,
- 0x82, 0x2d, 0xec, 0x93, 0xd0, 0xa8, 0x7d, 0x82, 0xf4, 0x33, 0xb1, 0x6f, 0x1b, 0x6e, 0xd6, 0x6c,
- 0xdd, 0x38, 0xb4, 0x2d, 0xcf, 0x27, 0x66, 0x34, 0x62, 0x3c, 0x86, 0xec, 0x85, 0xa4, 0xf3, 0xaa,
- 0x5b, 0x4b, 0x89, 0x54, 0xff, 0x2d, 0x01, 0xc5, 0x2d, 0xa2, 0xdb, 0xfe, 0xc1, 0xf4, 0x6a, 0xc8,
- 0x27, 0x9e, 0x2f, 0x0f, 0x2b, 0xfe, 0x1b, 0x7d, 0x03, 0x72, 0x61, 0x4e, 0x72, 0xed, 0xfb, 0x5b,
- 0x08, 0x45, 0x4f, 0x60, 0x9e, 0xed, 0x31, 0x3a, 0x0e, 0x8a, 0x9d, 0xab, 0x9e, 0x76, 0x24, 0x92,
- 0x1d, 0x32, 0x2e, 0xe1, 0x49, 0x08, 0x5f, 0x4a, 0x19, 0x1c, 0x34, 0xd1, 0xff, 0x87, 0x22, 0x7f,
- 0x99, 0x08, 0x72, 0xae, 0xcc, 0x75, 0x3a, 0x0b, 0xe2, 0x71, 0x51, 0xe4, 0x5b, 0xff, 0x93, 0x80,
- 0x95, 0x1d, 0x7d, 0xb2, 0x47, 0x64, 0xd8, 0x20, 0x26, 0x26, 0x06, 0x75, 0x4d, 0xd4, 0x8d, 0x86,
- 0x9b, 0x2b, 0xde, 0x2a, 0xe3, 0x84, 0xe3, 0xa3, 0x4e, 0x50, 0x80, 0x25, 0x23, 0x05, 0xd8, 0x0a,
- 0x64, 0x1c, 0xea, 0x18, 0x44, 0xc6, 0x22, 0xd1, 0x50, 0xad, 0x68, 0xa8, 0x29, 0x85, 0xcf, 0x88,
- 0xfc, 0x11, 0xb0, 0x4d, 0xfd, 0xb0, 0x37, 0xf4, 0x09, 0x94, 0x7a, 0xcd, 0x3a, 0x6e, 0xf6, 0x6b,
- 0x9d, 0xef, 0x6a, 0xbd, 0xea, 0x76, 0xaf, 0xfa, 0xf8, 0xa1, 0xd6, 0xed, 0x6c, 0x7f, 0xef, 0xd1,
- 0x93, 0x87, 0xdf, 0x50, 0x12, 0xa5, 0xf2, 0xc9, 0x69, 0xf9, 0x76, 0xbb, 0x5a, 0xdf, 0x16, 0x3b,
- 0x66, 0x8f, 0xbe, 0xec, 0xe9, 0xb6, 0xa7, 0x3f, 0x7e, 0xd8, 0xa5, 0xf6, 0x84, 0x61, 0xd8, 0xb2,
- 0x2e, 0x46, 0xcf, 0xab, 0xe8, 0x31, 0x9c, 0xb8, 0xf4, 0x18, 0x9e, 0x9e, 0xe6, 0xc9, 0x4b, 0x4e,
- 0xf3, 0x0d, 0x58, 0x31, 0x5c, 0xea, 0x79, 0x1a, 0xcb, 0xfe, 0x89, 0x39, 0x53, 0x5f, 0x7c, 0xe9,
- 0xfc, 0x6c, 0x7d, 0xb9, 0xce, 0xf8, 0x3d, 0xce, 0x96, 0xea, 0x97, 0x8d, 0x08, 0x89, 0xf7, 0xa4,
- 0xfe, 0x7e, 0x8a, 0x25, 0x52, 0xd6, 0x91, 0x65, 0x93, 0x01, 0xf1, 0xd0, 0x73, 0x58, 0x32, 0x5c,
- 0x62, 0xb2, 0xb4, 0x5e, 0xb7, 0xa3, 0x1f, 0xd1, 0xfe, 0xbf, 0xd8, 0x9c, 0x26, 0x14, 0xac, 0xd4,
- 0x43, 0xa9, 0xde, 0x88, 0x18, 0x78, 0xd1, 0xb8, 0xd0, 0x46, 0x9f, 0xc2, 0x92, 0x47, 0x6c, 0xcb,
- 0x19, 0xbf, 0xd4, 0x0c, 0xea, 0xf8, 0xe4, 0x65, 0xf0, 0x22, 0x76, 0x9d, 0xde, 0x5e, 0x73, 0x9b,
- 0x49, 0xd5, 0x85, 0x50, 0x0d, 0x9d, 0x9f, 0xad, 0x2f, 0x5e, 0xa4, 0xe1, 0x45, 0xa9, 0x59, 0xb6,
- 0x4b, 0x6d, 0x58, 0xbc, 0x68, 0x0d, 0x5a, 0x91, 0x7b, 0x9f, 0x87, 0x90, 0x60, 0x6f, 0xa3, 0xdb,
- 0x90, 0x73, 0xc9, 0xc0, 0xf2, 0x7c, 0x57, 0xb8, 0x99, 0x71, 0x42, 0x0a, 0xdb, 0xf9, 0xe2, 0x0b,
- 0xa8, 0xd2, 0x2f, 0xc3, 0x4c, 0x8f, 0x6c, 0xb3, 0x98, 0x96, 0xa7, 0xef, 0x49, 0x95, 0x39, 0x1c,
- 0x34, 0xd9, 0x1a, 0x1c, 0x7b, 0x61, 0xa2, 0xc6, 0x7f, 0x33, 0x1a, 0xcf, 0x28, 0xe4, 0xf7, 0x60,
- 0x3c, 0x67, 0x08, 0x3e, 0x2c, 0x4d, 0x47, 0x3e, 0x2c, 0x5d, 0x81, 0x8c, 0x4d, 0x8e, 0x88, 0x2d,
- 0xce, 0x72, 0x2c, 0x1a, 0xf7, 0x1e, 0x42, 0x31, 0xf8, 0x82, 0x91, 0x7f, 0x39, 0x91, 0x83, 0x74,
- 0xbf, 0xda, 0x7b, 0xa6, 0xcc, 0x21, 0x80, 0xac, 0x58, 0x9c, 0xe2, 0xb5, 0xae, 0xde, 0x69, 0x6f,
- 0xb4, 0x36, 0x95, 0xe4, 0xbd, 0xdf, 0x49, 0x43, 0x3e, 0x7c, 0x2f, 0x62, 0x67, 0x47, 0xbb, 0xf9,
- 0x22, 0x58, 0xdd, 0x21, 0xbd, 0x4d, 0x8e, 0xd1, 0xdb, 0xd3, 0x5b, 0xa8, 0x4f, 0xc4, 0x03, 0x79,
- 0xc8, 0x0e, 0x6e, 0xa0, 0xde, 0x85, 0x5c, 0xb5, 0xd7, 0x6b, 0x6d, 0xb6, 0x9b, 0x0d, 0xe5, 0xb3,
- 0x44, 0xe9, 0x4b, 0x27, 0xa7, 0xe5, 0xe5, 0x10, 0x54, 0xf5, 0xc4, 0xe2, 0xe3, 0xa8, 0x7a, 0xbd,
- 0xd9, 0xed, 0x37, 0x1b, 0xca, 0xab, 0xe4, 0x2c, 0x8a, 0xdf, 0xaa, 0xf0, 0x4f, 0x77, 0xf2, 0x5d,
- 0xdc, 0xec, 0x56, 0x31, 0xeb, 0xf0, 0xb3, 0xa4, 0xb8, 0x1c, 0x9b, 0xf6, 0xe8, 0x92, 0x91, 0xee,
- 0xb2, 0x3e, 0xd7, 0x82, 0x6f, 0xe1, 0x5e, 0xa5, 0xc4, 0xe7, 0x1d, 0xd3, 0xc7, 0x2f, 0xa2, 0x9b,
- 0x13, 0xd6, 0x1b, 0x7f, 0x75, 0xe4, 0x6a, 0x52, 0x33, 0xbd, 0xf5, 0x58, 0xec, 0x61, 0x5a, 0x54,
- 0x98, 0xc7, 0xbb, 0xed, 0x36, 0x03, 0xbd, 0x4a, 0xcf, 0x8c, 0x0e, 0x8f, 0x1d, 0x56, 0x31, 0xa3,
- 0xbb, 0x90, 0x0b, 0x1e, 0x25, 0x95, 0xcf, 0xd2, 0x33, 0x06, 0xd5, 0x83, 0x17, 0x55, 0xde, 0xe1,
- 0xd6, 0x6e, 0x9f, 0x7f, 0xaa, 0xf7, 0x2a, 0x33, 0xdb, 0xe1, 0xc1, 0xd8, 0x37, 0xe9, 0xb1, 0xc3,
- 0xf6, 0xac, 0xbc, 0x87, 0xfb, 0x2c, 0x23, 0x2e, 0x2d, 0x42, 0x8c, 0xbc, 0x84, 0x7b, 0x17, 0x72,
- 0xb8, 0xf9, 0x1d, 0xf1, 0x55, 0xdf, 0xab, 0xec, 0x8c, 0x1e, 0x4c, 0x3e, 0x25, 0x06, 0xeb, 0xad,
- 0x0c, 0x59, 0xdc, 0xdc, 0xe9, 0x3c, 0x6f, 0x2a, 0x7f, 0x90, 0x9d, 0xd1, 0x83, 0xc9, 0x90, 0xf2,
- 0x6f, 0x9b, 0x72, 0x1d, 0xdc, 0xdd, 0xaa, 0xf2, 0x49, 0x99, 0xd5, 0xd3, 0x71, 0x47, 0x07, 0xba,
- 0x43, 0xcc, 0xe9, 0x57, 0x30, 0x21, 0xeb, 0xde, 0x2f, 0x40, 0x2e, 0xc8, 0x5d, 0xd1, 0x1a, 0x64,
- 0x5f, 0x74, 0xf0, 0xb3, 0x26, 0x56, 0xe6, 0x84, 0x97, 0x03, 0xce, 0x0b, 0x51, 0x75, 0x94, 0x61,
- 0x7e, 0xa7, 0xda, 0xae, 0x6e, 0x36, 0x71, 0x70, 0x89, 0x1e, 0x00, 0x64, 0x02, 0x56, 0x52, 0x64,
- 0x07, 0xa1, 0xce, 0xda, 0xea, 0x0f, 0x7f, 0xb2, 0x36, 0xf7, 0xe3, 0x9f, 0xac, 0xcd, 0xbd, 0x3a,
- 0x5f, 0x4b, 0xfc, 0xf0, 0x7c, 0x2d, 0xf1, 0x77, 0xe7, 0x6b, 0x89, 0x7f, 0x3d, 0x5f, 0x4b, 0xec,
- 0x65, 0xf9, 0x31, 0xf1, 0xe4, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x08, 0x6c, 0xc9, 0x88, 0x12,
- 0x32, 0x00, 0x00,
+ 0xb6, 0x35, 0xeb, 0xd5, 0xfa, 0x16, 0xdf, 0xeb, 0xd3, 0xad, 0x19, 0x41, 0xd5, 0x75, 0xe3, 0x80,
+ 0x98, 0xe8, 0x3e, 0xe4, 0x1b, 0xcd, 0xed, 0xe6, 0x66, 0x95, 0x7b, 0xf7, 0xd2, 0x9d, 0x93, 0xd3,
+ 0xf2, 0xad, 0xd7, 0x7b, 0xb7, 0xc9, 0x40, 0xf7, 0x89, 0x39, 0xb3, 0x45, 0x23, 0x10, 0xf5, 0xbf,
+ 0x92, 0xb0, 0x80, 0x59, 0x3a, 0xec, 0xfa, 0x5d, 0x6a, 0x5b, 0xc6, 0x04, 0x75, 0x21, 0x6f, 0x50,
+ 0xc7, 0xb4, 0x22, 0x7e, 0xe2, 0xf1, 0x25, 0x21, 0xd1, 0x54, 0x2a, 0x68, 0xd5, 0x03, 0x49, 0x3c,
+ 0x55, 0x82, 0x1e, 0x40, 0xc6, 0x24, 0xb6, 0x3e, 0x91, 0xb1, 0xd9, 0xad, 0x8a, 0x48, 0xb8, 0x2b,
+ 0x41, 0xc2, 0x5d, 0x69, 0xc8, 0x84, 0x1b, 0x0b, 0x1c, 0xcf, 0x41, 0xf4, 0x97, 0x9a, 0xee, 0xfb,
+ 0x64, 0x38, 0xf2, 0x45, 0x60, 0x96, 0xc6, 0x85, 0xa1, 0xfe, 0xb2, 0x2a, 0x49, 0xe8, 0x11, 0x64,
+ 0x8f, 0x2d, 0xc7, 0xa4, 0xc7, 0x32, 0xf6, 0xba, 0x42, 0xa9, 0x04, 0xaa, 0x27, 0x2c, 0x24, 0x99,
+ 0x19, 0x26, 0xdb, 0x43, 0xed, 0x4e, 0xbb, 0x19, 0xec, 0x21, 0xc9, 0xef, 0x38, 0x6d, 0xea, 0xb0,
+ 0xf3, 0x0f, 0x9d, 0xb6, 0xb6, 0x51, 0x6d, 0x6d, 0xef, 0x62, 0xb6, 0x8f, 0x56, 0x4e, 0x4e, 0xcb,
+ 0x4a, 0x08, 0xd9, 0xd0, 0x2d, 0x9b, 0x25, 0x03, 0xb7, 0x20, 0x55, 0x6d, 0x7f, 0x47, 0x49, 0x96,
+ 0x94, 0x93, 0xd3, 0x72, 0x31, 0x64, 0x57, 0x9d, 0xc9, 0xd4, 0xee, 0xb3, 0xfd, 0xaa, 0x7f, 0x97,
+ 0x82, 0xe2, 0xee, 0xc8, 0xd4, 0x7d, 0x22, 0xce, 0x19, 0x2a, 0x43, 0x61, 0xa4, 0xbb, 0xba, 0x6d,
+ 0x13, 0xdb, 0xf2, 0x86, 0xb2, 0x94, 0x10, 0x25, 0xa1, 0x0f, 0xde, 0xd4, 0x8c, 0xb5, 0x1c, 0x3b,
+ 0x3b, 0xdf, 0xfb, 0xd7, 0xf5, 0x44, 0x60, 0xd0, 0x5d, 0x58, 0xdc, 0x17, 0xa3, 0xd5, 0x74, 0x83,
+ 0x2f, 0x6c, 0x8a, 0x2f, 0x6c, 0x25, 0x6e, 0x61, 0xa3, 0xc3, 0xaa, 0xc8, 0x49, 0x56, 0xb9, 0x14,
+ 0x5e, 0xd8, 0x8f, 0x36, 0xd1, 0x13, 0x98, 0x1f, 0x52, 0xc7, 0xf2, 0xa9, 0x7b, 0xfd, 0x2a, 0x04,
+ 0x48, 0x74, 0x0f, 0x96, 0xd9, 0xe2, 0x06, 0xe3, 0xe1, 0x6c, 0x7e, 0x9d, 0x27, 0xf1, 0xd2, 0x50,
+ 0x7f, 0x29, 0x3b, 0xc4, 0x8c, 0x8c, 0x6a, 0x90, 0xa1, 0x2e, 0x8b, 0x17, 0xb3, 0x7c, 0xb8, 0xf7,
+ 0xaf, 0x1d, 0xae, 0x68, 0x74, 0x98, 0x0c, 0x16, 0xa2, 0xea, 0xd7, 0x61, 0xe1, 0xc2, 0x24, 0x58,
+ 0x98, 0xd4, 0xad, 0xee, 0xf6, 0x9a, 0xca, 0x1c, 0x2a, 0x42, 0xae, 0xde, 0x69, 0xf7, 0x5b, 0xed,
+ 0x5d, 0x16, 0xe7, 0x15, 0x21, 0x87, 0x3b, 0xdb, 0xdb, 0xb5, 0x6a, 0xfd, 0x99, 0x92, 0x54, 0x2b,
+ 0x50, 0x88, 0x68, 0x43, 0x8b, 0x00, 0xbd, 0x7e, 0xa7, 0xab, 0x6d, 0xb4, 0x70, 0xaf, 0x2f, 0xa2,
+ 0xc4, 0x5e, 0xbf, 0x8a, 0xfb, 0x92, 0x90, 0x50, 0xff, 0x23, 0x19, 0xac, 0xa8, 0x0c, 0x0c, 0x6b,
+ 0x17, 0x03, 0xc3, 0x2b, 0x06, 0x2f, 0x43, 0xc3, 0x69, 0x23, 0x0c, 0x10, 0x3f, 0x00, 0xe0, 0x1b,
+ 0x87, 0x98, 0x9a, 0xee, 0xcb, 0x85, 0x2f, 0xbd, 0x66, 0xe4, 0x7e, 0x50, 0xd1, 0xc2, 0x79, 0x89,
+ 0xae, 0xfa, 0xe8, 0x1b, 0x50, 0x34, 0xe8, 0x70, 0x64, 0x13, 0x29, 0x9c, 0xba, 0x56, 0xb8, 0x10,
+ 0xe2, 0xab, 0x7e, 0x34, 0x34, 0x4d, 0x5f, 0x0c, 0x9e, 0x7f, 0x23, 0x11, 0x58, 0x26, 0x26, 0x1a,
+ 0x2d, 0x42, 0x6e, 0xb7, 0xdb, 0xa8, 0xf6, 0x5b, 0xed, 0x4d, 0x25, 0x81, 0x00, 0xb2, 0xdc, 0xd4,
+ 0x0d, 0x25, 0xc9, 0xa2, 0xe8, 0x7a, 0x67, 0xa7, 0xbb, 0xdd, 0xe4, 0x1e, 0x0b, 0xad, 0x80, 0x12,
+ 0x18, 0x5b, 0xe3, 0x86, 0x6c, 0x36, 0x94, 0x34, 0xba, 0x01, 0x4b, 0x21, 0x55, 0x4a, 0x66, 0xd0,
+ 0x4d, 0x40, 0x21, 0x71, 0xaa, 0x22, 0xab, 0xfe, 0x2a, 0x2c, 0xd5, 0xa9, 0xe3, 0xeb, 0x96, 0x13,
+ 0x66, 0x18, 0x8f, 0xd9, 0xa4, 0x25, 0x49, 0xb3, 0x64, 0x25, 0xa8, 0xb6, 0x74, 0x7e, 0xb6, 0x5e,
+ 0x08, 0xa1, 0xad, 0x06, 0x0f, 0x95, 0x64, 0xc3, 0x64, 0xe7, 0x77, 0x64, 0x99, 0xdc, 0xb8, 0x99,
+ 0xda, 0xfc, 0xf9, 0xd9, 0x7a, 0xaa, 0xdb, 0x6a, 0x60, 0x46, 0x43, 0x5f, 0x84, 0x3c, 0x79, 0x69,
+ 0xf9, 0x9a, 0xc1, 0xee, 0x25, 0x66, 0xc0, 0x0c, 0xce, 0x31, 0x42, 0x9d, 0x5d, 0x43, 0x35, 0x80,
+ 0x2e, 0x75, 0x7d, 0xd9, 0xf3, 0x57, 0x21, 0x33, 0xa2, 0x2e, 0xaf, 0x5d, 0x5c, 0x5a, 0x51, 0x63,
+ 0x70, 0xb1, 0x51, 0xb1, 0x00, 0xab, 0xbf, 0x97, 0x02, 0xe8, 0xeb, 0xde, 0xa1, 0x54, 0xf2, 0x14,
+ 0xf2, 0x61, 0x75, 0x52, 0x16, 0x41, 0xae, 0x5c, 0xed, 0x10, 0x8c, 0x9e, 0x04, 0x9b, 0x4d, 0xe4,
+ 0x4e, 0xb1, 0x49, 0x6c, 0xd0, 0x51, 0x5c, 0xfa, 0x71, 0x31, 0x41, 0x62, 0xd7, 0x3c, 0x71, 0x5d,
+ 0xb9, 0xf2, 0xec, 0x27, 0xaa, 0xf3, 0x6b, 0x41, 0x18, 0x4d, 0x46, 0xdf, 0xb1, 0x65, 0x9f, 0x99,
+ 0x15, 0xd9, 0x9a, 0xc3, 0x53, 0x39, 0xf4, 0x31, 0x14, 0xd8, 0xbc, 0x35, 0x8f, 0xf3, 0x64, 0xe0,
+ 0x7d, 0xa9, 0xa9, 0x84, 0x06, 0x0c, 0xa3, 0xa9, 0x95, 0xef, 0x00, 0xe8, 0xa3, 0x91, 0x6d, 0x11,
+ 0x53, 0xdb, 0x9b, 0xf0, 0x48, 0x3b, 0x8f, 0xf3, 0x92, 0x52, 0x9b, 0xb0, 0xe3, 0x12, 0xb0, 0x75,
+ 0x9f, 0x47, 0xcf, 0xd7, 0x18, 0x50, 0xa2, 0xab, 0x7e, 0x4d, 0x81, 0x45, 0x77, 0xec, 0x30, 0x83,
+ 0xca, 0xd1, 0xa9, 0x7f, 0x9a, 0x84, 0xb7, 0xda, 0xc4, 0x3f, 0xa6, 0xee, 0x61, 0xd5, 0xf7, 0x75,
+ 0xe3, 0x60, 0x48, 0x1c, 0xb9, 0x7c, 0x91, 0x84, 0x26, 0x71, 0x21, 0xa1, 0x59, 0x85, 0x79, 0xdd,
+ 0xb6, 0x74, 0x8f, 0x88, 0xe0, 0x2d, 0x8f, 0x83, 0x26, 0x4b, 0xbb, 0x58, 0x12, 0x47, 0x3c, 0x8f,
+ 0x88, 0xba, 0x0a, 0x1b, 0x78, 0x40, 0x40, 0xdf, 0x85, 0x9b, 0x32, 0x4c, 0xd3, 0xc3, 0xae, 0x58,
+ 0x42, 0x11, 0x14, 0x68, 0x9b, 0xb1, 0x59, 0x65, 0xfc, 0xe0, 0x64, 0x1c, 0x37, 0x25, 0x77, 0x46,
+ 0xbe, 0x8c, 0x0a, 0x57, 0xcc, 0x18, 0x56, 0x69, 0x13, 0x6e, 0x5d, 0x2a, 0xf2, 0xb9, 0xea, 0x36,
+ 0xff, 0x98, 0x04, 0x68, 0x75, 0xab, 0x3b, 0xd2, 0x48, 0x0d, 0xc8, 0xee, 0xeb, 0x43, 0xcb, 0x9e,
+ 0x5c, 0xe5, 0x01, 0xa7, 0xf8, 0x4a, 0x55, 0x98, 0x63, 0x83, 0xcb, 0x60, 0x29, 0xcb, 0x73, 0xca,
+ 0xf1, 0x9e, 0x43, 0xfc, 0x30, 0xa7, 0xe4, 0x2d, 0x36, 0x0c, 0x57, 0x77, 0xc2, 0xad, 0x2b, 0x1a,
+ 0x6c, 0x01, 0x58, 0xc8, 0x73, 0xac, 0x4f, 0x02, 0xb7, 0x25, 0x9b, 0x68, 0x8b, 0x57, 0x47, 0x89,
+ 0x7b, 0x44, 0xcc, 0xd5, 0x0c, 0x37, 0xea, 0x75, 0xe3, 0xc1, 0x12, 0x2e, 0x6c, 0x17, 0x4a, 0x97,
+ 0x3e, 0xe2, 0x21, 0xd3, 0x94, 0xf5, 0xb9, 0x6c, 0xf4, 0x10, 0x16, 0x2e, 0xcc, 0xf3, 0xb5, 0x64,
+ 0xbe, 0xd5, 0x7d, 0xfe, 0x55, 0x25, 0x2d, 0x7f, 0x7d, 0x5d, 0xc9, 0xaa, 0x7f, 0x9b, 0x12, 0x8e,
+ 0x46, 0x5a, 0x35, 0xfe, 0x55, 0x20, 0xc7, 0x77, 0xb7, 0x41, 0x6d, 0xe9, 0x00, 0xde, 0xbb, 0xda,
+ 0xff, 0xb0, 0x9c, 0x8e, 0xc3, 0x71, 0x28, 0x88, 0xd6, 0xa1, 0x20, 0x76, 0xb1, 0xc6, 0x0e, 0x1c,
+ 0x37, 0xeb, 0x02, 0x06, 0x41, 0x62, 0x92, 0xe8, 0x2e, 0x2c, 0xf2, 0xe2, 0x8f, 0x77, 0x40, 0x4c,
+ 0x81, 0x49, 0x73, 0xcc, 0x42, 0x48, 0xe5, 0xb0, 0x1d, 0x28, 0x4a, 0x82, 0xc6, 0xe3, 0xf9, 0x0c,
+ 0x1f, 0xd0, 0xbd, 0xeb, 0x06, 0x24, 0x44, 0x78, 0x98, 0x5f, 0x18, 0x4d, 0x1b, 0xea, 0x2f, 0x42,
+ 0x2e, 0x18, 0x2c, 0x5a, 0x85, 0x54, 0xbf, 0xde, 0x55, 0xe6, 0x4a, 0x4b, 0x27, 0xa7, 0xe5, 0x42,
+ 0x40, 0xee, 0xd7, 0xbb, 0x8c, 0xb3, 0xdb, 0xe8, 0x2a, 0x89, 0x8b, 0x9c, 0xdd, 0x46, 0x17, 0x95,
+ 0x20, 0xdd, 0xab, 0xf7, 0xbb, 0x41, 0x7c, 0x16, 0xb0, 0x18, 0xad, 0x94, 0x66, 0xf1, 0x99, 0xba,
+ 0x0f, 0x85, 0x48, 0xef, 0xe8, 0x1d, 0x98, 0x6f, 0xb5, 0x37, 0x71, 0xb3, 0xd7, 0x53, 0xe6, 0x4a,
+ 0x37, 0x4f, 0x4e, 0xcb, 0x28, 0xc2, 0x6d, 0x39, 0x03, 0xb6, 0x76, 0xe8, 0x0e, 0xa4, 0xb7, 0x3a,
+ 0xec, 0xde, 0x17, 0xc9, 0x45, 0x04, 0xb1, 0x45, 0x3d, 0xbf, 0x74, 0x43, 0x06, 0x7e, 0x51, 0xc5,
+ 0xea, 0xef, 0x27, 0x20, 0x2b, 0x0e, 0x5a, 0xec, 0x22, 0x56, 0x61, 0x3e, 0x28, 0x21, 0x88, 0xc4,
+ 0xef, 0xbd, 0xcb, 0x93, 0xb4, 0x8a, 0xcc, 0xa9, 0xc4, 0xd6, 0x0c, 0xe4, 0x4a, 0x1f, 0x42, 0x31,
+ 0xca, 0xf8, 0x5c, 0x1b, 0xf3, 0xbb, 0x50, 0x60, 0x7b, 0x3f, 0x48, 0xd6, 0x1e, 0x43, 0x56, 0x38,
+ 0x8b, 0xf0, 0x1e, 0xba, 0x3c, 0x63, 0x94, 0x48, 0xf4, 0x14, 0xe6, 0x45, 0x96, 0x19, 0x54, 0x8e,
+ 0xd7, 0xae, 0x3e, 0x61, 0x38, 0x80, 0xab, 0x1f, 0x43, 0xba, 0x4b, 0x88, 0xcb, 0x6c, 0xef, 0x50,
+ 0x93, 0x4c, 0xaf, 0x6e, 0x99, 0x20, 0x9b, 0xa4, 0xd5, 0x60, 0x09, 0xb2, 0x49, 0x5a, 0x66, 0x58,
+ 0x1b, 0x4b, 0x46, 0x6a, 0x63, 0x7d, 0x28, 0xbe, 0x20, 0xd6, 0xe0, 0xc0, 0x27, 0x26, 0x57, 0x74,
+ 0x1f, 0xd2, 0x23, 0x12, 0x0e, 0x7e, 0x35, 0x76, 0xf3, 0x11, 0xe2, 0x62, 0x8e, 0x62, 0x3e, 0xe6,
+ 0x98, 0x4b, 0xcb, 0xe7, 0x0e, 0xd9, 0x52, 0xff, 0x21, 0x09, 0x8b, 0x2d, 0xcf, 0x1b, 0xeb, 0x8e,
+ 0x11, 0x44, 0x75, 0xdf, 0xbc, 0x18, 0xd5, 0xc5, 0xbe, 0x0b, 0x5d, 0x14, 0xb9, 0x58, 0xf2, 0x93,
+ 0x37, 0x6b, 0x32, 0xbc, 0x59, 0xd5, 0x1f, 0x27, 0x82, 0xba, 0xde, 0xdd, 0x88, 0x2b, 0x10, 0x39,
+ 0x62, 0x54, 0x13, 0xd9, 0x75, 0x0e, 0x1d, 0x7a, 0xec, 0xa0, 0xb7, 0x21, 0x83, 0x9b, 0xed, 0xe6,
+ 0x0b, 0x25, 0x21, 0xb6, 0xe7, 0x05, 0x10, 0x26, 0x0e, 0x39, 0x66, 0x9a, 0xba, 0xcd, 0x76, 0x83,
+ 0x45, 0x61, 0xc9, 0x18, 0x4d, 0x5d, 0xe2, 0x98, 0x96, 0x33, 0x40, 0xef, 0x40, 0xb6, 0xd5, 0xeb,
+ 0xed, 0xf2, 0x14, 0xf2, 0xad, 0x93, 0xd3, 0xf2, 0x8d, 0x0b, 0x28, 0x5e, 0xd3, 0x35, 0x19, 0x88,
+ 0xa5, 0x40, 0x2c, 0x3e, 0x8b, 0x01, 0xb1, 0xd8, 0x5a, 0x80, 0x70, 0xa7, 0x5f, 0xed, 0x37, 0x95,
+ 0x4c, 0x0c, 0x08, 0x53, 0xf6, 0x57, 0x1e, 0xb7, 0x7f, 0x49, 0x82, 0x52, 0x35, 0x0c, 0x32, 0xf2,
+ 0x19, 0x5f, 0x66, 0x9d, 0x7d, 0xc8, 0x8d, 0xd8, 0x2f, 0x8b, 0x04, 0x11, 0xd4, 0xd3, 0xd8, 0x97,
+ 0xcd, 0x19, 0xb9, 0x0a, 0xa6, 0x36, 0xa9, 0x9a, 0x43, 0xcb, 0xf3, 0x2c, 0xea, 0x08, 0x1a, 0x0e,
+ 0x35, 0x95, 0xfe, 0x33, 0x01, 0x37, 0x62, 0x10, 0xe8, 0x21, 0xa4, 0x5d, 0x6a, 0x07, 0x6b, 0x78,
+ 0xfb, 0xb2, 0x92, 0x2d, 0x13, 0xc5, 0x1c, 0x89, 0xd6, 0x00, 0xf4, 0xb1, 0x4f, 0x75, 0xde, 0x3f,
+ 0x5f, 0xbd, 0x1c, 0x8e, 0x50, 0xd0, 0x0b, 0xc8, 0x7a, 0xc4, 0x70, 0x49, 0x10, 0x67, 0x7f, 0xfc,
+ 0xff, 0x1d, 0x7d, 0xa5, 0xc7, 0xd5, 0x60, 0xa9, 0xae, 0x54, 0x81, 0xac, 0xa0, 0xb0, 0x6d, 0x6f,
+ 0xea, 0xbe, 0x2e, 0x0b, 0xfa, 0xfc, 0x37, 0xdb, 0x4d, 0xba, 0x3d, 0x08, 0x76, 0x93, 0x6e, 0x0f,
+ 0xd4, 0xbf, 0x49, 0x02, 0x34, 0x5f, 0xfa, 0xc4, 0x75, 0x74, 0xbb, 0x5e, 0x45, 0xcd, 0xc8, 0xcd,
+ 0x20, 0x66, 0xfb, 0xe5, 0xd8, 0x57, 0x8a, 0x50, 0xa2, 0x52, 0xaf, 0xc6, 0xdc, 0x0d, 0xb7, 0x20,
+ 0x35, 0x76, 0xe5, 0x63, 0xb5, 0x88, 0x91, 0x77, 0xf1, 0x36, 0x66, 0x34, 0xd4, 0x9c, 0xba, 0xad,
+ 0xd4, 0xe5, 0x4f, 0xd2, 0x91, 0x0e, 0x62, 0x5d, 0x17, 0x3b, 0xf9, 0x86, 0xae, 0x19, 0x44, 0xde,
+ 0x2a, 0x45, 0x71, 0xf2, 0xeb, 0xd5, 0x3a, 0x71, 0x7d, 0x9c, 0x35, 0x74, 0xf6, 0xff, 0x27, 0xf2,
+ 0x6f, 0xf7, 0x01, 0xa6, 0x53, 0x43, 0x6b, 0x90, 0xa9, 0x6f, 0xf4, 0x7a, 0xdb, 0xca, 0x9c, 0x70,
+ 0xe0, 0x53, 0x16, 0x27, 0xab, 0x7f, 0x99, 0x84, 0x5c, 0xbd, 0x2a, 0xaf, 0xdc, 0x3a, 0x28, 0xdc,
+ 0x2b, 0xf1, 0x67, 0x10, 0xf2, 0x72, 0x64, 0xb9, 0x13, 0xe9, 0x58, 0xae, 0x48, 0x78, 0x17, 0x99,
+ 0x08, 0x1b, 0x75, 0x93, 0x0b, 0x20, 0x0c, 0x45, 0x22, 0x8d, 0xa0, 0x19, 0x7a, 0xe0, 0xe3, 0xd7,
+ 0xae, 0x36, 0x96, 0x48, 0x5d, 0xa6, 0x6d, 0x0f, 0x17, 0x02, 0x25, 0x75, 0xdd, 0x43, 0x1f, 0xc0,
+ 0x92, 0x67, 0x0d, 0x1c, 0xcb, 0x19, 0x68, 0x81, 0xf1, 0xf8, 0x9b, 0x4c, 0x6d, 0xf9, 0xfc, 0x6c,
+ 0x7d, 0xa1, 0x27, 0x58, 0xd2, 0x86, 0x0b, 0x12, 0x59, 0xe7, 0xa6, 0x44, 0x5f, 0x87, 0xc5, 0x88,
+ 0x28, 0xb3, 0xa2, 0x30, 0xbb, 0x72, 0x7e, 0xb6, 0x5e, 0x0c, 0x25, 0x9f, 0x91, 0x09, 0x2e, 0x86,
+ 0x82, 0xcf, 0x08, 0xaf, 0xcd, 0xec, 0x53, 0xd7, 0x20, 0x9a, 0xcb, 0xcf, 0x34, 0xbf, 0xdd, 0xd3,
+ 0xb8, 0xc0, 0x69, 0xe2, 0x98, 0xab, 0xcf, 0xe1, 0x46, 0xc7, 0x35, 0x0e, 0x88, 0xe7, 0x0b, 0x53,
+ 0x48, 0x2b, 0x7e, 0x0c, 0xb7, 0x7d, 0xdd, 0x3b, 0xd4, 0x0e, 0x2c, 0xcf, 0xa7, 0xee, 0x44, 0x73,
+ 0x89, 0x4f, 0x1c, 0xc6, 0xd7, 0xf8, 0x43, 0xae, 0x2c, 0x08, 0xde, 0x62, 0x98, 0x2d, 0x01, 0xc1,
+ 0x01, 0x62, 0x9b, 0x01, 0xd4, 0x16, 0x14, 0x59, 0x0a, 0x23, 0x8b, 0x6a, 0x6c, 0xf6, 0x60, 0xd3,
+ 0x81, 0xf6, 0xc6, 0xd7, 0x54, 0xde, 0xa6, 0x03, 0xf1, 0x53, 0xfd, 0x36, 0x28, 0x0d, 0xcb, 0x1b,
+ 0xe9, 0xbe, 0x71, 0x10, 0x54, 0x3a, 0x51, 0x03, 0x94, 0x03, 0xa2, 0xbb, 0xfe, 0x1e, 0xd1, 0x7d,
+ 0x6d, 0x44, 0x5c, 0x8b, 0x9a, 0xd7, 0xaf, 0xf2, 0x52, 0x28, 0xd2, 0xe5, 0x12, 0xea, 0x7f, 0x27,
+ 0x00, 0xb0, 0xbe, 0x1f, 0x44, 0x6b, 0x5f, 0x81, 0x65, 0xcf, 0xd1, 0x47, 0xde, 0x01, 0xf5, 0x35,
+ 0xcb, 0xf1, 0x89, 0x7b, 0xa4, 0xdb, 0xb2, 0xb8, 0xa3, 0x04, 0x8c, 0x96, 0xa4, 0xa3, 0xfb, 0x80,
+ 0x0e, 0x09, 0x19, 0x69, 0xd4, 0x36, 0xb5, 0x80, 0x29, 0x9e, 0x99, 0xd3, 0x58, 0x61, 0x9c, 0x8e,
+ 0x6d, 0xf6, 0x02, 0x3a, 0xaa, 0xc1, 0x1a, 0x9b, 0x3e, 0x71, 0x7c, 0xd7, 0x22, 0x9e, 0xb6, 0x4f,
+ 0x5d, 0xcd, 0xb3, 0xe9, 0xb1, 0xb6, 0x4f, 0x6d, 0x9b, 0x1e, 0x13, 0x37, 0xa8, 0x9b, 0x95, 0x6c,
+ 0x3a, 0x68, 0x0a, 0xd0, 0x06, 0x75, 0x7b, 0x36, 0x3d, 0xde, 0x08, 0x10, 0x2c, 0xa4, 0x9b, 0xce,
+ 0xd9, 0xb7, 0x8c, 0xc3, 0x20, 0xa4, 0x0b, 0xa9, 0x7d, 0xcb, 0x38, 0x44, 0xef, 0xc0, 0x02, 0xb1,
+ 0x09, 0x2f, 0x9f, 0x08, 0x54, 0x86, 0xa3, 0x8a, 0x01, 0x91, 0x81, 0xd4, 0x4f, 0x40, 0x69, 0x3a,
+ 0x86, 0x3b, 0x19, 0x45, 0xd6, 0xfc, 0x3e, 0x20, 0xe6, 0x24, 0x35, 0x9b, 0x1a, 0x87, 0xda, 0x50,
+ 0x77, 0xf4, 0x01, 0x1b, 0x97, 0x78, 0xfd, 0x53, 0x18, 0x67, 0x9b, 0x1a, 0x87, 0x3b, 0x92, 0xae,
+ 0x7e, 0x00, 0xd0, 0x1b, 0xb9, 0x44, 0x37, 0x3b, 0x2c, 0x9a, 0x60, 0xa6, 0xe3, 0x2d, 0xcd, 0x94,
+ 0xaf, 0xa7, 0xd4, 0x95, 0x47, 0x5d, 0x11, 0x8c, 0x46, 0x48, 0x57, 0x7f, 0x1e, 0x6e, 0x74, 0x6d,
+ 0xdd, 0xe0, 0x5f, 0x12, 0x74, 0xc3, 0xe7, 0x2c, 0xf4, 0x14, 0xb2, 0x02, 0x2a, 0x57, 0x32, 0xf6,
+ 0xb8, 0x4d, 0xfb, 0xdc, 0x9a, 0xc3, 0x12, 0x5f, 0x2b, 0x02, 0x4c, 0xf5, 0xa8, 0x7f, 0x9e, 0x80,
+ 0x7c, 0xa8, 0x1f, 0x95, 0xc5, 0x2b, 0x8d, 0xef, 0xea, 0x96, 0x23, 0x33, 0xfe, 0x3c, 0x8e, 0x92,
+ 0x50, 0x0b, 0x0a, 0xa3, 0x50, 0xfa, 0xca, 0x78, 0x2e, 0x66, 0xd4, 0x38, 0x2a, 0x8b, 0x3e, 0x84,
+ 0x7c, 0xf0, 0x5c, 0x1d, 0x78, 0xd8, 0xab, 0x5f, 0xb7, 0xa7, 0x70, 0xf5, 0x9b, 0x00, 0xdf, 0xa2,
+ 0x96, 0xd3, 0xa7, 0x87, 0xc4, 0xe1, 0xcf, 0xaf, 0x2c, 0x5f, 0x24, 0x81, 0x15, 0x65, 0x8b, 0x97,
+ 0x01, 0xc4, 0x12, 0x84, 0xaf, 0x90, 0xa2, 0xa9, 0xfe, 0x75, 0x12, 0xb2, 0x98, 0x52, 0xbf, 0x5e,
+ 0x45, 0x65, 0xc8, 0x4a, 0x3f, 0xc1, 0xef, 0x9f, 0x5a, 0xfe, 0xfc, 0x6c, 0x3d, 0x23, 0x1c, 0x44,
+ 0xc6, 0xe0, 0x9e, 0x21, 0xe2, 0xc1, 0x93, 0x97, 0x79, 0x70, 0xf4, 0x10, 0x8a, 0x12, 0xa4, 0x1d,
+ 0xe8, 0xde, 0x81, 0x48, 0xde, 0x6a, 0x8b, 0xe7, 0x67, 0xeb, 0x20, 0x90, 0x5b, 0xba, 0x77, 0x80,
+ 0x41, 0xa0, 0xd9, 0x6f, 0xd4, 0x84, 0xc2, 0xa7, 0xd4, 0x72, 0x34, 0x9f, 0x4f, 0x42, 0x16, 0x1a,
+ 0x63, 0xd7, 0x71, 0x3a, 0x55, 0xf9, 0x2d, 0x02, 0x7c, 0x3a, 0x9d, 0x7c, 0x13, 0x16, 0x5c, 0x4a,
+ 0x7d, 0xe1, 0xb6, 0x2c, 0xea, 0xc8, 0x1a, 0x46, 0x39, 0xb6, 0xb4, 0x4d, 0xa9, 0x8f, 0x25, 0x0e,
+ 0x17, 0xdd, 0x48, 0x0b, 0x3d, 0x84, 0x15, 0x5b, 0xf7, 0x7c, 0x8d, 0xfb, 0x3b, 0x73, 0xaa, 0x2d,
+ 0xcb, 0x8f, 0x1a, 0x62, 0xbc, 0x0d, 0xce, 0x0a, 0x24, 0xd4, 0x7f, 0x4a, 0x40, 0x81, 0x4d, 0xc6,
+ 0xda, 0xb7, 0x0c, 0x16, 0xe4, 0x7d, 0xfe, 0xd8, 0xe3, 0x16, 0xa4, 0x0c, 0xcf, 0x95, 0x46, 0xe5,
+ 0x97, 0x6f, 0xbd, 0x87, 0x31, 0xa3, 0xa1, 0x4f, 0x20, 0x2b, 0x6b, 0x29, 0x22, 0xec, 0x50, 0xaf,
+ 0x0f, 0x47, 0xa5, 0x6d, 0xa4, 0x1c, 0xdf, 0xcb, 0xd3, 0xd1, 0x89, 0x4b, 0x00, 0x47, 0x49, 0xe8,
+ 0x26, 0x24, 0x0d, 0x61, 0x2e, 0xf9, 0xb1, 0x4b, 0xbd, 0x8d, 0x93, 0x86, 0xa3, 0xfe, 0x20, 0x01,
+ 0x0b, 0xd3, 0x03, 0xcf, 0x76, 0xc0, 0x6d, 0xc8, 0x7b, 0xe3, 0x3d, 0x6f, 0xe2, 0xf9, 0x64, 0x18,
+ 0x3c, 0x2d, 0x87, 0x04, 0xd4, 0x82, 0xbc, 0x6e, 0x0f, 0xa8, 0x6b, 0xf9, 0x07, 0x43, 0x99, 0xa5,
+ 0xc6, 0x87, 0x0a, 0x51, 0x9d, 0x95, 0x6a, 0x20, 0x82, 0xa7, 0xd2, 0xc1, 0xbd, 0x2f, 0xbe, 0x3f,
+ 0xe0, 0xf7, 0xfe, 0xdb, 0x50, 0xb4, 0xf5, 0x21, 0x2f, 0x2e, 0xf9, 0xd6, 0x50, 0xcc, 0x23, 0x8d,
+ 0x0b, 0x92, 0xd6, 0xb7, 0x86, 0x44, 0x55, 0x21, 0x1f, 0x2a, 0x43, 0x4b, 0x50, 0xa8, 0x36, 0x7b,
+ 0xda, 0xa3, 0xc7, 0x4f, 0xb5, 0xcd, 0xfa, 0x8e, 0x32, 0x27, 0x63, 0xd3, 0xbf, 0x48, 0xc0, 0x82,
+ 0x74, 0x47, 0x32, 0xde, 0x7f, 0x07, 0xe6, 0x5d, 0x7d, 0xdf, 0x0f, 0x32, 0x92, 0xb4, 0xd8, 0xd5,
+ 0xcc, 0xc3, 0xb3, 0x8c, 0x84, 0xb1, 0xe2, 0x33, 0x92, 0xc8, 0xc7, 0x0e, 0xa9, 0x2b, 0x3f, 0x76,
+ 0x48, 0xff, 0x54, 0x3e, 0x76, 0x50, 0x7f, 0x0d, 0x60, 0xc3, 0xb2, 0x49, 0x5f, 0xd4, 0xa1, 0xe2,
+ 0xf2, 0x4b, 0x16, 0xc3, 0xc9, 0x3a, 0x67, 0x10, 0xc3, 0xb5, 0x1a, 0x98, 0xd1, 0x18, 0x6b, 0x60,
+ 0x99, 0xf2, 0x30, 0x72, 0xd6, 0x26, 0x63, 0x0d, 0x2c, 0x33, 0x7c, 0x95, 0x4b, 0x5f, 0xf7, 0x2a,
+ 0x77, 0x9a, 0x80, 0x25, 0x19, 0xbb, 0x86, 0xee, 0xf7, 0xcb, 0x90, 0x17, 0x61, 0xec, 0x34, 0xa1,
+ 0xe3, 0x0f, 0xfc, 0x02, 0xd7, 0x6a, 0xe0, 0x9c, 0x60, 0xb7, 0x4c, 0xb4, 0x0e, 0x05, 0x09, 0x8d,
+ 0x7c, 0x18, 0x05, 0x82, 0xd4, 0x66, 0xc3, 0xff, 0x2a, 0xa4, 0xf7, 0x2d, 0x9b, 0xc8, 0x8d, 0x1e,
+ 0xeb, 0x00, 0xa6, 0x06, 0xd8, 0x9a, 0xc3, 0x1c, 0x5d, 0xcb, 0x05, 0x85, 0x3a, 0x3e, 0x3e, 0x99,
+ 0x76, 0x46, 0xc7, 0x27, 0x32, 0xd0, 0x99, 0xf1, 0x09, 0x1c, 0x1b, 0x9f, 0x60, 0x8b, 0xf1, 0x49,
+ 0x68, 0x74, 0x7c, 0x82, 0xf4, 0x53, 0x19, 0xdf, 0x36, 0xdc, 0xac, 0xd9, 0xba, 0x71, 0x68, 0x5b,
+ 0x9e, 0x4f, 0xcc, 0xa8, 0xc7, 0x78, 0x0c, 0xd9, 0x0b, 0x41, 0xe7, 0x55, 0x15, 0x4d, 0x89, 0x54,
+ 0xff, 0x3d, 0x01, 0xc5, 0x2d, 0xa2, 0xdb, 0xfe, 0xc1, 0xb4, 0x6c, 0xe4, 0x13, 0xcf, 0x97, 0x97,
+ 0x15, 0xff, 0x8d, 0xbe, 0x06, 0xb9, 0x30, 0x26, 0xb9, 0xf6, 0x6d, 0x2e, 0x84, 0xa2, 0x27, 0x30,
+ 0xcf, 0xce, 0x18, 0x1d, 0x07, 0xc9, 0xce, 0x55, 0xcf, 0x3e, 0x12, 0xc9, 0x2e, 0x19, 0x97, 0xf0,
+ 0x20, 0x84, 0x6f, 0xa5, 0x0c, 0x0e, 0x9a, 0xe8, 0x67, 0xa1, 0xc8, 0x5f, 0x2d, 0x82, 0x98, 0x2b,
+ 0x73, 0x9d, 0xce, 0x82, 0x78, 0x78, 0x14, 0xf1, 0xd6, 0xff, 0x26, 0x60, 0x65, 0x47, 0x9f, 0xec,
+ 0x11, 0xe9, 0x36, 0x88, 0x89, 0x89, 0x41, 0x5d, 0x13, 0x75, 0xa3, 0xee, 0xe6, 0x8a, 0x77, 0xcc,
+ 0x38, 0xe1, 0x78, 0xaf, 0x13, 0x24, 0x60, 0xc9, 0x48, 0x02, 0xb6, 0x02, 0x19, 0x87, 0x3a, 0x06,
+ 0x91, 0xbe, 0x48, 0x34, 0x54, 0x2b, 0xea, 0x6a, 0x4a, 0xe1, 0x13, 0x23, 0x2f, 0x40, 0xb5, 0xa9,
+ 0x1f, 0xf6, 0x86, 0x3e, 0x81, 0x52, 0xaf, 0x59, 0xc7, 0xcd, 0x7e, 0xad, 0xf3, 0x6d, 0xad, 0x57,
+ 0xdd, 0xee, 0x55, 0x1f, 0x3f, 0xd4, 0xba, 0x9d, 0xed, 0xef, 0x3c, 0x7a, 0xf2, 0xf0, 0x6b, 0x4a,
+ 0xa2, 0x54, 0x3e, 0x39, 0x2d, 0xdf, 0x6e, 0x57, 0xeb, 0xdb, 0xe2, 0xc4, 0xec, 0xd1, 0x97, 0x3d,
+ 0xdd, 0xf6, 0xf4, 0xc7, 0x0f, 0xbb, 0xd4, 0x9e, 0x30, 0x0c, 0xdb, 0xd6, 0xc5, 0xe8, 0x7d, 0x15,
+ 0xbd, 0x86, 0x13, 0x97, 0x5e, 0xc3, 0xd3, 0xdb, 0x3c, 0x79, 0xc9, 0x6d, 0xbe, 0x01, 0x2b, 0x86,
+ 0x4b, 0x3d, 0x4f, 0x63, 0xd1, 0x3f, 0x31, 0x67, 0xf2, 0x8b, 0x2f, 0x9c, 0x9f, 0xad, 0x2f, 0xd7,
+ 0x19, 0xbf, 0xc7, 0xd9, 0x52, 0xfd, 0xb2, 0x11, 0x21, 0xf1, 0x9e, 0xd4, 0x3f, 0x48, 0xb1, 0x40,
+ 0xca, 0x3a, 0xb2, 0x6c, 0x32, 0x20, 0x1e, 0x7a, 0x0e, 0x4b, 0x86, 0x4b, 0x4c, 0x16, 0xd6, 0xeb,
+ 0x76, 0xf4, 0x03, 0xdb, 0x9f, 0x89, 0x8d, 0x69, 0x42, 0xc1, 0x4a, 0x3d, 0x94, 0xea, 0x8d, 0x88,
+ 0x81, 0x17, 0x8d, 0x0b, 0x6d, 0xf4, 0x29, 0x2c, 0x79, 0xc4, 0xb6, 0x9c, 0xf1, 0x4b, 0xcd, 0xa0,
+ 0x8e, 0x4f, 0x5e, 0x06, 0xaf, 0x65, 0xd7, 0xe9, 0xed, 0x35, 0xb7, 0x99, 0x54, 0x5d, 0x08, 0xd5,
+ 0xd0, 0xf9, 0xd9, 0xfa, 0xe2, 0x45, 0x1a, 0x5e, 0x94, 0x9a, 0x65, 0xbb, 0xd4, 0x86, 0xc5, 0x8b,
+ 0xa3, 0x41, 0x2b, 0xf2, 0xec, 0x73, 0x17, 0x12, 0x9c, 0x6d, 0x74, 0x1b, 0x72, 0x2e, 0x19, 0x58,
+ 0x9e, 0xef, 0x0a, 0x33, 0x33, 0x4e, 0x48, 0x61, 0x27, 0x5f, 0x7c, 0x1d, 0x55, 0xfa, 0x15, 0x98,
+ 0xe9, 0x91, 0x1d, 0x16, 0xd3, 0xf2, 0xf4, 0x3d, 0xa9, 0x32, 0x87, 0x83, 0x26, 0xdb, 0x83, 0x63,
+ 0x2f, 0x0c, 0xd4, 0xf8, 0x6f, 0x46, 0xe3, 0x11, 0x85, 0xfc, 0x56, 0x8c, 0xc7, 0x0c, 0xc1, 0x47,
+ 0xa7, 0xe9, 0xc8, 0x47, 0xa7, 0x2b, 0x90, 0xb1, 0xc9, 0x11, 0xb1, 0xc5, 0x5d, 0x8e, 0x45, 0xe3,
+ 0xde, 0x43, 0x28, 0x06, 0x5f, 0x37, 0xf2, 0xaf, 0x2a, 0x72, 0x90, 0xee, 0x57, 0x7b, 0xcf, 0x94,
+ 0x39, 0x04, 0x90, 0x15, 0x9b, 0x53, 0xbc, 0xe4, 0xd5, 0x3b, 0xed, 0x8d, 0xd6, 0xa6, 0x92, 0xbc,
+ 0xf7, 0xbb, 0x69, 0xc8, 0x87, 0x6f, 0x49, 0xec, 0xee, 0x68, 0x37, 0x5f, 0x04, 0xbb, 0x3b, 0xa4,
+ 0xb7, 0xc9, 0x31, 0x7a, 0x7b, 0x5a, 0x85, 0xfa, 0x44, 0x3c, 0x9e, 0x87, 0xec, 0xa0, 0x02, 0xf5,
+ 0x2e, 0xe4, 0xaa, 0xbd, 0x5e, 0x6b, 0xb3, 0xdd, 0x6c, 0x28, 0x9f, 0x25, 0x4a, 0x5f, 0x38, 0x39,
+ 0x2d, 0x2f, 0x87, 0xa0, 0xaa, 0x27, 0x36, 0x1f, 0x47, 0xd5, 0xeb, 0xcd, 0x6e, 0xbf, 0xd9, 0x50,
+ 0x5e, 0x25, 0x67, 0x51, 0xbc, 0xaa, 0xc2, 0x3f, 0xeb, 0xc9, 0x77, 0x71, 0xb3, 0x5b, 0xc5, 0xac,
+ 0xc3, 0xcf, 0x92, 0xa2, 0x38, 0x36, 0xed, 0xd1, 0x25, 0x23, 0xdd, 0x65, 0x7d, 0xae, 0x05, 0xdf,
+ 0xc9, 0xbd, 0x4a, 0x89, 0x4f, 0x3f, 0xa6, 0x0f, 0x63, 0x44, 0x37, 0x27, 0xac, 0x37, 0xfe, 0x22,
+ 0xc9, 0xd5, 0xa4, 0x66, 0x7a, 0xeb, 0x31, 0xdf, 0xc3, 0xb4, 0xa8, 0x30, 0x8f, 0x77, 0xdb, 0x6d,
+ 0x06, 0x7a, 0x95, 0x9e, 0x99, 0x1d, 0x1e, 0x3b, 0x2c, 0x63, 0x46, 0x77, 0x21, 0x17, 0x3c, 0x58,
+ 0x2a, 0x9f, 0xa5, 0x67, 0x06, 0x54, 0x0f, 0x5e, 0x5b, 0x79, 0x87, 0x5b, 0xbb, 0x7d, 0xfe, 0x19,
+ 0xdf, 0xab, 0xcc, 0x6c, 0x87, 0x07, 0x63, 0xdf, 0xa4, 0xc7, 0x0e, 0x3b, 0xb3, 0xb2, 0x0e, 0xf7,
+ 0x59, 0x46, 0x14, 0x2d, 0x42, 0x8c, 0x2c, 0xc2, 0xbd, 0x0b, 0x39, 0xdc, 0xfc, 0x96, 0xf8, 0xe2,
+ 0xef, 0x55, 0x76, 0x46, 0x0f, 0x26, 0x9f, 0x12, 0x83, 0xf5, 0x56, 0x86, 0x2c, 0x6e, 0xee, 0x74,
+ 0x9e, 0x37, 0x95, 0x3f, 0xcc, 0xce, 0xe8, 0xc1, 0x64, 0x48, 0xf9, 0x77, 0x4f, 0xb9, 0x0e, 0xee,
+ 0x6e, 0x55, 0xf9, 0xa2, 0xcc, 0xea, 0xe9, 0xb8, 0xa3, 0x03, 0xdd, 0x21, 0xe6, 0xf4, 0x0b, 0x99,
+ 0x90, 0x75, 0xef, 0x17, 0x20, 0x17, 0xc4, 0xae, 0x68, 0x0d, 0xb2, 0x2f, 0x3a, 0xf8, 0x59, 0x13,
+ 0x2b, 0x73, 0xc2, 0xca, 0x01, 0xe7, 0x85, 0xc8, 0x3a, 0xca, 0x30, 0xbf, 0x53, 0x6d, 0x57, 0x37,
+ 0x9b, 0x38, 0x28, 0xa2, 0x07, 0x00, 0x19, 0x80, 0x95, 0x14, 0xd9, 0x41, 0xa8, 0xb3, 0xb6, 0xfa,
+ 0xfd, 0x1f, 0xad, 0xcd, 0xfd, 0xf0, 0x47, 0x6b, 0x73, 0xaf, 0xce, 0xd7, 0x12, 0xdf, 0x3f, 0x5f,
+ 0x4b, 0xfc, 0xfd, 0xf9, 0x5a, 0xe2, 0xdf, 0xce, 0xd7, 0x12, 0x7b, 0x59, 0x7e, 0x4d, 0x3c, 0xf9,
+ 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x9b, 0x2e, 0x8d, 0x2e, 0x32, 0x00, 0x00,
}
diff --git a/vendor/github.com/docker/swarmkit/api/types.proto b/vendor/github.com/docker/swarmkit/api/types.proto
index 3b60c54..a7c5826 100644
--- a/vendor/github.com/docker/swarmkit/api/types.proto
+++ b/vendor/github.com/docker/swarmkit/api/types.proto
@@ -616,6 +616,7 @@
TCP = 0 [(gogoproto.enumvalue_customname) = "ProtocolTCP"];
UDP = 1 [(gogoproto.enumvalue_customname) = "ProtocolUDP"];
+ SCTP = 2 [(gogoproto.enumvalue_customname) = "ProtocolSCTP"];
}
// PublishMode controls how ports are published on the swarm.
diff --git a/vendor/github.com/docker/swarmkit/ca/certificates.go b/vendor/github.com/docker/swarmkit/ca/certificates.go
index 7a638fe..54c3b29 100644
--- a/vendor/github.com/docker/swarmkit/ca/certificates.go
+++ b/vendor/github.com/docker/swarmkit/ca/certificates.go
@@ -26,6 +26,8 @@
"github.com/cloudflare/cfssl/signer/local"
"github.com/docker/go-events"
"github.com/docker/swarmkit/api"
+ "github.com/docker/swarmkit/ca/keyutils"
+ "github.com/docker/swarmkit/ca/pkcs8"
"github.com/docker/swarmkit/connectionbroker"
"github.com/docker/swarmkit/ioutils"
"github.com/opencontainers/go-digest"
@@ -655,9 +657,9 @@
}
// Attempt to decrypt the current private-key with the passphrases provided
- priv, err = helpers.ParsePrivateKeyPEMWithPassword(keyBytes, passphrase)
+ priv, err = keyutils.ParsePrivateKeyPEMWithPassword(keyBytes, passphrase)
if err != nil {
- priv, err = helpers.ParsePrivateKeyPEMWithPassword(keyBytes, passphrasePrev)
+ priv, err = keyutils.ParsePrivateKeyPEMWithPassword(keyBytes, passphrasePrev)
if err != nil {
return nil, errors.Wrap(err, "malformed private key")
}
@@ -677,7 +679,7 @@
// ensure it is encrypted, so it doesn't hit raft in plain-text
// we don't have to check for nil, because if we couldn't pem-decode the bytes, then parsing above would have failed
keyBlock, _ := pem.Decode(keyBytes)
- if passphraseStr != "" && !x509.IsEncryptedPEMBlock(keyBlock) {
+ if passphraseStr != "" && !keyutils.IsEncryptedPEMBlock(keyBlock) {
keyBytes, err = EncryptECPrivateKey(keyBytes, passphraseStr)
if err != nil {
return nil, errors.Wrap(err, "unable to encrypt signing CA key material")
@@ -815,6 +817,14 @@
return RootCA{}, err
}
+ // Convert key to PKCS#8 in FIPS mode
+ if keyutils.FIPSEnabled() {
+ key, err = pkcs8.ConvertECPrivateKeyPEM(key)
+ if err != nil {
+ return RootCA{}, err
+ }
+ }
+
rootCA, err := NewRootCA(cert, cert, key, DefaultNodeCertExpiration, nil)
if err != nil {
return RootCA{}, err
@@ -956,7 +966,14 @@
req := &cfcsr.CertificateRequest{
KeyRequest: cfcsr.NewBasicKeyRequest(),
}
- return cfcsr.ParseRequest(req)
+
+ csr, key, err := cfcsr.ParseRequest(req)
+ if err != nil {
+ return nil, nil, err
+ }
+
+ key, err = pkcs8.ConvertECPrivateKeyPEM(key)
+ return csr, key, err
}
// EncryptECPrivateKey receives a PEM encoded private key and returns an encrypted
@@ -964,7 +981,6 @@
// TODO: Make this method generic to handle RSA keys
func EncryptECPrivateKey(key []byte, passphraseStr string) ([]byte, error) {
passphrase := []byte(passphraseStr)
- cipherType := x509.PEMCipherAES256
keyBlock, _ := pem.Decode(key)
if keyBlock == nil {
@@ -972,11 +988,7 @@
return nil, errors.New("error while decoding PEM key")
}
- encryptedPEMBlock, err := x509.EncryptPEMBlock(cryptorand.Reader,
- "EC PRIVATE KEY",
- keyBlock.Bytes,
- passphrase,
- cipherType)
+ encryptedPEMBlock, err := keyutils.EncryptPEMBlock(keyBlock.Bytes, passphrase)
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/docker/swarmkit/ca/keyreadwriter.go b/vendor/github.com/docker/swarmkit/ca/keyreadwriter.go
index 4a7c0a0..c929523 100644
--- a/vendor/github.com/docker/swarmkit/ca/keyreadwriter.go
+++ b/vendor/github.com/docker/swarmkit/ca/keyreadwriter.go
@@ -1,7 +1,6 @@
package ca
import (
- cryptorand "crypto/rand"
"crypto/x509"
"encoding/pem"
"io/ioutil"
@@ -13,6 +12,8 @@
"crypto/tls"
+ "github.com/docker/swarmkit/ca/keyutils"
+ "github.com/docker/swarmkit/ca/pkcs8"
"github.com/docker/swarmkit/ioutils"
"github.com/pkg/errors"
)
@@ -313,7 +314,7 @@
return nil, err
}
- if !x509.IsEncryptedPEMBlock(keyBlock) {
+ if !keyutils.IsEncryptedPEMBlock(keyBlock) {
return keyBlock, nil
}
@@ -323,10 +324,16 @@
return nil, ErrInvalidKEK{Wrapped: x509.IncorrectPasswordError}
}
- derBytes, err := x509.DecryptPEMBlock(keyBlock, k.kekData.KEK)
+ derBytes, err := keyutils.DecryptPEMBlock(keyBlock, k.kekData.KEK)
if err != nil {
return nil, ErrInvalidKEK{Wrapped: err}
}
+
+ // change header only if its pkcs8
+ if keyBlock.Type == "ENCRYPTED PRIVATE KEY" {
+ keyBlock.Type = "PRIVATE KEY"
+ }
+
// remove encryption PEM headers
headers := make(map[string]string)
mergePEMHeaders(headers, keyBlock.Headers)
@@ -342,15 +349,11 @@
// writing it to disk. If the kek is nil, writes it to disk unencrypted.
func (k *KeyReadWriter) writeKey(keyBlock *pem.Block, kekData KEKData, pkh PEMKeyHeaders) error {
if kekData.KEK != nil {
- encryptedPEMBlock, err := x509.EncryptPEMBlock(cryptorand.Reader,
- keyBlock.Type,
- keyBlock.Bytes,
- kekData.KEK,
- x509.PEMCipherAES256)
+ encryptedPEMBlock, err := keyutils.EncryptPEMBlock(keyBlock.Bytes, kekData.KEK)
if err != nil {
return err
}
- if encryptedPEMBlock.Headers == nil {
+ if !keyutils.IsEncryptedPEMBlock(encryptedPEMBlock) {
return errors.New("unable to encrypt key - invalid PEM file produced")
}
keyBlock = encryptedPEMBlock
@@ -373,6 +376,48 @@
return nil
}
+// DowngradeKey converts the PKCS#8 key to PKCS#1 format and save it
+func (k *KeyReadWriter) DowngradeKey() error {
+ _, key, err := k.Read()
+ if err != nil {
+ return err
+ }
+
+ oldBlock, _ := pem.Decode(key)
+ if oldBlock == nil {
+ return errors.New("invalid PEM-encoded private key")
+ }
+
+ // stop if the key is already downgraded to pkcs1
+ if !keyutils.IsPKCS8(oldBlock.Bytes) {
+ return errors.New("key is already downgraded to PKCS#1")
+ }
+
+ eckey, err := pkcs8.ConvertToECPrivateKeyPEM(key)
+ if err != nil {
+ return err
+ }
+
+ newBlock, _ := pem.Decode(eckey)
+ if newBlock == nil {
+ return errors.New("invalid PEM-encoded private key")
+ }
+
+ if k.kekData.KEK != nil {
+ newBlock, err = keyutils.EncryptPEMBlock(newBlock.Bytes, k.kekData.KEK)
+ if err != nil {
+ return err
+ }
+ }
+
+ // add kek-version header back to the new key
+ newBlock.Headers[versionHeader] = strconv.FormatUint(k.kekData.Version, 10)
+ mergePEMHeaders(newBlock.Headers, oldBlock.Headers)
+
+ // do not use krw.Write as it will convert the key to pkcs8
+ return ioutils.AtomicWriteFile(k.paths.Key, pem.EncodeToMemory(newBlock), keyPerms)
+}
+
// merges one set of PEM headers onto another, excepting for key encryption value
// "proc-type" and "dek-info"
func mergePEMHeaders(original, newSet map[string]string) {
diff --git a/vendor/github.com/docker/swarmkit/ca/keyutils/keyutils.go b/vendor/github.com/docker/swarmkit/ca/keyutils/keyutils.go
new file mode 100644
index 0000000..ee6ad8f
--- /dev/null
+++ b/vendor/github.com/docker/swarmkit/ca/keyutils/keyutils.go
@@ -0,0 +1,92 @@
+// Package keyutils serves as a utility to parse, encrypt and decrypt
+// PKCS#1 and PKCS#8 private keys based on current FIPS mode status,
+// supporting only EC type keys. It always allows PKCS#8 private keys
+// and disallow PKCS#1 private keys in FIPS-mode.
+package keyutils
+
+import (
+ "crypto"
+ cryptorand "crypto/rand"
+ "crypto/x509"
+ "encoding/pem"
+ "errors"
+ "os"
+
+ "github.com/cloudflare/cfssl/helpers"
+ "github.com/docker/swarmkit/ca/pkcs8"
+)
+
+var errFIPSUnsupportedKeyFormat = errors.New("unsupported key format due to FIPS compliance")
+
+// FIPSEnvVar is the environment variable which stores FIPS mode state
+const FIPSEnvVar = "GOFIPS"
+
+// FIPSEnabled returns true when FIPS mode is enabled
+func FIPSEnabled() bool {
+ return os.Getenv(FIPSEnvVar) != ""
+}
+
+// IsPKCS8 returns true if the provided der bytes is encrypted/unencrypted PKCS#8 key
+func IsPKCS8(derBytes []byte) bool {
+ if _, err := x509.ParsePKCS8PrivateKey(derBytes); err == nil {
+ return true
+ }
+
+ return pkcs8.IsEncryptedPEMBlock(&pem.Block{
+ Type: "PRIVATE KEY",
+ Headers: nil,
+ Bytes: derBytes,
+ })
+}
+
+// ParsePrivateKeyPEMWithPassword parses an encrypted or a decrypted PKCS#1 or PKCS#8 PEM to crypto.Signer.
+// It returns an error in FIPS mode if PKCS#1 PEM bytes are passed.
+func ParsePrivateKeyPEMWithPassword(pemBytes, password []byte) (crypto.Signer, error) {
+ block, _ := pem.Decode(pemBytes)
+ if block == nil {
+ return nil, errors.New("Could not parse PEM")
+ }
+
+ if IsPKCS8(block.Bytes) {
+ return pkcs8.ParsePrivateKeyPEMWithPassword(pemBytes, password)
+ } else if FIPSEnabled() {
+ return nil, errFIPSUnsupportedKeyFormat
+ }
+
+ return helpers.ParsePrivateKeyPEMWithPassword(pemBytes, password)
+}
+
+// IsEncryptedPEMBlock checks if a PKCS#1 or PKCS#8 PEM-block is encrypted or not
+// It returns false in FIPS mode even if PKCS#1 is encrypted
+func IsEncryptedPEMBlock(block *pem.Block) bool {
+ return pkcs8.IsEncryptedPEMBlock(block) || (!FIPSEnabled() && x509.IsEncryptedPEMBlock(block))
+}
+
+// DecryptPEMBlock requires PKCS#1 or PKCS#8 PEM Block and password to decrypt and return unencrypted der []byte
+// It returns an error in FIPS mode when PKCS#1 PEM Block is passed.
+func DecryptPEMBlock(block *pem.Block, password []byte) ([]byte, error) {
+ if IsPKCS8(block.Bytes) {
+ return pkcs8.DecryptPEMBlock(block, password)
+ } else if FIPSEnabled() {
+ return nil, errFIPSUnsupportedKeyFormat
+ }
+
+ return x509.DecryptPEMBlock(block, password)
+}
+
+// EncryptPEMBlock takes DER-format bytes and password to return an encrypted PKCS#1 or PKCS#8 PEM-block
+// It returns an error in FIPS mode when PKCS#1 PEM bytes are passed.
+func EncryptPEMBlock(data, password []byte) (*pem.Block, error) {
+ if IsPKCS8(data) {
+ return pkcs8.EncryptPEMBlock(data, password)
+ } else if FIPSEnabled() {
+ return nil, errFIPSUnsupportedKeyFormat
+ }
+
+ cipherType := x509.PEMCipherAES256
+ return x509.EncryptPEMBlock(cryptorand.Reader,
+ "EC PRIVATE KEY",
+ data,
+ password,
+ cipherType)
+}
diff --git a/vendor/github.com/docker/swarmkit/ca/pkcs8/pkcs8.go b/vendor/github.com/docker/swarmkit/ca/pkcs8/pkcs8.go
new file mode 100644
index 0000000..223fc99
--- /dev/null
+++ b/vendor/github.com/docker/swarmkit/ca/pkcs8/pkcs8.go
@@ -0,0 +1,311 @@
+// Package pkcs8 implements functions to encrypt, decrypt, parse and to convert
+// EC private keys to PKCS#8 format. However this package is hard forked from
+// https://github.com/youmark/pkcs8 and modified function signatures to match
+// signatures of crypto/x509 and cloudflare/cfssl/helpers to simplify package
+// swapping. License for original package is as follow:
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2014 youmark
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+package pkcs8
+
+import (
+ "bytes"
+ "crypto"
+ "crypto/aes"
+ "crypto/cipher"
+ "crypto/rand"
+ "crypto/sha1"
+ "encoding/asn1"
+ "encoding/pem"
+ "errors"
+
+ "github.com/cloudflare/cfssl/helpers/derhelpers"
+ "golang.org/x/crypto/pbkdf2"
+)
+
+// Copy from crypto/x509
+var (
+ oidPublicKeyECDSA = asn1.ObjectIdentifier{1, 2, 840, 10045, 2, 1}
+)
+
+// Unencrypted PKCS#8
+var (
+ oidPKCS5PBKDF2 = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 5, 12}
+ oidPBES2 = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 5, 13}
+ oidAES256CBC = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 1, 42}
+)
+
+type ecPrivateKey struct {
+ Version int
+ PrivateKey []byte
+ NamedCurveOID asn1.ObjectIdentifier `asn1:"optional,explicit,tag:0"`
+ PublicKey asn1.BitString `asn1:"optional,explicit,tag:1"`
+}
+
+type privateKeyInfo struct {
+ Version int
+ PrivateKeyAlgorithm []asn1.ObjectIdentifier
+ PrivateKey []byte
+}
+
+// Encrypted PKCS8
+type pbkdf2Params struct {
+ Salt []byte
+ IterationCount int
+}
+
+type pbkdf2Algorithms struct {
+ IDPBKDF2 asn1.ObjectIdentifier
+ PBKDF2Params pbkdf2Params
+}
+
+type pbkdf2Encs struct {
+ EncryAlgo asn1.ObjectIdentifier
+ IV []byte
+}
+
+type pbes2Params struct {
+ KeyDerivationFunc pbkdf2Algorithms
+ EncryptionScheme pbkdf2Encs
+}
+
+type pbes2Algorithms struct {
+ IDPBES2 asn1.ObjectIdentifier
+ PBES2Params pbes2Params
+}
+
+type encryptedPrivateKeyInfo struct {
+ EncryptionAlgorithm pbes2Algorithms
+ EncryptedData []byte
+}
+
+// ParsePrivateKeyPEMWithPassword parses an encrypted or a decrypted PKCS#8 PEM to crypto.signer
+func ParsePrivateKeyPEMWithPassword(pemBytes, password []byte) (crypto.Signer, error) {
+ block, _ := pem.Decode(pemBytes)
+ if block == nil {
+ return nil, errors.New("invalid pem file")
+ }
+
+ var (
+ der []byte
+ err error
+ )
+ der = block.Bytes
+
+ if ok := IsEncryptedPEMBlock(block); ok {
+ der, err = DecryptPEMBlock(block, password)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ return derhelpers.ParsePrivateKeyDER(der)
+}
+
+// IsEncryptedPEMBlock checks if a PKCS#8 PEM-block is encrypted or not
+func IsEncryptedPEMBlock(block *pem.Block) bool {
+ der := block.Bytes
+
+ var privKey encryptedPrivateKeyInfo
+ if _, err := asn1.Unmarshal(der, &privKey); err != nil {
+ return false
+ }
+
+ return true
+}
+
+// DecryptPEMBlock requires PKCS#8 PEM Block and password to decrypt and return unencrypted der []byte
+func DecryptPEMBlock(block *pem.Block, password []byte) ([]byte, error) {
+ der := block.Bytes
+
+ var privKey encryptedPrivateKeyInfo
+ if _, err := asn1.Unmarshal(der, &privKey); err != nil {
+ return nil, errors.New("pkcs8: only PKCS #5 v2.0 supported")
+ }
+
+ if !privKey.EncryptionAlgorithm.IDPBES2.Equal(oidPBES2) {
+ return nil, errors.New("pkcs8: only PBES2 supported")
+ }
+
+ if !privKey.EncryptionAlgorithm.PBES2Params.KeyDerivationFunc.IDPBKDF2.Equal(oidPKCS5PBKDF2) {
+ return nil, errors.New("pkcs8: only PBKDF2 supported")
+ }
+
+ encParam := privKey.EncryptionAlgorithm.PBES2Params.EncryptionScheme
+ kdfParam := privKey.EncryptionAlgorithm.PBES2Params.KeyDerivationFunc.PBKDF2Params
+
+ switch {
+ case encParam.EncryAlgo.Equal(oidAES256CBC):
+ iv := encParam.IV
+ salt := kdfParam.Salt
+ iter := kdfParam.IterationCount
+
+ encryptedKey := privKey.EncryptedData
+ symkey := pbkdf2.Key(password, salt, iter, 32, sha1.New)
+ block, err := aes.NewCipher(symkey)
+ if err != nil {
+ return nil, err
+ }
+ mode := cipher.NewCBCDecrypter(block, iv)
+ mode.CryptBlocks(encryptedKey, encryptedKey)
+
+ if _, err := derhelpers.ParsePrivateKeyDER(encryptedKey); err != nil {
+ return nil, errors.New("pkcs8: incorrect password")
+ }
+
+ // Remove padding from key as it might be used to encode to memory as pem
+ keyLen := len(encryptedKey)
+ padLen := int(encryptedKey[keyLen-1])
+ if padLen > keyLen || padLen > aes.BlockSize {
+ return nil, errors.New("pkcs8: invalid padding size")
+ }
+ encryptedKey = encryptedKey[:keyLen-padLen]
+
+ return encryptedKey, nil
+ default:
+ return nil, errors.New("pkcs8: only AES-256-CBC supported")
+ }
+}
+
+func encryptPrivateKey(pkey, password []byte) ([]byte, error) {
+ // Calculate key from password based on PKCS5 algorithm
+ // Use 8 byte salt, 16 byte IV, and 2048 iteration
+ iter := 2048
+ salt := make([]byte, 8)
+ iv := make([]byte, 16)
+
+ if _, err := rand.Reader.Read(salt); err != nil {
+ return nil, err
+ }
+
+ if _, err := rand.Reader.Read(iv); err != nil {
+ return nil, err
+ }
+
+ key := pbkdf2.Key(password, salt, iter, 32, sha1.New)
+
+ // Use AES256-CBC mode, pad plaintext with PKCS5 padding scheme
+ n := len(pkey)
+ padLen := aes.BlockSize - n%aes.BlockSize
+ if padLen > 0 {
+ padValue := []byte{byte(padLen)}
+ padding := bytes.Repeat(padValue, padLen)
+ pkey = append(pkey, padding...)
+ }
+
+ encryptedKey := make([]byte, len(pkey))
+ block, err := aes.NewCipher(key)
+ if err != nil {
+ return nil, err
+ }
+ mode := cipher.NewCBCEncrypter(block, iv)
+ mode.CryptBlocks(encryptedKey, pkey)
+
+ pbkdf2algo := pbkdf2Algorithms{oidPKCS5PBKDF2, pbkdf2Params{salt, iter}}
+ pbkdf2encs := pbkdf2Encs{oidAES256CBC, iv}
+ pbes2algo := pbes2Algorithms{oidPBES2, pbes2Params{pbkdf2algo, pbkdf2encs}}
+
+ encryptedPkey := encryptedPrivateKeyInfo{pbes2algo, encryptedKey}
+ return asn1.Marshal(encryptedPkey)
+}
+
+// EncryptPEMBlock takes DER-format bytes and password to return an encrypted PKCS#8 PEM-block
+func EncryptPEMBlock(data, password []byte) (*pem.Block, error) {
+ encryptedBytes, err := encryptPrivateKey(data, password)
+ if err != nil {
+ return nil, err
+ }
+
+ return &pem.Block{
+ Type: "ENCRYPTED PRIVATE KEY",
+ Headers: map[string]string{},
+ Bytes: encryptedBytes,
+ }, nil
+}
+
+// ConvertECPrivateKeyPEM takes an EC Private Key as input and returns PKCS#8 version of it
+func ConvertECPrivateKeyPEM(inPEM []byte) ([]byte, error) {
+ block, _ := pem.Decode(inPEM)
+ if block == nil {
+ return nil, errors.New("invalid pem bytes")
+ }
+
+ var ecPrivKey ecPrivateKey
+ if _, err := asn1.Unmarshal(block.Bytes, &ecPrivKey); err != nil {
+ return nil, errors.New("invalid ec private key")
+ }
+
+ var pkey privateKeyInfo
+ pkey.Version = 0
+ pkey.PrivateKeyAlgorithm = make([]asn1.ObjectIdentifier, 2)
+ pkey.PrivateKeyAlgorithm[0] = oidPublicKeyECDSA
+ pkey.PrivateKeyAlgorithm[1] = ecPrivKey.NamedCurveOID
+
+ // remove curve oid from private bytes as it is already mentioned in algorithm
+ ecPrivKey.NamedCurveOID = nil
+
+ privatekey, err := asn1.Marshal(ecPrivKey)
+ if err != nil {
+ return nil, err
+ }
+ pkey.PrivateKey = privatekey
+
+ der, err := asn1.Marshal(pkey)
+ if err != nil {
+ return nil, err
+ }
+
+ return pem.EncodeToMemory(&pem.Block{
+ Type: "PRIVATE KEY",
+ Bytes: der,
+ }), nil
+}
+
+// ConvertToECPrivateKeyPEM takes an unencrypted PKCS#8 PEM and converts it to
+// EC Private Key
+func ConvertToECPrivateKeyPEM(inPEM []byte) ([]byte, error) {
+ block, _ := pem.Decode(inPEM)
+ if block == nil {
+ return nil, errors.New("invalid pem bytes")
+ }
+
+ var pkey privateKeyInfo
+ if _, err := asn1.Unmarshal(block.Bytes, &pkey); err != nil {
+ return nil, errors.New("invalid pkcs8 key")
+ }
+
+ var ecPrivKey ecPrivateKey
+ if _, err := asn1.Unmarshal(pkey.PrivateKey, &ecPrivKey); err != nil {
+ return nil, errors.New("invalid private key")
+ }
+
+ ecPrivKey.NamedCurveOID = pkey.PrivateKeyAlgorithm[1]
+ key, err := asn1.Marshal(ecPrivKey)
+ if err != nil {
+ return nil, err
+ }
+
+ return pem.EncodeToMemory(&pem.Block{
+ Type: "EC PRIVATE KEY",
+ Bytes: key,
+ }), nil
+}
diff --git a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go b/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go
index b89e72e..2d533a4 100644
--- a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go
+++ b/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/networkallocator.go
@@ -15,6 +15,7 @@
"github.com/docker/swarmkit/log"
"github.com/docker/swarmkit/manager/allocator/networkallocator"
"github.com/pkg/errors"
+ "github.com/sirupsen/logrus"
"golang.org/x/net/context"
)
@@ -244,6 +245,7 @@
}
for _, nAttach := range specNetworks {
if nAttach.Target == eAttach.NetworkID {
+ log.L.WithFields(logrus.Fields{"service_id": s.ID, "vip": eAttach.Addr}).Debug("allocate vip")
if err = na.allocateVIP(eAttach); err != nil {
return err
}
diff --git a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/portallocator.go b/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/portallocator.go
index 7f3f1c1..113f900 100644
--- a/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/portallocator.go
+++ b/vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/portallocator.go
@@ -105,7 +105,7 @@
func newPortAllocator() (*portAllocator, error) {
portSpaces := make(map[api.PortConfig_Protocol]*portSpace)
- for _, protocol := range []api.PortConfig_Protocol{api.ProtocolTCP, api.ProtocolUDP} {
+ for _, protocol := range []api.PortConfig_Protocol{api.ProtocolTCP, api.ProtocolUDP, api.ProtocolSCTP} {
ps, err := newPortSpace(protocol)
if err != nil {
return nil, err
diff --git a/vendor/github.com/docker/swarmkit/manager/allocator/network.go b/vendor/github.com/docker/swarmkit/manager/allocator/network.go
index ac798c9..aee0387 100644
--- a/vendor/github.com/docker/swarmkit/manager/allocator/network.go
+++ b/vendor/github.com/docker/swarmkit/manager/allocator/network.go
@@ -244,7 +244,7 @@
break
}
- if err := a.allocateService(ctx, s); err != nil {
+ if err := a.allocateService(ctx, s, false); err != nil {
log.G(ctx).WithError(err).Errorf("Failed allocation for service %s", s.ID)
break
}
@@ -274,7 +274,7 @@
}
updatePortsInHostPublishMode(s)
} else {
- if err := a.allocateService(ctx, s); err != nil {
+ if err := a.allocateService(ctx, s, false); err != nil {
log.G(ctx).WithError(err).Errorf("Failed allocation during update of service %s", s.ID)
break
}
@@ -587,8 +587,8 @@
continue
}
- if err := a.allocateService(ctx, s); err != nil {
- log.G(ctx).WithError(err).Errorf("failed allocating service %s during init", s.ID)
+ if err := a.allocateService(ctx, s, existingAddressesOnly); err != nil {
+ log.G(ctx).WithField("existingAddressesOnly", existingAddressesOnly).WithError(err).Errorf("failed allocating service %s during init", s.ID)
continue
}
allocatedServices = append(allocatedServices, s)
@@ -940,7 +940,10 @@
s.Endpoint.Spec = s.Spec.Endpoint.Copy()
}
-func (a *Allocator) allocateService(ctx context.Context, s *api.Service) error {
+// allocateService takes care to align the desired state with the spec passed
+// the last parameter is true only during restart when the data is read from raft
+// and used to build internal state
+func (a *Allocator) allocateService(ctx context.Context, s *api.Service, existingAddressesOnly bool) error {
nc := a.netCtx
if s.Spec.Endpoint != nil {
@@ -972,7 +975,9 @@
&api.Endpoint_VirtualIP{NetworkID: nc.ingressNetwork.ID})
}
}
- } else if s.Endpoint != nil {
+ } else if s.Endpoint != nil && !existingAddressesOnly {
+ // if we are in the restart phase there is no reason to try to deallocate anything because the state
+ // is not there
// service has no user-defined endpoints while has already allocated network resources,
// need deallocated.
if err := nc.nwkAllocator.DeallocateService(s); err != nil {
@@ -1188,7 +1193,7 @@
var allocatedServices []*api.Service
for _, s := range nc.unallocatedServices {
if !nc.nwkAllocator.IsServiceAllocated(s) {
- if err := a.allocateService(ctx, s); err != nil {
+ if err := a.allocateService(ctx, s, false); err != nil {
log.G(ctx).WithError(err).Debugf("Failed allocation of unallocated service %s", s.ID)
continue
}
diff --git a/vendor/github.com/docker/swarmkit/manager/controlapi/task.go b/vendor/github.com/docker/swarmkit/manager/controlapi/task.go
index 51b7bf8..dc56e74 100644
--- a/vendor/github.com/docker/swarmkit/manager/controlapi/task.go
+++ b/vendor/github.com/docker/swarmkit/manager/controlapi/task.go
@@ -155,7 +155,8 @@
return false
}
- return !orchestrator.IsTaskDirty(service, e)
+ n := store.GetNode(tx, e.NodeID)
+ return !orchestrator.IsTaskDirty(service, e, n)
},
)
})
diff --git a/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go b/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go
index 12c2a81..bf48818 100644
--- a/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go
+++ b/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go
@@ -125,8 +125,12 @@
// Dispatcher is responsible for dispatching tasks and tracking agent health.
type Dispatcher struct {
- mu sync.Mutex
- wg sync.WaitGroup
+ // mu is a lock to provide mutually exclusive access to dispatcher fields
+ // e.g. lastSeenManagers, networkBootstrapKeys, lastSeenRootCert etc.
+ mu sync.Mutex
+ // shutdownWait is used by stop() to wait for existing operations to finish.
+ shutdownWait sync.WaitGroup
+
nodes *nodeStore
store *store.MemoryStore
lastSeenManagers []*api.WeightedPeer
@@ -249,8 +253,11 @@
defer cancel()
d.ctx, d.cancel = context.WithCancel(ctx)
ctx = d.ctx
- d.wg.Add(1)
- defer d.wg.Done()
+
+ // If Stop() is called, it should wait
+ // for Run() to complete.
+ d.shutdownWait.Add(1)
+ defer d.shutdownWait.Done()
d.mu.Unlock()
publishManagers := func(peers []*api.Peer) {
@@ -313,11 +320,14 @@
return errors.New("dispatcher is already stopped")
}
- log := log.G(d.ctx).WithField("method", "(*Dispatcher).Stop")
- log.Info("dispatcher stopping")
+ // Cancel dispatcher context.
+ // This should also close the the streams in Tasks(), Assignments().
d.cancel()
d.mu.Unlock()
+ // Wait for the RPCs that are in-progress to finish.
+ d.shutdownWait.Wait()
+
d.nodes.Clean()
d.processUpdatesLock.Lock()
@@ -328,9 +338,6 @@
d.processUpdatesLock.Unlock()
d.clusterUpdateQueue.Close()
-
- d.wg.Wait()
-
return nil
}
@@ -478,13 +485,13 @@
// register is used for registration of node with particular dispatcher.
func (d *Dispatcher) register(ctx context.Context, nodeID string, description *api.NodeDescription) (string, error) {
- logLocal := log.G(ctx).WithField("method", "(*Dispatcher).register")
- // prevent register until we're ready to accept it
dctx, err := d.isRunningLocked()
if err != nil {
return "", err
}
+ logLocal := log.G(ctx).WithField("method", "(*Dispatcher).register")
+
if err := d.nodes.CheckRateLimit(nodeID); err != nil {
return "", err
}
@@ -532,6 +539,21 @@
// UpdateTaskStatus updates status of task. Node should send such updates
// on every status change of its tasks.
func (d *Dispatcher) UpdateTaskStatus(ctx context.Context, r *api.UpdateTaskStatusRequest) (*api.UpdateTaskStatusResponse, error) {
+ // shutdownWait.Add() followed by isRunning() to ensures that
+ // if this rpc sees the dispatcher running,
+ // it will already have called Add() on the shutdownWait wait,
+ // which ensures that Stop() will wait for this rpc to complete.
+ // Note that Stop() first does Dispatcher.ctx.cancel() followed by
+ // shutdownWait.Wait() to make sure new rpc's don't start before waiting
+ // for existing ones to finish.
+ d.shutdownWait.Add(1)
+ defer d.shutdownWait.Done()
+
+ dctx, err := d.isRunningLocked()
+ if err != nil {
+ return nil, err
+ }
+
nodeInfo, err := ca.RemoteNode(ctx)
if err != nil {
return nil, err
@@ -547,11 +569,6 @@
}
log := log.G(ctx).WithFields(fields)
- dctx, err := d.isRunningLocked()
- if err != nil {
- return nil, err
- }
-
if _, err := d.nodes.GetWithSession(nodeID, r.SessionID); err != nil {
return nil, err
}
@@ -723,17 +740,27 @@
// of tasks which should be run on node, if task is not present in that list,
// it should be terminated.
func (d *Dispatcher) Tasks(r *api.TasksRequest, stream api.Dispatcher_TasksServer) error {
- nodeInfo, err := ca.RemoteNode(stream.Context())
- if err != nil {
- return err
- }
- nodeID := nodeInfo.NodeID
+ // shutdownWait.Add() followed by isRunning() to ensures that
+ // if this rpc sees the dispatcher running,
+ // it will already have called Add() on the shutdownWait wait,
+ // which ensures that Stop() will wait for this rpc to complete.
+ // Note that Stop() first does Dispatcher.ctx.cancel() followed by
+ // shutdownWait.Wait() to make sure new rpc's don't start before waiting
+ // for existing ones to finish.
+ d.shutdownWait.Add(1)
+ defer d.shutdownWait.Done()
dctx, err := d.isRunningLocked()
if err != nil {
return err
}
+ nodeInfo, err := ca.RemoteNode(stream.Context())
+ if err != nil {
+ return err
+ }
+ nodeID := nodeInfo.NodeID
+
fields := logrus.Fields{
"node.id": nodeID,
"node.session": r.SessionID,
@@ -846,17 +873,27 @@
// Assignments is a stream of assignments for a node. Each message contains
// either full list of tasks and secrets for the node, or an incremental update.
func (d *Dispatcher) Assignments(r *api.AssignmentsRequest, stream api.Dispatcher_AssignmentsServer) error {
- nodeInfo, err := ca.RemoteNode(stream.Context())
- if err != nil {
- return err
- }
- nodeID := nodeInfo.NodeID
+ // shutdownWait.Add() followed by isRunning() to ensures that
+ // if this rpc sees the dispatcher running,
+ // it will already have called Add() on the shutdownWait wait,
+ // which ensures that Stop() will wait for this rpc to complete.
+ // Note that Stop() first does Dispatcher.ctx.cancel() followed by
+ // shutdownWait.Wait() to make sure new rpc's don't start before waiting
+ // for existing ones to finish.
+ d.shutdownWait.Add(1)
+ defer d.shutdownWait.Done()
dctx, err := d.isRunningLocked()
if err != nil {
return err
}
+ nodeInfo, err := ca.RemoteNode(stream.Context())
+ if err != nil {
+ return err
+ }
+ nodeID := nodeInfo.NodeID
+
fields := logrus.Fields{
"node.id": nodeID,
"node.session": r.SessionID,
@@ -1103,6 +1140,24 @@
// Node should send new heartbeat earlier than now + TTL, otherwise it will
// be deregistered from dispatcher and its status will be updated to NodeStatus_DOWN
func (d *Dispatcher) Heartbeat(ctx context.Context, r *api.HeartbeatRequest) (*api.HeartbeatResponse, error) {
+ // shutdownWait.Add() followed by isRunning() to ensures that
+ // if this rpc sees the dispatcher running,
+ // it will already have called Add() on the shutdownWait wait,
+ // which ensures that Stop() will wait for this rpc to complete.
+ // Note that Stop() first does Dispatcher.ctx.cancel() followed by
+ // shutdownWait.Wait() to make sure new rpc's don't start before waiting
+ // for existing ones to finish.
+ d.shutdownWait.Add(1)
+ defer d.shutdownWait.Done()
+
+ // isRunningLocked() is not needed since its OK if
+ // the dispatcher context is cancelled while this call is in progress
+ // since Stop() which cancels the dispatcher context will wait for
+ // Heartbeat() to complete.
+ if !d.isRunning() {
+ return nil, status.Errorf(codes.Aborted, "dispatcher is stopped")
+ }
+
nodeInfo, err := ca.RemoteNode(ctx)
if err != nil {
return nil, err
@@ -1137,6 +1192,21 @@
// a special boolean field Disconnect which if true indicates that node should
// reconnect to another Manager immediately.
func (d *Dispatcher) Session(r *api.SessionRequest, stream api.Dispatcher_SessionServer) error {
+ // shutdownWait.Add() followed by isRunning() to ensures that
+ // if this rpc sees the dispatcher running,
+ // it will already have called Add() on the shutdownWait wait,
+ // which ensures that Stop() will wait for this rpc to complete.
+ // Note that Stop() first does Dispatcher.ctx.cancel() followed by
+ // shutdownWait.Wait() to make sure new rpc's don't start before waiting
+ // for existing ones to finish.
+ d.shutdownWait.Add(1)
+ defer d.shutdownWait.Done()
+
+ dctx, err := d.isRunningLocked()
+ if err != nil {
+ return err
+ }
+
ctx := stream.Context()
nodeInfo, err := ca.RemoteNode(ctx)
if err != nil {
@@ -1144,11 +1214,6 @@
}
nodeID := nodeInfo.NodeID
- dctx, err := d.isRunningLocked()
- if err != nil {
- return err
- }
-
var sessionID string
if _, err := d.nodes.GetWithSession(nodeID, r.SessionID); err != nil {
// register the node.
diff --git a/vendor/github.com/docker/swarmkit/manager/manager.go b/vendor/github.com/docker/swarmkit/manager/manager.go
index 1ce727d..84716b3 100644
--- a/vendor/github.com/docker/swarmkit/manager/manager.go
+++ b/vendor/github.com/docker/swarmkit/manager/manager.go
@@ -2,7 +2,6 @@
import (
"crypto/tls"
- "crypto/x509"
"encoding/pem"
"fmt"
"net"
@@ -13,12 +12,12 @@
"syscall"
"time"
- "github.com/cloudflare/cfssl/helpers"
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/go-events"
gmetrics "github.com/docker/go-metrics"
"github.com/docker/swarmkit/api"
"github.com/docker/swarmkit/ca"
+ "github.com/docker/swarmkit/ca/keyutils"
"github.com/docker/swarmkit/connectionbroker"
"github.com/docker/swarmkit/identity"
"github.com/docker/swarmkit/log"
@@ -817,10 +816,10 @@
return fmt.Errorf("invalid PEM-encoded private key inside of cluster %s", clusterID)
}
- if x509.IsEncryptedPEMBlock(keyBlock) {
+ if keyutils.IsEncryptedPEMBlock(keyBlock) {
// PEM encryption does not have a digest, so sometimes decryption doesn't
// error even with the wrong passphrase. So actually try to parse it into a valid key.
- _, err := helpers.ParsePrivateKeyPEMWithPassword(privKeyPEM, []byte(passphrase))
+ _, err := keyutils.ParsePrivateKeyPEMWithPassword(privKeyPEM, []byte(passphrase))
if err == nil {
// This key is already correctly encrypted with the correct KEK, nothing to do here
return nil
@@ -829,7 +828,7 @@
// This key is already encrypted, but failed with current main passphrase.
// Let's try to decrypt with the previous passphrase, and parse into a valid key, for the
// same reason as above.
- _, err = helpers.ParsePrivateKeyPEMWithPassword(privKeyPEM, []byte(passphrasePrev))
+ _, err = keyutils.ParsePrivateKeyPEMWithPassword(privKeyPEM, []byte(passphrasePrev))
if err != nil {
// We were not able to decrypt either with the main or backup passphrase, error
return err
@@ -837,7 +836,7 @@
// ok the above passphrase is correct, so decrypt the PEM block so we can re-encrypt -
// since the key was successfully decrypted above, there will be no error doing PEM
// decryption
- unencryptedDER, _ := x509.DecryptPEMBlock(keyBlock, []byte(passphrasePrev))
+ unencryptedDER, _ := keyutils.DecryptPEMBlock(keyBlock, []byte(passphrasePrev))
unencryptedKeyBlock := &pem.Block{
Type: keyBlock.Type,
Bytes: unencryptedDER,
diff --git a/vendor/github.com/docker/swarmkit/manager/orchestrator/global/global.go b/vendor/github.com/docker/swarmkit/manager/orchestrator/global/global.go
index f6217ff..2b20813 100644
--- a/vendor/github.com/docker/swarmkit/manager/orchestrator/global/global.go
+++ b/vendor/github.com/docker/swarmkit/manager/orchestrator/global/global.go
@@ -463,7 +463,7 @@
)
for _, t := range tasks[serviceID] {
- if orchestrator.IsTaskDirty(service.Service, t) {
+ if orchestrator.IsTaskDirty(service.Service, t, node) {
dirtyTasks = append(dirtyTasks, t)
} else {
cleanTasks = append(cleanTasks, t)
diff --git a/vendor/github.com/docker/swarmkit/manager/orchestrator/task.go b/vendor/github.com/docker/swarmkit/manager/orchestrator/task.go
index ebfeee2..8173dbd 100644
--- a/vendor/github.com/docker/swarmkit/manager/orchestrator/task.go
+++ b/vendor/github.com/docker/swarmkit/manager/orchestrator/task.go
@@ -7,6 +7,7 @@
"github.com/docker/swarmkit/api"
"github.com/docker/swarmkit/api/defaults"
"github.com/docker/swarmkit/identity"
+ "github.com/docker/swarmkit/manager/constraint"
"github.com/docker/swarmkit/protobuf/ptypes"
)
@@ -58,8 +59,17 @@
return restartCondition
}
-// IsTaskDirty determines whether a task matches the given service's spec.
-func IsTaskDirty(s *api.Service, t *api.Task) bool {
+// IsTaskDirty determines whether a task matches the given service's spec and
+// if the given node satisfies the placement constraints.
+// Returns false if the spec version didn't change,
+// only the task placement constraints changed and the assigned node
+// satisfies the new constraints, or the service task spec and the endpoint spec
+// didn't change at all.
+// Returns true otherwise.
+// Note: for non-failed tasks with a container spec runtime that have already
+// pulled the required image (i.e., current state is between READY and
+// RUNNING inclusively), the value of the `PullOptions` is ignored.
+func IsTaskDirty(s *api.Service, t *api.Task, n *api.Node) bool {
// If the spec version matches, we know the task is not dirty. However,
// if it does not match, that doesn't mean the task is dirty, since
// only a portion of the spec is included in the comparison.
@@ -70,6 +80,12 @@
// Make a deep copy of the service and task spec for the comparison.
serviceTaskSpec := *s.Spec.Task.Copy()
+ // Task is not dirty if the placement constraints alone changed
+ // and the node currently assigned can satisfy the changed constraints.
+ if IsTaskDirtyPlacementConstraintsOnly(serviceTaskSpec, t) && nodeMatches(s, n) {
+ return false
+ }
+
// For non-failed tasks with a container spec runtime that have already
// pulled the required image (i.e., current state is between READY and
// RUNNING inclusively), ignore the value of the `PullOptions` field by
@@ -83,7 +99,9 @@
// and its last known current state is between READY and RUNNING in
// which case we know that the task either successfully pulled its
// container image or didn't need to.
- ignorePullOpts := t.DesiredState <= api.TaskStateRunning && currentState >= api.TaskStateReady && currentState <= api.TaskStateRunning
+ ignorePullOpts := t.DesiredState <= api.TaskStateRunning &&
+ currentState >= api.TaskStateReady &&
+ currentState <= api.TaskStateRunning
if ignorePullOpts && serviceTaskSpec.GetContainer() != nil && t.Spec.GetContainer() != nil {
// Modify the service's container spec.
serviceTaskSpec.GetContainer().PullOptions = t.Spec.GetContainer().PullOptions
@@ -93,6 +111,31 @@
(t.Endpoint != nil && !reflect.DeepEqual(s.Spec.Endpoint, t.Endpoint.Spec))
}
+// Checks if the current assigned node matches the Placement.Constraints
+// specified in the task spec for Updater.newService.
+func nodeMatches(s *api.Service, n *api.Node) bool {
+ if n == nil {
+ return false
+ }
+
+ constraints, _ := constraint.Parse(s.Spec.Task.Placement.Constraints)
+ return constraint.NodeMatches(constraints, n)
+}
+
+// IsTaskDirtyPlacementConstraintsOnly checks if the Placement field alone
+// in the spec has changed.
+func IsTaskDirtyPlacementConstraintsOnly(serviceTaskSpec api.TaskSpec, t *api.Task) bool {
+ // Compare the task placement constraints.
+ if reflect.DeepEqual(serviceTaskSpec.Placement, t.Spec.Placement) {
+ return false
+ }
+
+ // Update spec placement to only the fields
+ // other than the placement constraints in the spec.
+ serviceTaskSpec.Placement = t.Spec.Placement
+ return reflect.DeepEqual(serviceTaskSpec, t.Spec)
+}
+
// InvalidNode is true if the node is nil, down, or drained
func InvalidNode(n *api.Node) bool {
return n == nil ||
diff --git a/vendor/github.com/docker/swarmkit/manager/orchestrator/taskreaper/task_reaper.go b/vendor/github.com/docker/swarmkit/manager/orchestrator/taskreaper/task_reaper.go
index d702783..88e353b 100644
--- a/vendor/github.com/docker/swarmkit/manager/orchestrator/taskreaper/task_reaper.go
+++ b/vendor/github.com/docker/swarmkit/manager/orchestrator/taskreaper/task_reaper.go
@@ -2,6 +2,7 @@
import (
"sort"
+ "sync"
"time"
"github.com/docker/swarmkit/api"
@@ -24,6 +25,9 @@
type TaskReaper struct {
store *store.MemoryStore
+ // closeOnce ensures that stopChan is closed only once
+ closeOnce sync.Once
+
// taskHistory is the number of tasks to keep
taskHistory int64
@@ -281,9 +285,14 @@
}
// Stop stops the TaskReaper and waits for the main loop to exit.
+// Stop can be called in two cases. One when the manager is
+// shutting down, and the other when the manager (the leader) is
+// becoming a follower. Since these two instances could race with
+// each other, we use closeOnce here to ensure that TaskReaper.Stop()
+// is called only once to avoid a panic.
func (tr *TaskReaper) Stop() {
- // TODO(dperny) calling stop on the task reaper twice will cause a panic
- // because we try to close a channel that will already have been closed.
- close(tr.stopChan)
+ tr.closeOnce.Do(func() {
+ close(tr.stopChan)
+ })
<-tr.doneChan
}
diff --git a/vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go b/vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go
index f7e4ff5..5a7d612 100644
--- a/vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go
+++ b/vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go
@@ -521,7 +521,11 @@
}
func (u *Updater) isTaskDirty(t *api.Task) bool {
- return orchestrator.IsTaskDirty(u.newService, t)
+ var n *api.Node
+ u.store.View(func(tx store.ReadTx) {
+ n = store.GetNode(tx, t.NodeID)
+ })
+ return orchestrator.IsTaskDirty(u.newService, t, n)
}
func (u *Updater) isSlotDirty(slot orchestrator.Slot) bool {
diff --git a/vendor/github.com/docker/swarmkit/node/node.go b/vendor/github.com/docker/swarmkit/node/node.go
index adad42b..d7b6011 100644
--- a/vendor/github.com/docker/swarmkit/node/node.go
+++ b/vendor/github.com/docker/swarmkit/node/node.go
@@ -971,6 +971,15 @@
}
}
+// DowngradeKey reverts the node key to older format so that it can
+// run on older version of swarmkit
+func (n *Node) DowngradeKey() error {
+ paths := ca.NewConfigPaths(filepath.Join(n.config.StateDir, certDirectory))
+ krw := ca.NewKeyReadWriter(paths.Node, n.config.UnlockKey, nil)
+
+ return krw.DowngradeKey()
+}
+
type persistentRemotes struct {
sync.RWMutex
c *sync.Cond
diff --git a/vendor/github.com/ishidawataru/sctp/LICENSE b/vendor/github.com/ishidawataru/sctp/LICENSE
new file mode 100644
index 0000000..8dada3e
--- /dev/null
+++ b/vendor/github.com/ishidawataru/sctp/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/vendor/github.com/ishidawataru/sctp/README.md b/vendor/github.com/ishidawataru/sctp/README.md
new file mode 100644
index 0000000..574ecec
--- /dev/null
+++ b/vendor/github.com/ishidawataru/sctp/README.md
@@ -0,0 +1,18 @@
+Stream Control Transmission Protocol (SCTP)
+----
+
+[](https://travis-ci.org/ishidawataru/sctp/builds)
+
+Examples
+----
+
+See `example/sctp.go`
+
+```go
+$ cd example
+$ go build
+$ # run example SCTP server
+$ ./example -server -port 1000 -ip 10.10.0.1,10.20.0.1
+$ # run example SCTP client
+$ ./example -port 1000 -ip 10.10.0.1,10.20.0.1
+```
diff --git a/vendor/github.com/ishidawataru/sctp/sctp.go b/vendor/github.com/ishidawataru/sctp/sctp.go
new file mode 100644
index 0000000..cac1a88
--- /dev/null
+++ b/vendor/github.com/ishidawataru/sctp/sctp.go
@@ -0,0 +1,656 @@
+package sctp
+
+import (
+ "bytes"
+ "encoding/binary"
+ "fmt"
+ "net"
+ "strconv"
+ "strings"
+ "sync"
+ "sync/atomic"
+ "syscall"
+ "time"
+ "unsafe"
+)
+
+const (
+ SOL_SCTP = 132
+
+ SCTP_BINDX_ADD_ADDR = 0x01
+ SCTP_BINDX_REM_ADDR = 0x02
+
+ MSG_NOTIFICATION = 0x8000
+)
+
+const (
+ SCTP_RTOINFO = iota
+ SCTP_ASSOCINFO
+ SCTP_INITMSG
+ SCTP_NODELAY
+ SCTP_AUTOCLOSE
+ SCTP_SET_PEER_PRIMARY_ADDR
+ SCTP_PRIMARY_ADDR
+ SCTP_ADAPTATION_LAYER
+ SCTP_DISABLE_FRAGMENTS
+ SCTP_PEER_ADDR_PARAMS
+ SCTP_DEFAULT_SENT_PARAM
+ SCTP_EVENTS
+ SCTP_I_WANT_MAPPED_V4_ADDR
+ SCTP_MAXSEG
+ SCTP_STATUS
+ SCTP_GET_PEER_ADDR_INFO
+ SCTP_DELAYED_ACK_TIME
+ SCTP_DELAYED_ACK = SCTP_DELAYED_ACK_TIME
+ SCTP_DELAYED_SACK = SCTP_DELAYED_ACK_TIME
+
+ SCTP_SOCKOPT_BINDX_ADD = 100
+ SCTP_SOCKOPT_BINDX_REM = 101
+ SCTP_SOCKOPT_PEELOFF = 102
+ SCTP_GET_PEER_ADDRS = 108
+ SCTP_GET_LOCAL_ADDRS = 109
+ SCTP_SOCKOPT_CONNECTX = 110
+ SCTP_SOCKOPT_CONNECTX3 = 111
+)
+
+const (
+ SCTP_EVENT_DATA_IO = 1 << iota
+ SCTP_EVENT_ASSOCIATION
+ SCTP_EVENT_ADDRESS
+ SCTP_EVENT_SEND_FAILURE
+ SCTP_EVENT_PEER_ERROR
+ SCTP_EVENT_SHUTDOWN
+ SCTP_EVENT_PARTIAL_DELIVERY
+ SCTP_EVENT_ADAPTATION_LAYER
+ SCTP_EVENT_AUTHENTICATION
+ SCTP_EVENT_SENDER_DRY
+
+ SCTP_EVENT_ALL = SCTP_EVENT_DATA_IO | SCTP_EVENT_ASSOCIATION | SCTP_EVENT_ADDRESS | SCTP_EVENT_SEND_FAILURE | SCTP_EVENT_PEER_ERROR | SCTP_EVENT_SHUTDOWN | SCTP_EVENT_PARTIAL_DELIVERY | SCTP_EVENT_ADAPTATION_LAYER | SCTP_EVENT_AUTHENTICATION | SCTP_EVENT_SENDER_DRY
+)
+
+type SCTPNotificationType int
+
+const (
+ SCTP_SN_TYPE_BASE = SCTPNotificationType(iota + (1 << 15))
+ SCTP_ASSOC_CHANGE
+ SCTP_PEER_ADDR_CHANGE
+ SCTP_SEND_FAILED
+ SCTP_REMOTE_ERROR
+ SCTP_SHUTDOWN_EVENT
+ SCTP_PARTIAL_DELIVERY_EVENT
+ SCTP_ADAPTATION_INDICATION
+ SCTP_AUTHENTICATION_INDICATION
+ SCTP_SENDER_DRY_EVENT
+)
+
+type NotificationHandler func([]byte) error
+
+type EventSubscribe struct {
+ DataIO uint8
+ Association uint8
+ Address uint8
+ SendFailure uint8
+ PeerError uint8
+ Shutdown uint8
+ PartialDelivery uint8
+ AdaptationLayer uint8
+ Authentication uint8
+ SenderDry uint8
+}
+
+const (
+ SCTP_CMSG_INIT = iota
+ SCTP_CMSG_SNDRCV
+ SCTP_CMSG_SNDINFO
+ SCTP_CMSG_RCVINFO
+ SCTP_CMSG_NXTINFO
+)
+
+const (
+ SCTP_UNORDERED = 1 << iota
+ SCTP_ADDR_OVER
+ SCTP_ABORT
+ SCTP_SACK_IMMEDIATELY
+ SCTP_EOF
+)
+
+const (
+ SCTP_MAX_STREAM = 0xffff
+)
+
+type InitMsg struct {
+ NumOstreams uint16
+ MaxInstreams uint16
+ MaxAttempts uint16
+ MaxInitTimeout uint16
+}
+
+type SndRcvInfo struct {
+ Stream uint16
+ SSN uint16
+ Flags uint16
+ _ uint16
+ PPID uint32
+ Context uint32
+ TTL uint32
+ TSN uint32
+ CumTSN uint32
+ AssocID int32
+}
+
+type SndInfo struct {
+ SID uint16
+ Flags uint16
+ PPID uint32
+ Context uint32
+ AssocID int32
+}
+
+type GetAddrsOld struct {
+ AssocID int32
+ AddrNum int32
+ Addrs uintptr
+}
+
+type NotificationHeader struct {
+ Type uint16
+ Flags uint16
+ Length uint32
+}
+
+type SCTPState uint16
+
+const (
+ SCTP_COMM_UP = SCTPState(iota)
+ SCTP_COMM_LOST
+ SCTP_RESTART
+ SCTP_SHUTDOWN_COMP
+ SCTP_CANT_STR_ASSOC
+)
+
+var nativeEndian binary.ByteOrder
+var sndRcvInfoSize uintptr
+
+func init() {
+ i := uint16(1)
+ if *(*byte)(unsafe.Pointer(&i)) == 0 {
+ nativeEndian = binary.BigEndian
+ } else {
+ nativeEndian = binary.LittleEndian
+ }
+ info := SndRcvInfo{}
+ sndRcvInfoSize = unsafe.Sizeof(info)
+}
+
+func toBuf(v interface{}) []byte {
+ var buf bytes.Buffer
+ binary.Write(&buf, nativeEndian, v)
+ return buf.Bytes()
+}
+
+func htons(h uint16) uint16 {
+ if nativeEndian == binary.LittleEndian {
+ return (h << 8 & 0xff00) | (h >> 8 & 0xff)
+ }
+ return h
+}
+
+var ntohs = htons
+
+func setNumOstreams(fd, num int) error {
+ param := InitMsg{
+ NumOstreams: uint16(num),
+ }
+ optlen := unsafe.Sizeof(param)
+ _, _, err := setsockopt(fd, SCTP_INITMSG, uintptr(unsafe.Pointer(¶m)), uintptr(optlen))
+ return err
+}
+
+type SCTPAddr struct {
+ IP []net.IP
+ Port int
+}
+
+func (a *SCTPAddr) ToRawSockAddrBuf() []byte {
+ buf := []byte{}
+ p := htons(uint16(a.Port))
+ for _, ip := range a.IP {
+ if ip.To4() != nil {
+ s := syscall.RawSockaddrInet4{
+ Family: syscall.AF_INET,
+ Port: p,
+ }
+ copy(s.Addr[:], ip.To4())
+ buf = append(buf, toBuf(s)...)
+ } else {
+ s := syscall.RawSockaddrInet6{
+ Family: syscall.AF_INET6,
+ Port: p,
+ }
+ copy(s.Addr[:], ip)
+ buf = append(buf, toBuf(s)...)
+ }
+ }
+ return buf
+}
+
+func (a *SCTPAddr) String() string {
+ var b bytes.Buffer
+
+ for n, i := range a.IP {
+ if a.IP[n].To4() != nil {
+ b.WriteString(i.String())
+ } else if a.IP[n].To16() != nil {
+ b.WriteRune('[')
+ b.WriteString(i.String())
+ b.WriteRune(']')
+ }
+ if n < len(a.IP)-1 {
+ b.WriteRune('/')
+ }
+ }
+ b.WriteRune(':')
+ b.WriteString(strconv.Itoa(a.Port))
+ return b.String()
+}
+
+func (a *SCTPAddr) Network() string { return "sctp" }
+
+func ResolveSCTPAddr(network, addrs string) (*SCTPAddr, error) {
+ tcpnet := ""
+ switch network {
+ case "", "sctp":
+ case "sctp4":
+ tcpnet = "tcp4"
+ case "sctp6":
+ tcpnet = "tcp6"
+ default:
+ return nil, fmt.Errorf("invalid net: %s", network)
+ }
+ elems := strings.Split(addrs, "/")
+ if len(elems) == 0 {
+ return nil, fmt.Errorf("invalid input: %s", addrs)
+ }
+ ipaddrs := make([]net.IP, 0, len(elems))
+ for _, e := range elems[:len(elems)-1] {
+ tcpa, err := net.ResolveTCPAddr(tcpnet, e+":")
+ if err != nil {
+ return nil, err
+ }
+ ipaddrs = append(ipaddrs, tcpa.IP)
+ }
+ tcpa, err := net.ResolveTCPAddr(tcpnet, elems[len(elems)-1])
+ if err != nil {
+ return nil, err
+ }
+ if tcpa.IP != nil {
+ ipaddrs = append(ipaddrs, tcpa.IP)
+ } else {
+ ipaddrs = nil
+ }
+ return &SCTPAddr{
+ IP: ipaddrs,
+ Port: tcpa.Port,
+ }, nil
+}
+
+func SCTPConnect(fd int, addr *SCTPAddr) (int, error) {
+ buf := addr.ToRawSockAddrBuf()
+ param := GetAddrsOld{
+ AddrNum: int32(len(buf)),
+ Addrs: uintptr(uintptr(unsafe.Pointer(&buf[0]))),
+ }
+ optlen := unsafe.Sizeof(param)
+ _, _, err := getsockopt(fd, SCTP_SOCKOPT_CONNECTX3, uintptr(unsafe.Pointer(¶m)), uintptr(unsafe.Pointer(&optlen)))
+ if err == nil {
+ return int(param.AssocID), nil
+ } else if err != syscall.ENOPROTOOPT {
+ return 0, err
+ }
+ r0, _, err := setsockopt(fd, SCTP_SOCKOPT_CONNECTX, uintptr(unsafe.Pointer(&buf[0])), uintptr(len(buf)))
+ return int(r0), err
+}
+
+func SCTPBind(fd int, addr *SCTPAddr, flags int) error {
+ var option uintptr
+ switch flags {
+ case SCTP_BINDX_ADD_ADDR:
+ option = SCTP_SOCKOPT_BINDX_ADD
+ case SCTP_BINDX_REM_ADDR:
+ option = SCTP_SOCKOPT_BINDX_REM
+ default:
+ return syscall.EINVAL
+ }
+
+ buf := addr.ToRawSockAddrBuf()
+ _, _, err := setsockopt(fd, option, uintptr(unsafe.Pointer(&buf[0])), uintptr(len(buf)))
+ return err
+}
+
+type SCTPConn struct {
+ _fd int32
+ notificationHandler NotificationHandler
+}
+
+func (c *SCTPConn) fd() int {
+ return int(atomic.LoadInt32(&c._fd))
+}
+
+func NewSCTPConn(fd int, handler NotificationHandler) *SCTPConn {
+ conn := &SCTPConn{
+ _fd: int32(fd),
+ notificationHandler: handler,
+ }
+ return conn
+}
+
+func (c *SCTPConn) Write(b []byte) (int, error) {
+ return c.SCTPWrite(b, nil)
+}
+
+func (c *SCTPConn) Read(b []byte) (int, error) {
+ n, _, err := c.SCTPRead(b)
+ if n < 0 {
+ n = 0
+ }
+ return n, err
+}
+
+func (c *SCTPConn) SetInitMsg(numOstreams, maxInstreams, maxAttempts, maxInitTimeout int) error {
+ param := InitMsg{
+ NumOstreams: uint16(numOstreams),
+ MaxInstreams: uint16(maxInstreams),
+ MaxAttempts: uint16(maxAttempts),
+ MaxInitTimeout: uint16(maxInitTimeout),
+ }
+ optlen := unsafe.Sizeof(param)
+ _, _, err := setsockopt(c.fd(), SCTP_INITMSG, uintptr(unsafe.Pointer(¶m)), uintptr(optlen))
+ return err
+}
+
+func (c *SCTPConn) SubscribeEvents(flags int) error {
+ var d, a, ad, sf, p, sh, pa, ada, au, se uint8
+ if flags&SCTP_EVENT_DATA_IO > 0 {
+ d = 1
+ }
+ if flags&SCTP_EVENT_ASSOCIATION > 0 {
+ a = 1
+ }
+ if flags&SCTP_EVENT_ADDRESS > 0 {
+ ad = 1
+ }
+ if flags&SCTP_EVENT_SEND_FAILURE > 0 {
+ sf = 1
+ }
+ if flags&SCTP_EVENT_PEER_ERROR > 0 {
+ p = 1
+ }
+ if flags&SCTP_EVENT_SHUTDOWN > 0 {
+ sh = 1
+ }
+ if flags&SCTP_EVENT_PARTIAL_DELIVERY > 0 {
+ pa = 1
+ }
+ if flags&SCTP_EVENT_ADAPTATION_LAYER > 0 {
+ ada = 1
+ }
+ if flags&SCTP_EVENT_AUTHENTICATION > 0 {
+ au = 1
+ }
+ if flags&SCTP_EVENT_SENDER_DRY > 0 {
+ se = 1
+ }
+ param := EventSubscribe{
+ DataIO: d,
+ Association: a,
+ Address: ad,
+ SendFailure: sf,
+ PeerError: p,
+ Shutdown: sh,
+ PartialDelivery: pa,
+ AdaptationLayer: ada,
+ Authentication: au,
+ SenderDry: se,
+ }
+ optlen := unsafe.Sizeof(param)
+ _, _, err := setsockopt(c.fd(), SCTP_EVENTS, uintptr(unsafe.Pointer(¶m)), uintptr(optlen))
+ return err
+}
+
+func (c *SCTPConn) SubscribedEvents() (int, error) {
+ param := EventSubscribe{}
+ optlen := unsafe.Sizeof(param)
+ _, _, err := getsockopt(c.fd(), SCTP_EVENTS, uintptr(unsafe.Pointer(¶m)), uintptr(unsafe.Pointer(&optlen)))
+ if err != nil {
+ return 0, err
+ }
+ var flags int
+ if param.DataIO > 0 {
+ flags |= SCTP_EVENT_DATA_IO
+ }
+ if param.Association > 0 {
+ flags |= SCTP_EVENT_ASSOCIATION
+ }
+ if param.Address > 0 {
+ flags |= SCTP_EVENT_ADDRESS
+ }
+ if param.SendFailure > 0 {
+ flags |= SCTP_EVENT_SEND_FAILURE
+ }
+ if param.PeerError > 0 {
+ flags |= SCTP_EVENT_PEER_ERROR
+ }
+ if param.Shutdown > 0 {
+ flags |= SCTP_EVENT_SHUTDOWN
+ }
+ if param.PartialDelivery > 0 {
+ flags |= SCTP_EVENT_PARTIAL_DELIVERY
+ }
+ if param.AdaptationLayer > 0 {
+ flags |= SCTP_EVENT_ADAPTATION_LAYER
+ }
+ if param.Authentication > 0 {
+ flags |= SCTP_EVENT_AUTHENTICATION
+ }
+ if param.SenderDry > 0 {
+ flags |= SCTP_EVENT_SENDER_DRY
+ }
+ return flags, nil
+}
+
+func (c *SCTPConn) SetDefaultSentParam(info *SndRcvInfo) error {
+ optlen := unsafe.Sizeof(*info)
+ _, _, err := setsockopt(c.fd(), SCTP_DEFAULT_SENT_PARAM, uintptr(unsafe.Pointer(info)), uintptr(optlen))
+ return err
+}
+
+func (c *SCTPConn) GetDefaultSentParam() (*SndRcvInfo, error) {
+ info := &SndRcvInfo{}
+ optlen := unsafe.Sizeof(*info)
+ _, _, err := getsockopt(c.fd(), SCTP_DEFAULT_SENT_PARAM, uintptr(unsafe.Pointer(info)), uintptr(unsafe.Pointer(&optlen)))
+ return info, err
+}
+
+func resolveFromRawAddr(ptr unsafe.Pointer, n int) (*SCTPAddr, error) {
+ addr := &SCTPAddr{
+ IP: make([]net.IP, n),
+ }
+
+ switch family := (*(*syscall.RawSockaddrAny)(ptr)).Addr.Family; family {
+ case syscall.AF_INET:
+ addr.Port = int(ntohs(uint16((*(*syscall.RawSockaddrInet4)(ptr)).Port)))
+ tmp := syscall.RawSockaddrInet4{}
+ size := unsafe.Sizeof(tmp)
+ for i := 0; i < n; i++ {
+ a := *(*syscall.RawSockaddrInet4)(unsafe.Pointer(
+ uintptr(ptr) + size*uintptr(i)))
+ addr.IP[i] = a.Addr[:]
+ }
+ case syscall.AF_INET6:
+ addr.Port = int(ntohs(uint16((*(*syscall.RawSockaddrInet4)(ptr)).Port)))
+ tmp := syscall.RawSockaddrInet6{}
+ size := unsafe.Sizeof(tmp)
+ for i := 0; i < n; i++ {
+ a := *(*syscall.RawSockaddrInet6)(unsafe.Pointer(
+ uintptr(ptr) + size*uintptr(i)))
+ addr.IP[i] = a.Addr[:]
+ }
+ default:
+ return nil, fmt.Errorf("unknown address family: %d", family)
+ }
+ return addr, nil
+}
+
+func sctpGetAddrs(fd, id, optname int) (*SCTPAddr, error) {
+
+ type getaddrs struct {
+ assocId int32
+ addrNum uint32
+ addrs [4096]byte
+ }
+ param := getaddrs{
+ assocId: int32(id),
+ }
+ optlen := unsafe.Sizeof(param)
+ _, _, err := getsockopt(fd, uintptr(optname), uintptr(unsafe.Pointer(¶m)), uintptr(unsafe.Pointer(&optlen)))
+ if err != nil {
+ return nil, err
+ }
+ return resolveFromRawAddr(unsafe.Pointer(¶m.addrs), int(param.addrNum))
+}
+
+func (c *SCTPConn) SCTPGetPrimaryPeerAddr() (*SCTPAddr, error) {
+
+ type sctpGetSetPrim struct {
+ assocId int32
+ addrs [128]byte
+ }
+ param := sctpGetSetPrim{
+ assocId: int32(0),
+ }
+ optlen := unsafe.Sizeof(param)
+ _, _, err := getsockopt(c.fd(), SCTP_PRIMARY_ADDR, uintptr(unsafe.Pointer(¶m)), uintptr(unsafe.Pointer(&optlen)))
+ if err != nil {
+ return nil, err
+ }
+ return resolveFromRawAddr(unsafe.Pointer(¶m.addrs), 1)
+}
+
+func (c *SCTPConn) SCTPLocalAddr(id int) (*SCTPAddr, error) {
+ return sctpGetAddrs(c.fd(), id, SCTP_GET_LOCAL_ADDRS)
+}
+
+func (c *SCTPConn) SCTPRemoteAddr(id int) (*SCTPAddr, error) {
+ return sctpGetAddrs(c.fd(), id, SCTP_GET_PEER_ADDRS)
+}
+
+func (c *SCTPConn) LocalAddr() net.Addr {
+ addr, err := sctpGetAddrs(c.fd(), 0, SCTP_GET_LOCAL_ADDRS)
+ if err != nil {
+ return nil
+ }
+ return addr
+}
+
+func (c *SCTPConn) RemoteAddr() net.Addr {
+ addr, err := sctpGetAddrs(c.fd(), 0, SCTP_GET_PEER_ADDRS)
+ if err != nil {
+ return nil
+ }
+ return addr
+}
+
+func (c *SCTPConn) PeelOff(id int) (*SCTPConn, error) {
+ type peeloffArg struct {
+ assocId int32
+ sd int
+ }
+ param := peeloffArg{
+ assocId: int32(id),
+ }
+ optlen := unsafe.Sizeof(param)
+ _, _, err := getsockopt(c.fd(), SCTP_SOCKOPT_PEELOFF, uintptr(unsafe.Pointer(¶m)), uintptr(unsafe.Pointer(&optlen)))
+ if err != nil {
+ return nil, err
+ }
+ return &SCTPConn{_fd: int32(param.sd)}, nil
+}
+
+func (c *SCTPConn) SetDeadline(t time.Time) error {
+ return syscall.EOPNOTSUPP
+}
+
+func (c *SCTPConn) SetReadDeadline(t time.Time) error {
+ return syscall.EOPNOTSUPP
+}
+
+func (c *SCTPConn) SetWriteDeadline(t time.Time) error {
+ return syscall.EOPNOTSUPP
+}
+
+type SCTPListener struct {
+ fd int
+ m sync.Mutex
+}
+
+func (ln *SCTPListener) Addr() net.Addr {
+ laddr, err := sctpGetAddrs(ln.fd, 0, SCTP_GET_LOCAL_ADDRS)
+ if err != nil {
+ return nil
+ }
+ return laddr
+}
+
+type SCTPSndRcvInfoWrappedConn struct {
+ conn *SCTPConn
+}
+
+func NewSCTPSndRcvInfoWrappedConn(conn *SCTPConn) *SCTPSndRcvInfoWrappedConn {
+ conn.SubscribeEvents(SCTP_EVENT_DATA_IO)
+ return &SCTPSndRcvInfoWrappedConn{conn}
+}
+
+func (c *SCTPSndRcvInfoWrappedConn) Write(b []byte) (int, error) {
+ if len(b) < int(sndRcvInfoSize) {
+ return 0, syscall.EINVAL
+ }
+ info := (*SndRcvInfo)(unsafe.Pointer(&b[0]))
+ n, err := c.conn.SCTPWrite(b[sndRcvInfoSize:], info)
+ return n + int(sndRcvInfoSize), err
+}
+
+func (c *SCTPSndRcvInfoWrappedConn) Read(b []byte) (int, error) {
+ if len(b) < int(sndRcvInfoSize) {
+ return 0, syscall.EINVAL
+ }
+ n, info, err := c.conn.SCTPRead(b[sndRcvInfoSize:])
+ if err != nil {
+ return n, err
+ }
+ copy(b, toBuf(info))
+ return n + int(sndRcvInfoSize), err
+}
+
+func (c *SCTPSndRcvInfoWrappedConn) Close() error {
+ return c.conn.Close()
+}
+
+func (c *SCTPSndRcvInfoWrappedConn) LocalAddr() net.Addr {
+ return c.conn.LocalAddr()
+}
+
+func (c *SCTPSndRcvInfoWrappedConn) RemoteAddr() net.Addr {
+ return c.conn.RemoteAddr()
+}
+
+func (c *SCTPSndRcvInfoWrappedConn) SetDeadline(t time.Time) error {
+ return c.conn.SetDeadline(t)
+}
+
+func (c *SCTPSndRcvInfoWrappedConn) SetReadDeadline(t time.Time) error {
+ return c.conn.SetReadDeadline(t)
+}
+
+func (c *SCTPSndRcvInfoWrappedConn) SetWriteDeadline(t time.Time) error {
+ return c.conn.SetWriteDeadline(t)
+}
diff --git a/vendor/github.com/ishidawataru/sctp/sctp_linux.go b/vendor/github.com/ishidawataru/sctp/sctp_linux.go
new file mode 100644
index 0000000..f93ab86
--- /dev/null
+++ b/vendor/github.com/ishidawataru/sctp/sctp_linux.go
@@ -0,0 +1,227 @@
+// +build linux,!386
+
+package sctp
+
+import (
+ "fmt"
+ "io"
+ "net"
+ "sync/atomic"
+ "syscall"
+ "unsafe"
+)
+
+func setsockopt(fd int, optname, optval, optlen uintptr) (uintptr, uintptr, error) {
+ // FIXME: syscall.SYS_SETSOCKOPT is undefined on 386
+ r0, r1, errno := syscall.Syscall6(syscall.SYS_SETSOCKOPT,
+ uintptr(fd),
+ SOL_SCTP,
+ optname,
+ optval,
+ optlen,
+ 0)
+ if errno != 0 {
+ return r0, r1, errno
+ }
+ return r0, r1, nil
+}
+
+func getsockopt(fd int, optname, optval, optlen uintptr) (uintptr, uintptr, error) {
+ // FIXME: syscall.SYS_GETSOCKOPT is undefined on 386
+ r0, r1, errno := syscall.Syscall6(syscall.SYS_GETSOCKOPT,
+ uintptr(fd),
+ SOL_SCTP,
+ optname,
+ optval,
+ optlen,
+ 0)
+ if errno != 0 {
+ return r0, r1, errno
+ }
+ return r0, r1, nil
+}
+
+func (c *SCTPConn) SCTPWrite(b []byte, info *SndRcvInfo) (int, error) {
+ var cbuf []byte
+ if info != nil {
+ cmsgBuf := toBuf(info)
+ hdr := &syscall.Cmsghdr{
+ Level: syscall.IPPROTO_SCTP,
+ Type: SCTP_CMSG_SNDRCV,
+ }
+
+ // bitwidth of hdr.Len is platform-specific,
+ // so we use hdr.SetLen() rather than directly setting hdr.Len
+ hdr.SetLen(syscall.CmsgSpace(len(cmsgBuf)))
+ cbuf = append(toBuf(hdr), cmsgBuf...)
+ }
+ return syscall.SendmsgN(c.fd(), b, cbuf, nil, 0)
+}
+
+func parseSndRcvInfo(b []byte) (*SndRcvInfo, error) {
+ msgs, err := syscall.ParseSocketControlMessage(b)
+ if err != nil {
+ return nil, err
+ }
+ for _, m := range msgs {
+ if m.Header.Level == syscall.IPPROTO_SCTP {
+ switch m.Header.Type {
+ case SCTP_CMSG_SNDRCV:
+ return (*SndRcvInfo)(unsafe.Pointer(&m.Data[0])), nil
+ }
+ }
+ }
+ return nil, nil
+}
+
+func (c *SCTPConn) SCTPRead(b []byte) (int, *SndRcvInfo, error) {
+ oob := make([]byte, 254)
+ for {
+ n, oobn, recvflags, _, err := syscall.Recvmsg(c.fd(), b, oob, 0)
+ if err != nil {
+ return n, nil, err
+ }
+
+ if n == 0 && oobn == 0 {
+ return 0, nil, io.EOF
+ }
+
+ if recvflags&MSG_NOTIFICATION > 0 && c.notificationHandler != nil {
+ if err := c.notificationHandler(b[:n]); err != nil {
+ return 0, nil, err
+ }
+ } else {
+ var info *SndRcvInfo
+ if oobn > 0 {
+ info, err = parseSndRcvInfo(oob[:oobn])
+ }
+ return n, info, err
+ }
+ }
+}
+
+func (c *SCTPConn) Close() error {
+ if c != nil {
+ fd := atomic.SwapInt32(&c._fd, -1)
+ if fd > 0 {
+ info := &SndRcvInfo{
+ Flags: SCTP_EOF,
+ }
+ c.SCTPWrite(nil, info)
+ syscall.Shutdown(int(fd), syscall.SHUT_RDWR)
+ return syscall.Close(int(fd))
+ }
+ }
+ return syscall.EBADF
+}
+
+func ListenSCTP(net string, laddr *SCTPAddr) (*SCTPListener, error) {
+ af := syscall.AF_INET
+ switch net {
+ case "sctp":
+ hasv6 := func(addr *SCTPAddr) bool {
+ if addr == nil {
+ return false
+ }
+ for _, ip := range addr.IP {
+ if ip.To4() == nil {
+ return true
+ }
+ }
+ return false
+ }
+ if hasv6(laddr) {
+ af = syscall.AF_INET6
+ }
+ case "sctp4":
+ case "sctp6":
+ af = syscall.AF_INET6
+ default:
+ return nil, fmt.Errorf("invalid net: %s", net)
+ }
+
+ sock, err := syscall.Socket(
+ af,
+ syscall.SOCK_STREAM,
+ syscall.IPPROTO_SCTP,
+ )
+ if err != nil {
+ return nil, err
+ }
+ err = setNumOstreams(sock, SCTP_MAX_STREAM)
+ if err != nil {
+ return nil, err
+ }
+ if laddr != nil && len(laddr.IP) != 0 {
+ err := SCTPBind(sock, laddr, SCTP_BINDX_ADD_ADDR)
+ if err != nil {
+ return nil, err
+ }
+ }
+ err = syscall.Listen(sock, syscall.SOMAXCONN)
+ if err != nil {
+ return nil, err
+ }
+ return &SCTPListener{
+ fd: sock,
+ }, nil
+}
+
+func (ln *SCTPListener) Accept() (net.Conn, error) {
+ fd, _, err := syscall.Accept4(ln.fd, 0)
+ return NewSCTPConn(fd, nil), err
+}
+
+func (ln *SCTPListener) Close() error {
+ syscall.Shutdown(ln.fd, syscall.SHUT_RDWR)
+ return syscall.Close(ln.fd)
+}
+
+func DialSCTP(net string, laddr, raddr *SCTPAddr) (*SCTPConn, error) {
+ af := syscall.AF_INET
+ switch net {
+ case "sctp":
+ hasv6 := func(addr *SCTPAddr) bool {
+ if addr == nil {
+ return false
+ }
+ for _, ip := range addr.IP {
+ if ip.To4() == nil {
+ return true
+ }
+ }
+ return false
+ }
+ if hasv6(laddr) || hasv6(raddr) {
+ af = syscall.AF_INET6
+ }
+ case "sctp4":
+ case "sctp6":
+ af = syscall.AF_INET6
+ default:
+ return nil, fmt.Errorf("invalid net: %s", net)
+ }
+ sock, err := syscall.Socket(
+ af,
+ syscall.SOCK_STREAM,
+ syscall.IPPROTO_SCTP,
+ )
+ if err != nil {
+ return nil, err
+ }
+ err = setNumOstreams(sock, SCTP_MAX_STREAM)
+ if err != nil {
+ return nil, err
+ }
+ if laddr != nil {
+ err := SCTPBind(sock, laddr, SCTP_BINDX_ADD_ADDR)
+ if err != nil {
+ return nil, err
+ }
+ }
+ _, err = SCTPConnect(sock, raddr)
+ if err != nil {
+ return nil, err
+ }
+ return NewSCTPConn(sock, nil), nil
+}
diff --git a/vendor/github.com/ishidawataru/sctp/sctp_unsupported.go b/vendor/github.com/ishidawataru/sctp/sctp_unsupported.go
new file mode 100644
index 0000000..adcbf78
--- /dev/null
+++ b/vendor/github.com/ishidawataru/sctp/sctp_unsupported.go
@@ -0,0 +1,47 @@
+// +build !linux linux,386
+
+package sctp
+
+import (
+ "errors"
+ "net"
+ "runtime"
+)
+
+var ErrUnsupported = errors.New("SCTP is unsupported on " + runtime.GOOS + "/" + runtime.GOARCH)
+
+func setsockopt(fd int, optname, optval, optlen uintptr) (uintptr, uintptr, error) {
+ return 0, 0, ErrUnsupported
+}
+
+func getsockopt(fd int, optname, optval, optlen uintptr) (uintptr, uintptr, error) {
+ return 0, 0, ErrUnsupported
+}
+
+func (c *SCTPConn) SCTPWrite(b []byte, info *SndRcvInfo) (int, error) {
+ return 0, ErrUnsupported
+}
+
+func (c *SCTPConn) SCTPRead(b []byte) (int, *SndRcvInfo, error) {
+ return 0, nil, ErrUnsupported
+}
+
+func (c *SCTPConn) Close() error {
+ return ErrUnsupported
+}
+
+func ListenSCTP(net string, laddr *SCTPAddr) (*SCTPListener, error) {
+ return nil, ErrUnsupported
+}
+
+func (ln *SCTPListener) Accept() (net.Conn, error) {
+ return nil, ErrUnsupported
+}
+
+func (ln *SCTPListener) Close() error {
+ return ErrUnsupported
+}
+
+func DialSCTP(net string, laddr, raddr *SCTPAddr) (*SCTPConn, error) {
+ return nil, ErrUnsupported
+}
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c b/vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c
index a6a107e..2c69cee 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c
+++ b/vendor/github.com/opencontainers/runc/libcontainer/nsenter/nsexec.c
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <sys/wait.h>
-
#include <linux/limits.h>
#include <linux/netlink.h>
#include <linux/types.h>
@@ -32,15 +31,15 @@
/* Synchronisation values. */
enum sync_t {
- SYNC_USERMAP_PLS = 0x40, /* Request parent to map our users. */
- SYNC_USERMAP_ACK = 0x41, /* Mapping finished by the parent. */
- SYNC_RECVPID_PLS = 0x42, /* Tell parent we're sending the PID. */
- SYNC_RECVPID_ACK = 0x43, /* PID was correctly received by parent. */
- SYNC_GRANDCHILD = 0x44, /* The grandchild is ready to run. */
- SYNC_CHILD_READY = 0x45, /* The child or grandchild is ready to return. */
+ SYNC_USERMAP_PLS = 0x40, /* Request parent to map our users. */
+ SYNC_USERMAP_ACK = 0x41, /* Mapping finished by the parent. */
+ SYNC_RECVPID_PLS = 0x42, /* Tell parent we're sending the PID. */
+ SYNC_RECVPID_ACK = 0x43, /* PID was correctly received by parent. */
+ SYNC_GRANDCHILD = 0x44, /* The grandchild is ready to run. */
+ SYNC_CHILD_READY = 0x45, /* The child or grandchild is ready to return. */
/* XXX: This doesn't help with segfaults and other such issues. */
- SYNC_ERR = 0xFF, /* Fatal error, no turning back. The error code follows. */
+ SYNC_ERR = 0xFF, /* Fatal error, no turning back. The error code follows. */
};
/* longjmp() arguments. */
@@ -73,7 +72,7 @@
char *oom_score_adj;
size_t oom_score_adj_len;
- /* User namespace settings.*/
+ /* User namespace settings. */
char *uidmap;
size_t uidmap_len;
char *gidmap;
@@ -82,7 +81,7 @@
size_t namespaces_len;
uint8_t is_setgroup;
- /* Rootless container settings.*/
+ /* Rootless container settings. */
uint8_t is_rootless;
char *uidmappath;
size_t uidmappath_len;
@@ -167,7 +166,7 @@
goto out;
}
-out:
+ out:
close(fd);
return ret;
}
@@ -184,16 +183,16 @@
char *policy;
switch (setgroup) {
- case SETGROUPS_ALLOW:
- policy = "allow";
- break;
- case SETGROUPS_DENY:
- policy = "deny";
- break;
- case SETGROUPS_DEFAULT:
- default:
- /* Nothing to do. */
- return;
+ case SETGROUPS_ALLOW:
+ policy = "allow";
+ break;
+ case SETGROUPS_DENY:
+ policy = "deny";
+ break;
+ case SETGROUPS_DEFAULT:
+ default:
+ /* Nothing to do. */
+ return;
}
if (write_file(policy, strlen(policy), "/proc/%d/setgroups", pid) < 0) {
@@ -226,14 +225,14 @@
if (!child) {
#define MAX_ARGV 20
char *argv[MAX_ARGV];
- char *envp[] = {NULL};
+ char *envp[] = { NULL };
char pid_fmt[16];
int argc = 0;
char *next;
snprintf(pid_fmt, 16, "%d", pid);
- argv[argc++] = (char *) app;
+ argv[argc++] = (char *)app;
argv[argc++] = pid_fmt;
/*
* Convert the map string into a list of argument that
@@ -319,7 +318,7 @@
static int clone_parent(jmp_buf *env, int jmpval)
{
struct clone_t ca = {
- .env = env,
+ .env = env,
.jmpval = jmpval,
};
@@ -533,7 +532,7 @@
int pipenum;
jmp_buf env;
int sync_child_pipe[2], sync_grandchild_pipe[2];
- struct nlconfig_t config = {0};
+ struct nlconfig_t config = { 0 };
/*
* If we don't have an init pipe, just return to the go routine.
@@ -630,21 +629,21 @@
*/
switch (setjmp(env)) {
- /*
- * Stage 0: We're in the parent. Our job is just to create a new child
- * (stage 1: JUMP_CHILD) process and write its uid_map and
- * gid_map. That process will go on to create a new process, then
- * it will send us its PID which we will send to the bootstrap
- * process.
- */
- case JUMP_PARENT: {
+ /*
+ * Stage 0: We're in the parent. Our job is just to create a new child
+ * (stage 1: JUMP_CHILD) process and write its uid_map and
+ * gid_map. That process will go on to create a new process, then
+ * it will send us its PID which we will send to the bootstrap
+ * process.
+ */
+ case JUMP_PARENT:{
int len;
pid_t child, first_child = -1;
char buf[JSON_MAX];
bool ready = false;
/* For debugging. */
- prctl(PR_SET_NAME, (unsigned long) "runc:[0:PARENT]", 0, 0, 0);
+ prctl(PR_SET_NAME, (unsigned long)"runc:[0:PARENT]", 0, 0, 0);
/* Start the process of getting a container. */
child = clone_parent(&env, JUMP_CHILD);
@@ -702,7 +701,7 @@
bail("failed to sync with child: write(SYNC_USERMAP_ACK)");
}
break;
- case SYNC_RECVPID_PLS: {
+ case SYNC_RECVPID_PLS:{
first_child = child;
/* Get the init_func pid. */
@@ -781,16 +780,16 @@
exit(0);
}
- /*
- * Stage 1: We're in the first child process. Our job is to join any
- * provided namespaces in the netlink payload and unshare all
- * of the requested namespaces. If we've been asked to
- * CLONE_NEWUSER, we will ask our parent (stage 0) to set up
- * our user mappings for us. Then, we create a new child
- * (stage 2: JUMP_INIT) for PID namespace. We then send the
- * child's PID to our parent (stage 0).
- */
- case JUMP_CHILD: {
+ /*
+ * Stage 1: We're in the first child process. Our job is to join any
+ * provided namespaces in the netlink payload and unshare all
+ * of the requested namespaces. If we've been asked to
+ * CLONE_NEWUSER, we will ask our parent (stage 0) to set up
+ * our user mappings for us. Then, we create a new child
+ * (stage 2: JUMP_INIT) for PID namespace. We then send the
+ * child's PID to our parent (stage 0).
+ */
+ case JUMP_CHILD:{
pid_t child;
enum sync_t s;
@@ -799,7 +798,7 @@
close(sync_child_pipe[1]);
/* For debugging. */
- prctl(PR_SET_NAME, (unsigned long) "runc:[1:CHILD]", 0, 0, 0);
+ prctl(PR_SET_NAME, (unsigned long)"runc:[1:CHILD]", 0, 0, 0);
/*
* We need to setns first. We cannot do this earlier (in stage 0)
@@ -901,13 +900,13 @@
exit(0);
}
- /*
- * Stage 2: We're the final child process, and the only process that will
- * actually return to the Go runtime. Our job is to just do the
- * final cleanup steps and then return to the Go runtime to allow
- * init_linux.go to run.
- */
- case JUMP_INIT: {
+ /*
+ * Stage 2: We're the final child process, and the only process that will
+ * actually return to the Go runtime. Our job is to just do the
+ * final cleanup steps and then return to the Go runtime to allow
+ * init_linux.go to run.
+ */
+ case JUMP_INIT:{
/*
* We're inside the child now, having jumped from the
* start_child() code after forking in the parent.
@@ -921,7 +920,7 @@
close(sync_child_pipe[1]);
/* For debugging. */
- prctl(PR_SET_NAME, (unsigned long) "runc:[2:INIT]", 0, 0, 0);
+ prctl(PR_SET_NAME, (unsigned long)"runc:[2:INIT]", 0, 0, 0);
if (read(syncfd, &s, sizeof(s)) != sizeof(s))
bail("failed to sync with parent: read(SYNC_GRANDCHILD)");
diff --git a/vendor/github.com/stevvooe/ttrpc/channel.go b/vendor/github.com/stevvooe/ttrpc/channel.go
index 4a33827..9493d68 100644
--- a/vendor/github.com/stevvooe/ttrpc/channel.go
+++ b/vendor/github.com/stevvooe/ttrpc/channel.go
@@ -5,6 +5,7 @@
"context"
"encoding/binary"
"io"
+ "net"
"sync"
"github.com/pkg/errors"
@@ -60,16 +61,18 @@
var buffers sync.Pool
type channel struct {
+ conn net.Conn
bw *bufio.Writer
br *bufio.Reader
hrbuf [messageHeaderLength]byte // avoid alloc when reading header
hwbuf [messageHeaderLength]byte
}
-func newChannel(w io.Writer, r io.Reader) *channel {
+func newChannel(conn net.Conn) *channel {
return &channel{
- bw: bufio.NewWriter(w),
- br: bufio.NewReader(r),
+ conn: conn,
+ bw: bufio.NewWriter(conn),
+ br: bufio.NewReader(conn),
}
}
diff --git a/vendor/github.com/stevvooe/ttrpc/client.go b/vendor/github.com/stevvooe/ttrpc/client.go
index ca76afe..f047181 100644
--- a/vendor/github.com/stevvooe/ttrpc/client.go
+++ b/vendor/github.com/stevvooe/ttrpc/client.go
@@ -2,8 +2,12 @@
import (
"context"
+ "io"
"net"
+ "os"
+ "strings"
"sync"
+ "syscall"
"github.com/containerd/containerd/log"
"github.com/gogo/protobuf/proto"
@@ -11,6 +15,10 @@
"google.golang.org/grpc/status"
)
+// ErrClosed is returned by client methods when the underlying connection is
+// closed.
+var ErrClosed = errors.New("ttrpc: closed")
+
type Client struct {
codec codec
conn net.Conn
@@ -19,18 +27,20 @@
closed chan struct{}
closeOnce sync.Once
+ closeFunc func()
done chan struct{}
err error
}
func NewClient(conn net.Conn) *Client {
c := &Client{
- codec: codec{},
- conn: conn,
- channel: newChannel(conn, conn),
- calls: make(chan *callRequest),
- closed: make(chan struct{}),
- done: make(chan struct{}),
+ codec: codec{},
+ conn: conn,
+ channel: newChannel(conn),
+ calls: make(chan *callRequest),
+ closed: make(chan struct{}),
+ done: make(chan struct{}),
+ closeFunc: func() {},
}
go c.run()
@@ -91,7 +101,7 @@
select {
case err := <-errs:
- return err
+ return filterCloseErr(err)
case <-c.done:
return c.err
}
@@ -105,6 +115,11 @@
return nil
}
+// OnClose allows a close func to be called when the server is closed
+func (c *Client) OnClose(closer func()) {
+ c.closeFunc = closer
+}
+
type message struct {
messageHeader
p []byte
@@ -150,6 +165,7 @@
defer c.conn.Close()
defer close(c.done)
+ defer c.closeFunc()
for {
select {
@@ -171,7 +187,14 @@
call.errs <- c.recv(call.resp, msg)
delete(waiters, msg.StreamID)
case <-shutdown:
+ if shutdownErr != nil {
+ shutdownErr = filterCloseErr(shutdownErr)
+ } else {
+ shutdownErr = ErrClosed
+ }
+
shutdownErr = errors.Wrapf(shutdownErr, "ttrpc: client shutting down")
+
c.err = shutdownErr
for _, waiter := range waiters {
waiter.errs <- shutdownErr
@@ -179,9 +202,12 @@
c.Close()
return
case <-c.closed:
+ if c.err == nil {
+ c.err = ErrClosed
+ }
// broadcast the shutdown error to the remaining waiters.
for _, waiter := range waiters {
- waiter.errs <- shutdownErr
+ waiter.errs <- c.err
}
return
}
@@ -209,3 +235,30 @@
defer c.channel.putmbuf(msg.p)
return proto.Unmarshal(msg.p, resp)
}
+
+// filterCloseErr rewrites EOF and EPIPE errors to ErrClosed. Use when
+// returning from call or handling errors from main read loop.
+//
+// This purposely ignores errors with a wrapped cause.
+func filterCloseErr(err error) error {
+ if err == nil {
+ return nil
+ }
+
+ if err == io.EOF {
+ return ErrClosed
+ }
+
+ if strings.Contains(err.Error(), "use of closed network connection") {
+ return ErrClosed
+ }
+
+ // if we have an epipe on a write, we cast to errclosed
+ if oerr, ok := err.(*net.OpError); ok && oerr.Op == "write" {
+ if serr, ok := oerr.Err.(*os.SyscallError); ok && serr.Err == syscall.EPIPE {
+ return ErrClosed
+ }
+ }
+
+ return err
+}
diff --git a/vendor/github.com/stevvooe/ttrpc/server.go b/vendor/github.com/stevvooe/ttrpc/server.go
index edfca0c..fd29b71 100644
--- a/vendor/github.com/stevvooe/ttrpc/server.go
+++ b/vendor/github.com/stevvooe/ttrpc/server.go
@@ -16,7 +16,7 @@
)
var (
- ErrServerClosed = errors.New("ttrpc: server close")
+ ErrServerClosed = errors.New("ttrpc: server closed")
)
type Server struct {
@@ -281,7 +281,7 @@
)
var (
- ch = newChannel(c.conn, c.conn)
+ ch = newChannel(c.conn)
ctx, cancel = context.WithCancel(sctx)
active int
state connState = connStateIdle
diff --git a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
new file mode 100644
index 0000000..593f653
--- /dev/null
+++ b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
@@ -0,0 +1,77 @@
+// Copyright 2012 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+/*
+Package pbkdf2 implements the key derivation function PBKDF2 as defined in RFC
+2898 / PKCS #5 v2.0.
+
+A key derivation function is useful when encrypting data based on a password
+or any other not-fully-random data. It uses a pseudorandom function to derive
+a secure encryption key based on the password.
+
+While v2.0 of the standard defines only one pseudorandom function to use,
+HMAC-SHA1, the drafted v2.1 specification allows use of all five FIPS Approved
+Hash Functions SHA-1, SHA-224, SHA-256, SHA-384 and SHA-512 for HMAC. To
+choose, you can pass the `New` functions from the different SHA packages to
+pbkdf2.Key.
+*/
+package pbkdf2 // import "golang.org/x/crypto/pbkdf2"
+
+import (
+ "crypto/hmac"
+ "hash"
+)
+
+// Key derives a key from the password, salt and iteration count, returning a
+// []byte of length keylen that can be used as cryptographic key. The key is
+// derived based on the method described as PBKDF2 with the HMAC variant using
+// the supplied hash function.
+//
+// For example, to use a HMAC-SHA-1 based PBKDF2 key derivation function, you
+// can get a derived key for e.g. AES-256 (which needs a 32-byte key) by
+// doing:
+//
+// dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New)
+//
+// Remember to get a good random salt. At least 8 bytes is recommended by the
+// RFC.
+//
+// Using a higher iteration count will increase the cost of an exhaustive
+// search but will also make derivation proportionally slower.
+func Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte {
+ prf := hmac.New(h, password)
+ hashLen := prf.Size()
+ numBlocks := (keyLen + hashLen - 1) / hashLen
+
+ var buf [4]byte
+ dk := make([]byte, 0, numBlocks*hashLen)
+ U := make([]byte, hashLen)
+ for block := 1; block <= numBlocks; block++ {
+ // N.B.: || means concatenation, ^ means XOR
+ // for each block T_i = U_1 ^ U_2 ^ ... ^ U_iter
+ // U_1 = PRF(password, salt || uint(i))
+ prf.Reset()
+ prf.Write(salt)
+ buf[0] = byte(block >> 24)
+ buf[1] = byte(block >> 16)
+ buf[2] = byte(block >> 8)
+ buf[3] = byte(block)
+ prf.Write(buf[:4])
+ dk = prf.Sum(dk)
+ T := dk[len(dk)-hashLen:]
+ copy(U, T)
+
+ // U_n = PRF(password, U_(n-1))
+ for n := 2; n <= iter; n++ {
+ prf.Reset()
+ prf.Write(U)
+ U = U[:0]
+ U = prf.Sum(U)
+ for x := range U {
+ T[x] ^= U[x]
+ }
+ }
+ }
+ return dk[:keyLen]
+}
diff --git a/vendor/golang.org/x/sys/unix/affinity_linux.go b/vendor/golang.org/x/sys/unix/affinity_linux.go
new file mode 100644
index 0000000..72afe33
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/affinity_linux.go
@@ -0,0 +1,124 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// CPU affinity functions
+
+package unix
+
+import (
+ "unsafe"
+)
+
+const cpuSetSize = _CPU_SETSIZE / _NCPUBITS
+
+// CPUSet represents a CPU affinity mask.
+type CPUSet [cpuSetSize]cpuMask
+
+func schedAffinity(trap uintptr, pid int, set *CPUSet) error {
+ _, _, e := RawSyscall(trap, uintptr(pid), uintptr(unsafe.Sizeof(*set)), uintptr(unsafe.Pointer(set)))
+ if e != 0 {
+ return errnoErr(e)
+ }
+ return nil
+}
+
+// SchedGetaffinity gets the CPU affinity mask of the thread specified by pid.
+// If pid is 0 the calling thread is used.
+func SchedGetaffinity(pid int, set *CPUSet) error {
+ return schedAffinity(SYS_SCHED_GETAFFINITY, pid, set)
+}
+
+// SchedSetaffinity sets the CPU affinity mask of the thread specified by pid.
+// If pid is 0 the calling thread is used.
+func SchedSetaffinity(pid int, set *CPUSet) error {
+ return schedAffinity(SYS_SCHED_SETAFFINITY, pid, set)
+}
+
+// Zero clears the set s, so that it contains no CPUs.
+func (s *CPUSet) Zero() {
+ for i := range s {
+ s[i] = 0
+ }
+}
+
+func cpuBitsIndex(cpu int) int {
+ return cpu / _NCPUBITS
+}
+
+func cpuBitsMask(cpu int) cpuMask {
+ return cpuMask(1 << (uint(cpu) % _NCPUBITS))
+}
+
+// Set adds cpu to the set s.
+func (s *CPUSet) Set(cpu int) {
+ i := cpuBitsIndex(cpu)
+ if i < len(s) {
+ s[i] |= cpuBitsMask(cpu)
+ }
+}
+
+// Clear removes cpu from the set s.
+func (s *CPUSet) Clear(cpu int) {
+ i := cpuBitsIndex(cpu)
+ if i < len(s) {
+ s[i] &^= cpuBitsMask(cpu)
+ }
+}
+
+// IsSet reports whether cpu is in the set s.
+func (s *CPUSet) IsSet(cpu int) bool {
+ i := cpuBitsIndex(cpu)
+ if i < len(s) {
+ return s[i]&cpuBitsMask(cpu) != 0
+ }
+ return false
+}
+
+// Count returns the number of CPUs in the set s.
+func (s *CPUSet) Count() int {
+ c := 0
+ for _, b := range s {
+ c += onesCount64(uint64(b))
+ }
+ return c
+}
+
+// onesCount64 is a copy of Go 1.9's math/bits.OnesCount64.
+// Once this package can require Go 1.9, we can delete this
+// and update the caller to use bits.OnesCount64.
+func onesCount64(x uint64) int {
+ const m0 = 0x5555555555555555 // 01010101 ...
+ const m1 = 0x3333333333333333 // 00110011 ...
+ const m2 = 0x0f0f0f0f0f0f0f0f // 00001111 ...
+ const m3 = 0x00ff00ff00ff00ff // etc.
+ const m4 = 0x0000ffff0000ffff
+
+ // Implementation: Parallel summing of adjacent bits.
+ // See "Hacker's Delight", Chap. 5: Counting Bits.
+ // The following pattern shows the general approach:
+ //
+ // x = x>>1&(m0&m) + x&(m0&m)
+ // x = x>>2&(m1&m) + x&(m1&m)
+ // x = x>>4&(m2&m) + x&(m2&m)
+ // x = x>>8&(m3&m) + x&(m3&m)
+ // x = x>>16&(m4&m) + x&(m4&m)
+ // x = x>>32&(m5&m) + x&(m5&m)
+ // return int(x)
+ //
+ // Masking (& operations) can be left away when there's no
+ // danger that a field's sum will carry over into the next
+ // field: Since the result cannot be > 64, 8 bits is enough
+ // and we can ignore the masks for the shifts by 8 and up.
+ // Per "Hacker's Delight", the first line can be simplified
+ // more, but it saves at best one instruction, so we leave
+ // it alone for clarity.
+ const m = 1<<64 - 1
+ x = x>>1&(m0&m) + x&(m0&m)
+ x = x>>2&(m1&m) + x&(m1&m)
+ x = (x>>4 + x) & (m2 & m)
+ x += x >> 8
+ x += x >> 16
+ x += x >> 32
+ return int(x) & (1<<7 - 1)
+}
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_386.s b/vendor/golang.org/x/sys/unix/asm_linux_386.s
index 4db2909..448bebb 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_386.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_386.s
@@ -10,21 +10,51 @@
// System calls for 386, Linux
//
+// See ../runtime/sys_linux_386.s for the reason why we always use int 0x80
+// instead of the glibc-specific "CALL 0x10(GS)".
+#define INVOKE_SYSCALL INT $0x80
+
// Just jump to package syscall's implementation for all these functions.
// The runtime may know about them.
-TEXT ·Syscall(SB),NOSPLIT,$0-28
+TEXT ·Syscall(SB),NOSPLIT,$0-28
JMP syscall·Syscall(SB)
-TEXT ·Syscall6(SB),NOSPLIT,$0-40
+TEXT ·Syscall6(SB),NOSPLIT,$0-40
JMP syscall·Syscall6(SB)
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-24
+ CALL runtime·entersyscall(SB)
+ MOVL trap+0(FP), AX // syscall entry
+ MOVL a1+4(FP), BX
+ MOVL a2+8(FP), CX
+ MOVL a3+12(FP), DX
+ MOVL $0, SI
+ MOVL $0, DI
+ INVOKE_SYSCALL
+ MOVL AX, r1+16(FP)
+ MOVL DX, r2+20(FP)
+ CALL runtime·exitsyscall(SB)
+ RET
+
TEXT ·RawSyscall(SB),NOSPLIT,$0-28
JMP syscall·RawSyscall(SB)
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
JMP syscall·RawSyscall6(SB)
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24
+ MOVL trap+0(FP), AX // syscall entry
+ MOVL a1+4(FP), BX
+ MOVL a2+8(FP), CX
+ MOVL a3+12(FP), DX
+ MOVL $0, SI
+ MOVL $0, DI
+ INVOKE_SYSCALL
+ MOVL AX, r1+16(FP)
+ MOVL DX, r2+20(FP)
+ RET
+
TEXT ·socketcall(SB),NOSPLIT,$0-36
JMP syscall·socketcall(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
index 44e25c6..c6468a9 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
@@ -13,17 +13,45 @@
// Just jump to package syscall's implementation for all these functions.
// The runtime may know about them.
-TEXT ·Syscall(SB),NOSPLIT,$0-56
+TEXT ·Syscall(SB),NOSPLIT,$0-56
JMP syscall·Syscall(SB)
TEXT ·Syscall6(SB),NOSPLIT,$0-80
JMP syscall·Syscall6(SB)
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+ CALL runtime·entersyscall(SB)
+ MOVQ a1+8(FP), DI
+ MOVQ a2+16(FP), SI
+ MOVQ a3+24(FP), DX
+ MOVQ $0, R10
+ MOVQ $0, R8
+ MOVQ $0, R9
+ MOVQ trap+0(FP), AX // syscall entry
+ SYSCALL
+ MOVQ AX, r1+32(FP)
+ MOVQ DX, r2+40(FP)
+ CALL runtime·exitsyscall(SB)
+ RET
+
TEXT ·RawSyscall(SB),NOSPLIT,$0-56
JMP syscall·RawSyscall(SB)
TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
JMP syscall·RawSyscall6(SB)
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+ MOVQ a1+8(FP), DI
+ MOVQ a2+16(FP), SI
+ MOVQ a3+24(FP), DX
+ MOVQ $0, R10
+ MOVQ $0, R8
+ MOVQ $0, R9
+ MOVQ trap+0(FP), AX // syscall entry
+ SYSCALL
+ MOVQ AX, r1+32(FP)
+ MOVQ DX, r2+40(FP)
+ RET
+
TEXT ·gettimeofday(SB),NOSPLIT,$0-16
JMP syscall·gettimeofday(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm.s b/vendor/golang.org/x/sys/unix/asm_linux_arm.s
index cf0b574..cf0f357 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_arm.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_arm.s
@@ -13,17 +13,44 @@
// Just jump to package syscall's implementation for all these functions.
// The runtime may know about them.
-TEXT ·Syscall(SB),NOSPLIT,$0-28
+TEXT ·Syscall(SB),NOSPLIT,$0-28
B syscall·Syscall(SB)
-TEXT ·Syscall6(SB),NOSPLIT,$0-40
+TEXT ·Syscall6(SB),NOSPLIT,$0-40
B syscall·Syscall6(SB)
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-24
+ BL runtime·entersyscall(SB)
+ MOVW trap+0(FP), R7
+ MOVW a1+4(FP), R0
+ MOVW a2+8(FP), R1
+ MOVW a3+12(FP), R2
+ MOVW $0, R3
+ MOVW $0, R4
+ MOVW $0, R5
+ SWI $0
+ MOVW R0, r1+16(FP)
+ MOVW $0, R0
+ MOVW R0, r2+20(FP)
+ BL runtime·exitsyscall(SB)
+ RET
+
TEXT ·RawSyscall(SB),NOSPLIT,$0-28
B syscall·RawSyscall(SB)
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
B syscall·RawSyscall6(SB)
-TEXT ·seek(SB),NOSPLIT,$0-32
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24
+ MOVW trap+0(FP), R7 // syscall entry
+ MOVW a1+4(FP), R0
+ MOVW a2+8(FP), R1
+ MOVW a3+12(FP), R2
+ SWI $0
+ MOVW R0, r1+16(FP)
+ MOVW $0, R0
+ MOVW R0, r2+20(FP)
+ RET
+
+TEXT ·seek(SB),NOSPLIT,$0-28
B syscall·seek(SB)
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
index 4be9bfe..afe6fdf 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
@@ -11,14 +11,42 @@
// Just jump to package syscall's implementation for all these functions.
// The runtime may know about them.
-TEXT ·Syscall(SB),NOSPLIT,$0-56
+TEXT ·Syscall(SB),NOSPLIT,$0-56
B syscall·Syscall(SB)
TEXT ·Syscall6(SB),NOSPLIT,$0-80
B syscall·Syscall6(SB)
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+ BL runtime·entersyscall(SB)
+ MOVD a1+8(FP), R0
+ MOVD a2+16(FP), R1
+ MOVD a3+24(FP), R2
+ MOVD $0, R3
+ MOVD $0, R4
+ MOVD $0, R5
+ MOVD trap+0(FP), R8 // syscall entry
+ SVC
+ MOVD R0, r1+32(FP) // r1
+ MOVD R1, r2+40(FP) // r2
+ BL runtime·exitsyscall(SB)
+ RET
+
TEXT ·RawSyscall(SB),NOSPLIT,$0-56
B syscall·RawSyscall(SB)
TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
B syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+ MOVD a1+8(FP), R0
+ MOVD a2+16(FP), R1
+ MOVD a3+24(FP), R2
+ MOVD $0, R3
+ MOVD $0, R4
+ MOVD $0, R5
+ MOVD trap+0(FP), R8 // syscall entry
+ SVC
+ MOVD R0, r1+32(FP)
+ MOVD R1, r2+40(FP)
+ RET
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
index 724e580..ab9d638 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
@@ -15,14 +15,42 @@
// Just jump to package syscall's implementation for all these functions.
// The runtime may know about them.
-TEXT ·Syscall(SB),NOSPLIT,$0-56
+TEXT ·Syscall(SB),NOSPLIT,$0-56
JMP syscall·Syscall(SB)
-TEXT ·Syscall6(SB),NOSPLIT,$0-80
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
JMP syscall·Syscall6(SB)
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+ JAL runtime·entersyscall(SB)
+ MOVV a1+8(FP), R4
+ MOVV a2+16(FP), R5
+ MOVV a3+24(FP), R6
+ MOVV R0, R7
+ MOVV R0, R8
+ MOVV R0, R9
+ MOVV trap+0(FP), R2 // syscall entry
+ SYSCALL
+ MOVV R2, r1+32(FP)
+ MOVV R3, r2+40(FP)
+ JAL runtime·exitsyscall(SB)
+ RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
JMP syscall·RawSyscall(SB)
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
JMP syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+ MOVV a1+8(FP), R4
+ MOVV a2+16(FP), R5
+ MOVV a3+24(FP), R6
+ MOVV R0, R7
+ MOVV R0, R8
+ MOVV R0, R9
+ MOVV trap+0(FP), R2 // syscall entry
+ SYSCALL
+ MOVV R2, r1+32(FP)
+ MOVV R3, r2+40(FP)
+ RET
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s b/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
index 2ea4257..99e5399 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
@@ -15,17 +15,40 @@
// Just jump to package syscall's implementation for all these functions.
// The runtime may know about them.
-TEXT ·Syscall(SB),NOSPLIT,$0-28
+TEXT ·Syscall(SB),NOSPLIT,$0-28
JMP syscall·Syscall(SB)
-TEXT ·Syscall6(SB),NOSPLIT,$0-40
+TEXT ·Syscall6(SB),NOSPLIT,$0-40
JMP syscall·Syscall6(SB)
-TEXT ·Syscall9(SB),NOSPLIT,$0-52
+TEXT ·Syscall9(SB),NOSPLIT,$0-52
JMP syscall·Syscall9(SB)
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-24
+ JAL runtime·entersyscall(SB)
+ MOVW a1+4(FP), R4
+ MOVW a2+8(FP), R5
+ MOVW a3+12(FP), R6
+ MOVW R0, R7
+ MOVW trap+0(FP), R2 // syscall entry
+ SYSCALL
+ MOVW R2, r1+16(FP) // r1
+ MOVW R3, r2+20(FP) // r2
+ JAL runtime·exitsyscall(SB)
+ RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
JMP syscall·RawSyscall(SB)
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
JMP syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24
+ MOVW a1+4(FP), R4
+ MOVW a2+8(FP), R5
+ MOVW a3+12(FP), R6
+ MOVW trap+0(FP), R2 // syscall entry
+ SYSCALL
+ MOVW R2, r1+16(FP)
+ MOVW R3, r2+20(FP)
+ RET
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
index 8d231fe..649e587 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
@@ -15,14 +15,42 @@
// Just jump to package syscall's implementation for all these functions.
// The runtime may know about them.
-TEXT ·Syscall(SB),NOSPLIT,$0-56
+TEXT ·Syscall(SB),NOSPLIT,$0-56
BR syscall·Syscall(SB)
TEXT ·Syscall6(SB),NOSPLIT,$0-80
BR syscall·Syscall6(SB)
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+ BL runtime·entersyscall(SB)
+ MOVD a1+8(FP), R3
+ MOVD a2+16(FP), R4
+ MOVD a3+24(FP), R5
+ MOVD R0, R6
+ MOVD R0, R7
+ MOVD R0, R8
+ MOVD trap+0(FP), R9 // syscall entry
+ SYSCALL R9
+ MOVD R3, r1+32(FP)
+ MOVD R4, r2+40(FP)
+ BL runtime·exitsyscall(SB)
+ RET
+
TEXT ·RawSyscall(SB),NOSPLIT,$0-56
BR syscall·RawSyscall(SB)
TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
BR syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+ MOVD a1+8(FP), R3
+ MOVD a2+16(FP), R4
+ MOVD a3+24(FP), R5
+ MOVD R0, R6
+ MOVD R0, R7
+ MOVD R0, R8
+ MOVD trap+0(FP), R9 // syscall entry
+ SYSCALL R9
+ MOVD R3, r1+32(FP)
+ MOVD R4, r2+40(FP)
+ RET
diff --git a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
index 1188985..a5a863c 100644
--- a/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
+++ b/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
@@ -21,8 +21,36 @@
TEXT ·Syscall6(SB),NOSPLIT,$0-80
BR syscall·Syscall6(SB)
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+ BL runtime·entersyscall(SB)
+ MOVD a1+8(FP), R2
+ MOVD a2+16(FP), R3
+ MOVD a3+24(FP), R4
+ MOVD $0, R5
+ MOVD $0, R6
+ MOVD $0, R7
+ MOVD trap+0(FP), R1 // syscall entry
+ SYSCALL
+ MOVD R2, r1+32(FP)
+ MOVD R3, r2+40(FP)
+ BL runtime·exitsyscall(SB)
+ RET
+
TEXT ·RawSyscall(SB),NOSPLIT,$0-56
BR syscall·RawSyscall(SB)
TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
BR syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+ MOVD a1+8(FP), R2
+ MOVD a2+16(FP), R3
+ MOVD a3+24(FP), R4
+ MOVD $0, R5
+ MOVD $0, R6
+ MOVD $0, R7
+ MOVD trap+0(FP), R1 // syscall entry
+ SYSCALL
+ MOVD R2, r1+32(FP)
+ MOVD R3, r2+40(FP)
+ RET
diff --git a/vendor/golang.org/x/sys/unix/dirent.go b/vendor/golang.org/x/sys/unix/dirent.go
index bd47581..95fd353 100644
--- a/vendor/golang.org/x/sys/unix/dirent.go
+++ b/vendor/golang.org/x/sys/unix/dirent.go
@@ -6,97 +6,12 @@
package unix
-import "unsafe"
-
-// readInt returns the size-bytes unsigned integer in native byte order at offset off.
-func readInt(b []byte, off, size uintptr) (u uint64, ok bool) {
- if len(b) < int(off+size) {
- return 0, false
- }
- if isBigEndian {
- return readIntBE(b[off:], size), true
- }
- return readIntLE(b[off:], size), true
-}
-
-func readIntBE(b []byte, size uintptr) uint64 {
- switch size {
- case 1:
- return uint64(b[0])
- case 2:
- _ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
- return uint64(b[1]) | uint64(b[0])<<8
- case 4:
- _ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
- return uint64(b[3]) | uint64(b[2])<<8 | uint64(b[1])<<16 | uint64(b[0])<<24
- case 8:
- _ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
- return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
- uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
- default:
- panic("syscall: readInt with unsupported size")
- }
-}
-
-func readIntLE(b []byte, size uintptr) uint64 {
- switch size {
- case 1:
- return uint64(b[0])
- case 2:
- _ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
- return uint64(b[0]) | uint64(b[1])<<8
- case 4:
- _ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
- return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24
- case 8:
- _ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
- return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
- uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
- default:
- panic("syscall: readInt with unsupported size")
- }
-}
+import "syscall"
// ParseDirent parses up to max directory entries in buf,
// appending the names to names. It returns the number of
// bytes consumed from buf, the number of entries added
// to names, and the new names slice.
func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
- origlen := len(buf)
- count = 0
- for max != 0 && len(buf) > 0 {
- reclen, ok := direntReclen(buf)
- if !ok || reclen > uint64(len(buf)) {
- return origlen, count, names
- }
- rec := buf[:reclen]
- buf = buf[reclen:]
- ino, ok := direntIno(rec)
- if !ok {
- break
- }
- if ino == 0 { // File absent in directory.
- continue
- }
- const namoff = uint64(unsafe.Offsetof(Dirent{}.Name))
- namlen, ok := direntNamlen(rec)
- if !ok || namoff+namlen > uint64(len(rec)) {
- break
- }
- name := rec[namoff : namoff+namlen]
- for i, c := range name {
- if c == 0 {
- name = name[:i]
- break
- }
- }
- // Check for useless names before allocating a string.
- if string(name) == "." || string(name) == ".." {
- continue
- }
- max--
- count++
- names = append(names, string(name))
- }
- return origlen - len(buf), count, names
+ return syscall.ParseDirent(buf, max, names)
}
diff --git a/vendor/golang.org/x/sys/unix/env_unix.go b/vendor/golang.org/x/sys/unix/env_unix.go
index 2e06b33..706b3cd 100644
--- a/vendor/golang.org/x/sys/unix/env_unix.go
+++ b/vendor/golang.org/x/sys/unix/env_unix.go
@@ -25,3 +25,7 @@
func Environ() []string {
return syscall.Environ()
}
+
+func Unsetenv(key string) error {
+ return syscall.Unsetenv(key)
+}
diff --git a/vendor/golang.org/x/sys/unix/env_unset.go b/vendor/golang.org/x/sys/unix/env_unset.go
deleted file mode 100644
index c44fdc4..0000000
--- a/vendor/golang.org/x/sys/unix/env_unset.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.4
-
-package unix
-
-import "syscall"
-
-func Unsetenv(key string) error {
- // This was added in Go 1.4.
- return syscall.Unsetenv(key)
-}
diff --git a/vendor/golang.org/x/sys/unix/file_unix.go b/vendor/golang.org/x/sys/unix/file_unix.go
deleted file mode 100644
index 47f6a83..0000000
--- a/vendor/golang.org/x/sys/unix/file_unix.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unix
-
-import (
- "os"
- "syscall"
-)
-
-// FIXME: unexported function from os
-// syscallMode returns the syscall-specific mode bits from Go's portable mode bits.
-func syscallMode(i os.FileMode) (o uint32) {
- o |= uint32(i.Perm())
- if i&os.ModeSetuid != 0 {
- o |= syscall.S_ISUID
- }
- if i&os.ModeSetgid != 0 {
- o |= syscall.S_ISGID
- }
- if i&os.ModeSticky != 0 {
- o |= syscall.S_ISVTX
- }
- // No mapping for Go's ModeTemporary (plan9 only).
- return
-}
diff --git a/vendor/golang.org/x/sys/unix/gccgo.go b/vendor/golang.org/x/sys/unix/gccgo.go
index 40bed3f..50062e3 100644
--- a/vendor/golang.org/x/sys/unix/gccgo.go
+++ b/vendor/golang.org/x/sys/unix/gccgo.go
@@ -11,9 +11,19 @@
// We can't use the gc-syntax .s files for gccgo. On the plus side
// much of the functionality can be written directly in Go.
+//extern gccgoRealSyscallNoError
+func realSyscallNoError(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r uintptr)
+
//extern gccgoRealSyscall
func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr)
+func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {
+ syscall.Entersyscall()
+ r := realSyscallNoError(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+ syscall.Exitsyscall()
+ return r, 0
+}
+
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
syscall.Entersyscall()
r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
@@ -35,6 +45,11 @@
return r, 0, syscall.Errno(errno)
}
+func RawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {
+ r := realSyscallNoError(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+ return r, 0
+}
+
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
return r, 0, syscall.Errno(errno)
diff --git a/vendor/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c
index 99a774f..24e96b1 100644
--- a/vendor/golang.org/x/sys/unix/gccgo_c.c
+++ b/vendor/golang.org/x/sys/unix/gccgo_c.c
@@ -31,6 +31,12 @@
return r;
}
+uintptr_t
+gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
+{
+ return syscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9);
+}
+
// Define the use function in C so that it is not inlined.
extern void use(void *) __asm__ (GOSYM_PREFIX GOPKGPATH ".use") __attribute__((noinline));
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go
index 4119edd..d3903ed 100644
--- a/vendor/golang.org/x/sys/unix/syscall_bsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -352,6 +352,18 @@
return &value, err
}
+// GetsockoptString returns the string value of the socket option opt for the
+// socket associated with fd at the given socket level.
+func GetsockoptString(fd, level, opt int) (string, error) {
+ buf := make([]byte, 256)
+ vallen := _Socklen(len(buf))
+ err := getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+ if err != nil {
+ return "", err
+ }
+ return string(buf[:vallen-1]), nil
+}
+
//sys recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
//sys sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error)
//sys recvmsg(s int, msg *Msghdr, flags int) (n int, err error)
@@ -570,7 +582,12 @@
if len(ts) != 2 {
return EINVAL
}
- err := utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+ // Darwin setattrlist can set nanosecond timestamps
+ err := setattrlistTimes(path, ts, 0)
+ if err != ENOSYS {
+ return err
+ }
+ err = utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
if err != ENOSYS {
return err
}
@@ -590,6 +607,10 @@
if len(ts) != 2 {
return EINVAL
}
+ err := setattrlistTimes(path, ts, flags)
+ if err != ENOSYS {
+ return err
+ }
return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
}
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
index f6a8fcc..b959869 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -36,6 +36,7 @@
return "", ENOTSUP
}
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
type SockaddrDatalink struct {
Len uint8
Family uint8
@@ -76,18 +77,6 @@
return buf[0 : n/siz], nil
}
-func direntIno(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
//sys ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
@@ -187,6 +176,37 @@
return
}
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+ _p0, err := BytePtrFromString(path)
+ if err != nil {
+ return err
+ }
+
+ var attrList attrList
+ attrList.bitmapCount = ATTR_BIT_MAP_COUNT
+ attrList.CommonAttr = ATTR_CMN_MODTIME | ATTR_CMN_ACCTIME
+
+ // order is mtime, atime: the opposite of Chtimes
+ attributes := [2]Timespec{times[1], times[0]}
+ options := 0
+ if flags&AT_SYMLINK_NOFOLLOW != 0 {
+ options |= FSOPT_NOFOLLOW
+ }
+ _, _, e1 := Syscall6(
+ SYS_SETATTRLIST,
+ uintptr(unsafe.Pointer(_p0)),
+ uintptr(unsafe.Pointer(&attrList)),
+ uintptr(unsafe.Pointer(&attributes)),
+ uintptr(unsafe.Sizeof(attributes)),
+ uintptr(options),
+ 0,
+ )
+ if e1 != 0 {
+ return e1
+ }
+ return nil
+}
+
func utimensat(dirfd int, path string, times *[2]Timespec, flags int) error {
// Darwin doesn't support SYS_UTIMENSAT
return ENOSYS
@@ -239,6 +259,52 @@
return &value, err
}
+func Uname(uname *Utsname) error {
+ mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+ n := unsafe.Sizeof(uname.Sysname)
+ if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+ n = unsafe.Sizeof(uname.Nodename)
+ if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+ n = unsafe.Sizeof(uname.Release)
+ if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_VERSION}
+ n = unsafe.Sizeof(uname.Version)
+ if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ // The version might have newlines or tabs in it, convert them to
+ // spaces.
+ for i, b := range uname.Version {
+ if b == '\n' || b == '\t' {
+ if i == len(uname.Version)-1 {
+ uname.Version[i] = 0
+ } else {
+ uname.Version[i] = ' '
+ }
+ }
+ }
+
+ mib = []_C_int{CTL_HW, HW_MACHINE}
+ n = unsafe.Sizeof(uname.Machine)
+ if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ return nil
+}
+
/*
* Exposed directly
*/
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
index 47ab664..faae207 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
@@ -60,3 +60,7 @@
}
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/arm the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
index fee0683..777860b 100644
--- a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -14,6 +14,7 @@
import "unsafe"
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
type SockaddrDatalink struct {
Len uint8
Family uint8
@@ -56,22 +57,6 @@
return buf[0 : n/siz], nil
}
-func direntIno(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Fileno), unsafe.Sizeof(Dirent{}.Fileno))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
- namlen, ok := direntNamlen(buf)
- if !ok {
- return 0, false
- }
- return (16 + namlen + 1 + 7) &^ 7, true
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
//sysnb pipe() (r int, w int, err error)
func Pipe(p []int) (err error) {
@@ -110,6 +95,23 @@
return
}
+const ImplementsGetwd = true
+
+//sys Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+ var buf [PathMax]byte
+ _, err := Getcwd(buf[0:])
+ if err != nil {
+ return "", err
+ }
+ n := clen(buf[:])
+ if n < 1 {
+ return "", EINVAL
+ }
+ return string(buf[:n]), nil
+}
+
func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
var _p0 unsafe.Pointer
var bufsize uintptr
@@ -125,6 +127,113 @@
return
}
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+ // used on Darwin for UtimesNano
+ return ENOSYS
+}
+
+//sys ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+ return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+ return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+ return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+ var value int
+ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+ return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+ var value Winsize
+ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+ return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+ var value Termios
+ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+ return &value, err
+}
+
+func sysctlUname(mib []_C_int, old *byte, oldlen *uintptr) error {
+ err := sysctl(mib, old, oldlen, nil, 0)
+ if err != nil {
+ // Utsname members on Dragonfly are only 32 bytes and
+ // the syscall returns ENOMEM in case the actual value
+ // is longer.
+ if err == ENOMEM {
+ err = nil
+ }
+ }
+ return err
+}
+
+func Uname(uname *Utsname) error {
+ mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+ n := unsafe.Sizeof(uname.Sysname)
+ if err := sysctlUname(mib, &uname.Sysname[0], &n); err != nil {
+ return err
+ }
+ uname.Sysname[unsafe.Sizeof(uname.Sysname)-1] = 0
+
+ mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+ n = unsafe.Sizeof(uname.Nodename)
+ if err := sysctlUname(mib, &uname.Nodename[0], &n); err != nil {
+ return err
+ }
+ uname.Nodename[unsafe.Sizeof(uname.Nodename)-1] = 0
+
+ mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+ n = unsafe.Sizeof(uname.Release)
+ if err := sysctlUname(mib, &uname.Release[0], &n); err != nil {
+ return err
+ }
+ uname.Release[unsafe.Sizeof(uname.Release)-1] = 0
+
+ mib = []_C_int{CTL_KERN, KERN_VERSION}
+ n = unsafe.Sizeof(uname.Version)
+ if err := sysctlUname(mib, &uname.Version[0], &n); err != nil {
+ return err
+ }
+
+ // The version might have newlines or tabs in it, convert them to
+ // spaces.
+ for i, b := range uname.Version {
+ if b == '\n' || b == '\t' {
+ if i == len(uname.Version)-1 {
+ uname.Version[i] = 0
+ } else {
+ uname.Version[i] = ' '
+ }
+ }
+ }
+
+ mib = []_C_int{CTL_HW, HW_MACHINE}
+ n = unsafe.Sizeof(uname.Machine)
+ if err := sysctlUname(mib, &uname.Machine[0], &n); err != nil {
+ return err
+ }
+ uname.Machine[unsafe.Sizeof(uname.Machine)-1] = 0
+
+ return nil
+}
+
/*
* Exposed directly
*/
@@ -225,7 +334,6 @@
// Getlogin
// Sigpending
// Sigaltstack
-// Ioctl
// Reboot
// Execve
// Vfork
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
index 8f7ab16..89f2c3f 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
@@ -14,6 +14,7 @@
import "unsafe"
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
type SockaddrDatalink struct {
Len uint8
Family uint8
@@ -54,18 +55,6 @@
return buf[0 : n/siz], nil
}
-func direntIno(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Fileno), unsafe.Sizeof(Dirent{}.Fileno))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
//sysnb pipe() (r int, w int, err error)
func Pipe(p []int) (err error) {
@@ -105,6 +94,23 @@
return
}
+const ImplementsGetwd = true
+
+//sys Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+ var buf [PathMax]byte
+ _, err := Getcwd(buf[0:])
+ if err != nil {
+ return "", err
+ }
+ n := clen(buf[:])
+ if n < 1 {
+ return "", EINVAL
+ }
+ return string(buf[:n]), nil
+}
+
func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
var _p0 unsafe.Pointer
var bufsize uintptr
@@ -120,6 +126,11 @@
return
}
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+ // used on Darwin for UtimesNano
+ return ENOSYS
+}
+
// Derive extattr namespace and attribute name
func xattrnamespace(fullattr string) (ns int, attr string, err error) {
@@ -271,7 +282,6 @@
// FreeBSD won't allow you to list xattrs from multiple namespaces
s := 0
- var e error
for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
stmp, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
@@ -283,7 +293,6 @@
* we don't have read permissions on, so don't ignore those errors
*/
if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
- e = nil
continue
} else if e != nil {
return s, e
@@ -297,7 +306,7 @@
d = initxattrdest(dest, s)
}
- return s, e
+ return s, nil
}
func Flistxattr(fd int, dest []byte) (sz int, err error) {
@@ -305,11 +314,9 @@
destsiz := len(dest)
s := 0
- var e error
for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
stmp, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
- e = nil
continue
} else if e != nil {
return s, e
@@ -323,7 +330,7 @@
d = initxattrdest(dest, s)
}
- return s, e
+ return s, nil
}
func Llistxattr(link string, dest []byte) (sz int, err error) {
@@ -331,11 +338,9 @@
destsiz := len(dest)
s := 0
- var e error
for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
stmp, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
- e = nil
continue
} else if e != nil {
return s, e
@@ -349,7 +354,7 @@
d = initxattrdest(dest, s)
}
- return s, e
+ return s, nil
}
//sys ioctl(fd int, req uint, arg uintptr) (err error)
@@ -391,6 +396,52 @@
return &value, err
}
+func Uname(uname *Utsname) error {
+ mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+ n := unsafe.Sizeof(uname.Sysname)
+ if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+ n = unsafe.Sizeof(uname.Nodename)
+ if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+ n = unsafe.Sizeof(uname.Release)
+ if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_VERSION}
+ n = unsafe.Sizeof(uname.Version)
+ if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ // The version might have newlines or tabs in it, convert them to
+ // spaces.
+ for i, b := range uname.Version {
+ if b == '\n' || b == '\t' {
+ if i == len(uname.Version)-1 {
+ uname.Version[i] = 0
+ } else {
+ uname.Version[i] = ' '
+ }
+ }
+ }
+
+ mib = []_C_int{CTL_HW, HW_MACHINE}
+ n = unsafe.Sizeof(uname.Machine)
+ if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ return nil
+}
+
/*
* Exposed directly
*/
@@ -434,6 +485,7 @@
//sys Fstatfs(fd int, stat *Statfs_t) (err error)
//sys Fsync(fd int) (err error)
//sys Ftruncate(fd int, length int64) (err error)
+//sys Getdents(fd int, buf []byte) (n int, err error)
//sys Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
//sys Getdtablesize() (size int)
//sysnb Getegid() (egid int)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
index b98a7e1..76cf81f 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -413,6 +413,7 @@
return unsafe.Pointer(&sa.raw), sl, nil
}
+// SockaddrLinklayer implements the Sockaddr interface for AF_PACKET type sockets.
type SockaddrLinklayer struct {
Protocol uint16
Ifindex int
@@ -439,6 +440,7 @@
return unsafe.Pointer(&sa.raw), SizeofSockaddrLinklayer, nil
}
+// SockaddrNetlink implements the Sockaddr interface for AF_NETLINK type sockets.
type SockaddrNetlink struct {
Family uint16
Pad uint16
@@ -455,6 +457,8 @@
return unsafe.Pointer(&sa.raw), SizeofSockaddrNetlink, nil
}
+// SockaddrHCI implements the Sockaddr interface for AF_BLUETOOTH type sockets
+// using the HCI protocol.
type SockaddrHCI struct {
Dev uint16
Channel uint16
@@ -468,6 +472,31 @@
return unsafe.Pointer(&sa.raw), SizeofSockaddrHCI, nil
}
+// SockaddrL2 implements the Sockaddr interface for AF_BLUETOOTH type sockets
+// using the L2CAP protocol.
+type SockaddrL2 struct {
+ PSM uint16
+ CID uint16
+ Addr [6]uint8
+ AddrType uint8
+ raw RawSockaddrL2
+}
+
+func (sa *SockaddrL2) sockaddr() (unsafe.Pointer, _Socklen, error) {
+ sa.raw.Family = AF_BLUETOOTH
+ psm := (*[2]byte)(unsafe.Pointer(&sa.raw.Psm))
+ psm[0] = byte(sa.PSM)
+ psm[1] = byte(sa.PSM >> 8)
+ for i := 0; i < len(sa.Addr); i++ {
+ sa.raw.Bdaddr[i] = sa.Addr[len(sa.Addr)-1-i]
+ }
+ cid := (*[2]byte)(unsafe.Pointer(&sa.raw.Cid))
+ cid[0] = byte(sa.CID)
+ cid[1] = byte(sa.CID >> 8)
+ sa.raw.Bdaddr_type = sa.AddrType
+ return unsafe.Pointer(&sa.raw), SizeofSockaddrL2, nil
+}
+
// SockaddrCAN implements the Sockaddr interface for AF_CAN type sockets.
// The RxID and TxID fields are used for transport protocol addressing in
// (CAN_TP16, CAN_TP20, CAN_MCNET, and CAN_ISOTP), they can be left with
@@ -808,6 +837,24 @@
return &value, err
}
+// GetsockoptString returns the string value of the socket option opt for the
+// socket associated with fd at the given socket level.
+func GetsockoptString(fd, level, opt int) (string, error) {
+ buf := make([]byte, 256)
+ vallen := _Socklen(len(buf))
+ err := getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+ if err != nil {
+ if err == ERANGE {
+ buf = make([]byte, vallen)
+ err = getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+ }
+ if err != nil {
+ return "", err
+ }
+ }
+ return string(buf[:vallen-1]), nil
+}
+
func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
}
@@ -1125,6 +1172,10 @@
return ptracePoke(PTRACE_POKEDATA, PTRACE_PEEKDATA, pid, addr, data)
}
+func PtracePokeUser(pid int, addr uintptr, data []byte) (count int, err error) {
+ return ptracePoke(PTRACE_POKEUSR, PTRACE_PEEKUSR, pid, addr, data)
+}
+
func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) {
return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
}
@@ -1168,22 +1219,6 @@
return Getdents(fd, buf)
}
-func direntIno(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
- reclen, ok := direntReclen(buf)
- if !ok {
- return 0, false
- }
- return reclen - uint64(unsafe.Offsetof(Dirent{}.Name)), true
-}
-
//sys mount(source string, target string, fstype string, flags uintptr, data *byte) (err error)
func Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
@@ -1289,6 +1324,7 @@
//sys Setpriority(which int, who int, prio int) (err error)
//sys Setxattr(path string, attr string, data []byte, flags int) (err error)
+//sys Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error)
//sys Sync()
//sys Syncfs(fd int) (err error)
//sysnb Sysinfo(info *Sysinfo_t) (err error)
@@ -1406,7 +1442,6 @@
// Msgget
// Msgrcv
// Msgsnd
-// Newfstatat
// Nfsservctl
// Personality
// Pselect6
@@ -1427,11 +1462,9 @@
// RtSigtimedwait
// SchedGetPriorityMax
// SchedGetPriorityMin
-// SchedGetaffinity
// SchedGetparam
// SchedGetscheduler
// SchedRrGetInterval
-// SchedSetaffinity
// SchedSetparam
// SchedYield
// Security
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
index 4774fa3..bb8e4fb 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_386.go
@@ -54,6 +54,7 @@
//sys Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64_64
//sys Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
//sys Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
//sys Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
//sysnb Getegid() (egid int) = SYS_GETEGID32
//sysnb Geteuid() (euid int) = SYS_GETEUID32
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
index 3707f6b..53d38a5 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
@@ -11,6 +11,7 @@
//sys Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
//sys Fchown(fd int, uid int, gid int) (err error)
//sys Fstat(fd int, stat *Stat_t) (err error)
+//sys Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
//sys Fstatfs(fd int, buf *Statfs_t) (err error)
//sys Ftruncate(fd int, length int64) (err error)
//sysnb Getegid() (egid int)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
index 226be10..c59f858 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
@@ -77,6 +77,7 @@
//sys Dup2(oldfd int, newfd int) (err error)
//sys Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
//sys Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
//sysnb Getegid() (egid int) = SYS_GETEGID32
//sysnb Geteuid() (euid int) = SYS_GETEUID32
//sysnb Getgid() (gid int) = SYS_GETGID32
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_gc.go b/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
new file mode 100644
index 0000000..c26e6ec
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
@@ -0,0 +1,14 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux,!gccgo
+
+package unix
+
+// SyscallNoError may be used instead of Syscall for syscalls that don't fail.
+func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr)
+
+// RawSyscallNoError may be used instead of RawSyscall for syscalls that don't
+// fail.
+func RawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
index cdda11a..46aa4ff 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
@@ -10,6 +10,7 @@
//sys Dup2(oldfd int, newfd int) (err error)
//sys EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
//sys Fchown(fd int, uid int, gid int) (err error)
+//sys Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
//sys Fstatfs(fd int, buf *Statfs_t) (err error)
//sys Ftruncate(fd int, length int64) (err error)
//sysnb Getegid() (egid int)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
index a114ba8..40b8e4f 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
@@ -65,6 +65,7 @@
//sys Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
//sys Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
//sys Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
//sys Utime(path string, buf *Utimbuf) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
index 7cae936..17c9116 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
@@ -11,6 +11,7 @@
//sys Dup2(oldfd int, newfd int) (err error)
//sys Fchown(fd int, uid int, gid int) (err error)
//sys Fstat(fd int, stat *Stat_t) (err error)
+//sys Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
//sys Fstatfs(fd int, buf *Statfs_t) (err error)
//sys Ftruncate(fd int, length int64) (err error)
//sysnb Getegid() (egid int)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
index e96a40c..c0d86e7 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
@@ -15,6 +15,7 @@
//sys Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
//sys Fchown(fd int, uid int, gid int) (err error)
//sys Fstat(fd int, stat *Stat_t) (err error)
+//sys Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
//sys Fstatfs(fd int, buf *Statfs_t) (err error)
//sys Ftruncate(fd int, length int64) (err error)
//sysnb Getegid() (egid int)
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
index 012a328..a00f992 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
@@ -10,6 +10,7 @@
//sys Dup2(oldfd int, newfd int) (err error)
//sys Fchown(fd int, uid int, gid int) (err error)
//sys Fstat(fd int, stat *Stat_t) (err error)
+//sys Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
//sys Fstatfs(fd int, buf *Statfs_t) (err error)
//sys Ftruncate(fd int, length int64) (err error)
//sysnb Getegid() (egid int)
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
index 1caa5b3..71b7078 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -17,6 +17,7 @@
"unsafe"
)
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
type SockaddrDatalink struct {
Len uint8
Family uint8
@@ -55,7 +56,6 @@
}
func nametomib(name string) (mib []_C_int, err error) {
-
// Split name into components.
var parts []string
last := 0
@@ -93,18 +93,6 @@
return mib, nil
}
-func direntIno(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Fileno), unsafe.Sizeof(Dirent{}.Fileno))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
//sysnb pipe() (fd1 int, fd2 int, err error)
func Pipe(p []int) (err error) {
if len(p) != 2 {
@@ -119,11 +107,118 @@
return getdents(fd, buf)
}
+const ImplementsGetwd = true
+
+//sys Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+ var buf [PathMax]byte
+ _, err := Getcwd(buf[0:])
+ if err != nil {
+ return "", err
+ }
+ n := clen(buf[:])
+ if n < 1 {
+ return "", EINVAL
+ }
+ return string(buf[:n]), nil
+}
+
// TODO
func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
return -1, ENOSYS
}
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+ // used on Darwin for UtimesNano
+ return ENOSYS
+}
+
+//sys ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+ return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+ return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+ return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+ var value int
+ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+ return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+ var value Winsize
+ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+ return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+ var value Termios
+ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+ return &value, err
+}
+
+func Uname(uname *Utsname) error {
+ mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+ n := unsafe.Sizeof(uname.Sysname)
+ if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+ n = unsafe.Sizeof(uname.Nodename)
+ if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+ n = unsafe.Sizeof(uname.Release)
+ if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_VERSION}
+ n = unsafe.Sizeof(uname.Version)
+ if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ // The version might have newlines or tabs in it, convert them to
+ // spaces.
+ for i, b := range uname.Version {
+ if b == '\n' || b == '\t' {
+ if i == len(uname.Version)-1 {
+ uname.Version[i] = 0
+ } else {
+ uname.Version[i] = ' '
+ }
+ }
+ }
+
+ mib = []_C_int{CTL_HW, HW_MACHINE}
+ n = unsafe.Sizeof(uname.Machine)
+ if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ return nil
+}
+
/*
* Exposed directly
*/
@@ -384,7 +479,6 @@
// getitimer
// getvfsstat
// getxattr
-// ioctl
// ktrace
// lchflags
// lchmod
diff --git a/vendor/golang.org/x/sys/unix/syscall_no_getwd.go b/vendor/golang.org/x/sys/unix/syscall_no_getwd.go
deleted file mode 100644
index 530792e..0000000
--- a/vendor/golang.org/x/sys/unix/syscall_no_getwd.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build dragonfly freebsd netbsd openbsd
-
-package unix
-
-const ImplementsGetwd = false
-
-func Getwd() (string, error) { return "", ENOTSUP }
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
index 03a0fac..37556e7 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -13,10 +13,12 @@
package unix
import (
+ "sort"
"syscall"
"unsafe"
)
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
type SockaddrDatalink struct {
Len uint8
Family uint8
@@ -32,39 +34,15 @@
func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
func nametomib(name string) (mib []_C_int, err error) {
-
- // Perform lookup via a binary search
- left := 0
- right := len(sysctlMib) - 1
- for {
- idx := left + (right-left)/2
- switch {
- case name == sysctlMib[idx].ctlname:
- return sysctlMib[idx].ctloid, nil
- case name > sysctlMib[idx].ctlname:
- left = idx + 1
- default:
- right = idx - 1
- }
- if left > right {
- break
- }
+ i := sort.Search(len(sysctlMib), func(i int) bool {
+ return sysctlMib[i].ctlname >= name
+ })
+ if i < len(sysctlMib) && sysctlMib[i].ctlname == name {
+ return sysctlMib[i].ctloid, nil
}
return nil, EINVAL
}
-func direntIno(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Fileno), unsafe.Sizeof(Dirent{}.Fileno))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
-}
-
//sysnb pipe(p *[2]_C_int) (err error)
func Pipe(p []int) (err error) {
if len(p) != 2 {
@@ -82,6 +60,23 @@
return getdents(fd, buf)
}
+const ImplementsGetwd = true
+
+//sys Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+ var buf [PathMax]byte
+ _, err := Getcwd(buf[0:])
+ if err != nil {
+ return "", err
+ }
+ n := clen(buf[:])
+ if n < 1 {
+ return "", EINVAL
+ }
+ return string(buf[:n]), nil
+}
+
// TODO
func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
return -1, ENOSYS
@@ -102,6 +97,96 @@
return
}
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+ // used on Darwin for UtimesNano
+ return ENOSYS
+}
+
+//sys ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+ return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+ return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+ return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+ var value int
+ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+ return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+ var value Winsize
+ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+ return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+ var value Termios
+ err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+ return &value, err
+}
+
+func Uname(uname *Utsname) error {
+ mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+ n := unsafe.Sizeof(uname.Sysname)
+ if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+ n = unsafe.Sizeof(uname.Nodename)
+ if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+ n = unsafe.Sizeof(uname.Release)
+ if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ mib = []_C_int{CTL_KERN, KERN_VERSION}
+ n = unsafe.Sizeof(uname.Version)
+ if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ // The version might have newlines or tabs in it, convert them to
+ // spaces.
+ for i, b := range uname.Version {
+ if b == '\n' || b == '\t' {
+ if i == len(uname.Version)-1 {
+ uname.Version[i] = 0
+ } else {
+ uname.Version[i] = ' '
+ }
+ }
+ }
+
+ mib = []_C_int{CTL_HW, HW_MACHINE}
+ n = unsafe.Sizeof(uname.Machine)
+ if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+ return err
+ }
+
+ return nil
+}
+
/*
* Exposed directly
*/
@@ -222,7 +307,6 @@
// getresuid
// getrtable
// getthrid
-// ioctl
// ktrace
// lfs_bmapv
// lfs_markv
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go
index 3ab9e07..eca8d1d 100644
--- a/vendor/golang.org/x/sys/unix/syscall_solaris.go
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go
@@ -23,6 +23,7 @@
func rawSysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
type SockaddrDatalink struct {
Family uint16
Index uint16
@@ -34,31 +35,6 @@
raw RawSockaddrDatalink
}
-func clen(n []byte) int {
- for i := 0; i < len(n); i++ {
- if n[i] == 0 {
- return i
- }
- }
- return len(n)
-}
-
-func direntIno(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Ino), unsafe.Sizeof(Dirent{}.Ino))
-}
-
-func direntReclen(buf []byte) (uint64, bool) {
- return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
-}
-
-func direntNamlen(buf []byte) (uint64, bool) {
- reclen, ok := direntReclen(buf)
- if !ok {
- return 0, false
- }
- return reclen - uint64(unsafe.Offsetof(Dirent{}.Name)), true
-}
-
//sysnb pipe(p *[2]_C_int) (n int, err error)
func Pipe(p []int) (err error) {
@@ -139,6 +115,18 @@
return anyToSockaddr(&rsa)
}
+// GetsockoptString returns the string value of the socket option opt for the
+// socket associated with fd at the given socket level.
+func GetsockoptString(fd, level, opt int) (string, error) {
+ buf := make([]byte, 256)
+ vallen := _Socklen(len(buf))
+ err := getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+ if err != nil {
+ return "", err
+ }
+ return string(buf[:vallen-1]), nil
+}
+
const ImplementsGetwd = true
//sys Getcwd(buf []byte) (n int, err error)
@@ -655,6 +643,7 @@
//sys Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
//sys Rmdir(path string) (err error)
//sys Seek(fd int, offset int64, whence int) (newoffset int64, err error) = lseek
+//sys Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
//sysnb Setegid(egid int) (err error)
//sysnb Seteuid(euid int) (err error)
//sysnb Setgid(gid int) (err error)
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go
index 3ed8a91..cd8f3a9 100644
--- a/vendor/golang.org/x/sys/unix/syscall_unix.go
+++ b/vendor/golang.org/x/sys/unix/syscall_unix.go
@@ -50,6 +50,16 @@
return e
}
+// clen returns the index of the first NULL byte in n or len(n) if n contains no NULL byte.
+func clen(n []byte) int {
+ for i := 0; i < len(n); i++ {
+ if n[i] == 0 {
+ return i
+ }
+ }
+ return len(n)
+}
+
// Mmap manager, for use by operating system-specific implementations.
type mmapper struct {
@@ -138,16 +148,19 @@
// creation of IPv6 sockets to return EAFNOSUPPORT.
var SocketDisableIPv6 bool
+// Sockaddr represents a socket address.
type Sockaddr interface {
sockaddr() (ptr unsafe.Pointer, len _Socklen, err error) // lowercase; only we can define Sockaddrs
}
+// SockaddrInet4 implements the Sockaddr interface for AF_INET type sockets.
type SockaddrInet4 struct {
Port int
Addr [4]byte
raw RawSockaddrInet4
}
+// SockaddrInet6 implements the Sockaddr interface for AF_INET6 type sockets.
type SockaddrInet6 struct {
Port int
ZoneId uint32
@@ -155,6 +168,7 @@
raw RawSockaddrInet6
}
+// SockaddrUnix implements the Sockaddr interface for AF_UNIX type sockets.
type SockaddrUnix struct {
Name string
raw RawSockaddrUnix
diff --git a/vendor/golang.org/x/sys/unix/timestruct.go b/vendor/golang.org/x/sys/unix/timestruct.go
index 139fbbe..47b9011 100644
--- a/vendor/golang.org/x/sys/unix/timestruct.go
+++ b/vendor/golang.org/x/sys/unix/timestruct.go
@@ -6,6 +6,8 @@
package unix
+import "time"
+
// TimespecToNsec converts a Timespec value into a number of
// nanoseconds since the Unix epoch.
func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
@@ -22,6 +24,24 @@
return setTimespec(sec, nsec)
}
+// TimeToTimespec converts t into a Timespec.
+// On some 32-bit systems the range of valid Timespec values are smaller
+// than that of time.Time values. So if t is out of the valid range of
+// Timespec, it returns a zero Timespec and ERANGE.
+func TimeToTimespec(t time.Time) (Timespec, error) {
+ sec := t.Unix()
+ nsec := int64(t.Nanosecond())
+ ts := setTimespec(sec, nsec)
+
+ // Currently all targets have either int32 or int64 for Timespec.Sec.
+ // If there were a new target with floating point type for it, we have
+ // to consider the rounding error.
+ if int64(ts.Sec) != sec {
+ return Timespec{}, ERANGE
+ }
+ return ts, nil
+}
+
// TimevalToNsec converts a Timeval value into a number of nanoseconds
// since the Unix epoch.
func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
index 1c68758..dcba884 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
@@ -49,6 +49,86 @@
AF_UNSPEC = 0x0
AF_UTUN = 0x26
ALTWERASE = 0x200
+ ATTR_BIT_MAP_COUNT = 0x5
+ ATTR_CMN_ACCESSMASK = 0x20000
+ ATTR_CMN_ACCTIME = 0x1000
+ ATTR_CMN_ADDEDTIME = 0x10000000
+ ATTR_CMN_BKUPTIME = 0x2000
+ ATTR_CMN_CHGTIME = 0x800
+ ATTR_CMN_CRTIME = 0x200
+ ATTR_CMN_DATA_PROTECT_FLAGS = 0x40000000
+ ATTR_CMN_DEVID = 0x2
+ ATTR_CMN_DOCUMENT_ID = 0x100000
+ ATTR_CMN_ERROR = 0x20000000
+ ATTR_CMN_EXTENDED_SECURITY = 0x400000
+ ATTR_CMN_FILEID = 0x2000000
+ ATTR_CMN_FLAGS = 0x40000
+ ATTR_CMN_FNDRINFO = 0x4000
+ ATTR_CMN_FSID = 0x4
+ ATTR_CMN_FULLPATH = 0x8000000
+ ATTR_CMN_GEN_COUNT = 0x80000
+ ATTR_CMN_GRPID = 0x10000
+ ATTR_CMN_GRPUUID = 0x1000000
+ ATTR_CMN_MODTIME = 0x400
+ ATTR_CMN_NAME = 0x1
+ ATTR_CMN_NAMEDATTRCOUNT = 0x80000
+ ATTR_CMN_NAMEDATTRLIST = 0x100000
+ ATTR_CMN_OBJID = 0x20
+ ATTR_CMN_OBJPERMANENTID = 0x40
+ ATTR_CMN_OBJTAG = 0x10
+ ATTR_CMN_OBJTYPE = 0x8
+ ATTR_CMN_OWNERID = 0x8000
+ ATTR_CMN_PARENTID = 0x4000000
+ ATTR_CMN_PAROBJID = 0x80
+ ATTR_CMN_RETURNED_ATTRS = 0x80000000
+ ATTR_CMN_SCRIPT = 0x100
+ ATTR_CMN_SETMASK = 0x41c7ff00
+ ATTR_CMN_USERACCESS = 0x200000
+ ATTR_CMN_UUID = 0x800000
+ ATTR_CMN_VALIDMASK = 0xffffffff
+ ATTR_CMN_VOLSETMASK = 0x6700
+ ATTR_FILE_ALLOCSIZE = 0x4
+ ATTR_FILE_CLUMPSIZE = 0x10
+ ATTR_FILE_DATAALLOCSIZE = 0x400
+ ATTR_FILE_DATAEXTENTS = 0x800
+ ATTR_FILE_DATALENGTH = 0x200
+ ATTR_FILE_DEVTYPE = 0x20
+ ATTR_FILE_FILETYPE = 0x40
+ ATTR_FILE_FORKCOUNT = 0x80
+ ATTR_FILE_FORKLIST = 0x100
+ ATTR_FILE_IOBLOCKSIZE = 0x8
+ ATTR_FILE_LINKCOUNT = 0x1
+ ATTR_FILE_RSRCALLOCSIZE = 0x2000
+ ATTR_FILE_RSRCEXTENTS = 0x4000
+ ATTR_FILE_RSRCLENGTH = 0x1000
+ ATTR_FILE_SETMASK = 0x20
+ ATTR_FILE_TOTALSIZE = 0x2
+ ATTR_FILE_VALIDMASK = 0x37ff
+ ATTR_VOL_ALLOCATIONCLUMP = 0x40
+ ATTR_VOL_ATTRIBUTES = 0x40000000
+ ATTR_VOL_CAPABILITIES = 0x20000
+ ATTR_VOL_DIRCOUNT = 0x400
+ ATTR_VOL_ENCODINGSUSED = 0x10000
+ ATTR_VOL_FILECOUNT = 0x200
+ ATTR_VOL_FSTYPE = 0x1
+ ATTR_VOL_INFO = 0x80000000
+ ATTR_VOL_IOBLOCKSIZE = 0x80
+ ATTR_VOL_MAXOBJCOUNT = 0x800
+ ATTR_VOL_MINALLOCATION = 0x20
+ ATTR_VOL_MOUNTEDDEVICE = 0x8000
+ ATTR_VOL_MOUNTFLAGS = 0x4000
+ ATTR_VOL_MOUNTPOINT = 0x1000
+ ATTR_VOL_NAME = 0x2000
+ ATTR_VOL_OBJCOUNT = 0x100
+ ATTR_VOL_QUOTA_SIZE = 0x10000000
+ ATTR_VOL_RESERVED_SIZE = 0x20000000
+ ATTR_VOL_SETMASK = 0x80002000
+ ATTR_VOL_SIGNATURE = 0x2
+ ATTR_VOL_SIZE = 0x4
+ ATTR_VOL_SPACEAVAIL = 0x10
+ ATTR_VOL_SPACEFREE = 0x8
+ ATTR_VOL_UUID = 0x40000
+ ATTR_VOL_VALIDMASK = 0xf007ffff
B0 = 0x0
B110 = 0x6e
B115200 = 0x1c200
@@ -169,6 +249,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
DLT_A429 = 0xb8
@@ -390,6 +472,11 @@
FF1 = 0x4000
FFDLY = 0x4000
FLUSHO = 0x800000
+ FSOPT_ATTR_CMN_EXTENDED = 0x20
+ FSOPT_NOFOLLOW = 0x1
+ FSOPT_NOINMEMUPDATE = 0x2
+ FSOPT_PACK_INVAL_ATTRS = 0x8
+ FSOPT_REPORT_FULLSIZE = 0x4
F_ADDFILESIGS = 0x3d
F_ADDFILESIGS_FOR_DYLD_SIM = 0x53
F_ADDFILESIGS_RETURN = 0x61
@@ -425,6 +512,7 @@
F_PATHPKG_CHECK = 0x34
F_PEOFPOSMODE = 0x3
F_PREALLOCATE = 0x2a
+ F_PUNCHHOLE = 0x63
F_RDADVISE = 0x2c
F_RDAHEAD = 0x2d
F_RDLCK = 0x1
@@ -441,10 +529,12 @@
F_SINGLE_WRITER = 0x4c
F_THAW_FS = 0x36
F_TRANSCODEKEY = 0x4b
+ F_TRIM_ACTIVE_FILE = 0x64
F_UNLCK = 0x2
F_VOLPOSMODE = 0x4
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -681,6 +771,7 @@
IPV6_FAITH = 0x1d
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
+ IPV6_FLOW_ECN_MASK = 0x300
IPV6_FRAGTTL = 0x3c
IPV6_FW_ADD = 0x1e
IPV6_FW_DEL = 0x1f
@@ -771,6 +862,7 @@
IP_RECVOPTS = 0x5
IP_RECVPKTINFO = 0x1a
IP_RECVRETOPTS = 0x6
+ IP_RECVTOS = 0x1b
IP_RECVTTL = 0x18
IP_RETOPTS = 0x8
IP_RF = 0x8000
@@ -789,6 +881,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
index 48f63d4..1a51c96 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
@@ -49,6 +49,86 @@
AF_UNSPEC = 0x0
AF_UTUN = 0x26
ALTWERASE = 0x200
+ ATTR_BIT_MAP_COUNT = 0x5
+ ATTR_CMN_ACCESSMASK = 0x20000
+ ATTR_CMN_ACCTIME = 0x1000
+ ATTR_CMN_ADDEDTIME = 0x10000000
+ ATTR_CMN_BKUPTIME = 0x2000
+ ATTR_CMN_CHGTIME = 0x800
+ ATTR_CMN_CRTIME = 0x200
+ ATTR_CMN_DATA_PROTECT_FLAGS = 0x40000000
+ ATTR_CMN_DEVID = 0x2
+ ATTR_CMN_DOCUMENT_ID = 0x100000
+ ATTR_CMN_ERROR = 0x20000000
+ ATTR_CMN_EXTENDED_SECURITY = 0x400000
+ ATTR_CMN_FILEID = 0x2000000
+ ATTR_CMN_FLAGS = 0x40000
+ ATTR_CMN_FNDRINFO = 0x4000
+ ATTR_CMN_FSID = 0x4
+ ATTR_CMN_FULLPATH = 0x8000000
+ ATTR_CMN_GEN_COUNT = 0x80000
+ ATTR_CMN_GRPID = 0x10000
+ ATTR_CMN_GRPUUID = 0x1000000
+ ATTR_CMN_MODTIME = 0x400
+ ATTR_CMN_NAME = 0x1
+ ATTR_CMN_NAMEDATTRCOUNT = 0x80000
+ ATTR_CMN_NAMEDATTRLIST = 0x100000
+ ATTR_CMN_OBJID = 0x20
+ ATTR_CMN_OBJPERMANENTID = 0x40
+ ATTR_CMN_OBJTAG = 0x10
+ ATTR_CMN_OBJTYPE = 0x8
+ ATTR_CMN_OWNERID = 0x8000
+ ATTR_CMN_PARENTID = 0x4000000
+ ATTR_CMN_PAROBJID = 0x80
+ ATTR_CMN_RETURNED_ATTRS = 0x80000000
+ ATTR_CMN_SCRIPT = 0x100
+ ATTR_CMN_SETMASK = 0x41c7ff00
+ ATTR_CMN_USERACCESS = 0x200000
+ ATTR_CMN_UUID = 0x800000
+ ATTR_CMN_VALIDMASK = 0xffffffff
+ ATTR_CMN_VOLSETMASK = 0x6700
+ ATTR_FILE_ALLOCSIZE = 0x4
+ ATTR_FILE_CLUMPSIZE = 0x10
+ ATTR_FILE_DATAALLOCSIZE = 0x400
+ ATTR_FILE_DATAEXTENTS = 0x800
+ ATTR_FILE_DATALENGTH = 0x200
+ ATTR_FILE_DEVTYPE = 0x20
+ ATTR_FILE_FILETYPE = 0x40
+ ATTR_FILE_FORKCOUNT = 0x80
+ ATTR_FILE_FORKLIST = 0x100
+ ATTR_FILE_IOBLOCKSIZE = 0x8
+ ATTR_FILE_LINKCOUNT = 0x1
+ ATTR_FILE_RSRCALLOCSIZE = 0x2000
+ ATTR_FILE_RSRCEXTENTS = 0x4000
+ ATTR_FILE_RSRCLENGTH = 0x1000
+ ATTR_FILE_SETMASK = 0x20
+ ATTR_FILE_TOTALSIZE = 0x2
+ ATTR_FILE_VALIDMASK = 0x37ff
+ ATTR_VOL_ALLOCATIONCLUMP = 0x40
+ ATTR_VOL_ATTRIBUTES = 0x40000000
+ ATTR_VOL_CAPABILITIES = 0x20000
+ ATTR_VOL_DIRCOUNT = 0x400
+ ATTR_VOL_ENCODINGSUSED = 0x10000
+ ATTR_VOL_FILECOUNT = 0x200
+ ATTR_VOL_FSTYPE = 0x1
+ ATTR_VOL_INFO = 0x80000000
+ ATTR_VOL_IOBLOCKSIZE = 0x80
+ ATTR_VOL_MAXOBJCOUNT = 0x800
+ ATTR_VOL_MINALLOCATION = 0x20
+ ATTR_VOL_MOUNTEDDEVICE = 0x8000
+ ATTR_VOL_MOUNTFLAGS = 0x4000
+ ATTR_VOL_MOUNTPOINT = 0x1000
+ ATTR_VOL_NAME = 0x2000
+ ATTR_VOL_OBJCOUNT = 0x100
+ ATTR_VOL_QUOTA_SIZE = 0x10000000
+ ATTR_VOL_RESERVED_SIZE = 0x20000000
+ ATTR_VOL_SETMASK = 0x80002000
+ ATTR_VOL_SIGNATURE = 0x2
+ ATTR_VOL_SIZE = 0x4
+ ATTR_VOL_SPACEAVAIL = 0x10
+ ATTR_VOL_SPACEFREE = 0x8
+ ATTR_VOL_UUID = 0x40000
+ ATTR_VOL_VALIDMASK = 0xf007ffff
B0 = 0x0
B110 = 0x6e
B115200 = 0x1c200
@@ -169,6 +249,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
DLT_A429 = 0xb8
@@ -390,6 +472,11 @@
FF1 = 0x4000
FFDLY = 0x4000
FLUSHO = 0x800000
+ FSOPT_ATTR_CMN_EXTENDED = 0x20
+ FSOPT_NOFOLLOW = 0x1
+ FSOPT_NOINMEMUPDATE = 0x2
+ FSOPT_PACK_INVAL_ATTRS = 0x8
+ FSOPT_REPORT_FULLSIZE = 0x4
F_ADDFILESIGS = 0x3d
F_ADDFILESIGS_FOR_DYLD_SIM = 0x53
F_ADDFILESIGS_RETURN = 0x61
@@ -425,6 +512,7 @@
F_PATHPKG_CHECK = 0x34
F_PEOFPOSMODE = 0x3
F_PREALLOCATE = 0x2a
+ F_PUNCHHOLE = 0x63
F_RDADVISE = 0x2c
F_RDAHEAD = 0x2d
F_RDLCK = 0x1
@@ -441,10 +529,12 @@
F_SINGLE_WRITER = 0x4c
F_THAW_FS = 0x36
F_TRANSCODEKEY = 0x4b
+ F_TRIM_ACTIVE_FILE = 0x64
F_UNLCK = 0x2
F_VOLPOSMODE = 0x4
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -681,6 +771,7 @@
IPV6_FAITH = 0x1d
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
+ IPV6_FLOW_ECN_MASK = 0x300
IPV6_FRAGTTL = 0x3c
IPV6_FW_ADD = 0x1e
IPV6_FW_DEL = 0x1f
@@ -771,6 +862,7 @@
IP_RECVOPTS = 0x5
IP_RECVPKTINFO = 0x1a
IP_RECVRETOPTS = 0x6
+ IP_RECVTOS = 0x1b
IP_RECVTTL = 0x18
IP_RETOPTS = 0x8
IP_RF = 0x8000
@@ -789,6 +881,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
index 24cb522..fa135b1 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
@@ -49,6 +49,86 @@
AF_UNSPEC = 0x0
AF_UTUN = 0x26
ALTWERASE = 0x200
+ ATTR_BIT_MAP_COUNT = 0x5
+ ATTR_CMN_ACCESSMASK = 0x20000
+ ATTR_CMN_ACCTIME = 0x1000
+ ATTR_CMN_ADDEDTIME = 0x10000000
+ ATTR_CMN_BKUPTIME = 0x2000
+ ATTR_CMN_CHGTIME = 0x800
+ ATTR_CMN_CRTIME = 0x200
+ ATTR_CMN_DATA_PROTECT_FLAGS = 0x40000000
+ ATTR_CMN_DEVID = 0x2
+ ATTR_CMN_DOCUMENT_ID = 0x100000
+ ATTR_CMN_ERROR = 0x20000000
+ ATTR_CMN_EXTENDED_SECURITY = 0x400000
+ ATTR_CMN_FILEID = 0x2000000
+ ATTR_CMN_FLAGS = 0x40000
+ ATTR_CMN_FNDRINFO = 0x4000
+ ATTR_CMN_FSID = 0x4
+ ATTR_CMN_FULLPATH = 0x8000000
+ ATTR_CMN_GEN_COUNT = 0x80000
+ ATTR_CMN_GRPID = 0x10000
+ ATTR_CMN_GRPUUID = 0x1000000
+ ATTR_CMN_MODTIME = 0x400
+ ATTR_CMN_NAME = 0x1
+ ATTR_CMN_NAMEDATTRCOUNT = 0x80000
+ ATTR_CMN_NAMEDATTRLIST = 0x100000
+ ATTR_CMN_OBJID = 0x20
+ ATTR_CMN_OBJPERMANENTID = 0x40
+ ATTR_CMN_OBJTAG = 0x10
+ ATTR_CMN_OBJTYPE = 0x8
+ ATTR_CMN_OWNERID = 0x8000
+ ATTR_CMN_PARENTID = 0x4000000
+ ATTR_CMN_PAROBJID = 0x80
+ ATTR_CMN_RETURNED_ATTRS = 0x80000000
+ ATTR_CMN_SCRIPT = 0x100
+ ATTR_CMN_SETMASK = 0x41c7ff00
+ ATTR_CMN_USERACCESS = 0x200000
+ ATTR_CMN_UUID = 0x800000
+ ATTR_CMN_VALIDMASK = 0xffffffff
+ ATTR_CMN_VOLSETMASK = 0x6700
+ ATTR_FILE_ALLOCSIZE = 0x4
+ ATTR_FILE_CLUMPSIZE = 0x10
+ ATTR_FILE_DATAALLOCSIZE = 0x400
+ ATTR_FILE_DATAEXTENTS = 0x800
+ ATTR_FILE_DATALENGTH = 0x200
+ ATTR_FILE_DEVTYPE = 0x20
+ ATTR_FILE_FILETYPE = 0x40
+ ATTR_FILE_FORKCOUNT = 0x80
+ ATTR_FILE_FORKLIST = 0x100
+ ATTR_FILE_IOBLOCKSIZE = 0x8
+ ATTR_FILE_LINKCOUNT = 0x1
+ ATTR_FILE_RSRCALLOCSIZE = 0x2000
+ ATTR_FILE_RSRCEXTENTS = 0x4000
+ ATTR_FILE_RSRCLENGTH = 0x1000
+ ATTR_FILE_SETMASK = 0x20
+ ATTR_FILE_TOTALSIZE = 0x2
+ ATTR_FILE_VALIDMASK = 0x37ff
+ ATTR_VOL_ALLOCATIONCLUMP = 0x40
+ ATTR_VOL_ATTRIBUTES = 0x40000000
+ ATTR_VOL_CAPABILITIES = 0x20000
+ ATTR_VOL_DIRCOUNT = 0x400
+ ATTR_VOL_ENCODINGSUSED = 0x10000
+ ATTR_VOL_FILECOUNT = 0x200
+ ATTR_VOL_FSTYPE = 0x1
+ ATTR_VOL_INFO = 0x80000000
+ ATTR_VOL_IOBLOCKSIZE = 0x80
+ ATTR_VOL_MAXOBJCOUNT = 0x800
+ ATTR_VOL_MINALLOCATION = 0x20
+ ATTR_VOL_MOUNTEDDEVICE = 0x8000
+ ATTR_VOL_MOUNTFLAGS = 0x4000
+ ATTR_VOL_MOUNTPOINT = 0x1000
+ ATTR_VOL_NAME = 0x2000
+ ATTR_VOL_OBJCOUNT = 0x100
+ ATTR_VOL_QUOTA_SIZE = 0x10000000
+ ATTR_VOL_RESERVED_SIZE = 0x20000000
+ ATTR_VOL_SETMASK = 0x80002000
+ ATTR_VOL_SIGNATURE = 0x2
+ ATTR_VOL_SIZE = 0x4
+ ATTR_VOL_SPACEAVAIL = 0x10
+ ATTR_VOL_SPACEFREE = 0x8
+ ATTR_VOL_UUID = 0x40000
+ ATTR_VOL_VALIDMASK = 0xf007ffff
B0 = 0x0
B110 = 0x6e
B115200 = 0x1c200
@@ -169,6 +249,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
DLT_A429 = 0xb8
@@ -390,6 +472,11 @@
FF1 = 0x4000
FFDLY = 0x4000
FLUSHO = 0x800000
+ FSOPT_ATTR_CMN_EXTENDED = 0x20
+ FSOPT_NOFOLLOW = 0x1
+ FSOPT_NOINMEMUPDATE = 0x2
+ FSOPT_PACK_INVAL_ATTRS = 0x8
+ FSOPT_REPORT_FULLSIZE = 0x4
F_ADDFILESIGS = 0x3d
F_ADDFILESIGS_FOR_DYLD_SIM = 0x53
F_ADDFILESIGS_RETURN = 0x61
@@ -425,6 +512,7 @@
F_PATHPKG_CHECK = 0x34
F_PEOFPOSMODE = 0x3
F_PREALLOCATE = 0x2a
+ F_PUNCHHOLE = 0x63
F_RDADVISE = 0x2c
F_RDAHEAD = 0x2d
F_RDLCK = 0x1
@@ -441,10 +529,12 @@
F_SINGLE_WRITER = 0x4c
F_THAW_FS = 0x36
F_TRANSCODEKEY = 0x4b
+ F_TRIM_ACTIVE_FILE = 0x64
F_UNLCK = 0x2
F_VOLPOSMODE = 0x4
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -681,6 +771,7 @@
IPV6_FAITH = 0x1d
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
+ IPV6_FLOW_ECN_MASK = 0x300
IPV6_FRAGTTL = 0x3c
IPV6_FW_ADD = 0x1e
IPV6_FW_DEL = 0x1f
@@ -771,6 +862,7 @@
IP_RECVOPTS = 0x5
IP_RECVPKTINFO = 0x1a
IP_RECVRETOPTS = 0x6
+ IP_RECVTOS = 0x1b
IP_RECVTTL = 0x18
IP_RETOPTS = 0x8
IP_RF = 0x8000
@@ -789,6 +881,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
index cc8cc5b..6419c65 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
@@ -49,6 +49,86 @@
AF_UNSPEC = 0x0
AF_UTUN = 0x26
ALTWERASE = 0x200
+ ATTR_BIT_MAP_COUNT = 0x5
+ ATTR_CMN_ACCESSMASK = 0x20000
+ ATTR_CMN_ACCTIME = 0x1000
+ ATTR_CMN_ADDEDTIME = 0x10000000
+ ATTR_CMN_BKUPTIME = 0x2000
+ ATTR_CMN_CHGTIME = 0x800
+ ATTR_CMN_CRTIME = 0x200
+ ATTR_CMN_DATA_PROTECT_FLAGS = 0x40000000
+ ATTR_CMN_DEVID = 0x2
+ ATTR_CMN_DOCUMENT_ID = 0x100000
+ ATTR_CMN_ERROR = 0x20000000
+ ATTR_CMN_EXTENDED_SECURITY = 0x400000
+ ATTR_CMN_FILEID = 0x2000000
+ ATTR_CMN_FLAGS = 0x40000
+ ATTR_CMN_FNDRINFO = 0x4000
+ ATTR_CMN_FSID = 0x4
+ ATTR_CMN_FULLPATH = 0x8000000
+ ATTR_CMN_GEN_COUNT = 0x80000
+ ATTR_CMN_GRPID = 0x10000
+ ATTR_CMN_GRPUUID = 0x1000000
+ ATTR_CMN_MODTIME = 0x400
+ ATTR_CMN_NAME = 0x1
+ ATTR_CMN_NAMEDATTRCOUNT = 0x80000
+ ATTR_CMN_NAMEDATTRLIST = 0x100000
+ ATTR_CMN_OBJID = 0x20
+ ATTR_CMN_OBJPERMANENTID = 0x40
+ ATTR_CMN_OBJTAG = 0x10
+ ATTR_CMN_OBJTYPE = 0x8
+ ATTR_CMN_OWNERID = 0x8000
+ ATTR_CMN_PARENTID = 0x4000000
+ ATTR_CMN_PAROBJID = 0x80
+ ATTR_CMN_RETURNED_ATTRS = 0x80000000
+ ATTR_CMN_SCRIPT = 0x100
+ ATTR_CMN_SETMASK = 0x41c7ff00
+ ATTR_CMN_USERACCESS = 0x200000
+ ATTR_CMN_UUID = 0x800000
+ ATTR_CMN_VALIDMASK = 0xffffffff
+ ATTR_CMN_VOLSETMASK = 0x6700
+ ATTR_FILE_ALLOCSIZE = 0x4
+ ATTR_FILE_CLUMPSIZE = 0x10
+ ATTR_FILE_DATAALLOCSIZE = 0x400
+ ATTR_FILE_DATAEXTENTS = 0x800
+ ATTR_FILE_DATALENGTH = 0x200
+ ATTR_FILE_DEVTYPE = 0x20
+ ATTR_FILE_FILETYPE = 0x40
+ ATTR_FILE_FORKCOUNT = 0x80
+ ATTR_FILE_FORKLIST = 0x100
+ ATTR_FILE_IOBLOCKSIZE = 0x8
+ ATTR_FILE_LINKCOUNT = 0x1
+ ATTR_FILE_RSRCALLOCSIZE = 0x2000
+ ATTR_FILE_RSRCEXTENTS = 0x4000
+ ATTR_FILE_RSRCLENGTH = 0x1000
+ ATTR_FILE_SETMASK = 0x20
+ ATTR_FILE_TOTALSIZE = 0x2
+ ATTR_FILE_VALIDMASK = 0x37ff
+ ATTR_VOL_ALLOCATIONCLUMP = 0x40
+ ATTR_VOL_ATTRIBUTES = 0x40000000
+ ATTR_VOL_CAPABILITIES = 0x20000
+ ATTR_VOL_DIRCOUNT = 0x400
+ ATTR_VOL_ENCODINGSUSED = 0x10000
+ ATTR_VOL_FILECOUNT = 0x200
+ ATTR_VOL_FSTYPE = 0x1
+ ATTR_VOL_INFO = 0x80000000
+ ATTR_VOL_IOBLOCKSIZE = 0x80
+ ATTR_VOL_MAXOBJCOUNT = 0x800
+ ATTR_VOL_MINALLOCATION = 0x20
+ ATTR_VOL_MOUNTEDDEVICE = 0x8000
+ ATTR_VOL_MOUNTFLAGS = 0x4000
+ ATTR_VOL_MOUNTPOINT = 0x1000
+ ATTR_VOL_NAME = 0x2000
+ ATTR_VOL_OBJCOUNT = 0x100
+ ATTR_VOL_QUOTA_SIZE = 0x10000000
+ ATTR_VOL_RESERVED_SIZE = 0x20000000
+ ATTR_VOL_SETMASK = 0x80002000
+ ATTR_VOL_SIGNATURE = 0x2
+ ATTR_VOL_SIZE = 0x4
+ ATTR_VOL_SPACEAVAIL = 0x10
+ ATTR_VOL_SPACEFREE = 0x8
+ ATTR_VOL_UUID = 0x40000
+ ATTR_VOL_VALIDMASK = 0xf007ffff
B0 = 0x0
B110 = 0x6e
B115200 = 0x1c200
@@ -169,6 +249,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
DLT_A429 = 0xb8
@@ -390,6 +472,11 @@
FF1 = 0x4000
FFDLY = 0x4000
FLUSHO = 0x800000
+ FSOPT_ATTR_CMN_EXTENDED = 0x20
+ FSOPT_NOFOLLOW = 0x1
+ FSOPT_NOINMEMUPDATE = 0x2
+ FSOPT_PACK_INVAL_ATTRS = 0x8
+ FSOPT_REPORT_FULLSIZE = 0x4
F_ADDFILESIGS = 0x3d
F_ADDFILESIGS_FOR_DYLD_SIM = 0x53
F_ADDFILESIGS_RETURN = 0x61
@@ -425,6 +512,7 @@
F_PATHPKG_CHECK = 0x34
F_PEOFPOSMODE = 0x3
F_PREALLOCATE = 0x2a
+ F_PUNCHHOLE = 0x63
F_RDADVISE = 0x2c
F_RDAHEAD = 0x2d
F_RDLCK = 0x1
@@ -441,10 +529,12 @@
F_SINGLE_WRITER = 0x4c
F_THAW_FS = 0x36
F_TRANSCODEKEY = 0x4b
+ F_TRIM_ACTIVE_FILE = 0x64
F_UNLCK = 0x2
F_VOLPOSMODE = 0x4
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -681,6 +771,7 @@
IPV6_FAITH = 0x1d
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
+ IPV6_FLOW_ECN_MASK = 0x300
IPV6_FRAGTTL = 0x3c
IPV6_FW_ADD = 0x1e
IPV6_FW_DEL = 0x1f
@@ -771,6 +862,7 @@
IP_RECVOPTS = 0x5
IP_RECVPKTINFO = 0x1a
IP_RECVRETOPTS = 0x6
+ IP_RECVTOS = 0x1b
IP_RECVTTL = 0x18
IP_RETOPTS = 0x8
IP_RF = 0x8000
@@ -789,6 +881,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
index 8f40598..d960155 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
@@ -168,6 +168,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
DLT_A429 = 0xb8
@@ -353,6 +355,7 @@
F_UNLCK = 0x2
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -835,6 +838,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
index adf5eef..a8b0587 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
@@ -351,6 +351,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0x18
CTL_NET = 0x4
DLT_A429 = 0xb8
@@ -608,6 +610,7 @@
F_UNLCKSYS = 0x4
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -944,6 +947,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
index 360caff..cf5f012 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
@@ -351,6 +351,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0x18
CTL_NET = 0x4
DLT_A429 = 0xb8
@@ -608,6 +610,7 @@
F_UNLCKSYS = 0x4
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -944,6 +947,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
index 87deda9..9bbb90a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
@@ -351,6 +351,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0x18
CTL_NET = 0x4
DLT_A429 = 0xb8
@@ -615,6 +617,7 @@
F_UNLCKSYS = 0x4
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -951,6 +954,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
index bb8a772..4fba476 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1637,6 +1638,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
index cf0b224..7e2a108 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1638,6 +1639,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
index 57cfcf3..250841b 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1642,6 +1643,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
index b6e5b09..f5d7856 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -625,6 +625,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1628,6 +1629,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
index 0113e1f..f45492d 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1640,6 +1641,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
index 6857657..f5a64fb 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1640,6 +1641,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
index 14f7e0e..db6d556 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1640,6 +1641,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
index f795862..4a62a55 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1640,6 +1641,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
index 2544c4b..5e1e81e 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1695,6 +1696,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
index 133bdf5..6a80324 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1695,6 +1696,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
index b921fb1..af5a895 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -623,6 +623,7 @@
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
+ IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -1699,6 +1700,27 @@
SPLICE_F_MORE = 0x4
SPLICE_F_MOVE = 0x1
SPLICE_F_NONBLOCK = 0x2
+ STATX_ALL = 0xfff
+ STATX_ATIME = 0x20
+ STATX_ATTR_APPEND = 0x20
+ STATX_ATTR_AUTOMOUNT = 0x1000
+ STATX_ATTR_COMPRESSED = 0x4
+ STATX_ATTR_ENCRYPTED = 0x800
+ STATX_ATTR_IMMUTABLE = 0x10
+ STATX_ATTR_NODUMP = 0x40
+ STATX_BASIC_STATS = 0x7ff
+ STATX_BLOCKS = 0x400
+ STATX_BTIME = 0x800
+ STATX_CTIME = 0x80
+ STATX_GID = 0x10
+ STATX_INO = 0x100
+ STATX_MODE = 0x2
+ STATX_MTIME = 0x40
+ STATX_NLINK = 0x4
+ STATX_SIZE = 0x200
+ STATX_TYPE = 0x1
+ STATX_UID = 0x8
+ STATX__RESERVED = 0x80000000
S_BLKSIZE = 0x200
S_IEXEC = 0x40
S_IFBLK = 0x6000
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
index b4338d5..1612b66 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
@@ -1,5 +1,5 @@
// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
// +build 386,netbsd
@@ -169,6 +169,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
CTL_QUERY = -0x2
@@ -581,6 +583,7 @@
F_UNLCK = 0x2
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -970,6 +973,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
index 4994437..c994ab6 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
@@ -1,5 +1,5 @@
// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
// +build amd64,netbsd
@@ -169,6 +169,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
CTL_QUERY = -0x2
@@ -571,6 +573,7 @@
F_UNLCK = 0x2
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -960,6 +963,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
index 206c75f..a8f9efe 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
@@ -1,5 +1,5 @@
// mkerrors.sh -marm
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
// +build arm,netbsd
@@ -161,6 +161,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
CTL_QUERY = -0x2
@@ -563,6 +565,7 @@
F_UNLCK = 0x2
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -952,6 +955,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LOCK_EX = 0x2
LOCK_NB = 0x4
LOCK_SH = 0x1
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
index 3322e99..04e4f33 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
@@ -1,5 +1,5 @@
// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
// +build 386,openbsd
@@ -157,6 +157,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
DIOCOSFPFLUSH = 0x2000444e
@@ -442,6 +444,7 @@
F_UNLCK = 0x2
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -860,6 +863,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LCNT_OVERLOAD_FLUSH = 0x6
LOCK_EX = 0x2
LOCK_NB = 0x4
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
index 1758ecc..c80ff98 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
@@ -1,5 +1,5 @@
// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
// +build amd64,openbsd
@@ -157,6 +157,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
DIOCOSFPFLUSH = 0x2000444e
@@ -442,6 +444,7 @@
F_UNLCK = 0x2
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -860,6 +863,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LCNT_OVERLOAD_FLUSH = 0x6
LOCK_EX = 0x2
LOCK_NB = 0x4
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
index 3ed0b26..4c32049 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
@@ -1,5 +1,5 @@
// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
// Created by cgo -godefs - DO NOT EDIT
// cgo -godefs -- _const.go
@@ -157,6 +157,8 @@
CSTOP = 0x13
CSTOPB = 0x400
CSUSP = 0x1a
+ CTL_HW = 0x6
+ CTL_KERN = 0x1
CTL_MAXNAME = 0xc
CTL_NET = 0x4
DIOCOSFPFLUSH = 0x2000444e
@@ -441,6 +443,7 @@
F_UNLCK = 0x2
F_WRLCK = 0x3
HUPCL = 0x4000
+ HW_MACHINE = 0x1
ICANON = 0x100
ICMP6_FILTER = 0x12
ICRNL = 0x100
@@ -859,6 +862,10 @@
IXANY = 0x800
IXOFF = 0x400
IXON = 0x200
+ KERN_HOSTNAME = 0xa
+ KERN_OSRELEASE = 0x2
+ KERN_OSTYPE = 0x1
+ KERN_VERSION = 0x4
LCNT_OVERLOAD_FLUSH = 0x6
LOCK_EX = 0x2
LOCK_NB = 0x4
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
index 9fb1b31..763ae4f 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
@@ -266,6 +266,17 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+ r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Madvise(b []byte, behav int) (err error) {
var _p0 unsafe.Pointer
if len(b) > 0 {
@@ -408,17 +419,6 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
- r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
index 1e0fb46..d6808e0 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -266,6 +266,17 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+ r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Madvise(b []byte, behav int) (err error) {
var _p0 unsafe.Pointer
if len(b) > 0 {
@@ -408,17 +419,6 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
- r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
index e1026a8..6ae95e6 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
@@ -221,7 +221,7 @@
} else {
_p0 = unsafe.Pointer(&_zero)
}
- _, _, e1 := Syscall6(SYS_SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+ _, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
if e1 != 0 {
err = errnoErr(e1)
}
@@ -266,6 +266,17 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+ r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Madvise(b []byte, behav int) (err error) {
var _p0 unsafe.Pointer
if len(b) > 0 {
@@ -408,17 +419,6 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
- r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
index 37fb210..ca6a7ea 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -266,6 +266,17 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+ r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Madvise(b []byte, behav int) (err error) {
var _p0 unsafe.Pointer
if len(b) > 0 {
@@ -408,17 +419,6 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
- r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
- n = int(r0)
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
index 7576147..a0241de 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
@@ -423,6 +423,33 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+ _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
index 8bcecfb..fd9ca5a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
@@ -389,6 +389,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ioctl(fd int, req uint, arg uintptr) (err error) {
_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
if e1 != 0 {
@@ -937,6 +954,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getdents(fd int, buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
var _p0 unsafe.Pointer
if len(buf) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
index 61c0cf9..a9f18b2 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
@@ -389,6 +389,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ioctl(fd int, req uint, arg uintptr) (err error) {
_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
if e1 != 0 {
@@ -937,6 +954,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getdents(fd int, buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
var _p0 unsafe.Pointer
if len(buf) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
index ffd0107..9823e18 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
@@ -389,6 +389,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func ioctl(fd int, req uint, arg uintptr) (err error) {
_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
if e1 != 0 {
@@ -937,6 +954,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getdents(fd int, buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
var _p0 unsafe.Pointer
if len(buf) > 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
index 85a2907..ef9602c 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1569,6 +1584,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Ftruncate(fd int, length int64) (err error) {
_, _, e1 := Syscall(SYS_FTRUNCATE64, uintptr(fd), uintptr(length), uintptr(length>>32))
if e1 != 0 {
@@ -1580,7 +1610,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID32, 0, 0, 0)
egid = int(r0)
return
}
@@ -1588,7 +1618,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID32, 0, 0, 0)
euid = int(r0)
return
}
@@ -1596,7 +1626,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID32, 0, 0, 0)
gid = int(r0)
return
}
@@ -1604,7 +1634,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID32, 0, 0, 0)
uid = int(r0)
return
}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
index 8e2be97..63054b3 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1566,6 +1581,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Fstatfs(fd int, buf *Statfs_t) (err error) {
_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
if e1 != 0 {
@@ -1587,7 +1617,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
egid = int(r0)
return
}
@@ -1595,7 +1625,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
euid = int(r0)
return
}
@@ -1603,7 +1633,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
gid = int(r0)
return
}
@@ -1621,7 +1651,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
uid = int(r0)
return
}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
index 5ff0637..8b10ee1 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1728,8 +1743,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID32, 0, 0, 0)
egid = int(r0)
return
}
@@ -1737,7 +1767,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID32, 0, 0, 0)
euid = int(r0)
return
}
@@ -1745,7 +1775,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID32, 0, 0, 0)
gid = int(r0)
return
}
@@ -1753,7 +1783,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID32, 0, 0, 0)
uid = int(r0)
return
}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
index 4076011..8f276d6 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1582,7 +1597,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
egid = int(r0)
return
}
@@ -1590,7 +1605,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
euid = int(r0)
return
}
@@ -1598,7 +1613,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
gid = int(r0)
return
}
@@ -1616,7 +1631,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
uid = int(r0)
return
}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
index 984e561..61169b3 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1540,7 +1555,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
egid = int(r0)
return
}
@@ -1548,7 +1563,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
euid = int(r0)
return
}
@@ -1556,7 +1571,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
gid = int(r0)
return
}
@@ -1564,7 +1579,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
uid = int(r0)
return
}
@@ -2014,6 +2029,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Stat(path string, stat *Stat_t) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
index f98194e..4cb59b4 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1546,6 +1561,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Fstatfs(fd int, buf *Statfs_t) (err error) {
_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
if e1 != 0 {
@@ -1567,7 +1597,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
egid = int(r0)
return
}
@@ -1575,7 +1605,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
euid = int(r0)
return
}
@@ -1583,7 +1613,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
gid = int(r0)
return
}
@@ -1601,7 +1631,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
uid = int(r0)
return
}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
index f302670..0b547ae 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1546,6 +1561,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Fstatfs(fd int, buf *Statfs_t) (err error) {
_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
if e1 != 0 {
@@ -1567,7 +1597,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
egid = int(r0)
return
}
@@ -1575,7 +1605,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
euid = int(r0)
return
}
@@ -1583,7 +1613,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
gid = int(r0)
return
}
@@ -1601,7 +1631,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
uid = int(r0)
return
}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
index f18c5e4..cd94d3a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1540,7 +1555,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
egid = int(r0)
return
}
@@ -1548,7 +1563,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
euid = int(r0)
return
}
@@ -1556,7 +1571,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
gid = int(r0)
return
}
@@ -1564,7 +1579,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
uid = int(r0)
return
}
@@ -2014,6 +2029,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Stat(path string, stat *Stat_t) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
index bc26824..cdad555 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1556,6 +1571,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Fstatfs(fd int, buf *Statfs_t) (err error) {
_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
if e1 != 0 {
@@ -1577,7 +1607,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
egid = int(r0)
return
}
@@ -1585,7 +1615,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
euid = int(r0)
return
}
@@ -1593,7 +1623,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
gid = int(r0)
return
}
@@ -1611,7 +1641,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
uid = int(r0)
return
}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
index 8d874cb..38f4e44 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1556,6 +1571,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Fstatfs(fd int, buf *Statfs_t) (err error) {
_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
if e1 != 0 {
@@ -1577,7 +1607,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
egid = int(r0)
return
}
@@ -1585,7 +1615,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
euid = int(r0)
return
}
@@ -1593,7 +1623,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
gid = int(r0)
return
}
@@ -1611,7 +1641,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
uid = int(r0)
return
}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
index 1693212..c443baf 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
@@ -538,7 +538,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Exit(code int) {
- Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+ SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
return
}
@@ -674,7 +674,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getpid() (pid int) {
- r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
pid = int(r0)
return
}
@@ -682,7 +682,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getppid() (ppid int) {
- r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
ppid = int(r0)
return
}
@@ -739,7 +739,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Gettid() (tid int) {
- r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
tid = int(r0)
return
}
@@ -1238,8 +1238,23 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Sync() {
- Syscall(SYS_SYNC, 0, 0, 0)
+ SyscallNoError(SYS_SYNC, 0, 0, 0)
return
}
@@ -1298,7 +1313,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Umask(mask int) (oldmask int) {
- r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+ r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
oldmask = int(r0)
return
}
@@ -1566,6 +1581,21 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+ var _p0 *byte
+ _p0, err = BytePtrFromString(path)
+ if err != nil {
+ return
+ }
+ _, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Fstatfs(fd int, buf *Statfs_t) (err error) {
_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
if e1 != 0 {
@@ -1587,7 +1617,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getegid() (egid int) {
- r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
egid = int(r0)
return
}
@@ -1595,7 +1625,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Geteuid() (euid int) {
- r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
euid = int(r0)
return
}
@@ -1603,7 +1633,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getgid() (gid int) {
- r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
gid = int(r0)
return
}
@@ -1621,7 +1651,7 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func Getuid() (uid int) {
- r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+ r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
uid = int(r0)
return
}
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
index cfdea85..62eadff 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
@@ -406,6 +406,33 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+ _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
index 244a3c7..307f4e9 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
@@ -406,6 +406,33 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+ _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
index e891adc..6110931 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
@@ -406,6 +406,33 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+ _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
index f48beb0..003f820 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
@@ -404,6 +404,33 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+ _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
index 44a3faf..ba0e8f3 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
@@ -404,6 +404,33 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+ _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
index 1563752..2ce02c7 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
@@ -404,6 +404,33 @@
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+func Getcwd(buf []byte) (n int, err error) {
+ var _p0 unsafe.Pointer
+ if len(buf) > 0 {
+ _p0 = unsafe.Pointer(&buf[0])
+ } else {
+ _p0 = unsafe.Pointer(&_zero)
+ }
+ r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+ n = int(r0)
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+ _, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+ if e1 != 0 {
+ err = errnoErr(e1)
+ }
+ return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
func Access(path string, mode uint32) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
index 1d45276..f5d01b3 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
@@ -95,6 +95,7 @@
//go:cgo_import_dynamic libc_renameat renameat "libc.so"
//go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
//go:cgo_import_dynamic libc_lseek lseek "libc.so"
+//go:cgo_import_dynamic libc_select select "libc.so"
//go:cgo_import_dynamic libc_setegid setegid "libc.so"
//go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
//go:cgo_import_dynamic libc_setgid setgid "libc.so"
@@ -220,6 +221,7 @@
//go:linkname procRenameat libc_renameat
//go:linkname procRmdir libc_rmdir
//go:linkname proclseek libc_lseek
+//go:linkname procSelect libc_select
//go:linkname procSetegid libc_setegid
//go:linkname procSeteuid libc_seteuid
//go:linkname procSetgid libc_setgid
@@ -346,6 +348,7 @@
procRenameat,
procRmdir,
proclseek,
+ procSelect,
procSetegid,
procSeteuid,
procSetgid,
@@ -1264,6 +1267,14 @@
return
}
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+ _, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSelect)), 5, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+ if e1 != 0 {
+ err = e1
+ }
+ return
+}
+
func Setegid(egid int) (err error) {
_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetegid)), 1, uintptr(egid), 0, 0, 0, 0, 0)
if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
index 2786773..d1d36da 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
@@ -1,5 +1,5 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
// +build 386,darwin
@@ -121,13 +121,15 @@
SYS_CSOPS = 169
SYS_CSOPS_AUDITTOKEN = 170
SYS_WAITID = 173
+ SYS_KDEBUG_TYPEFILTER = 177
+ SYS_KDEBUG_TRACE_STRING = 178
SYS_KDEBUG_TRACE64 = 179
SYS_KDEBUG_TRACE = 180
SYS_SETGID = 181
SYS_SETEGID = 182
SYS_SETEUID = 183
SYS_SIGRETURN = 184
- SYS_CHUD = 185
+ SYS_THREAD_SELFCOUNTS = 186
SYS_FDATASYNC = 187
SYS_STAT = 188
SYS_FSTAT = 189
@@ -278,7 +280,6 @@
SYS_KQUEUE = 362
SYS_KEVENT = 363
SYS_LCHOWN = 364
- SYS_STACK_SNAPSHOT = 365
SYS_BSDTHREAD_REGISTER = 366
SYS_WORKQ_OPEN = 367
SYS_WORKQ_KERNRETURN = 368
@@ -287,6 +288,8 @@
SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL = 371
SYS_THREAD_SELFID = 372
SYS_LEDGER = 373
+ SYS_KEVENT_QOS = 374
+ SYS_KEVENT_ID = 375
SYS___MAC_EXECVE = 380
SYS___MAC_SYSCALL = 381
SYS___MAC_GET_FILE = 382
@@ -298,11 +301,8 @@
SYS___MAC_GET_FD = 388
SYS___MAC_SET_FD = 389
SYS___MAC_GET_PID = 390
- SYS___MAC_GET_LCID = 391
- SYS___MAC_GET_LCTX = 392
- SYS___MAC_SET_LCTX = 393
- SYS_SETLCID = 394
- SYS_GETLCID = 395
+ SYS_PSELECT = 394
+ SYS_PSELECT_NOCANCEL = 395
SYS_READ_NOCANCEL = 396
SYS_WRITE_NOCANCEL = 397
SYS_OPEN_NOCANCEL = 398
@@ -351,6 +351,7 @@
SYS_GUARDED_CLOSE_NP = 442
SYS_GUARDED_KQUEUE_NP = 443
SYS_CHANGE_FDGUARD_NP = 444
+ SYS_USRCTL = 445
SYS_PROC_RLIMIT_CONTROL = 446
SYS_CONNECTX = 447
SYS_DISCONNECTX = 448
@@ -367,6 +368,7 @@
SYS_COALITION_INFO = 459
SYS_NECP_MATCH_POLICY = 460
SYS_GETATTRLISTBULK = 461
+ SYS_CLONEFILEAT = 462
SYS_OPENAT = 463
SYS_OPENAT_NOCANCEL = 464
SYS_RENAMEAT = 465
@@ -392,7 +394,43 @@
SYS_GUARDED_WRITE_NP = 485
SYS_GUARDED_PWRITE_NP = 486
SYS_GUARDED_WRITEV_NP = 487
- SYS_RENAME_EXT = 488
+ SYS_RENAMEATX_NP = 488
SYS_MREMAP_ENCRYPTED = 489
- SYS_MAXSYSCALL = 490
+ SYS_NETAGENT_TRIGGER = 490
+ SYS_STACK_SNAPSHOT_WITH_CONFIG = 491
+ SYS_MICROSTACKSHOT = 492
+ SYS_GRAB_PGO_DATA = 493
+ SYS_PERSONA = 494
+ SYS_WORK_INTERVAL_CTL = 499
+ SYS_GETENTROPY = 500
+ SYS_NECP_OPEN = 501
+ SYS_NECP_CLIENT_ACTION = 502
+ SYS___NEXUS_OPEN = 503
+ SYS___NEXUS_REGISTER = 504
+ SYS___NEXUS_DEREGISTER = 505
+ SYS___NEXUS_CREATE = 506
+ SYS___NEXUS_DESTROY = 507
+ SYS___NEXUS_GET_OPT = 508
+ SYS___NEXUS_SET_OPT = 509
+ SYS___CHANNEL_OPEN = 510
+ SYS___CHANNEL_GET_INFO = 511
+ SYS___CHANNEL_SYNC = 512
+ SYS___CHANNEL_GET_OPT = 513
+ SYS___CHANNEL_SET_OPT = 514
+ SYS_ULOCK_WAIT = 515
+ SYS_ULOCK_WAKE = 516
+ SYS_FCLONEFILEAT = 517
+ SYS_FS_SNAPSHOT = 518
+ SYS_TERMINATE_WITH_PAYLOAD = 520
+ SYS_ABORT_WITH_PAYLOAD = 521
+ SYS_NECP_SESSION_OPEN = 522
+ SYS_NECP_SESSION_ACTION = 523
+ SYS_SETATTRLISTAT = 524
+ SYS_NET_QOS_GUIDELINE = 525
+ SYS_FMOUNT = 526
+ SYS_NTP_ADJTIME = 527
+ SYS_NTP_GETTIME = 528
+ SYS_OS_FAULT_WITH_PAYLOAD = 529
+ SYS_MAXSYSCALL = 530
+ SYS_INVALID = 63
)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
index 09de240..e35de41 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
@@ -1,5 +1,5 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
// +build amd64,darwin
@@ -121,13 +121,15 @@
SYS_CSOPS = 169
SYS_CSOPS_AUDITTOKEN = 170
SYS_WAITID = 173
+ SYS_KDEBUG_TYPEFILTER = 177
+ SYS_KDEBUG_TRACE_STRING = 178
SYS_KDEBUG_TRACE64 = 179
SYS_KDEBUG_TRACE = 180
SYS_SETGID = 181
SYS_SETEGID = 182
SYS_SETEUID = 183
SYS_SIGRETURN = 184
- SYS_CHUD = 185
+ SYS_THREAD_SELFCOUNTS = 186
SYS_FDATASYNC = 187
SYS_STAT = 188
SYS_FSTAT = 189
@@ -278,7 +280,6 @@
SYS_KQUEUE = 362
SYS_KEVENT = 363
SYS_LCHOWN = 364
- SYS_STACK_SNAPSHOT = 365
SYS_BSDTHREAD_REGISTER = 366
SYS_WORKQ_OPEN = 367
SYS_WORKQ_KERNRETURN = 368
@@ -287,6 +288,8 @@
SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL = 371
SYS_THREAD_SELFID = 372
SYS_LEDGER = 373
+ SYS_KEVENT_QOS = 374
+ SYS_KEVENT_ID = 375
SYS___MAC_EXECVE = 380
SYS___MAC_SYSCALL = 381
SYS___MAC_GET_FILE = 382
@@ -298,11 +301,8 @@
SYS___MAC_GET_FD = 388
SYS___MAC_SET_FD = 389
SYS___MAC_GET_PID = 390
- SYS___MAC_GET_LCID = 391
- SYS___MAC_GET_LCTX = 392
- SYS___MAC_SET_LCTX = 393
- SYS_SETLCID = 394
- SYS_GETLCID = 395
+ SYS_PSELECT = 394
+ SYS_PSELECT_NOCANCEL = 395
SYS_READ_NOCANCEL = 396
SYS_WRITE_NOCANCEL = 397
SYS_OPEN_NOCANCEL = 398
@@ -351,6 +351,7 @@
SYS_GUARDED_CLOSE_NP = 442
SYS_GUARDED_KQUEUE_NP = 443
SYS_CHANGE_FDGUARD_NP = 444
+ SYS_USRCTL = 445
SYS_PROC_RLIMIT_CONTROL = 446
SYS_CONNECTX = 447
SYS_DISCONNECTX = 448
@@ -367,6 +368,7 @@
SYS_COALITION_INFO = 459
SYS_NECP_MATCH_POLICY = 460
SYS_GETATTRLISTBULK = 461
+ SYS_CLONEFILEAT = 462
SYS_OPENAT = 463
SYS_OPENAT_NOCANCEL = 464
SYS_RENAMEAT = 465
@@ -392,7 +394,43 @@
SYS_GUARDED_WRITE_NP = 485
SYS_GUARDED_PWRITE_NP = 486
SYS_GUARDED_WRITEV_NP = 487
- SYS_RENAME_EXT = 488
+ SYS_RENAMEATX_NP = 488
SYS_MREMAP_ENCRYPTED = 489
- SYS_MAXSYSCALL = 490
+ SYS_NETAGENT_TRIGGER = 490
+ SYS_STACK_SNAPSHOT_WITH_CONFIG = 491
+ SYS_MICROSTACKSHOT = 492
+ SYS_GRAB_PGO_DATA = 493
+ SYS_PERSONA = 494
+ SYS_WORK_INTERVAL_CTL = 499
+ SYS_GETENTROPY = 500
+ SYS_NECP_OPEN = 501
+ SYS_NECP_CLIENT_ACTION = 502
+ SYS___NEXUS_OPEN = 503
+ SYS___NEXUS_REGISTER = 504
+ SYS___NEXUS_DEREGISTER = 505
+ SYS___NEXUS_CREATE = 506
+ SYS___NEXUS_DESTROY = 507
+ SYS___NEXUS_GET_OPT = 508
+ SYS___NEXUS_SET_OPT = 509
+ SYS___CHANNEL_OPEN = 510
+ SYS___CHANNEL_GET_INFO = 511
+ SYS___CHANNEL_SYNC = 512
+ SYS___CHANNEL_GET_OPT = 513
+ SYS___CHANNEL_SET_OPT = 514
+ SYS_ULOCK_WAIT = 515
+ SYS_ULOCK_WAKE = 516
+ SYS_FCLONEFILEAT = 517
+ SYS_FS_SNAPSHOT = 518
+ SYS_TERMINATE_WITH_PAYLOAD = 520
+ SYS_ABORT_WITH_PAYLOAD = 521
+ SYS_NECP_SESSION_OPEN = 522
+ SYS_NECP_SESSION_ACTION = 523
+ SYS_SETATTRLISTAT = 524
+ SYS_NET_QOS_GUIDELINE = 525
+ SYS_FMOUNT = 526
+ SYS_NTP_ADJTIME = 527
+ SYS_NTP_GETTIME = 528
+ SYS_OS_FAULT_WITH_PAYLOAD = 529
+ SYS_MAXSYSCALL = 530
+ SYS_INVALID = 63
)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
index 41cb6ed..f2df27d 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
@@ -1,4 +1,4 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/include/sys/syscall.h
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.1.sdk/usr/include/sys/syscall.h
// Code generated by the command above; see README.md. DO NOT EDIT.
// +build arm,darwin
@@ -129,6 +129,7 @@
SYS_SETEGID = 182
SYS_SETEUID = 183
SYS_SIGRETURN = 184
+ SYS_THREAD_SELFCOUNTS = 186
SYS_FDATASYNC = 187
SYS_STAT = 188
SYS_FSTAT = 189
@@ -288,6 +289,7 @@
SYS_THREAD_SELFID = 372
SYS_LEDGER = 373
SYS_KEVENT_QOS = 374
+ SYS_KEVENT_ID = 375
SYS___MAC_EXECVE = 380
SYS___MAC_SYSCALL = 381
SYS___MAC_GET_FILE = 382
@@ -421,6 +423,14 @@
SYS_FS_SNAPSHOT = 518
SYS_TERMINATE_WITH_PAYLOAD = 520
SYS_ABORT_WITH_PAYLOAD = 521
- SYS_MAXSYSCALL = 522
+ SYS_NECP_SESSION_OPEN = 522
+ SYS_NECP_SESSION_ACTION = 523
+ SYS_SETATTRLISTAT = 524
+ SYS_NET_QOS_GUIDELINE = 525
+ SYS_FMOUNT = 526
+ SYS_NTP_ADJTIME = 527
+ SYS_NTP_GETTIME = 528
+ SYS_OS_FAULT_WITH_PAYLOAD = 529
+ SYS_MAXSYSCALL = 530
SYS_INVALID = 63
)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
index 075816c..9694630 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
@@ -1,4 +1,4 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/include/sys/syscall.h
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.1.sdk/usr/include/sys/syscall.h
// Code generated by the command above; see README.md. DO NOT EDIT.
// +build arm64,darwin
@@ -129,6 +129,7 @@
SYS_SETEGID = 182
SYS_SETEUID = 183
SYS_SIGRETURN = 184
+ SYS_THREAD_SELFCOUNTS = 186
SYS_FDATASYNC = 187
SYS_STAT = 188
SYS_FSTAT = 189
@@ -288,6 +289,7 @@
SYS_THREAD_SELFID = 372
SYS_LEDGER = 373
SYS_KEVENT_QOS = 374
+ SYS_KEVENT_ID = 375
SYS___MAC_EXECVE = 380
SYS___MAC_SYSCALL = 381
SYS___MAC_GET_FILE = 382
@@ -421,6 +423,14 @@
SYS_FS_SNAPSHOT = 518
SYS_TERMINATE_WITH_PAYLOAD = 520
SYS_ABORT_WITH_PAYLOAD = 521
- SYS_MAXSYSCALL = 522
+ SYS_NECP_SESSION_OPEN = 522
+ SYS_NECP_SESSION_ACTION = 523
+ SYS_SETATTRLISTAT = 524
+ SYS_NET_QOS_GUIDELINE = 525
+ SYS_FMOUNT = 526
+ SYS_NTP_ADJTIME = 527
+ SYS_NTP_GETTIME = 528
+ SYS_OS_FAULT_WITH_PAYLOAD = 529
+ SYS_MAXSYSCALL = 530
SYS_INVALID = 63
)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
deleted file mode 100644
index c708659..0000000
--- a/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,solaris
-
-package unix
-
-// TODO(aram): remove these before Go 1.3.
-const (
- SYS_EXECVE = 59
- SYS_FCNTL = 62
-)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
index 4667c7b..bc4bc89 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
@@ -479,3 +479,11 @@
POLLWRBAND = 0x100
POLLWRNORM = 0x4
)
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
index 3f33b18..d8abcab 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
@@ -489,3 +489,11 @@
POLLWRBAND = 0x100
POLLWRNORM = 0x4
)
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
index 463a28b..9749c9f 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
@@ -480,3 +480,11 @@
POLLWRBAND = 0x100
POLLWRNORM = 0x4
)
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
index 1ec20a0..810b0bd 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
@@ -489,3 +489,11 @@
POLLWRBAND = 0x100
POLLWRNORM = 0x4
)
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
index ab515c3..e3b8ebb 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
@@ -143,6 +143,10 @@
Val [2]int32
}
+const (
+ PathMax = 0x400
+)
+
type RawSockaddrInet4 struct {
Len uint8
Family uint8
@@ -442,6 +446,13 @@
Ospeed uint32
}
+type Winsize struct {
+ Row uint16
+ Col uint16
+ Xpixel uint16
+ Ypixel uint16
+}
+
const (
AT_FDCWD = 0xfffafdcd
AT_SYMLINK_NOFOLLOW = 0x1
@@ -465,3 +476,11 @@
POLLWRBAND = 0x100
POLLWRNORM = 0x4
)
+
+type Utsname struct {
+ Sysname [32]byte
+ Nodename [32]byte
+ Release [32]byte
+ Version [32]byte
+ Machine [32]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
index 18f7816..878a21a 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
@@ -141,6 +141,10 @@
}
const (
+ PathMax = 0x400
+)
+
+const (
FADV_NORMAL = 0x0
FADV_RANDOM = 0x1
FADV_SEQUENTIAL = 0x2
@@ -539,3 +543,11 @@
type CapRights struct {
Rights [2]uint64
}
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
index dd0db2a..8408af1 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
@@ -141,6 +141,10 @@
}
const (
+ PathMax = 0x400
+)
+
+const (
FADV_NORMAL = 0x0
FADV_RANDOM = 0x1
FADV_SEQUENTIAL = 0x2
@@ -542,3 +546,11 @@
type CapRights struct {
Rights [2]uint64
}
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
index 473d3dc..4b2d9a4 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
@@ -143,6 +143,10 @@
}
const (
+ PathMax = 0x400
+)
+
+const (
FADV_NORMAL = 0x0
FADV_RANDOM = 0x1
FADV_SEQUENTIAL = 0x2
@@ -542,3 +546,11 @@
type CapRights struct {
Rights [2]uint64
}
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
index c6de942..7aa206e 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -52,7 +52,7 @@
Errcnt int32
Stbcnt int32
Tai int32
- Pad_cgo_0 [44]byte
+ _ [44]byte
}
type Time_t int32
@@ -98,7 +98,7 @@
type Stat_t struct {
Dev uint64
X__pad1 uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
X__st_ino uint32
Mode uint32
Nlink uint32
@@ -106,7 +106,7 @@
Gid uint32
Rdev uint64
X__pad2 uint16
- Pad_cgo_1 [2]byte
+ _ [2]byte
Size int64
Blksize int32
Blocks int64
@@ -131,13 +131,43 @@
Spare [4]int32
}
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
+}
+
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]int8
- Pad_cgo_0 [1]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]int8
+ _ [1]byte
}
type Fsid struct {
@@ -224,11 +254,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -341,7 +380,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -376,6 +415,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -565,9 +605,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [2]byte
- Filter *SockFilter
+ Len uint16
+ _ [2]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -643,8 +683,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -693,11 +740,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -709,13 +756,13 @@
Ac_comm [32]int8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -759,6 +806,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -791,3 +856,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint32
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x20
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
index 4ea42df..abb3d89 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -33,13 +33,13 @@
type Timex struct {
Modes uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Offset int64
Freq int64
Maxerror int64
Esterror int64
Status int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
Constant int64
Precision int64
Tolerance int64
@@ -48,14 +48,14 @@
Ppsfreq int64
Jitter int64
Shift int32
- Pad_cgo_2 [4]byte
+ _ [4]byte
Stabil int64
Jitcnt int64
Calcnt int64
Errcnt int64
Stbcnt int64
Tai int32
- Pad_cgo_3 [44]byte
+ _ [44]byte
}
type Time_t int64
@@ -131,13 +131,43 @@
Spare [4]int64
}
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
+}
+
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]int8
- Pad_cgo_0 [5]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]int8
+ _ [5]byte
}
type Fsid struct {
@@ -145,13 +175,13 @@
}
type Flock_t struct {
- Type int16
- Whence int16
- Pad_cgo_0 [4]byte
- Start int64
- Len int64
- Pid int32
- Pad_cgo_1 [4]byte
+ Type int16
+ Whence int16
+ _ [4]byte
+ Start int64
+ Len int64
+ Pid int32
+ _ [4]byte
}
type FscryptPolicy struct {
@@ -226,11 +256,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -297,13 +336,13 @@
type Msghdr struct {
Name *byte
Namelen uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Iov *Iovec
Iovlen uint64
Control *byte
Controllen uint64
Flags int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Cmsghdr struct {
@@ -345,7 +384,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -380,6 +419,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -569,9 +609,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [6]byte
- Filter *SockFilter
+ Len uint16
+ _ [6]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -628,12 +668,12 @@
Freeswap uint64
Procs uint16
Pad uint16
- Pad_cgo_0 [4]byte
+ _ [4]byte
Totalhigh uint64
Freehigh uint64
Unit uint32
X_f [0]int8
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Utsname struct {
@@ -646,12 +686,12 @@
}
type Ustat_t struct {
- Tfree int32
- Pad_cgo_0 [4]byte
- Tinode uint64
- Fname [6]int8
- Fpack [6]int8
- Pad_cgo_1 [4]byte
+ Tfree int32
+ _ [4]byte
+ Tinode uint64
+ Fname [6]int8
+ Fpack [6]int8
+ _ [4]byte
}
type EpollEvent struct {
@@ -661,8 +701,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -711,11 +758,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -727,13 +774,13 @@
Ac_comm [32]int8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -777,6 +824,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -809,3 +874,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint64
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x40
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
index f86d683..1165417 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -52,7 +52,7 @@
Errcnt int32
Stbcnt int32
Tai int32
- Pad_cgo_0 [44]byte
+ _ [44]byte
}
type Time_t int32
@@ -98,7 +98,7 @@
type Stat_t struct {
Dev uint64
X__pad1 uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
X__st_ino uint32
Mode uint32
Nlink uint32
@@ -106,10 +106,10 @@
Gid uint32
Rdev uint64
X__pad2 uint16
- Pad_cgo_1 [6]byte
+ _ [6]byte
Size int64
Blksize int32
- Pad_cgo_2 [4]byte
+ _ [4]byte
Blocks int64
Atim Timespec
Mtim Timespec
@@ -118,28 +118,58 @@
}
type Statfs_t struct {
- Type int32
- Bsize int32
- Blocks uint64
- Bfree uint64
- Bavail uint64
- Files uint64
- Ffree uint64
- Fsid Fsid
- Namelen int32
- Frsize int32
- Flags int32
- Spare [4]int32
- Pad_cgo_0 [4]byte
+ Type int32
+ Bsize int32
+ Blocks uint64
+ Bfree uint64
+ Bavail uint64
+ Files uint64
+ Ffree uint64
+ Fsid Fsid
+ Namelen int32
+ Frsize int32
+ Flags int32
+ Spare [4]int32
+ _ [4]byte
+}
+
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
}
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]uint8
- Pad_cgo_0 [5]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]uint8
+ _ [5]byte
}
type Fsid struct {
@@ -147,13 +177,13 @@
}
type Flock_t struct {
- Type int16
- Whence int16
- Pad_cgo_0 [4]byte
- Start int64
- Len int64
- Pid int32
- Pad_cgo_1 [4]byte
+ Type int16
+ Whence int16
+ _ [4]byte
+ Start int64
+ Len int64
+ Pid int32
+ _ [4]byte
}
type FscryptPolicy struct {
@@ -228,11 +258,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -345,7 +384,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -380,6 +419,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -569,9 +609,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [2]byte
- Filter *SockFilter
+ Len uint16
+ _ [2]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -632,8 +672,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -682,11 +729,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -698,13 +745,13 @@
Ac_comm [32]uint8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -748,6 +795,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -780,3 +845,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint32
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x20
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
index 45c10b7..0d0de46 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -33,13 +33,13 @@
type Timex struct {
Modes uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Offset int64
Freq int64
Maxerror int64
Esterror int64
Status int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
Constant int64
Precision int64
Tolerance int64
@@ -48,14 +48,14 @@
Ppsfreq int64
Jitter int64
Shift int32
- Pad_cgo_2 [4]byte
+ _ [4]byte
Stabil int64
Jitcnt int64
Calcnt int64
Errcnt int64
Stbcnt int64
Tai int32
- Pad_cgo_3 [44]byte
+ _ [44]byte
}
type Time_t int64
@@ -132,13 +132,43 @@
Spare [4]int64
}
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
+}
+
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]int8
- Pad_cgo_0 [5]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]int8
+ _ [5]byte
}
type Fsid struct {
@@ -146,13 +176,13 @@
}
type Flock_t struct {
- Type int16
- Whence int16
- Pad_cgo_0 [4]byte
- Start int64
- Len int64
- Pid int32
- Pad_cgo_1 [4]byte
+ Type int16
+ Whence int16
+ _ [4]byte
+ Start int64
+ Len int64
+ Pid int32
+ _ [4]byte
}
type FscryptPolicy struct {
@@ -227,11 +257,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -298,13 +337,13 @@
type Msghdr struct {
Name *byte
Namelen uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Iov *Iovec
Iovlen uint64
Control *byte
Controllen uint64
Flags int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Cmsghdr struct {
@@ -346,7 +385,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -381,6 +420,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -570,9 +610,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [6]byte
- Filter *SockFilter
+ Len uint16
+ _ [6]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -606,12 +646,12 @@
Freeswap uint64
Procs uint16
Pad uint16
- Pad_cgo_0 [4]byte
+ _ [4]byte
Totalhigh uint64
Freehigh uint64
Unit uint32
X_f [0]int8
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Utsname struct {
@@ -624,12 +664,12 @@
}
type Ustat_t struct {
- Tfree int32
- Pad_cgo_0 [4]byte
- Tinode uint64
- Fname [6]int8
- Fpack [6]int8
- Pad_cgo_1 [4]byte
+ Tfree int32
+ _ [4]byte
+ Tinode uint64
+ Fname [6]int8
+ Fpack [6]int8
+ _ [4]byte
}
type EpollEvent struct {
@@ -640,8 +680,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -690,11 +737,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -706,13 +753,13 @@
Ac_comm [32]int8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -756,6 +803,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -788,3 +853,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint64
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x40
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
index 4cc0a1c..a9087c5 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
@@ -52,7 +52,7 @@
Errcnt int32
Stbcnt int32
Tai int32
- Pad_cgo_0 [44]byte
+ _ [44]byte
}
type Time_t int32
@@ -116,29 +116,59 @@
}
type Statfs_t struct {
- Type int32
- Bsize int32
- Frsize int32
- Pad_cgo_0 [4]byte
- Blocks uint64
- Bfree uint64
- Files uint64
- Ffree uint64
- Bavail uint64
- Fsid Fsid
- Namelen int32
- Flags int32
- Spare [5]int32
- Pad_cgo_1 [4]byte
+ Type int32
+ Bsize int32
+ Frsize int32
+ _ [4]byte
+ Blocks uint64
+ Bfree uint64
+ Files uint64
+ Ffree uint64
+ Bavail uint64
+ Fsid Fsid
+ Namelen int32
+ Flags int32
+ Spare [5]int32
+ _ [4]byte
+}
+
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
}
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]int8
- Pad_cgo_0 [5]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]int8
+ _ [5]byte
}
type Fsid struct {
@@ -146,13 +176,13 @@
}
type Flock_t struct {
- Type int16
- Whence int16
- Pad_cgo_0 [4]byte
- Start int64
- Len int64
- Pid int32
- Pad_cgo_1 [4]byte
+ Type int16
+ Whence int16
+ _ [4]byte
+ Start int64
+ Len int64
+ Pid int32
+ _ [4]byte
}
type FscryptPolicy struct {
@@ -227,11 +257,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -344,7 +383,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -379,6 +418,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -568,9 +608,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [2]byte
- Filter *SockFilter
+ Len uint16
+ _ [2]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -637,8 +677,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -687,11 +734,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -703,13 +750,13 @@
Ac_comm [32]int8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -753,6 +800,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -785,3 +850,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint32
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x20
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
index d9df087..01e8f65 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -33,13 +33,13 @@
type Timex struct {
Modes uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Offset int64
Freq int64
Maxerror int64
Esterror int64
Status int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
Constant int64
Precision int64
Tolerance int64
@@ -48,14 +48,14 @@
Ppsfreq int64
Jitter int64
Shift int32
- Pad_cgo_2 [4]byte
+ _ [4]byte
Stabil int64
Jitcnt int64
Calcnt int64
Errcnt int64
Stbcnt int64
Tai int32
- Pad_cgo_3 [44]byte
+ _ [44]byte
}
type Time_t int64
@@ -132,13 +132,43 @@
Spare [5]int64
}
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
+}
+
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]int8
- Pad_cgo_0 [5]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]int8
+ _ [5]byte
}
type Fsid struct {
@@ -146,13 +176,13 @@
}
type Flock_t struct {
- Type int16
- Whence int16
- Pad_cgo_0 [4]byte
- Start int64
- Len int64
- Pid int32
- Pad_cgo_1 [4]byte
+ Type int16
+ Whence int16
+ _ [4]byte
+ Start int64
+ Len int64
+ Pid int32
+ _ [4]byte
}
type FscryptPolicy struct {
@@ -227,11 +257,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -298,13 +337,13 @@
type Msghdr struct {
Name *byte
Namelen uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Iov *Iovec
Iovlen uint64
Control *byte
Controllen uint64
Flags int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Cmsghdr struct {
@@ -346,7 +385,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -381,6 +420,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -570,9 +610,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [6]byte
- Filter *SockFilter
+ Len uint16
+ _ [6]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -609,12 +649,12 @@
Freeswap uint64
Procs uint16
Pad uint16
- Pad_cgo_0 [4]byte
+ _ [4]byte
Totalhigh uint64
Freehigh uint64
Unit uint32
X_f [0]int8
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Utsname struct {
@@ -627,12 +667,12 @@
}
type Ustat_t struct {
- Tfree int32
- Pad_cgo_0 [4]byte
- Tinode uint64
- Fname [6]int8
- Fpack [6]int8
- Pad_cgo_1 [4]byte
+ Tfree int32
+ _ [4]byte
+ Tinode uint64
+ Fname [6]int8
+ Fpack [6]int8
+ _ [4]byte
}
type EpollEvent struct {
@@ -642,8 +682,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -692,11 +739,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -708,13 +755,13 @@
Ac_comm [32]int8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -758,6 +805,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -790,3 +855,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint64
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x40
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
index 15e6b4b..6f9452d 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -33,13 +33,13 @@
type Timex struct {
Modes uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Offset int64
Freq int64
Maxerror int64
Esterror int64
Status int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
Constant int64
Precision int64
Tolerance int64
@@ -48,14 +48,14 @@
Ppsfreq int64
Jitter int64
Shift int32
- Pad_cgo_2 [4]byte
+ _ [4]byte
Stabil int64
Jitcnt int64
Calcnt int64
Errcnt int64
Stbcnt int64
Tai int32
- Pad_cgo_3 [44]byte
+ _ [44]byte
}
type Time_t int64
@@ -132,13 +132,43 @@
Spare [5]int64
}
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
+}
+
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]int8
- Pad_cgo_0 [5]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]int8
+ _ [5]byte
}
type Fsid struct {
@@ -146,13 +176,13 @@
}
type Flock_t struct {
- Type int16
- Whence int16
- Pad_cgo_0 [4]byte
- Start int64
- Len int64
- Pid int32
- Pad_cgo_1 [4]byte
+ Type int16
+ Whence int16
+ _ [4]byte
+ Start int64
+ Len int64
+ Pid int32
+ _ [4]byte
}
type FscryptPolicy struct {
@@ -227,11 +257,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -298,13 +337,13 @@
type Msghdr struct {
Name *byte
Namelen uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Iov *Iovec
Iovlen uint64
Control *byte
Controllen uint64
Flags int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Cmsghdr struct {
@@ -346,7 +385,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -381,6 +420,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -570,9 +610,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [6]byte
- Filter *SockFilter
+ Len uint16
+ _ [6]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -609,12 +649,12 @@
Freeswap uint64
Procs uint16
Pad uint16
- Pad_cgo_0 [4]byte
+ _ [4]byte
Totalhigh uint64
Freehigh uint64
Unit uint32
X_f [0]int8
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Utsname struct {
@@ -627,12 +667,12 @@
}
type Ustat_t struct {
- Tfree int32
- Pad_cgo_0 [4]byte
- Tinode uint64
- Fname [6]int8
- Fpack [6]int8
- Pad_cgo_1 [4]byte
+ Tfree int32
+ _ [4]byte
+ Tinode uint64
+ Fname [6]int8
+ Fpack [6]int8
+ _ [4]byte
}
type EpollEvent struct {
@@ -642,8 +682,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -692,11 +739,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -708,13 +755,13 @@
Ac_comm [32]int8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -758,6 +805,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -790,3 +855,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint64
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x40
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
index b6c2d32..6de721f 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
@@ -52,7 +52,7 @@
Errcnt int32
Stbcnt int32
Tai int32
- Pad_cgo_0 [44]byte
+ _ [44]byte
}
type Time_t int32
@@ -116,29 +116,59 @@
}
type Statfs_t struct {
- Type int32
- Bsize int32
- Frsize int32
- Pad_cgo_0 [4]byte
- Blocks uint64
- Bfree uint64
- Files uint64
- Ffree uint64
- Bavail uint64
- Fsid Fsid
- Namelen int32
- Flags int32
- Spare [5]int32
- Pad_cgo_1 [4]byte
+ Type int32
+ Bsize int32
+ Frsize int32
+ _ [4]byte
+ Blocks uint64
+ Bfree uint64
+ Files uint64
+ Ffree uint64
+ Bavail uint64
+ Fsid Fsid
+ Namelen int32
+ Flags int32
+ Spare [5]int32
+ _ [4]byte
+}
+
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
}
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]int8
- Pad_cgo_0 [5]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]int8
+ _ [5]byte
}
type Fsid struct {
@@ -146,13 +176,13 @@
}
type Flock_t struct {
- Type int16
- Whence int16
- Pad_cgo_0 [4]byte
- Start int64
- Len int64
- Pid int32
- Pad_cgo_1 [4]byte
+ Type int16
+ Whence int16
+ _ [4]byte
+ Start int64
+ Len int64
+ Pid int32
+ _ [4]byte
}
type FscryptPolicy struct {
@@ -227,11 +257,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -344,7 +383,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -379,6 +418,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -568,9 +608,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [2]byte
- Filter *SockFilter
+ Len uint16
+ _ [2]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -637,8 +677,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -687,11 +734,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -703,13 +750,13 @@
Ac_comm [32]int8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -753,6 +800,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -785,3 +850,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint32
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x20
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
index 3803e10..cb2701f 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -33,13 +33,13 @@
type Timex struct {
Modes uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Offset int64
Freq int64
Maxerror int64
Esterror int64
Status int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
Constant int64
Precision int64
Tolerance int64
@@ -48,14 +48,14 @@
Ppsfreq int64
Jitter int64
Shift int32
- Pad_cgo_2 [4]byte
+ _ [4]byte
Stabil int64
Jitcnt int64
Calcnt int64
Errcnt int64
Stbcnt int64
Tai int32
- Pad_cgo_3 [44]byte
+ _ [44]byte
}
type Time_t int64
@@ -133,13 +133,43 @@
Spare [4]int64
}
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
+}
+
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]uint8
- Pad_cgo_0 [5]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]uint8
+ _ [5]byte
}
type Fsid struct {
@@ -147,13 +177,13 @@
}
type Flock_t struct {
- Type int16
- Whence int16
- Pad_cgo_0 [4]byte
- Start int64
- Len int64
- Pid int32
- Pad_cgo_1 [4]byte
+ Type int16
+ Whence int16
+ _ [4]byte
+ Start int64
+ Len int64
+ Pid int32
+ _ [4]byte
}
type FscryptPolicy struct {
@@ -228,11 +258,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -299,13 +338,13 @@
type Msghdr struct {
Name *byte
Namelen uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Iov *Iovec
Iovlen uint64
Control *byte
Controllen uint64
Flags int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Cmsghdr struct {
@@ -347,7 +386,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -382,6 +421,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -571,9 +611,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [6]byte
- Filter *SockFilter
+ Len uint16
+ _ [6]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -616,12 +656,12 @@
Freeswap uint64
Procs uint16
Pad uint16
- Pad_cgo_0 [4]byte
+ _ [4]byte
Totalhigh uint64
Freehigh uint64
Unit uint32
X_f [0]uint8
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Utsname struct {
@@ -634,12 +674,12 @@
}
type Ustat_t struct {
- Tfree int32
- Pad_cgo_0 [4]byte
- Tinode uint64
- Fname [6]uint8
- Fpack [6]uint8
- Pad_cgo_1 [4]byte
+ Tfree int32
+ _ [4]byte
+ Tinode uint64
+ Fname [6]uint8
+ Fpack [6]uint8
+ _ [4]byte
}
type EpollEvent struct {
@@ -650,8 +690,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -700,11 +747,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -716,13 +763,13 @@
Ac_comm [32]uint8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -766,6 +813,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -798,3 +863,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint64
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x40
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
index 7ef31fe..fa5b15b 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -33,13 +33,13 @@
type Timex struct {
Modes uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Offset int64
Freq int64
Maxerror int64
Esterror int64
Status int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
Constant int64
Precision int64
Tolerance int64
@@ -48,14 +48,14 @@
Ppsfreq int64
Jitter int64
Shift int32
- Pad_cgo_2 [4]byte
+ _ [4]byte
Stabil int64
Jitcnt int64
Calcnt int64
Errcnt int64
Stbcnt int64
Tai int32
- Pad_cgo_3 [44]byte
+ _ [44]byte
}
type Time_t int64
@@ -133,13 +133,43 @@
Spare [4]int64
}
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ X__reserved int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
+}
+
type Dirent struct {
- Ino uint64
- Off int64
- Reclen uint16
- Type uint8
- Name [256]uint8
- Pad_cgo_0 [5]byte
+ Ino uint64
+ Off int64
+ Reclen uint16
+ Type uint8
+ Name [256]uint8
+ _ [5]byte
}
type Fsid struct {
@@ -147,13 +177,13 @@
}
type Flock_t struct {
- Type int16
- Whence int16
- Pad_cgo_0 [4]byte
- Start int64
- Len int64
- Pid int32
- Pad_cgo_1 [4]byte
+ Type int16
+ Whence int16
+ _ [4]byte
+ Start int64
+ Len int64
+ Pid int32
+ _ [4]byte
}
type FscryptPolicy struct {
@@ -228,11 +258,20 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
- Family uint16
- Pad_cgo_0 [2]byte
- Ifindex int32
- Addr [8]byte
+ Family uint16
+ _ [2]byte
+ Ifindex int32
+ Addr [8]byte
}
type RawSockaddrALG struct {
@@ -299,13 +338,13 @@
type Msghdr struct {
Name *byte
Namelen uint32
- Pad_cgo_0 [4]byte
+ _ [4]byte
Iov *Iovec
Iovlen uint64
Control *byte
Controllen uint64
Flags int32
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Cmsghdr struct {
@@ -347,7 +386,7 @@
Probes uint8
Backoff uint8
Options uint8
- Pad_cgo_0 [2]byte
+ _ [2]byte
Rto uint32
Ato uint32
Snd_mss uint32
@@ -382,6 +421,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -571,9 +611,9 @@
}
type SockFprog struct {
- Len uint16
- Pad_cgo_0 [6]byte
- Filter *SockFilter
+ Len uint16
+ _ [6]byte
+ Filter *SockFilter
}
type InotifyEvent struct {
@@ -616,12 +656,12 @@
Freeswap uint64
Procs uint16
Pad uint16
- Pad_cgo_0 [4]byte
+ _ [4]byte
Totalhigh uint64
Freehigh uint64
Unit uint32
X_f [0]uint8
- Pad_cgo_1 [4]byte
+ _ [4]byte
}
type Utsname struct {
@@ -634,12 +674,12 @@
}
type Ustat_t struct {
- Tfree int32
- Pad_cgo_0 [4]byte
- Tinode uint64
- Fname [6]uint8
- Fpack [6]uint8
- Pad_cgo_1 [4]byte
+ Tfree int32
+ _ [4]byte
+ Tinode uint64
+ Fname [6]uint8
+ Fpack [6]uint8
+ _ [4]byte
}
type EpollEvent struct {
@@ -650,8 +690,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -700,11 +747,11 @@
type Taskstats struct {
Version uint16
- Pad_cgo_0 [2]byte
+ _ [2]byte
Ac_exitcode uint32
Ac_flag uint8
Ac_nice uint8
- Pad_cgo_1 [6]byte
+ _ [6]byte
Cpu_count uint64
Cpu_delay_total uint64
Blkio_count uint64
@@ -716,13 +763,13 @@
Ac_comm [32]uint8
Ac_sched uint8
Ac_pad [3]uint8
- Pad_cgo_2 [4]byte
+ _ [4]byte
Ac_uid uint32
Ac_gid uint32
Ac_pid uint32
Ac_ppid uint32
Ac_btime uint32
- Pad_cgo_3 [4]byte
+ _ [4]byte
Ac_etime uint64
Ac_utime uint64
Ac_stime uint64
@@ -766,6 +813,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -798,3 +863,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint64
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x40
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
index cb194f4..64952cb 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -132,6 +132,36 @@
_ [4]byte
}
+type StatxTimestamp struct {
+ Sec int64
+ Nsec uint32
+ _ int32
+}
+
+type Statx_t struct {
+ Mask uint32
+ Blksize uint32
+ Attributes uint64
+ Nlink uint32
+ Uid uint32
+ Gid uint32
+ Mode uint16
+ _ [1]uint16
+ Ino uint64
+ Size uint64
+ Blocks uint64
+ Attributes_mask uint64
+ Atime StatxTimestamp
+ Btime StatxTimestamp
+ Ctime StatxTimestamp
+ Mtime StatxTimestamp
+ Rdev_major uint32
+ Rdev_minor uint32
+ Dev_major uint32
+ Dev_minor uint32
+ _ [14]uint64
+}
+
type Dirent struct {
Ino uint64
Off int64
@@ -227,6 +257,15 @@
Channel uint16
}
+type RawSockaddrL2 struct {
+ Family uint16
+ Psm uint16
+ Bdaddr [6]uint8
+ Cid uint16
+ Bdaddr_type uint8
+ _ [1]byte
+}
+
type RawSockaddrCAN struct {
Family uint16
_ [2]byte
@@ -381,6 +420,7 @@
SizeofSockaddrLinklayer = 0x14
SizeofSockaddrNetlink = 0xc
SizeofSockaddrHCI = 0x6
+ SizeofSockaddrL2 = 0xe
SizeofSockaddrCAN = 0x10
SizeofSockaddrALG = 0x58
SizeofSockaddrVM = 0x10
@@ -667,8 +707,15 @@
}
const (
- AT_FDCWD = -0x64
- AT_REMOVEDIR = 0x200
+ AT_EMPTY_PATH = 0x1000
+ AT_FDCWD = -0x64
+ AT_NO_AUTOMOUNT = 0x800
+ AT_REMOVEDIR = 0x200
+
+ AT_STATX_SYNC_AS_STAT = 0x0
+ AT_STATX_FORCE_SYNC = 0x2000
+ AT_STATX_DONT_SYNC = 0x4000
+
AT_SYMLINK_FOLLOW = 0x400
AT_SYMLINK_NOFOLLOW = 0x100
)
@@ -783,6 +830,24 @@
TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
)
+type CGroupStats struct {
+ Sleeping uint64
+ Running uint64
+ Stopped uint64
+ Uninterruptible uint64
+ Io_wait uint64
+}
+
+const (
+ CGROUPSTATS_CMD_UNSPEC = 0x3
+ CGROUPSTATS_CMD_GET = 0x4
+ CGROUPSTATS_CMD_NEW = 0x5
+ CGROUPSTATS_TYPE_UNSPEC = 0x0
+ CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+ CGROUPSTATS_CMD_ATTR_UNSPEC = 0x0
+ CGROUPSTATS_CMD_ATTR_FD = 0x1
+)
+
type Genlmsghdr struct {
Cmd uint8
Version uint8
@@ -815,3 +880,16 @@
CTRL_ATTR_MCAST_GRP_NAME = 0x1
CTRL_ATTR_MCAST_GRP_ID = 0x2
)
+
+type cpuMask uint64
+
+const (
+ _CPU_SETSIZE = 0x400
+ _NCPUBITS = 0x40
+)
+
+const (
+ BDADDR_BREDR = 0x0
+ BDADDR_LE_PUBLIC = 0x1
+ BDADDR_LE_RANDOM = 0x2
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
index dfe446b..da70faa 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
@@ -99,6 +99,10 @@
X__fsid_val [2]int32
}
+const (
+ PathMax = 0x400
+)
+
type RawSockaddrInet4 struct {
Len uint8
Family uint8
@@ -382,6 +386,13 @@
Ospeed int32
}
+type Winsize struct {
+ Row uint16
+ Col uint16
+ Xpixel uint16
+ Ypixel uint16
+}
+
const (
AT_FDCWD = -0x64
AT_SYMLINK_NOFOLLOW = 0x200
@@ -418,3 +429,11 @@
X_sysctl_parent [8]byte
X_sysctl_desc [8]byte
}
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
index 1498c23..0963ab8 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
@@ -103,6 +103,10 @@
X__fsid_val [2]int32
}
+const (
+ PathMax = 0x400
+)
+
type RawSockaddrInet4 struct {
Len uint8
Family uint8
@@ -389,6 +393,13 @@
Ospeed int32
}
+type Winsize struct {
+ Row uint16
+ Col uint16
+ Xpixel uint16
+ Ypixel uint16
+}
+
const (
AT_FDCWD = -0x64
AT_SYMLINK_NOFOLLOW = 0x200
@@ -425,3 +436,11 @@
X_sysctl_parent [8]byte
X_sysctl_desc [8]byte
}
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
index d6711ce..211f641 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
@@ -104,6 +104,10 @@
X__fsid_val [2]int32
}
+const (
+ PathMax = 0x400
+)
+
type RawSockaddrInet4 struct {
Len uint8
Family uint8
@@ -387,6 +391,13 @@
Ospeed int32
}
+type Winsize struct {
+ Row uint16
+ Col uint16
+ Xpixel uint16
+ Ypixel uint16
+}
+
const (
AT_FDCWD = -0x64
AT_SYMLINK_NOFOLLOW = 0x200
@@ -423,3 +434,11 @@
X_sysctl_parent [8]byte
X_sysctl_desc [8]byte
}
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
index af295c3..d5a2d75 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
@@ -140,6 +140,10 @@
Val [2]int32
}
+const (
+ PathMax = 0x400
+)
+
type RawSockaddrInet4 struct {
Len uint8
Family uint8
@@ -440,6 +444,13 @@
Ospeed int32
}
+type Winsize struct {
+ Row uint16
+ Col uint16
+ Xpixel uint16
+ Ypixel uint16
+}
+
const (
AT_FDCWD = -0x64
AT_SYMLINK_NOFOLLOW = 0x2
@@ -463,3 +474,11 @@
POLLWRBAND = 0x100
POLLWRNORM = 0x4
)
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
index ae153e7..d531410 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
@@ -142,6 +142,10 @@
Val [2]int32
}
+const (
+ PathMax = 0x400
+)
+
type RawSockaddrInet4 struct {
Len uint8
Family uint8
@@ -447,6 +451,13 @@
Ospeed int32
}
+type Winsize struct {
+ Row uint16
+ Col uint16
+ Xpixel uint16
+ Ypixel uint16
+}
+
const (
AT_FDCWD = -0x64
AT_SYMLINK_NOFOLLOW = 0x2
@@ -470,3 +481,11 @@
POLLWRBAND = 0x100
POLLWRNORM = 0x4
)
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
index 35bb619..e35b13b 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
@@ -140,6 +140,10 @@
Val [2]int32
}
+const (
+ PathMax = 0x400
+)
+
type RawSockaddrInet4 struct {
Len uint8
Family uint8
@@ -433,6 +437,13 @@
Ospeed int32
}
+type Winsize struct {
+ Row uint16
+ Col uint16
+ Xpixel uint16
+ Ypixel uint16
+}
+
const (
AT_FDCWD = -0x64
AT_SYMLINK_NOFOLLOW = 0x2
@@ -456,3 +467,11 @@
POLLWRBAND = 0x100
POLLWRNORM = 0x4
)
+
+type Utsname struct {
+ Sysname [256]byte
+ Nodename [256]byte
+ Release [256]byte
+ Version [256]byte
+ Machine [256]byte
+}
diff --git a/vendor/golang.org/x/sys/windows/env_unset.go b/vendor/golang.org/x/sys/windows/env_unset.go
deleted file mode 100644
index b712c66..0000000
--- a/vendor/golang.org/x/sys/windows/env_unset.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-// +build go1.4
-
-package windows
-
-import "syscall"
-
-func Unsetenv(key string) error {
- // This was added in Go 1.4.
- return syscall.Unsetenv(key)
-}
diff --git a/vendor/golang.org/x/sys/windows/env_windows.go b/vendor/golang.org/x/sys/windows/env_windows.go
index e829238..bdc71e2 100644
--- a/vendor/golang.org/x/sys/windows/env_windows.go
+++ b/vendor/golang.org/x/sys/windows/env_windows.go
@@ -23,3 +23,7 @@
func Environ() []string {
return syscall.Environ()
}
+
+func Unsetenv(key string) error {
+ return syscall.Unsetenv(key)
+}
diff --git a/vendor/golang.org/x/sys/windows/security_windows.go b/vendor/golang.org/x/sys/windows/security_windows.go
index d8e7ff2..f1ec5dc 100644
--- a/vendor/golang.org/x/sys/windows/security_windows.go
+++ b/vendor/golang.org/x/sys/windows/security_windows.go
@@ -132,6 +132,36 @@
SECURITY_NT_NON_UNIQUE_RID = 0x15
)
+// Predefined domain-relative RIDs for local groups.
+// See https://msdn.microsoft.com/en-us/library/windows/desktop/aa379649(v=vs.85).aspx
+const (
+ DOMAIN_ALIAS_RID_ADMINS = 0x220
+ DOMAIN_ALIAS_RID_USERS = 0x221
+ DOMAIN_ALIAS_RID_GUESTS = 0x222
+ DOMAIN_ALIAS_RID_POWER_USERS = 0x223
+ DOMAIN_ALIAS_RID_ACCOUNT_OPS = 0x224
+ DOMAIN_ALIAS_RID_SYSTEM_OPS = 0x225
+ DOMAIN_ALIAS_RID_PRINT_OPS = 0x226
+ DOMAIN_ALIAS_RID_BACKUP_OPS = 0x227
+ DOMAIN_ALIAS_RID_REPLICATOR = 0x228
+ DOMAIN_ALIAS_RID_RAS_SERVERS = 0x229
+ DOMAIN_ALIAS_RID_PREW2KCOMPACCESS = 0x22a
+ DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS = 0x22b
+ DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS = 0x22c
+ DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS = 0x22d
+ DOMAIN_ALIAS_RID_MONITORING_USERS = 0X22e
+ DOMAIN_ALIAS_RID_LOGGING_USERS = 0x22f
+ DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS = 0x230
+ DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS = 0x231
+ DOMAIN_ALIAS_RID_DCOM_USERS = 0x232
+ DOMAIN_ALIAS_RID_IUSERS = 0x238
+ DOMAIN_ALIAS_RID_CRYPTO_OPERATORS = 0x239
+ DOMAIN_ALIAS_RID_CACHEABLE_PRINCIPALS_GROUP = 0x23b
+ DOMAIN_ALIAS_RID_NON_CACHEABLE_PRINCIPALS_GROUP = 0x23c
+ DOMAIN_ALIAS_RID_EVENT_LOG_READERS_GROUP = 0x23d
+ DOMAIN_ALIAS_RID_CERTSVC_DCOM_ACCESS_GROUP = 0x23e
+)
+
//sys LookupAccountSid(systemName *uint16, sid *SID, name *uint16, nameLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) = advapi32.LookupAccountSidW
//sys LookupAccountName(systemName *uint16, accountName *uint16, sid *SID, sidLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) = advapi32.LookupAccountNameW
//sys ConvertSidToStringSid(sid *SID, stringSid **uint16) (err error) = advapi32.ConvertSidToStringSidW
@@ -335,6 +365,8 @@
Groups [1]SIDAndAttributes
}
+// Authorization Functions
+//sys checkTokenMembership(tokenHandle Token, sidToCheck *SID, isMember *int32) (err error) = advapi32.CheckTokenMembership
//sys OpenProcessToken(h Handle, access uint32, token *Token) (err error) = advapi32.OpenProcessToken
//sys GetTokenInformation(t Token, infoClass uint32, info *byte, infoLen uint32, returnedLen *uint32) (err error) = advapi32.GetTokenInformation
//sys GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) = userenv.GetUserProfileDirectoryW
@@ -433,3 +465,12 @@
}
}
}
+
+// IsMember reports whether the access token t is a member of the provided SID.
+func (t Token) IsMember(sid *SID) (bool, error) {
+ var b int32
+ if e := checkTokenMembership(t, sid, &b); e != nil {
+ return false, e
+ }
+ return b != 0, nil
+}
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
index bb778db..1e9f4bb 100644
--- a/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -16,7 +16,46 @@
type Handle uintptr
-const InvalidHandle = ^Handle(0)
+const (
+ InvalidHandle = ^Handle(0)
+
+ // Flags for DefineDosDevice.
+ DDD_EXACT_MATCH_ON_REMOVE = 0x00000004
+ DDD_NO_BROADCAST_SYSTEM = 0x00000008
+ DDD_RAW_TARGET_PATH = 0x00000001
+ DDD_REMOVE_DEFINITION = 0x00000002
+
+ // Return values for GetDriveType.
+ DRIVE_UNKNOWN = 0
+ DRIVE_NO_ROOT_DIR = 1
+ DRIVE_REMOVABLE = 2
+ DRIVE_FIXED = 3
+ DRIVE_REMOTE = 4
+ DRIVE_CDROM = 5
+ DRIVE_RAMDISK = 6
+
+ // File system flags from GetVolumeInformation and GetVolumeInformationByHandle.
+ FILE_CASE_SENSITIVE_SEARCH = 0x00000001
+ FILE_CASE_PRESERVED_NAMES = 0x00000002
+ FILE_FILE_COMPRESSION = 0x00000010
+ FILE_DAX_VOLUME = 0x20000000
+ FILE_NAMED_STREAMS = 0x00040000
+ FILE_PERSISTENT_ACLS = 0x00000008
+ FILE_READ_ONLY_VOLUME = 0x00080000
+ FILE_SEQUENTIAL_WRITE_ONCE = 0x00100000
+ FILE_SUPPORTS_ENCRYPTION = 0x00020000
+ FILE_SUPPORTS_EXTENDED_ATTRIBUTES = 0x00800000
+ FILE_SUPPORTS_HARD_LINKS = 0x00400000
+ FILE_SUPPORTS_OBJECT_IDS = 0x00010000
+ FILE_SUPPORTS_OPEN_BY_FILE_ID = 0x01000000
+ FILE_SUPPORTS_REPARSE_POINTS = 0x00000080
+ FILE_SUPPORTS_SPARSE_FILES = 0x00000040
+ FILE_SUPPORTS_TRANSACTIONS = 0x00200000
+ FILE_SUPPORTS_USN_JOURNAL = 0x02000000
+ FILE_UNICODE_ON_DISK = 0x00000004
+ FILE_VOLUME_IS_COMPRESSED = 0x00008000
+ FILE_VOLUME_QUOTAS = 0x00000020
+)
// StringToUTF16 is deprecated. Use UTF16FromString instead.
// If s contains a NUL byte this function panics instead of
@@ -200,6 +239,27 @@
//sys ResetEvent(event Handle) (err error) = kernel32.ResetEvent
//sys PulseEvent(event Handle) (err error) = kernel32.PulseEvent
+// Volume Management Functions
+//sys DefineDosDevice(flags uint32, deviceName *uint16, targetPath *uint16) (err error) = DefineDosDeviceW
+//sys DeleteVolumeMountPoint(volumeMountPoint *uint16) (err error) = DeleteVolumeMountPointW
+//sys FindFirstVolume(volumeName *uint16, bufferLength uint32) (handle Handle, err error) [failretval==InvalidHandle] = FindFirstVolumeW
+//sys FindFirstVolumeMountPoint(rootPathName *uint16, volumeMountPoint *uint16, bufferLength uint32) (handle Handle, err error) [failretval==InvalidHandle] = FindFirstVolumeMountPointW
+//sys FindNextVolume(findVolume Handle, volumeName *uint16, bufferLength uint32) (err error) = FindNextVolumeW
+//sys FindNextVolumeMountPoint(findVolumeMountPoint Handle, volumeMountPoint *uint16, bufferLength uint32) (err error) = FindNextVolumeMountPointW
+//sys FindVolumeClose(findVolume Handle) (err error)
+//sys FindVolumeMountPointClose(findVolumeMountPoint Handle) (err error)
+//sys GetDriveType(rootPathName *uint16) (driveType uint32) = GetDriveTypeW
+//sys GetLogicalDrives() (drivesBitMask uint32, err error) [failretval==0]
+//sys GetLogicalDriveStrings(bufferLength uint32, buffer *uint16) (n uint32, err error) [failretval==0] = GetLogicalDriveStringsW
+//sys GetVolumeInformation(rootPathName *uint16, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) = GetVolumeInformationW
+//sys GetVolumeInformationByHandle(file Handle, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) = GetVolumeInformationByHandleW
+//sys GetVolumeNameForVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16, bufferlength uint32) (err error) = GetVolumeNameForVolumeMountPointW
+//sys GetVolumePathName(fileName *uint16, volumePathName *uint16, bufferLength uint32) (err error) = GetVolumePathNameW
+//sys GetVolumePathNamesForVolumeName(volumeName *uint16, volumePathNames *uint16, bufferLength uint32, returnLength *uint32) (err error) = GetVolumePathNamesForVolumeNameW
+//sys QueryDosDevice(deviceName *uint16, targetPath *uint16, max uint32) (n uint32, err error) [failretval==0] = QueryDosDeviceW
+//sys SetVolumeLabel(rootPathName *uint16, volumeName *uint16) (err error) = SetVolumeLabelW
+//sys SetVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16) (err error) = SetVolumeMountPointW
+
// syscall interface implementation for other packages
// GetProcAddressByOrdinal retrieves the address of the exported
@@ -796,6 +856,75 @@
return connectEx(fd, ptr, n, sendBuf, sendDataLen, bytesSent, overlapped)
}
+var sendRecvMsgFunc struct {
+ once sync.Once
+ sendAddr uintptr
+ recvAddr uintptr
+ err error
+}
+
+func loadWSASendRecvMsg() error {
+ sendRecvMsgFunc.once.Do(func() {
+ var s Handle
+ s, sendRecvMsgFunc.err = Socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)
+ if sendRecvMsgFunc.err != nil {
+ return
+ }
+ defer CloseHandle(s)
+ var n uint32
+ sendRecvMsgFunc.err = WSAIoctl(s,
+ SIO_GET_EXTENSION_FUNCTION_POINTER,
+ (*byte)(unsafe.Pointer(&WSAID_WSARECVMSG)),
+ uint32(unsafe.Sizeof(WSAID_WSARECVMSG)),
+ (*byte)(unsafe.Pointer(&sendRecvMsgFunc.recvAddr)),
+ uint32(unsafe.Sizeof(sendRecvMsgFunc.recvAddr)),
+ &n, nil, 0)
+ if sendRecvMsgFunc.err != nil {
+ return
+ }
+ sendRecvMsgFunc.err = WSAIoctl(s,
+ SIO_GET_EXTENSION_FUNCTION_POINTER,
+ (*byte)(unsafe.Pointer(&WSAID_WSASENDMSG)),
+ uint32(unsafe.Sizeof(WSAID_WSASENDMSG)),
+ (*byte)(unsafe.Pointer(&sendRecvMsgFunc.sendAddr)),
+ uint32(unsafe.Sizeof(sendRecvMsgFunc.sendAddr)),
+ &n, nil, 0)
+ })
+ return sendRecvMsgFunc.err
+}
+
+func WSASendMsg(fd Handle, msg *WSAMsg, flags uint32, bytesSent *uint32, overlapped *Overlapped, croutine *byte) error {
+ err := loadWSASendRecvMsg()
+ if err != nil {
+ return err
+ }
+ r1, _, e1 := syscall.Syscall6(sendRecvMsgFunc.sendAddr, 6, uintptr(fd), uintptr(unsafe.Pointer(msg)), uintptr(flags), uintptr(unsafe.Pointer(bytesSent)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)))
+ if r1 == socket_error {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return err
+}
+
+func WSARecvMsg(fd Handle, msg *WSAMsg, bytesReceived *uint32, overlapped *Overlapped, croutine *byte) error {
+ err := loadWSASendRecvMsg()
+ if err != nil {
+ return err
+ }
+ r1, _, e1 := syscall.Syscall6(sendRecvMsgFunc.recvAddr, 5, uintptr(fd), uintptr(unsafe.Pointer(msg)), uintptr(unsafe.Pointer(bytesReceived)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0)
+ if r1 == socket_error {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return err
+}
+
// Invented structures to support what package os expects.
type Rusage struct {
CreationTime Filetime
diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go
index 0229f79..52c2037 100644
--- a/vendor/golang.org/x/sys/windows/types_windows.go
+++ b/vendor/golang.org/x/sys/windows/types_windows.go
@@ -29,6 +29,7 @@
ERROR_NOT_FOUND syscall.Errno = 1168
ERROR_PRIVILEGE_NOT_HELD syscall.Errno = 1314
WSAEACCES syscall.Errno = 10013
+ WSAEMSGSIZE syscall.Errno = 10040
WSAECONNRESET syscall.Errno = 10054
)
@@ -158,9 +159,6 @@
WAIT_OBJECT_0 = 0x00000000
WAIT_FAILED = 0xFFFFFFFF
- CREATE_NEW_PROCESS_GROUP = 0x00000200
- CREATE_UNICODE_ENVIRONMENT = 0x00000400
-
PROCESS_TERMINATE = 1
PROCESS_QUERY_INFORMATION = 0x00000400
SYNCHRONIZE = 0x00100000
@@ -178,6 +176,26 @@
)
const (
+ // Process creation flags.
+ CREATE_BREAKAWAY_FROM_JOB = 0x01000000
+ CREATE_DEFAULT_ERROR_MODE = 0x04000000
+ CREATE_NEW_CONSOLE = 0x00000010
+ CREATE_NEW_PROCESS_GROUP = 0x00000200
+ CREATE_NO_WINDOW = 0x08000000
+ CREATE_PROTECTED_PROCESS = 0x00040000
+ CREATE_PRESERVE_CODE_AUTHZ_LEVEL = 0x02000000
+ CREATE_SEPARATE_WOW_VDM = 0x00000800
+ CREATE_SHARED_WOW_VDM = 0x00001000
+ CREATE_SUSPENDED = 0x00000004
+ CREATE_UNICODE_ENVIRONMENT = 0x00000400
+ DEBUG_ONLY_THIS_PROCESS = 0x00000002
+ DEBUG_PROCESS = 0x00000001
+ DETACHED_PROCESS = 0x00000008
+ EXTENDED_STARTUPINFO_PRESENT = 0x00080000
+ INHERIT_PARENT_AFFINITY = 0x00010000
+)
+
+const (
// flags for CreateToolhelp32Snapshot
TH32CS_SNAPHEAPLIST = 0x01
TH32CS_SNAPPROCESS = 0x02
@@ -567,6 +585,16 @@
IPV6_JOIN_GROUP = 0xc
IPV6_LEAVE_GROUP = 0xd
+ MSG_OOB = 0x1
+ MSG_PEEK = 0x2
+ MSG_DONTROUTE = 0x4
+ MSG_WAITALL = 0x8
+
+ MSG_TRUNC = 0x0100
+ MSG_CTRUNC = 0x0200
+ MSG_BCAST = 0x0400
+ MSG_MCAST = 0x0800
+
SOMAXCONN = 0x7fffffff
TCP_NODELAY = 1
@@ -584,6 +612,15 @@
Buf *byte
}
+type WSAMsg struct {
+ Name *syscall.RawSockaddrAny
+ Namelen int32
+ Buffers *WSABuf
+ BufferCount uint32
+ Control WSABuf
+ Flags uint32
+}
+
// Invented values to support what package os expects.
const (
S_IFMT = 0x1f000
@@ -1011,6 +1048,20 @@
[8]byte{0x8e, 0xe9, 0x76, 0xe5, 0x8c, 0x74, 0x06, 0x3e},
}
+var WSAID_WSASENDMSG = GUID{
+ 0xa441e712,
+ 0x754f,
+ 0x43ca,
+ [8]byte{0x84, 0xa7, 0x0d, 0xee, 0x44, 0xcf, 0x60, 0x6d},
+}
+
+var WSAID_WSARECVMSG = GUID{
+ 0xf689d7c8,
+ 0x6f1f,
+ 0x436b,
+ [8]byte{0x8a, 0x53, 0xe5, 0x4f, 0xe3, 0x51, 0xc3, 0x22},
+}
+
const (
FILE_SKIP_COMPLETION_PORT_ON_SUCCESS = 1
FILE_SKIP_SET_EVENT_ON_HANDLE = 2
diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
index 2f893d2..c7b3b15 100644
--- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
@@ -178,6 +178,25 @@
procSetEvent = modkernel32.NewProc("SetEvent")
procResetEvent = modkernel32.NewProc("ResetEvent")
procPulseEvent = modkernel32.NewProc("PulseEvent")
+ procDefineDosDeviceW = modkernel32.NewProc("DefineDosDeviceW")
+ procDeleteVolumeMountPointW = modkernel32.NewProc("DeleteVolumeMountPointW")
+ procFindFirstVolumeW = modkernel32.NewProc("FindFirstVolumeW")
+ procFindFirstVolumeMountPointW = modkernel32.NewProc("FindFirstVolumeMountPointW")
+ procFindNextVolumeW = modkernel32.NewProc("FindNextVolumeW")
+ procFindNextVolumeMountPointW = modkernel32.NewProc("FindNextVolumeMountPointW")
+ procFindVolumeClose = modkernel32.NewProc("FindVolumeClose")
+ procFindVolumeMountPointClose = modkernel32.NewProc("FindVolumeMountPointClose")
+ procGetDriveTypeW = modkernel32.NewProc("GetDriveTypeW")
+ procGetLogicalDrives = modkernel32.NewProc("GetLogicalDrives")
+ procGetLogicalDriveStringsW = modkernel32.NewProc("GetLogicalDriveStringsW")
+ procGetVolumeInformationW = modkernel32.NewProc("GetVolumeInformationW")
+ procGetVolumeInformationByHandleW = modkernel32.NewProc("GetVolumeInformationByHandleW")
+ procGetVolumeNameForVolumeMountPointW = modkernel32.NewProc("GetVolumeNameForVolumeMountPointW")
+ procGetVolumePathNameW = modkernel32.NewProc("GetVolumePathNameW")
+ procGetVolumePathNamesForVolumeNameW = modkernel32.NewProc("GetVolumePathNamesForVolumeNameW")
+ procQueryDosDeviceW = modkernel32.NewProc("QueryDosDeviceW")
+ procSetVolumeLabelW = modkernel32.NewProc("SetVolumeLabelW")
+ procSetVolumeMountPointW = modkernel32.NewProc("SetVolumeMountPointW")
procWSAStartup = modws2_32.NewProc("WSAStartup")
procWSACleanup = modws2_32.NewProc("WSACleanup")
procWSAIoctl = modws2_32.NewProc("WSAIoctl")
@@ -227,6 +246,7 @@
procAllocateAndInitializeSid = modadvapi32.NewProc("AllocateAndInitializeSid")
procFreeSid = modadvapi32.NewProc("FreeSid")
procEqualSid = modadvapi32.NewProc("EqualSid")
+ procCheckTokenMembership = modadvapi32.NewProc("CheckTokenMembership")
procOpenProcessToken = modadvapi32.NewProc("OpenProcessToken")
procGetTokenInformation = modadvapi32.NewProc("GetTokenInformation")
procGetUserProfileDirectoryW = moduserenv.NewProc("GetUserProfileDirectoryW")
@@ -1843,6 +1863,233 @@
return
}
+func DefineDosDevice(flags uint32, deviceName *uint16, targetPath *uint16) (err error) {
+ r1, _, e1 := syscall.Syscall(procDefineDosDeviceW.Addr(), 3, uintptr(flags), uintptr(unsafe.Pointer(deviceName)), uintptr(unsafe.Pointer(targetPath)))
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func DeleteVolumeMountPoint(volumeMountPoint *uint16) (err error) {
+ r1, _, e1 := syscall.Syscall(procDeleteVolumeMountPointW.Addr(), 1, uintptr(unsafe.Pointer(volumeMountPoint)), 0, 0)
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func FindFirstVolume(volumeName *uint16, bufferLength uint32) (handle Handle, err error) {
+ r0, _, e1 := syscall.Syscall(procFindFirstVolumeW.Addr(), 2, uintptr(unsafe.Pointer(volumeName)), uintptr(bufferLength), 0)
+ handle = Handle(r0)
+ if handle == InvalidHandle {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func FindFirstVolumeMountPoint(rootPathName *uint16, volumeMountPoint *uint16, bufferLength uint32) (handle Handle, err error) {
+ r0, _, e1 := syscall.Syscall(procFindFirstVolumeMountPointW.Addr(), 3, uintptr(unsafe.Pointer(rootPathName)), uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(bufferLength))
+ handle = Handle(r0)
+ if handle == InvalidHandle {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func FindNextVolume(findVolume Handle, volumeName *uint16, bufferLength uint32) (err error) {
+ r1, _, e1 := syscall.Syscall(procFindNextVolumeW.Addr(), 3, uintptr(findVolume), uintptr(unsafe.Pointer(volumeName)), uintptr(bufferLength))
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func FindNextVolumeMountPoint(findVolumeMountPoint Handle, volumeMountPoint *uint16, bufferLength uint32) (err error) {
+ r1, _, e1 := syscall.Syscall(procFindNextVolumeMountPointW.Addr(), 3, uintptr(findVolumeMountPoint), uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(bufferLength))
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func FindVolumeClose(findVolume Handle) (err error) {
+ r1, _, e1 := syscall.Syscall(procFindVolumeClose.Addr(), 1, uintptr(findVolume), 0, 0)
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func FindVolumeMountPointClose(findVolumeMountPoint Handle) (err error) {
+ r1, _, e1 := syscall.Syscall(procFindVolumeMountPointClose.Addr(), 1, uintptr(findVolumeMountPoint), 0, 0)
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func GetDriveType(rootPathName *uint16) (driveType uint32) {
+ r0, _, _ := syscall.Syscall(procGetDriveTypeW.Addr(), 1, uintptr(unsafe.Pointer(rootPathName)), 0, 0)
+ driveType = uint32(r0)
+ return
+}
+
+func GetLogicalDrives() (drivesBitMask uint32, err error) {
+ r0, _, e1 := syscall.Syscall(procGetLogicalDrives.Addr(), 0, 0, 0, 0)
+ drivesBitMask = uint32(r0)
+ if drivesBitMask == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func GetLogicalDriveStrings(bufferLength uint32, buffer *uint16) (n uint32, err error) {
+ r0, _, e1 := syscall.Syscall(procGetLogicalDriveStringsW.Addr(), 2, uintptr(bufferLength), uintptr(unsafe.Pointer(buffer)), 0)
+ n = uint32(r0)
+ if n == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func GetVolumeInformation(rootPathName *uint16, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) {
+ r1, _, e1 := syscall.Syscall9(procGetVolumeInformationW.Addr(), 8, uintptr(unsafe.Pointer(rootPathName)), uintptr(unsafe.Pointer(volumeNameBuffer)), uintptr(volumeNameSize), uintptr(unsafe.Pointer(volumeNameSerialNumber)), uintptr(unsafe.Pointer(maximumComponentLength)), uintptr(unsafe.Pointer(fileSystemFlags)), uintptr(unsafe.Pointer(fileSystemNameBuffer)), uintptr(fileSystemNameSize), 0)
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func GetVolumeInformationByHandle(file Handle, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) {
+ r1, _, e1 := syscall.Syscall9(procGetVolumeInformationByHandleW.Addr(), 8, uintptr(file), uintptr(unsafe.Pointer(volumeNameBuffer)), uintptr(volumeNameSize), uintptr(unsafe.Pointer(volumeNameSerialNumber)), uintptr(unsafe.Pointer(maximumComponentLength)), uintptr(unsafe.Pointer(fileSystemFlags)), uintptr(unsafe.Pointer(fileSystemNameBuffer)), uintptr(fileSystemNameSize), 0)
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func GetVolumeNameForVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16, bufferlength uint32) (err error) {
+ r1, _, e1 := syscall.Syscall(procGetVolumeNameForVolumeMountPointW.Addr(), 3, uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(unsafe.Pointer(volumeName)), uintptr(bufferlength))
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func GetVolumePathName(fileName *uint16, volumePathName *uint16, bufferLength uint32) (err error) {
+ r1, _, e1 := syscall.Syscall(procGetVolumePathNameW.Addr(), 3, uintptr(unsafe.Pointer(fileName)), uintptr(unsafe.Pointer(volumePathName)), uintptr(bufferLength))
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func GetVolumePathNamesForVolumeName(volumeName *uint16, volumePathNames *uint16, bufferLength uint32, returnLength *uint32) (err error) {
+ r1, _, e1 := syscall.Syscall6(procGetVolumePathNamesForVolumeNameW.Addr(), 4, uintptr(unsafe.Pointer(volumeName)), uintptr(unsafe.Pointer(volumePathNames)), uintptr(bufferLength), uintptr(unsafe.Pointer(returnLength)), 0, 0)
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func QueryDosDevice(deviceName *uint16, targetPath *uint16, max uint32) (n uint32, err error) {
+ r0, _, e1 := syscall.Syscall(procQueryDosDeviceW.Addr(), 3, uintptr(unsafe.Pointer(deviceName)), uintptr(unsafe.Pointer(targetPath)), uintptr(max))
+ n = uint32(r0)
+ if n == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func SetVolumeLabel(rootPathName *uint16, volumeName *uint16) (err error) {
+ r1, _, e1 := syscall.Syscall(procSetVolumeLabelW.Addr(), 2, uintptr(unsafe.Pointer(rootPathName)), uintptr(unsafe.Pointer(volumeName)), 0)
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
+func SetVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16) (err error) {
+ r1, _, e1 := syscall.Syscall(procSetVolumeMountPointW.Addr(), 2, uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(unsafe.Pointer(volumeName)), 0)
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
func WSAStartup(verreq uint32, data *WSAData) (sockerr error) {
r0, _, _ := syscall.Syscall(procWSAStartup.Addr(), 2, uintptr(verreq), uintptr(unsafe.Pointer(data)), 0)
if r0 != 0 {
@@ -2391,6 +2638,18 @@
return
}
+func checkTokenMembership(tokenHandle Token, sidToCheck *SID, isMember *int32) (err error) {
+ r1, _, e1 := syscall.Syscall(procCheckTokenMembership.Addr(), 3, uintptr(tokenHandle), uintptr(unsafe.Pointer(sidToCheck)), uintptr(unsafe.Pointer(isMember)))
+ if r1 == 0 {
+ if e1 != 0 {
+ err = errnoErr(e1)
+ } else {
+ err = syscall.EINVAL
+ }
+ }
+ return
+}
+
func OpenProcessToken(h Handle, access uint32, token *Token) (err error) {
r1, _, e1 := syscall.Syscall(procOpenProcessToken.Addr(), 3, uintptr(h), uintptr(access), uintptr(unsafe.Pointer(token)))
if r1 == 0 {
diff --git a/volume/drivers/adapter.go b/volume/drivers/adapter.go
index 76ed39b..8415c7f 100644
--- a/volume/drivers/adapter.go
+++ b/volume/drivers/adapter.go
@@ -2,7 +2,6 @@
import (
"errors"
- "path/filepath"
"strings"
"time"
@@ -16,7 +15,7 @@
type volumeDriverAdapter struct {
name string
- baseHostPath string
+ scopePath func(s string) string
capabilities *volume.Capability
proxy *volumeDriverProxy
}
@@ -30,10 +29,10 @@
return nil, err
}
return &volumeAdapter{
- proxy: a.proxy,
- name: name,
- driverName: a.name,
- baseHostPath: a.baseHostPath,
+ proxy: a.proxy,
+ name: name,
+ driverName: a.name,
+ scopePath: a.scopePath,
}, nil
}
@@ -41,13 +40,6 @@
return a.proxy.Remove(v.Name())
}
-func hostPath(baseHostPath, path string) string {
- if baseHostPath != "" {
- path = filepath.Join(baseHostPath, path)
- }
- return path
-}
-
func (a *volumeDriverAdapter) List() ([]volume.Volume, error) {
ls, err := a.proxy.List()
if err != nil {
@@ -57,11 +49,11 @@
var out []volume.Volume
for _, vp := range ls {
out = append(out, &volumeAdapter{
- proxy: a.proxy,
- name: vp.Name,
- baseHostPath: a.baseHostPath,
- driverName: a.name,
- eMount: hostPath(a.baseHostPath, vp.Mountpoint),
+ proxy: a.proxy,
+ name: vp.Name,
+ scopePath: a.scopePath,
+ driverName: a.name,
+ eMount: a.scopePath(vp.Mountpoint),
})
}
return out, nil
@@ -79,13 +71,13 @@
}
return &volumeAdapter{
- proxy: a.proxy,
- name: v.Name,
- driverName: a.Name(),
- eMount: v.Mountpoint,
- createdAt: v.CreatedAt,
- status: v.Status,
- baseHostPath: a.baseHostPath,
+ proxy: a.proxy,
+ name: v.Name,
+ driverName: a.Name(),
+ eMount: v.Mountpoint,
+ createdAt: v.CreatedAt,
+ status: v.Status,
+ scopePath: a.scopePath,
}, nil
}
@@ -122,13 +114,13 @@
}
type volumeAdapter struct {
- proxy *volumeDriverProxy
- name string
- baseHostPath string
- driverName string
- eMount string // ephemeral host volume path
- createdAt time.Time // time the directory was created
- status map[string]interface{}
+ proxy *volumeDriverProxy
+ name string
+ scopePath func(string) string
+ driverName string
+ eMount string // ephemeral host volume path
+ createdAt time.Time // time the directory was created
+ status map[string]interface{}
}
type proxyVolume struct {
@@ -149,7 +141,7 @@
func (a *volumeAdapter) Path() string {
if len(a.eMount) == 0 {
mountpoint, _ := a.proxy.Path(a.name)
- a.eMount = hostPath(a.baseHostPath, mountpoint)
+ a.eMount = a.scopePath(mountpoint)
}
return a.eMount
}
@@ -160,7 +152,7 @@
func (a *volumeAdapter) Mount(id string) (string, error) {
mountpoint, err := a.proxy.Mount(a.name, id)
- a.eMount = hostPath(a.baseHostPath, mountpoint)
+ a.eMount = a.scopePath(mountpoint)
return a.eMount, err
}
diff --git a/volume/drivers/extpoint.go b/volume/drivers/extpoint.go
index a239035..15cf850 100644
--- a/volume/drivers/extpoint.go
+++ b/volume/drivers/extpoint.go
@@ -25,9 +25,9 @@
const extName = "VolumeDriver"
// NewVolumeDriver returns a driver has the given name mapped on the given client.
-func NewVolumeDriver(name string, baseHostPath string, c client) volume.Driver {
+func NewVolumeDriver(name string, scopePath func(string) string, c client) volume.Driver {
proxy := &volumeDriverProxy{c}
- return &volumeDriverAdapter{name: name, baseHostPath: baseHostPath, proxy: proxy}
+ return &volumeDriverAdapter{name: name, scopePath: scopePath, proxy: proxy}
}
// volumeDriver defines the available functions that volume plugins must implement.
@@ -129,7 +129,7 @@
return nil, errors.Wrap(err, "error looking up volume plugin "+name)
}
- d := NewVolumeDriver(p.Name(), p.BasePath(), p.Client())
+ d := NewVolumeDriver(p.Name(), p.ScopedPath, p.Client())
if err := validateDriver(d); err != nil {
if mode > 0 {
// Undo any reference count changes from the initial `Get`
@@ -224,7 +224,7 @@
continue
}
- ext := NewVolumeDriver(name, p.BasePath(), p.Client())
+ ext := NewVolumeDriver(name, p.ScopedPath, p.Client())
if p.IsV1() {
drivers.extensions[name] = ext
}
diff --git a/volume/testutils/testutils.go b/volume/testutils/testutils.go
index 45f4459..a328db4 100644
--- a/volume/testutils/testutils.go
+++ b/volume/testutils/testutils.go
@@ -178,8 +178,8 @@
return false
}
-func (p *fakePlugin) BasePath() string {
- return ""
+func (p *fakePlugin) ScopedPath(s string) string {
+ return s
}
type fakePluginGetter struct {
