diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-10-07 21:00:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-10-07 21:00:35 +0000 |
| commit | 009580d88e7b5077bb1df88f731bbcfc60826d38 (patch) | |
| tree | 95b7acbf9ffa0237347df9c9ae4da18a398880c1 /pkg/sentry/strace | |
| parent | e3a366f06fa97b6c58eee09e619de697fa42378c (diff) | |
| parent | 6a9823794975d2401ae1bda3937a63de959192ab (diff) | |
Merge release-20190806.1-244-g6a98237 (automated)
Diffstat (limited to 'pkg/sentry/strace')
| -rw-r--r-- | pkg/sentry/strace/socket.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/strace/socket.go b/pkg/sentry/strace/socket.go index f779186ad..94334f6d2 100644 --- a/pkg/sentry/strace/socket.go +++ b/pkg/sentry/strace/socket.go @@ -23,8 +23,8 @@ import ( "gvisor.dev/gvisor/pkg/binary" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/socket/control" - "gvisor.dev/gvisor/pkg/sentry/socket/epsocket" "gvisor.dev/gvisor/pkg/sentry/socket/netlink" + "gvisor.dev/gvisor/pkg/sentry/socket/netstack" slinux "gvisor.dev/gvisor/pkg/sentry/syscalls/linux" "gvisor.dev/gvisor/pkg/sentry/usermem" ) @@ -332,7 +332,7 @@ func sockAddr(t *kernel.Task, addr usermem.Addr, length uint32) string { switch family { case linux.AF_INET, linux.AF_INET6, linux.AF_UNIX: - fa, _, err := epsocket.AddressAndFamily(int(family), b, true /* strict */) + fa, _, err := netstack.AddressAndFamily(int(family), b, true /* strict */) if err != nil { return fmt.Sprintf("%#x {Family: %s, error extracting address: %v}", addr, familyStr, err) } |