summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/google
diff options
context:
space:
mode:
authorWim <wim@42.be>2021-10-30 15:17:50 +0200
committerGitHub <noreply@github.com>2021-10-30 15:17:50 +0200
commit835dd2635af46e3c8604fae8c9d383a80535c29e (patch)
treef433dd39c7cf8b35f73ff885ac7fb6f508958263 /vendor/github.com/google
parentf65b18c2f6716744fe2f781843f83ddc325b73ec (diff)
downloadmatterbridge-msglm-835dd2635af46e3c8604fae8c9d383a80535c29e.tar.gz
matterbridge-msglm-835dd2635af46e3c8604fae8c9d383a80535c29e.tar.bz2
matterbridge-msglm-835dd2635af46e3c8604fae8c9d383a80535c29e.zip
Update dependencies (#1628)
Diffstat (limited to 'vendor/github.com/google')
-rw-r--r--vendor/github.com/google/gops/agent/agent.go2
-rw-r--r--vendor/github.com/google/gops/agent/sockopt_reuseport.go (renamed from vendor/github.com/google/gops/agent/sockopt_unix.go)8
-rw-r--r--vendor/github.com/google/gops/agent/sockopt_unsupported.go6
3 files changed, 8 insertions, 8 deletions
diff --git a/vendor/github.com/google/gops/agent/agent.go b/vendor/github.com/google/gops/agent/agent.go
index 5fde1fd1..2af03e5a 100644
--- a/vendor/github.com/google/gops/agent/agent.go
+++ b/vendor/github.com/google/gops/agent/agent.go
@@ -107,7 +107,7 @@ func Listen(opts Options) error {
}
var lc net.ListenConfig
if opts.ReuseSocketAddrAndPort {
- lc.Control = setsockoptReuseAddrAndPort
+ lc.Control = setReuseAddrAndPortSockopts
}
listener, err = lc.Listen(context.Background(), "tcp", addr)
if err != nil {
diff --git a/vendor/github.com/google/gops/agent/sockopt_unix.go b/vendor/github.com/google/gops/agent/sockopt_reuseport.go
index 8c472c64..8311fe39 100644
--- a/vendor/github.com/google/gops/agent/sockopt_unix.go
+++ b/vendor/github.com/google/gops/agent/sockopt_reuseport.go
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build !js && !plan9 && !windows
-// +build !js,!plan9,!windows
+//go:build !js && !plan9 && !solaris && !windows
+// +build !js,!plan9,!solaris,!windows
package agent
@@ -13,10 +13,10 @@ import (
"golang.org/x/sys/unix"
)
-// setsockoptReuseAddrAndPort sets the SO_REUSEADDR and SO_REUSEPORT socket
+// setReuseAddrAndPortSockopts sets the SO_REUSEADDR and SO_REUSEPORT socket
// options on c's underlying socket in order to increase the chance to re-bind()
// to the same address and port upon agent restart.
-func setsockoptReuseAddrAndPort(network, address string, c syscall.RawConn) error {
+func setReuseAddrAndPortSockopts(network, address string, c syscall.RawConn) error {
var soerr error
if err := c.Control(func(su uintptr) {
sock := int(su)
diff --git a/vendor/github.com/google/gops/agent/sockopt_unsupported.go b/vendor/github.com/google/gops/agent/sockopt_unsupported.go
index ca079c69..2493e8ca 100644
--- a/vendor/github.com/google/gops/agent/sockopt_unsupported.go
+++ b/vendor/github.com/google/gops/agent/sockopt_unsupported.go
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build (js && wasm) || plan9 || windows
-// +build js,wasm plan9 windows
+//go:build (js && wasm) || plan9 || solaris || windows
+// +build js,wasm plan9 solaris windows
package agent
import "syscall"
-func setsockoptReuseAddrAndPort(network, address string, c syscall.RawConn) error {
+func setReuseAddrAndPortSockopts(network, address string, c syscall.RawConn) error {
return nil
}