Merge release-20200928.0-78-g743327817 (automated)

5 files changed, 261 insertions, 261 deletions

diff --git a/pkg/tcpip/transport/icmp/icmp_state_autogen.go b/pkg/tcpip/transport/icmp/icmp_state_autogen.go
index d88c817e4..2acf00a72 100644
--- a/pkg/tcpip/transport/icmp/icmp_state_autogen.go
+++ b/pkg/tcpip/transport/icmp/icmp_state_autogen.go
@@ -7,11 +7,11 @@ import (
 	"gvisor.dev/gvisor/pkg/tcpip/buffer"
 )
 
-func (i *icmpPacket) StateTypeName() string {
+func (p *icmpPacket) StateTypeName() string {
 	return "pkg/tcpip/transport/icmp.icmpPacket"
 }
 
-func (i *icmpPacket) StateFields() []string {
+func (p *icmpPacket) StateFields() []string {
 	return []string{
 		"icmpPacketEntry",
 		"senderAddress",
@@ -20,24 +20,24 @@ func (i *icmpPacket) StateFields() []string {
 	}
 }
 
-func (i *icmpPacket) beforeSave() {}
+func (p *icmpPacket) beforeSave() {}
 
-func (i *icmpPacket) StateSave(stateSinkObject state.Sink) {
-	i.beforeSave()
-	var dataValue buffer.VectorisedView = i.saveData()
+func (p *icmpPacket) StateSave(stateSinkObject state.Sink) {
+	p.beforeSave()
+	var dataValue buffer.VectorisedView = p.saveData()
 	stateSinkObject.SaveValue(2, dataValue)
-	stateSinkObject.Save(0, &i.icmpPacketEntry)
-	stateSinkObject.Save(1, &i.senderAddress)
-	stateSinkObject.Save(3, &i.timestamp)
+	stateSinkObject.Save(0, &p.icmpPacketEntry)
+	stateSinkObject.Save(1, &p.senderAddress)
+	stateSinkObject.Save(3, &p.timestamp)
 }
 
-func (i *icmpPacket) afterLoad() {}
+func (p *icmpPacket) afterLoad() {}
 
-func (i *icmpPacket) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &i.icmpPacketEntry)
-	stateSourceObject.Load(1, &i.senderAddress)
-	stateSourceObject.Load(3, &i.timestamp)
-	stateSourceObject.LoadValue(2, new(buffer.VectorisedView), func(y interface{}) { i.loadData(y.(buffer.VectorisedView)) })
+func (p *icmpPacket) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &p.icmpPacketEntry)
+	stateSourceObject.Load(1, &p.senderAddress)
+	stateSourceObject.Load(3, &p.timestamp)
+	stateSourceObject.LoadValue(2, new(buffer.VectorisedView), func(y interface{}) { p.loadData(y.(buffer.VectorisedView)) })
 }
 
 func (e *endpoint) StateTypeName() string {
@@ -100,56 +100,56 @@ func (e *endpoint) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.AfterLoad(e.afterLoad)
 }
 
-func (i *icmpPacketList) StateTypeName() string {
+func (l *icmpPacketList) StateTypeName() string {
 	return "pkg/tcpip/transport/icmp.icmpPacketList"
 }
 
-func (i *icmpPacketList) StateFields() []string {
+func (l *icmpPacketList) StateFields() []string {
 	return []string{
 		"head",
 		"tail",
 	}
 }
 
-func (i *icmpPacketList) beforeSave() {}
+func (l *icmpPacketList) beforeSave() {}
 
-func (i *icmpPacketList) StateSave(stateSinkObject state.Sink) {
-	i.beforeSave()
-	stateSinkObject.Save(0, &i.head)
-	stateSinkObject.Save(1, &i.tail)
+func (l *icmpPacketList) StateSave(stateSinkObject state.Sink) {
+	l.beforeSave()
+	stateSinkObject.Save(0, &l.head)
+	stateSinkObject.Save(1, &l.tail)
 }
 
-func (i *icmpPacketList) afterLoad() {}
+func (l *icmpPacketList) afterLoad() {}
 
-func (i *icmpPacketList) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &i.head)
-	stateSourceObject.Load(1, &i.tail)
+func (l *icmpPacketList) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &l.head)
+	stateSourceObject.Load(1, &l.tail)
 }
 
-func (i *icmpPacketEntry) StateTypeName() string {
+func (e *icmpPacketEntry) StateTypeName() string {
 	return "pkg/tcpip/transport/icmp.icmpPacketEntry"
 }
 
-func (i *icmpPacketEntry) StateFields() []string {
+func (e *icmpPacketEntry) StateFields() []string {
 	return []string{
 		"next",
 		"prev",
 	}
 }
 
-func (i *icmpPacketEntry) beforeSave() {}
+func (e *icmpPacketEntry) beforeSave() {}
 
-func (i *icmpPacketEntry) StateSave(stateSinkObject state.Sink) {
-	i.beforeSave()
-	stateSinkObject.Save(0, &i.next)
-	stateSinkObject.Save(1, &i.prev)
+func (e *icmpPacketEntry) StateSave(stateSinkObject state.Sink) {
+	e.beforeSave()
+	stateSinkObject.Save(0, &e.next)
+	stateSinkObject.Save(1, &e.prev)
 }
 
-func (i *icmpPacketEntry) afterLoad() {}
+func (e *icmpPacketEntry) afterLoad() {}
 
-func (i *icmpPacketEntry) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &i.next)
-	stateSourceObject.Load(1, &i.prev)
+func (e *icmpPacketEntry) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &e.next)
+	stateSourceObject.Load(1, &e.prev)
 }
 
 func init() {
diff --git a/pkg/tcpip/transport/packet/packet_state_autogen.go b/pkg/tcpip/transport/packet/packet_state_autogen.go
index 261bf1448..66b6a4cc2 100644
--- a/pkg/tcpip/transport/packet/packet_state_autogen.go
+++ b/pkg/tcpip/transport/packet/packet_state_autogen.go
@@ -43,11 +43,11 @@ func (p *packet) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(1, new(buffer.VectorisedView), func(y interface{}) { p.loadData(y.(buffer.VectorisedView)) })
 }
 
-func (e *endpoint) StateTypeName() string {
+func (ep *endpoint) StateTypeName() string {
 	return "pkg/tcpip/transport/packet.endpoint"
 }
 
-func (e *endpoint) StateFields() []string {
+func (ep *endpoint) StateFields() []string {
 	return []string{
 		"TransportEndpointInfo",
 		"netProto",
@@ -67,96 +67,96 @@ func (e *endpoint) StateFields() []string {
 	}
 }
 
-func (e *endpoint) StateSave(stateSinkObject state.Sink) {
-	e.beforeSave()
-	var rcvBufSizeMaxValue int = e.saveRcvBufSizeMax()
+func (ep *endpoint) StateSave(stateSinkObject state.Sink) {
+	ep.beforeSave()
+	var rcvBufSizeMaxValue int = ep.saveRcvBufSizeMax()
 	stateSinkObject.SaveValue(5, rcvBufSizeMaxValue)
-	var lastErrorValue string = e.saveLastError()
+	var lastErrorValue string = ep.saveLastError()
 	stateSinkObject.SaveValue(14, lastErrorValue)
-	stateSinkObject.Save(0, &e.TransportEndpointInfo)
-	stateSinkObject.Save(1, &e.netProto)
-	stateSinkObject.Save(2, &e.waiterQueue)
-	stateSinkObject.Save(3, &e.cooked)
-	stateSinkObject.Save(4, &e.rcvList)
-	stateSinkObject.Save(6, &e.rcvBufSize)
-	stateSinkObject.Save(7, &e.rcvClosed)
-	stateSinkObject.Save(8, &e.sndBufSize)
-	stateSinkObject.Save(9, &e.sndBufSizeMax)
-	stateSinkObject.Save(10, &e.closed)
-	stateSinkObject.Save(11, &e.bound)
-	stateSinkObject.Save(12, &e.boundNIC)
-	stateSinkObject.Save(13, &e.linger)
-}
-
-func (e *endpoint) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &e.TransportEndpointInfo)
-	stateSourceObject.Load(1, &e.netProto)
-	stateSourceObject.Load(2, &e.waiterQueue)
-	stateSourceObject.Load(3, &e.cooked)
-	stateSourceObject.Load(4, &e.rcvList)
-	stateSourceObject.Load(6, &e.rcvBufSize)
-	stateSourceObject.Load(7, &e.rcvClosed)
-	stateSourceObject.Load(8, &e.sndBufSize)
-	stateSourceObject.Load(9, &e.sndBufSizeMax)
-	stateSourceObject.Load(10, &e.closed)
-	stateSourceObject.Load(11, &e.bound)
-	stateSourceObject.Load(12, &e.boundNIC)
-	stateSourceObject.Load(13, &e.linger)
-	stateSourceObject.LoadValue(5, new(int), func(y interface{}) { e.loadRcvBufSizeMax(y.(int)) })
-	stateSourceObject.LoadValue(14, new(string), func(y interface{}) { e.loadLastError(y.(string)) })
-	stateSourceObject.AfterLoad(e.afterLoad)
-}
-
-func (p *packetList) StateTypeName() string {
+	stateSinkObject.Save(0, &ep.TransportEndpointInfo)
+	stateSinkObject.Save(1, &ep.netProto)
+	stateSinkObject.Save(2, &ep.waiterQueue)
+	stateSinkObject.Save(3, &ep.cooked)
+	stateSinkObject.Save(4, &ep.rcvList)
+	stateSinkObject.Save(6, &ep.rcvBufSize)
+	stateSinkObject.Save(7, &ep.rcvClosed)
+	stateSinkObject.Save(8, &ep.sndBufSize)
+	stateSinkObject.Save(9, &ep.sndBufSizeMax)
+	stateSinkObject.Save(10, &ep.closed)
+	stateSinkObject.Save(11, &ep.bound)
+	stateSinkObject.Save(12, &ep.boundNIC)
+	stateSinkObject.Save(13, &ep.linger)
+}
+
+func (ep *endpoint) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &ep.TransportEndpointInfo)
+	stateSourceObject.Load(1, &ep.netProto)
+	stateSourceObject.Load(2, &ep.waiterQueue)
+	stateSourceObject.Load(3, &ep.cooked)
+	stateSourceObject.Load(4, &ep.rcvList)
+	stateSourceObject.Load(6, &ep.rcvBufSize)
+	stateSourceObject.Load(7, &ep.rcvClosed)
+	stateSourceObject.Load(8, &ep.sndBufSize)
+	stateSourceObject.Load(9, &ep.sndBufSizeMax)
+	stateSourceObject.Load(10, &ep.closed)
+	stateSourceObject.Load(11, &ep.bound)
+	stateSourceObject.Load(12, &ep.boundNIC)
+	stateSourceObject.Load(13, &ep.linger)
+	stateSourceObject.LoadValue(5, new(int), func(y interface{}) { ep.loadRcvBufSizeMax(y.(int)) })
+	stateSourceObject.LoadValue(14, new(string), func(y interface{}) { ep.loadLastError(y.(string)) })
+	stateSourceObject.AfterLoad(ep.afterLoad)
+}
+
+func (l *packetList) StateTypeName() string {
 	return "pkg/tcpip/transport/packet.packetList"
 }
 
-func (p *packetList) StateFields() []string {
+func (l *packetList) StateFields() []string {
 	return []string{
 		"head",
 		"tail",
 	}
 }
 
-func (p *packetList) beforeSave() {}
+func (l *packetList) beforeSave() {}
 
-func (p *packetList) StateSave(stateSinkObject state.Sink) {
-	p.beforeSave()
-	stateSinkObject.Save(0, &p.head)
-	stateSinkObject.Save(1, &p.tail)
+func (l *packetList) StateSave(stateSinkObject state.Sink) {
+	l.beforeSave()
+	stateSinkObject.Save(0, &l.head)
+	stateSinkObject.Save(1, &l.tail)
 }
 
-func (p *packetList) afterLoad() {}
+func (l *packetList) afterLoad() {}
 
-func (p *packetList) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &p.head)
-	stateSourceObject.Load(1, &p.tail)
+func (l *packetList) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &l.head)
+	stateSourceObject.Load(1, &l.tail)
 }
 
