Merge release-20191114.0-41-g684f757 (automated)

2 files changed, 21 insertions, 1 deletions

diff --git a/pkg/tcpip/tcpip.go b/pkg/tcpip/tcpip.go
index bd5eb89ca..5746043cc 100644
--- a/pkg/tcpip/tcpip.go
+++ b/pkg/tcpip/tcpip.go
@@ -308,7 +308,7 @@ type ControlMessages struct {
 	// HasTimestamp indicates whether Timestamp is valid/set.
 	HasTimestamp bool
 
-	// Timestamp is the time (in ns) that the last packed used to create
+	// Timestamp is the time (in ns) that the last packet used to create
 	// the read data was received.
 	Timestamp int64
 
@@ -317,6 +317,18 @@ type ControlMessages struct {
 
 	// Inq is the number of bytes ready to be received.
 	Inq int32
+
+	// HasTOS indicates whether Tos is valid/set.
+	HasTOS bool
+
+	// TOS is the IPv4 type of service of the associated packet.
+	TOS int8
+
+	// HasTClass indicates whether Tclass is valid/set.
+	HasTClass bool
+
+	// Tclass is the IPv6 traffic class of the associated packet.
+	TClass int32
 }
 
 // Endpoint is the interface implemented by transport protocols (e.g., tcp, udp)
diff --git a/pkg/tcpip/tcpip_state_autogen.go b/pkg/tcpip/tcpip_state_autogen.go
index 89b2dab67..7083b7964 100755
--- a/pkg/tcpip/tcpip_state_autogen.go
+++ b/pkg/tcpip/tcpip_state_autogen.go
@@ -50,6 +50,10 @@ func (x *ControlMessages) save(m state.Map) {
 	m.Save("Timestamp", &x.Timestamp)
 	m.Save("HasInq", &x.HasInq)
 	m.Save("Inq", &x.Inq)
+	m.Save("HasTOS", &x.HasTOS)
+	m.Save("TOS", &x.TOS)
+	m.Save("HasTClass", &x.HasTClass)
+	m.Save("TClass", &x.TClass)
 }
 
 func (x *ControlMessages) afterLoad() {}
@@ -58,6 +62,10 @@ func (x *ControlMessages) load(m state.Map) {
 	m.Load("Timestamp", &x.Timestamp)
 	m.Load("HasInq", &x.HasInq)
 	m.Load("Inq", &x.Inq)
+	m.Load("HasTOS", &x.HasTOS)
+	m.Load("TOS", &x.TOS)
+	m.Load("HasTClass", &x.HasTClass)
+	m.Load("TClass", &x.TClass)
 }
 
 func init() {