Merge release-20190806.1-346-gdb37483 (automated)

2 files changed, 9 insertions, 0 deletions

diff --git a/pkg/tcpip/transport/udp/endpoint.go b/pkg/tcpip/transport/udp/endpoint.go
index cda302bb7..68977dc25 100644
--- a/pkg/tcpip/transport/udp/endpoint.go
+++ b/pkg/tcpip/transport/udp/endpoint.go
@@ -80,6 +80,7 @@ type endpoint struct {
 	// change throughout the lifetime of the endpoint.
 	stack       *stack.Stack `state:"manual"`
 	waiterQueue *waiter.Queue
+	uniqueID    uint64
 
 	// The following fields are used to manage the receive queue, and are
 	// protected by rcvMu.
@@ -160,9 +161,15 @@ func newEndpoint(s *stack.Stack, netProto tcpip.NetworkProtocolNumber, waiterQue
 		rcvBufSizeMax: 32 * 1024,
 		sndBufSize:    32 * 1024,
 		state:         StateInitial,
+		uniqueID:      s.UniqueID(),
 	}
 }
 
+// UniqueID implements stack.TransportEndpoint.UniqueID.
+func (e *endpoint) UniqueID() uint64 {
+	return e.uniqueID
+}
+
 // Close puts the endpoint in a closed state and frees all resources
 // associated with it.
 func (e *endpoint) Close() {
diff --git a/pkg/tcpip/transport/udp/udp_state_autogen.go b/pkg/tcpip/transport/udp/udp_state_autogen.go
index bd811ed5c..dffafd240 100755
--- a/pkg/tcpip/transport/udp/udp_state_autogen.go
+++ b/pkg/tcpip/transport/udp/udp_state_autogen.go
@@ -31,6 +31,7 @@ func (x *endpoint) save(m state.Map) {
 	m.SaveValue("rcvBufSizeMax", rcvBufSizeMax)
 	m.Save("TransportEndpointInfo", &x.TransportEndpointInfo)
 	m.Save("waiterQueue", &x.waiterQueue)
+	m.Save("uniqueID", &x.uniqueID)
 	m.Save("rcvReady", &x.rcvReady)
 	m.Save("rcvList", &x.rcvList)
 	m.Save("rcvBufSize", &x.rcvBufSize)
@@ -56,6 +57,7 @@ func (x *endpoint) save(m state.Map) {
 func (x *endpoint) load(m state.Map) {
 	m.Load("TransportEndpointInfo", &x.TransportEndpointInfo)
 	m.Load("waiterQueue", &x.waiterQueue)
+	m.Load("uniqueID", &x.uniqueID)
 	m.Load("rcvReady", &x.rcvReady)
 	m.Load("rcvList", &x.rcvList)
 	m.Load("rcvBufSize", &x.rcvBufSize)