-func (p *packetEntry) StateTypeName() string {
+func (e *packetEntry) StateTypeName() string {
 	return "pkg/tcpip/transport/packet.packetEntry"
 }
 
-func (p *packetEntry) StateFields() []string {
+func (e *packetEntry) StateFields() []string {
 	return []string{
 		"next",
 		"prev",
 	}
 }
 
-func (p *packetEntry) beforeSave() {}
+func (e *packetEntry) beforeSave() {}
 
-func (p *packetEntry) StateSave(stateSinkObject state.Sink) {
-	p.beforeSave()
-	stateSinkObject.Save(0, &p.next)
-	stateSinkObject.Save(1, &p.prev)
+func (e *packetEntry) StateSave(stateSinkObject state.Sink) {
+	e.beforeSave()
+	stateSinkObject.Save(0, &e.next)
+	stateSinkObject.Save(1, &e.prev)
 }
 
-func (p *packetEntry) afterLoad() {}
+func (e *packetEntry) afterLoad() {}
 
-func (p *packetEntry) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &p.next)
-	stateSourceObject.Load(1, &p.prev)
+func (e *packetEntry) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &e.next)
+	stateSourceObject.Load(1, &e.prev)
 }
 
 func init() {
diff --git a/pkg/tcpip/transport/raw/raw_state_autogen.go b/pkg/tcpip/transport/raw/raw_state_autogen.go
index 6efb1f07e..ae59d31d6 100644
--- a/pkg/tcpip/transport/raw/raw_state_autogen.go
+++ b/pkg/tcpip/transport/raw/raw_state_autogen.go
@@ -7,11 +7,11 @@ import (
 	"gvisor.dev/gvisor/pkg/tcpip/buffer"
 )
 
-func (r *rawPacket) StateTypeName() string {
+func (p *rawPacket) StateTypeName() string {
 	return "pkg/tcpip/transport/raw.rawPacket"
 }
 
-func (r *rawPacket) StateFields() []string {
+func (p *rawPacket) StateFields() []string {
 	return []string{
 		"rawPacketEntry",
 		"data",
@@ -20,31 +20,31 @@ func (r *rawPacket) StateFields() []string {
 	}
 }
 
-func (r *rawPacket) beforeSave() {}
+func (p *rawPacket) beforeSave() {}
 
-func (r *rawPacket) StateSave(stateSinkObject state.Sink) {
-	r.beforeSave()
-	var dataValue buffer.VectorisedView = r.saveData()
+func (p *rawPacket) StateSave(stateSinkObject state.Sink) {
+	p.beforeSave()
+	var dataValue buffer.VectorisedView = p.saveData()
 	stateSinkObject.SaveValue(1, dataValue)
-	stateSinkObject.Save(0, &r.rawPacketEntry)
-	stateSinkObject.Save(2, &r.timestampNS)
-	stateSinkObject.Save(3, &r.senderAddr)
+	stateSinkObject.Save(0, &p.rawPacketEntry)
+	stateSinkObject.Save(2, &p.timestampNS)
+	stateSinkObject.Save(3, &p.senderAddr)
 }
 
-func (r *rawPacket) afterLoad() {}
+func (p *rawPacket) afterLoad() {}
 
-func (r *rawPacket) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &r.rawPacketEntry)
-	stateSourceObject.Load(2, &r.timestampNS)
-	stateSourceObject.Load(3, &r.senderAddr)
-	stateSourceObject.LoadValue(1, new(buffer.VectorisedView), func(y interface{}) { r.loadData(y.(buffer.VectorisedView)) })
+func (p *rawPacket) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &p.rawPacketEntry)
+	stateSourceObject.Load(2, &p.timestampNS)
+	stateSourceObject.Load(3, &p.senderAddr)
+	stateSourceObject.LoadValue(1, new(buffer.VectorisedView), func(y interface{}) { p.loadData(y.(buffer.VectorisedView)) })
 }
 
-func (e *endpoint) StateTypeName() string {
+func (ep *endpoint) StateTypeName() string {
 	return "pkg/tcpip/transport/raw.endpoint"
 }
 
-func (e *endpoint) StateFields() []string {
+func (ep *endpoint) StateFields() []string {
 	return []string{
 		"TransportEndpointInfo",
 		"waiterQueue",
@@ -64,95 +64,95 @@ func (e *endpoint) StateFields() []string {
 	}
 }
 
-func (e *endpoint) StateSave(stateSinkObject state.Sink) {
-	e.beforeSave()
-	var rcvBufSizeMaxValue int = e.saveRcvBufSizeMax()
+func (ep *endpoint) StateSave(stateSinkObject state.Sink) {
+	ep.beforeSave()
+	var rcvBufSizeMaxValue int = ep.saveRcvBufSizeMax()
 	stateSinkObject.SaveValue(6, rcvBufSizeMaxValue)
-	stateSinkObject.Save(0, &e.TransportEndpointInfo)
-	stateSinkObject.Save(1, &e.waiterQueue)
-	stateSinkObject.Save(2, &e.associated)
-	stateSinkObject.Save(3, &e.hdrIncluded)
-	stateSinkObject.Save(4, &e.rcvList)
-	stateSinkObject.Save(5, &e.rcvBufSize)
-	stateSinkObject.Save(7, &e.rcvClosed)
-	stateSinkObject.Save(8, &e.sndBufSize)
-	stateSinkObject.Save(9, &e.sndBufSizeMax)
-	stateSinkObject.Save(10, &e.closed)
-	stateSinkObject.Save(11, &e.connected)
-	stateSinkObject.Save(12, &e.bound)
-	stateSinkObject.Save(13, &e.linger)
-	stateSinkObject.Save(14, &e.owner)
-}
-
-func (e *endpoint) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &e.TransportEndpointInfo)
-	stateSourceObject.Load(1, &e.waiterQueue)
-	stateSourceObject.Load(2, &e.associated)
-	stateSourceObject.Load(3, &e.hdrIncluded)
-	stateSourceObject.Load(4, &e.rcvList)
-	stateSourceObject.Load(5, &e.rcvBufSize)
-	stateSourceObject.Load(7, &e.rcvClosed)
-	stateSourceObject.Load(8, &e.sndBufSize)
-	stateSourceObject.Load(9, &e.sndBufSizeMax)
-	stateSourceObject.Load(10, &e.closed)
-	stateSourceObject.Load(11, &e.connected)
-	stateSourceObject.Load(12, &e.bound)
-	stateSourceObject.Load(13, &e.linger)
-	stateSourceObject.Load(14, &e.owner)
-	stateSourceObject.LoadValue(6, new(int), func(y interface{}) { e.loadRcvBufSizeMax(y.(int)) })
-	stateSourceObject.AfterLoad(e.afterLoad)
-}
-
-func (r *rawPacketList) StateTypeName() string {
+	stateSinkObject.Save(0, &ep.TransportEndpointInfo)
+	stateSinkObject.Save(1, &ep.waiterQueue)
+	stateSinkObject.Save(2, &ep.associated)
+	stateSinkObject.Save(3, &ep.hdrIncluded)
+	stateSinkObject.Save(4, &ep.rcvList)
+	stateSinkObject.Save(5, &ep.rcvBufSize)
+	stateSinkObject.Save(7, &ep.rcvClosed)
+	stateSinkObject.Save(8, &ep.sndBufSize)
+	stateSinkObject.Save(9, &ep.sndBufSizeMax)
+	stateSinkObject.Save(10, &ep.closed)
+	stateSinkObject.Save(11, &ep.connected)
+	stateSinkObject.Save(12, &ep.bound)
+	stateSinkObject.Save(13, &ep.linger)
+	stateSinkObject.Save(14, &ep.owner)
+}
+
+func (ep *endpoint) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &ep.TransportEndpointInfo)
+	stateSourceObject.Load(1, &ep.waiterQueue)
+	stateSourceObject.Load(2, &ep.associated)
+	stateSourceObject.Load(3, &ep.hdrIncluded)
+	stateSourceObject.Load(4, &ep.rcvList)
+	stateSourceObject.Load(5, &ep.rcvBufSize)
+	stateSourceObject.Load(7, &ep.rcvClosed)
+	stateSourceObject.Load(8, &ep.sndBufSize)
+	stateSourceObject.Load(9, &ep.sndBufSizeMax)
+	stateSourceObject.Load(10, &ep.closed)
+	stateSourceObject.Load(11, &ep.connected)
+	stateSourceObject.Load(12, &ep.bound)
+	stateSourceObject.Load(13, &ep.linger)
+	stateSourceObject.Load(14, &ep.owner)
+	stateSourceObject.LoadValue(6, new(int), func(y interface{}) { ep.loadRcvBufSizeMax(y.(int)) })
+	stateSourceObject.AfterLoad(ep.afterLoad)
+}
+
+func (l *rawPacketList) StateTypeName() string {
 	return "pkg/tcpip/transport/raw.rawPacketList"
 }
 
-func (r *rawPacketList) StateFields() []string {
+func (l *rawPacketList) StateFields() []string {
 	return []string{
 		"head",
 		"tail",
 	}
 }
 
-func (r *rawPacketList) beforeSave() {}
+func (l *rawPacketList) beforeSave() {}
 
-func (r *rawPacketList) StateSave(stateSinkObject state.Sink) {
-	r.beforeSave()
-	stateSinkObject.Save(0, &r.head)
-	stateSinkObject.Save(1, &r.tail)
+func (l *rawPacketList) StateSave(stateSinkObject state.Sink) {
+	l.beforeSave()
+	stateSinkObject.Save(0, &l.head)
+	stateSinkObject.Save(1, &l.tail)
 }
 
-func (r *rawPacketList) afterLoad() {}
+func (l *rawPacketList) afterLoad() {}
 
-func (r *rawPacketList) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &r.head)
-	stateSourceObject.Load(1, &r.tail)
+func (l *rawPacketList) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &l.head)
+	stateSourceObject.Load(1, &l.tail)
 }
 
-func (r *rawPacketEntry) StateTypeName() string {
+func (e *rawPacketEntry) StateTypeName() string {
 	return "pkg/tcpip/transport/raw.rawPacketEntry"
 }
 
-func (r *rawPacketEntry) StateFields() []string {
+func (e *rawPacketEntry) StateFields() []string {
 	return []string{
 		"next",
 		"prev",
 	}
 }
 
-func (r *rawPacketEntry) beforeSave() {}
+func (e *rawPacketEntry) beforeSave() {}
 
-func (r *rawPacketEntry) StateSave(stateSinkObject state.Sink) {
-	r.beforeSave()
-	stateSinkObject.Save(0, &r.next)
-	stateSinkObject.Save(1, &r.prev)
+func (e *rawPacketEntry) StateSave(stateSinkObject state.Sink) {
+	e.beforeSave()
+	stateSinkObject.Save(0, &e.next)
+	stateSinkObject.Save(1, &e.prev)
 }
 
-func (r *rawPacketEntry) afterLoad() {}
+func (e *rawPacketEntry) afterLoad() {}
 
-func (r *rawPacketEntry) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &r.next)
-	stateSourceObject.Load(1, &r.prev)
+func (e *rawPacketEntry) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &e.next)
+	stateSourceObject.Load(1, &e.prev)
 }
 
 func init() {
diff --git a/pkg/tcpip/transport/tcp/tcp_state_autogen.go b/pkg/tcpip/transport/tcp/tcp_state_autogen.go
index 9893252ef..be50ff9ff 100644
--- a/pkg/tcpip/transport/tcp/tcp_state_autogen.go
+++ b/pkg/tcpip/transport/tcp/tcp_state_autogen.go
@@ -402,11 +402,11 @@ func (k *keepalive) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(4, &k.unacked)
 }
 
-func (r *rackControl) StateTypeName() string {
+func (rc *rackControl) StateTypeName() string {
 	return "pkg/tcpip/transport/tcp.rackControl"
 }
 
-func (r *rackControl) StateFields() []string {
+func (rc *rackControl) StateFields() []string {
 	return []string{
 		"xmitTime",
 		"endSequence",
@@ -416,26 +416,26 @@ func (r *rackControl) StateFields() []string {
 	}
 }
 
-func (r *rackControl) beforeSave() {}
+func (rc *rackControl) beforeSave() {}
 
-func (r *rackControl) StateSave(stateSinkObject state.Sink) {
-	r.beforeSave()
-	var xmitTimeValue unixTime = r.saveXmitTime()
+func (rc *rackControl) StateSave(stateSinkObject state.Sink) {
+	rc.beforeSave()
+	var xmitTimeValue unixTime = rc.saveXmitTime()
 	stateSinkObject.SaveValue(0, xmitTimeValue)
-	stateSinkObject.Save(1, &r.endSequence)
-	stateSinkObject.Save(2, &r.fack)
-	stateSinkObject.Save(3, &r.minRTT)
-	stateSinkObject.Save(4, &r.rtt)
+	stateSinkObject.Save(1, &rc.endSequence)
+	stateSinkObject.Save(2, &rc.fack)
+	stateSinkObject.Save(3, &rc.minRTT)
+	stateSinkObject.Save(4, &rc.rtt)
 }
 
-func (r *rackControl) afterLoad() {}
+func (rc *rackControl) afterLoad() {}
 
-func (r *rackControl) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(1, &r.endSequence)
-	stateSourceObject.Load(2, &r.fack)
-	stateSourceObject.Load(3, &r.minRTT)
-	stateSourceObject.Load(4, &r.rtt)
-	stateSourceObject.LoadValue(0, new(unixTime), func(y interface{}) { r.loadXmitTime(y.(unixTime)) })
+func (rc *rackControl) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(1, &rc.endSequence)
+	stateSourceObject.Load(2, &rc.fack)
+	stateSourceObject.Load(3, &rc.minRTT)
+	stateSourceObject.Load(4, &rc.rtt)
+	stateSourceObject.LoadValue(0, new(unixTime), func(y interface{}) { rc.loadXmitTime(y.(unixTime)) })
 }
 
 func (r *receiver) StateTypeName() string {
@@ -616,11 +616,11 @@ func (s *segment) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.LoadValue(17, new(unixTime), func(y interface{}) { s.loadXmitTime(y.(unixTime)) })
 }
 
-func (s *segmentQueue) StateTypeName() string {
+func (q *segmentQueue) StateTypeName() string {
 	return "pkg/tcpip/transport/tcp.segmentQueue"
 }
 
-func (s *segmentQueue) StateFields() []string {
+func (q *segmentQueue) StateFields() []string {
 	return []string{
 		"list",
 		"ep",
@@ -628,21 +628,21 @@ func (s *segmentQueue) StateFields() []string {
 	}
 }
 
-func (s *segmentQueue) beforeSave() {}
+func (q *segmentQueue) beforeSave() {}
 
-func (s *segmentQueue) StateSave(stateSinkObject state.Sink) {
-	s.beforeSave()
-	stateSinkObject.Save(0, &s.list)
-	stateSinkObject.Save(1, &s.ep)
-	stateSinkObject.Save(2, &s.frozen)
+func (q *segmentQueue) StateSave(stateSinkObject state.Sink) {
+	q.beforeSave()
+	stateSinkObject.Save(0, &q.list)
+	stateSinkObject.Save(1, &q.ep)
+	stateSinkObject.Save(2, &q.frozen)
 }
 
-func (s *segmentQueue) afterLoad() {}
+func (q *segmentQueue) afterLoad() {}
 
-func (s *segmentQueue) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.LoadWait(0, &s.list)
-	stateSourceObject.Load(1, &s.ep)
-	stateSourceObject.Load(2, &s.frozen)
+func (q *segmentQueue) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.LoadWait(0, &q.list)
+	stateSourceObject.Load(1, &q.ep)
+	stateSourceObject.Load(2, &q.frozen)
 }
 
 func (s *sender) StateTypeName() string {
@@ -847,30 +847,30 @@ func (u *unixTime) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(1, &u.nano)
 }
 
-func (e *endpointList) StateTypeName() string {
+func (l *endpointList) StateTypeName() string {
 	return "pkg/tcpip/transport/tcp.endpointList"
 }
 
-func (e *endpointList) StateFields() []string {
+func (l *endpointList) StateFields() []string {
 	return []string{
 		"head",
 		"tail",
 	}
 }
 
-func (e *endpointList) beforeSave() {}
+func (l *endpointList) beforeSave() {}
 
-func (e *endpointList) StateSave(stateSinkObject state.Sink) {
-	e.beforeSave()
-	stateSinkObject.Save(0, &e.head)
-	stateSinkObject.Save(1, &e.tail)
+func (l *endpointList) StateSave(stateSinkObject state.Sink) {
+	l.beforeSave()
+	stateSinkObject.Save(0, &l.head)
+	stateSinkObject.Save(1, &l.tail)
 }
 
-func (e *endpointList) afterLoad() {}
+func (l *endpointList) afterLoad() {}
 
-func (e *endpointList) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &e.head)
-	stateSourceObject.Load(1, &e.tail)
+func (l *endpointList) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &l.head)
+	stateSourceObject.Load(1, &l.tail)
 }
 
 func (e *endpointEntry) StateTypeName() string {
@@ -899,56 +899,56 @@ func (e *endpointEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(1, &e.prev)
 }
 
-func (s *segmentList) StateTypeName() string {
+func (l *segmentList) StateTypeName() string {
 	return "pkg/tcpip/transport/tcp.segmentList"
 }
 
-func (s *segmentList) StateFields() []string {
+func (l *segmentList) StateFields() []string {
 	return []string{
 		"head",
 		"tail",
 	}
 }
 
-func (s *segmentList) beforeSave() {}
+func (l *segmentList) beforeSave() {}
 
-func (s *segmentList) StateSave(stateSinkObject state.Sink) {
-	s.beforeSave()
-	stateSinkObject.Save(0, &s.head)
-	stateSinkObject.Save(1, &s.tail)
+func (l *segmentList) StateSave(stateSinkObject state.Sink) {
+	l.beforeSave()
+	stateSinkObject.Save(0, &l.head)
+	stateSinkObject.Save(1, &l.tail)
 }
 
-func (s *segmentList) afterLoad() {}
+func (l *segmentList) afterLoad() {}
 
-func (s *segmentList) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &s.head)
-	stateSourceObject.Load(1, &s.tail)
+func (l *segmentList) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &l.head)
+	stateSourceObject.Load(1, &l.tail)
 }
 
-func (s *segmentEntry) StateTypeName() string {
+func (e *segmentEntry) StateTypeName() string {
 	return "pkg/tcpip/transport/tcp.segmentEntry"
 }
 
-func (s *segmentEntry) StateFields() []string {
+func (e *segmentEntry) StateFields() []string {
 	return []string{
 		"next",
 		"prev",
 	}
 }
 
-func (s *segmentEntry) beforeSave() {}
+func (e *segmentEntry) beforeSave() {}
 
-func (s *segmentEntry) StateSave(stateSinkObject state.Sink) {
-	s.beforeSave()
-	stateSinkObject.Save(0, &s.next)
-	stateSinkObject.Save(1, &s.prev)
+func (e *segmentEntry) StateSave(stateSinkObject state.Sink) {
+	e.beforeSave()
+	stateSinkObject.Save(0, &e.next)
+	stateSinkObject.Save(1, &e.prev)
 }
 
-func (s *segmentEntry) afterLoad() {}
+func (e *segmentEntry) afterLoad() {}
 
-func (s *segmentEntry) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &s.next)
-	stateSourceObject.Load(1, &s.prev)
+func (e *segmentEntry) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &e.next)
+	stateSourceObject.Load(1, &e.prev)
 }
 
 func init() {
diff --git a/pkg/tcpip/transport/udp/udp_state_autogen.go b/pkg/tcpip/transport/udp/udp_state_autogen.go
index 74cec739f..06d025590 100644
--- a/pkg/tcpip/transport/udp/udp_state_autogen.go
+++ b/pkg/tcpip/transport/udp/udp_state_autogen.go
@@ -193,56 +193,56 @@ func (m *multicastMembership) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(1, &m.multicastAddr)
 }
 
-func (u *udpPacketList) StateTypeName() string {
+func (l *udpPacketList) StateTypeName() string {
 	return "pkg/tcpip/transport/udp.udpPacketList"
 }
 
-func (u *udpPacketList) StateFields() []string {
+func (l *udpPacketList) StateFields() []string {
 	return []string{
 		"head",
 		"tail",
 	}
 }
 
-func (u *udpPacketList) beforeSave() {}
+func (l *udpPacketList) beforeSave() {}
 
-func (u *udpPacketList) StateSave(stateSinkObject state.Sink) {
-	u.beforeSave()
-	stateSinkObject.Save(0, &u.head)
-	stateSinkObject.Save(1, &u.tail)
+func (l *udpPacketList) StateSave(stateSinkObject state.Sink) {
+	l.beforeSave()
+	stateSinkObject.Save(0, &l.head)
+	stateSinkObject.Save(1, &l.tail)
 }
 
-func (u *udpPacketList) afterLoad() {}
+func (l *udpPacketList) afterLoad() {}
 
-func (u *udpPacketList) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &u.head)
-	stateSourceObject.Load(1, &u.tail)
+func (l *udpPacketList) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &l.head)
+	stateSourceObject.Load(1, &l.tail)
 }
 
-func (u *udpPacketEntry) StateTypeName() string {
+func (e *udpPacketEntry) StateTypeName() string {
 	return "pkg/tcpip/transport/udp.udpPacketEntry"
 }
 
-func (u *udpPacketEntry) StateFields() []string {
+func (e *udpPacketEntry) StateFields() []string {
 	return []string{
 		"next",
 		"prev",
 	}
 }
 
-func (u *udpPacketEntry) beforeSave() {}
+func (e *udpPacketEntry) beforeSave() {}
 
-func (u *udpPacketEntry) StateSave(stateSinkObject state.Sink) {
-	u.beforeSave()
-	stateSinkObject.Save(0, &u.next)
-	stateSinkObject.Save(1, &u.prev)
+func (e *udpPacketEntry) StateSave(stateSinkObject state.Sink) {
+	e.beforeSave()
+	stateSinkObject.Save(0, &e.next)
+	stateSinkObject.Save(1, &e.prev)
 }
 
-func (u *udpPacketEntry) afterLoad() {}
+func (e *udpPacketEntry) afterLoad() {}
 
-func (u *udpPacketEntry) StateLoad(stateSourceObject state.Source) {
-	stateSourceObject.Load(0, &u.next)
-	stateSourceObject.Load(1, &u.prev)
+func (e *udpPacketEntry) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &e.next)
+	stateSourceObject.Load(1, &e.prev)
 }
 
 func init() {