summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/stack
diff options
context:
space:
mode:
authorZhaozhong Ni <nzz@google.com>2018-07-27 10:16:27 -0700
committerShentubot <shentubot@google.com>2018-07-27 10:17:21 -0700
commitbe7fcbc5582fe831b5ec63f773d867d7591e27a1 (patch)
tree0b14ffa46eebaeab73a751ac4b3b38e434bbed67 /pkg/tcpip/stack
parentb8f96a9d0b9868060025e7a89e99e1b30d17fa8b (diff)
stateify: support explicit annotation mode; convert refs and stack packages.
We have been unnecessarily creating too many savable types implicitly. PiperOrigin-RevId: 206334201 Change-Id: Idc5a3a14bfb7ee125c4f2bb2b1c53164e46f29a8
Diffstat (limited to 'pkg/tcpip/stack')
-rw-r--r--pkg/tcpip/stack/BUILD15
-rw-r--r--pkg/tcpip/stack/registration.go2
2 files changed, 3 insertions, 14 deletions
diff --git a/pkg/tcpip/stack/BUILD b/pkg/tcpip/stack/BUILD
index 6d201d0a2..5e7355135 100644
--- a/pkg/tcpip/stack/BUILD
+++ b/pkg/tcpip/stack/BUILD
@@ -1,17 +1,6 @@
package(licenses = ["notice"]) # Apache 2.0
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-load("//tools/go_stateify:defs.bzl", "go_stateify")
-
-go_stateify(
- name = "stack_state",
- srcs = [
- "registration.go",
- "stack.go",
- ],
- out = "stack_state.go",
- package = "stack",
-)
+load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
go_library(
name = "stack",
@@ -22,7 +11,6 @@ go_library(
"route.go",
"stack.go",
"stack_global_state.go",
- "stack_state.go",
"transport_demuxer.go",
],
importpath = "gvisor.googlesource.com/gvisor/pkg/tcpip/stack",
@@ -32,7 +20,6 @@ go_library(
deps = [
"//pkg/ilist",
"//pkg/sleep",
- "//pkg/state",
"//pkg/tcpip",
"//pkg/tcpip/buffer",
"//pkg/tcpip/header",
diff --git a/pkg/tcpip/stack/registration.go b/pkg/tcpip/stack/registration.go
index e9550a062..c66f925a8 100644
--- a/pkg/tcpip/stack/registration.go
+++ b/pkg/tcpip/stack/registration.go
@@ -31,6 +31,8 @@ type NetworkEndpointID struct {
}
// TransportEndpointID is the identifier of a transport layer protocol endpoint.
+//
+// +stateify savable
type TransportEndpointID struct {
// LocalPort is the local port associated with the endpoint.
LocalPort uint16