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 /runsc/boot/loader.go | |
| parent | e3a366f06fa97b6c58eee09e619de697fa42378c (diff) | |
| parent | 6a9823794975d2401ae1bda3937a63de959192ab (diff) | |
Merge release-20190806.1-244-g6a98237 (automated)
Diffstat (limited to 'runsc/boot/loader.go')
| -rw-r--r-- | runsc/boot/loader.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index adf345490..4e57155c6 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -62,10 +62,10 @@ import ( "gvisor.dev/gvisor/runsc/specutils" // Include supported socket providers. - "gvisor.dev/gvisor/pkg/sentry/socket/epsocket" "gvisor.dev/gvisor/pkg/sentry/socket/hostinet" _ "gvisor.dev/gvisor/pkg/sentry/socket/netlink" _ "gvisor.dev/gvisor/pkg/sentry/socket/netlink/route" + "gvisor.dev/gvisor/pkg/sentry/socket/netstack" _ "gvisor.dev/gvisor/pkg/sentry/socket/unix" ) @@ -914,11 +914,11 @@ func newEmptyNetworkStack(conf *Config, clock tcpip.Clock) (inet.Stack, error) { // NetworkNone sets up loopback using netstack. netProtos := []stack.NetworkProtocol{ipv4.NewProtocol(), ipv6.NewProtocol(), arp.NewProtocol()} transProtos := []stack.TransportProtocol{tcp.NewProtocol(), udp.NewProtocol(), icmp.NewProtocol4()} - s := epsocket.Stack{stack.New(stack.Options{ + s := netstack.Stack{stack.New(stack.Options{ NetworkProtocols: netProtos, TransportProtocols: transProtos, Clock: clock, - Stats: epsocket.Metrics, + Stats: netstack.Metrics, HandleLocal: true, // Enable raw sockets for users with sufficient // privileges. |