Skip to content

Commit f164a56

Browse files
authored
Merge pull request moby#50844 from akerouanton/vendor-sctp
vendor: github.com/ishidawataru/sctp v0.0.0-20250829011129-4b890084db30
2 parents 4929dce + 9dc0c09 commit f164a56

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

cmd/docker-proxy/main_linux.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,7 @@ func parseFlags() ProxyConfig {
178178
}
179179

180180
if useListenFd {
181-
// Unlike the stdlib, passing a non-blocking socket to `sctp.FileListener`
182-
// will result in a non-blocking Accept(). So, do not set this flag for SCTP.
183-
if config.Proto != "sctp" {
184-
_ = syscall.SetNonblock(int(listenSockFd), true)
185-
}
181+
_ = syscall.SetNonblock(int(listenSockFd), true)
186182
config.ListenSock = os.NewFile(listenSockFd, "listen-sock")
187183
}
188184

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ require (
5151
github.com/hashicorp/go-memdb v1.3.2
5252
github.com/hashicorp/memberlist v0.4.0
5353
github.com/hashicorp/serf v0.8.5
54-
github.com/ishidawataru/sctp v0.0.0-20250708014235-1989182a9425
54+
github.com/ishidawataru/sctp v0.0.0-20250829011129-4b890084db30
5555
github.com/miekg/dns v1.1.66
5656
github.com/mistifyio/go-zfs/v3 v3.0.1
5757
github.com/mitchellh/copystructure v1.2.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ github.com/in-toto/in-toto-golang v0.9.0/go.mod h1:xsBVrVsHNsB61++S6Dy2vWosKhuA3
339339
github.com/inconshreveable/log15 v0.0.0-20170622235902-74a0988b5f80/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o=
340340
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
341341
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
342-
github.com/ishidawataru/sctp v0.0.0-20250708014235-1989182a9425 h1:37AZdk/mVlt6NiksUPgo7MCHBVTLUWWD8CIbQdeLU5E=
343-
github.com/ishidawataru/sctp v0.0.0-20250708014235-1989182a9425/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=
342+
github.com/ishidawataru/sctp v0.0.0-20250829011129-4b890084db30 h1:SF8DGX8bGAXMAvxtJvFFy2KIAPwxIEDP3XpzZVhz0i4=
343+
github.com/ishidawataru/sctp v0.0.0-20250829011129-4b890084db30/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=
344344
github.com/jmoiron/sqlx v1.3.3 h1:j82X0bf7oQ27XeqxicSZsTU5suPwKElg3oyxNn43iTk=
345345
github.com/jmoiron/sqlx v1.3.3/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=
346346
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=

vendor/github.com/ishidawataru/sctp/sctp_linux.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v1
722722
# github.com/inconshreveable/mousetrap v1.1.0
723723
## explicit; go 1.18
724724
github.com/inconshreveable/mousetrap
725-
# github.com/ishidawataru/sctp v0.0.0-20250708014235-1989182a9425
725+
# github.com/ishidawataru/sctp v0.0.0-20250829011129-4b890084db30
726726
## explicit; go 1.12
727727
github.com/ishidawataru/sctp
728728
# github.com/jmoiron/sqlx v1.3.3

0 commit comments

Comments
 (0)