Merge cf4fc510 (automated)

2 files changed, 12 insertions, 0 deletions

diff --git a/pkg/sentry/inet/inet.go b/pkg/sentry/inet/inet.go
index 7c104fd47..5b75a4a06 100644
--- a/pkg/sentry/inet/inet.go
+++ b/pkg/sentry/inet/inet.go
@@ -49,6 +49,9 @@ type Stack interface {
 	// SetTCPSACKEnabled attempts to change TCP selective acknowledgement
 	// settings.
 	SetTCPSACKEnabled(enabled bool) error
+
+	// Statistics reports stack statistics.
+	Statistics(stat interface{}, arg string) error
 }
 
 // Interface contains information about a network interface.
@@ -102,3 +105,7 @@ type TCPBufferSize struct {
 	// Max is the maximum size.
 	Max int
 }
+
+// StatDev describes one line of /proc/net/dev, i.e., stats for one network
+// interface.
+type StatDev [16]uint64
diff --git a/pkg/sentry/inet/test_stack.go b/pkg/sentry/inet/test_stack.go
index 624371eb6..75f9e7a77 100644
--- a/pkg/sentry/inet/test_stack.go
+++ b/pkg/sentry/inet/test_stack.go
@@ -81,3 +81,8 @@ func (s *TestStack) SetTCPSACKEnabled(enabled bool) error {
 	s.TCPSACKFlag = enabled
 	return nil
 }
+
+// Statistics implements inet.Stack.Statistics.
+func (s *TestStack) Statistics(stat interface{}, arg string) error {
+	return nil
+}