Extract ICMPv4/v6 specific stats to their own types

This change lets us split the v4 stats from the v6 stats, which will be
useful when adding stats for each network endpoint.

PiperOrigin-RevId: 345322615

8 files changed, 38 insertions, 38 deletions

diff --git a/pkg/tcpip/network/ipv4/icmp.go b/pkg/tcpip/network/ipv4/icmp.go
index 488945226..8e392f86c 100644
--- a/pkg/tcpip/network/ipv4/icmp.go
+++ b/pkg/tcpip/network/ipv4/icmp.go
@@ -63,7 +63,7 @@ func (e *endpoint) handleControl(typ stack.ControlType, extra uint32, pkt *stack
 
 func (e *endpoint) handleICMP(pkt *stack.PacketBuffer) {
 	stats := e.protocol.stack.Stats()
-	received := stats.ICMP.V4PacketsReceived
+	received := stats.ICMP.V4.PacketsReceived
 	// TODO(gvisor.dev/issue/170): ICMP packets don't have their
 	// TransportHeader fields set. See icmp/protocol.go:protocol.Parse for a
 	// full explanation.
@@ -130,7 +130,7 @@ func (e *endpoint) handleICMP(pkt *stack.PacketBuffer) {
 	case header.ICMPv4Echo:
 		received.Echo.Increment()
 
-		sent := stats.ICMP.V4PacketsSent
+		sent := stats.ICMP.V4.PacketsSent
 		if !e.protocol.stack.AllowICMPMessage() {
 			sent.RateLimited.Increment()
 			return
@@ -379,7 +379,7 @@ func (p *protocol) returnError(reason icmpReason, pkt *stack.PacketBuffer) *tcpi
 	}
 	defer route.Release()
 
-	sent := p.stack.Stats().ICMP.V4PacketsSent
+	sent := p.stack.Stats().ICMP.V4.PacketsSent
 	if !p.stack.AllowICMPMessage() {
 		sent.RateLimited.Increment()
 		return nil
diff --git a/pkg/tcpip/network/ipv6/icmp.go b/pkg/tcpip/network/ipv6/icmp.go
index 0fb98c578..510276b8e 100644
--- a/pkg/tcpip/network/ipv6/icmp.go
+++ b/pkg/tcpip/network/ipv6/icmp.go
@@ -126,8 +126,8 @@ func getTargetLinkAddr(it header.NDPOptionIterator) (tcpip.LinkAddress, bool) {
 
 func (e *endpoint) handleICMP(pkt *stack.PacketBuffer, hasFragmentHeader bool) {
 	stats := e.protocol.stack.Stats().ICMP
-	sent := stats.V6PacketsSent
-	received := stats.V6PacketsReceived
+	sent := stats.V6.PacketsSent
+	received := stats.V6.PacketsReceived
 	// TODO(gvisor.dev/issue/170): ICMP packets don't have their
 	// TransportHeader fields set. See icmp/protocol.go:protocol.Parse for a
 	// full explanation.
@@ -709,7 +709,7 @@ func (p *protocol) LinkAddressRequest(targetAddr, localAddr tcpip.Address, remot
 	ns.Options().Serialize(optsSerializer)
 	packet.SetChecksum(header.ICMPv6Checksum(packet, r.LocalAddress, r.RemoteAddress, buffer.VectorisedView{}))
 
-	stat := p.stack.Stats().ICMP.V6PacketsSent
+	stat := p.stack.Stats().ICMP.V6.PacketsSent
 	if err := r.WritePacket(nil /* gso */, stack.NetworkHeaderParams{
 		Protocol: header.ICMPv6ProtocolNumber,
 		TTL:      header.NDPHopLimit,
@@ -856,7 +856,7 @@ func (p *protocol) returnError(reason icmpReason, pkt *stack.PacketBuffer) *tcpi
 	defer route.Release()
 
 	stats := p.stack.Stats().ICMP
-	sent := stats.V6PacketsSent
+	sent := stats.V6.PacketsSent
 	if !p.stack.AllowICMPMessage() {
 		sent.RateLimited.Increment()
 		return nil
diff --git a/pkg/tcpip/network/ipv6/icmp_test.go b/pkg/tcpip/network/ipv6/icmp_test.go
index ead0739e5..f19b7bec9 100644
--- a/pkg/tcpip/network/ipv6/icmp_test.go
+++ b/pkg/tcpip/network/ipv6/icmp_test.go
@@ -317,7 +317,7 @@ func TestICMPCounts(t *testing.T) {
 			// Stats().ICMP.ICMPv6ReceivedPacketStats.Invalid is incremented.
 			handleIPv6Payload(header.ICMPv6(buffer.NewView(header.IPv6MinimumSize)))
 
-			icmpv6Stats := s.Stats().ICMP.V6PacketsReceived
+			icmpv6Stats := s.Stats().ICMP.V6.PacketsReceived
 			visitStats(reflect.ValueOf(&icmpv6Stats).Elem(), func(name string, s *tcpip.StatCounter) {
 				if got, want := s.Value(), uint64(1); got != want {
 					t.Errorf("got %s = %d, want = %d", name, got, want)
@@ -475,7 +475,7 @@ func TestICMPCountsWithNeighborCache(t *testing.T) {
 	// Stats().ICMP.ICMPv6ReceivedPacketStats.Invalid is incremented.
 	handleIPv6Payload(header.ICMPv6(buffer.NewView(header.IPv6MinimumSize)))
 
-	icmpv6Stats := s.Stats().ICMP.V6PacketsReceived
+	icmpv6Stats := s.Stats().ICMP.V6.PacketsReceived
 	visitStats(reflect.ValueOf(&icmpv6Stats).Elem(), func(name string, s *tcpip.StatCounter) {
 		if got, want := s.Value(), uint64(1); got != want {
 			t.Errorf("got %s = %d, want = %d", name, got, want)
@@ -865,7 +865,7 @@ func TestICMPChecksumValidationSimple(t *testing.T) {
 							e.InjectInbound(ProtocolNumber, pkt)
 						}
 
-						stats := s.Stats().ICMP.V6PacketsReceived
+						stats := s.Stats().ICMP.V6.PacketsReceived
 						invalid := stats.Invalid
 						routerOnly := stats.RouterOnlyPacketsDroppedByHost
 						typStat := typ.statCounter(stats)
@@ -1060,7 +1060,7 @@ func TestICMPChecksumValidationWithPayload(t *testing.T) {
 				e.InjectInbound(ProtocolNumber, pkt)
 			}
 
-			stats := s.Stats().ICMP.V6PacketsReceived
+			stats := s.Stats().ICMP.V6.PacketsReceived
 			invalid := stats.Invalid
 			typStat := typ.statCounter(stats)
 
@@ -1239,7 +1239,7 @@ func TestICMPChecksumValidationWithPayloadMultipleViews(t *testing.T) {
 				e.InjectInbound(ProtocolNumber, pkt)
 			}
 
-			stats := s.Stats().ICMP.V6PacketsReceived
+			stats := s.Stats().ICMP.V6.PacketsReceived
 			invalid := stats.Invalid
 			typStat := typ.statCounter(stats)
 
diff --git a/pkg/tcpip/network/ipv6/ipv6_test.go b/pkg/tcpip/network/ipv6/ipv6_test.go
index 73d2abd31..1c01f17ab 100644
--- a/pkg/tcpip/network/ipv6/ipv6_test.go
+++ b/pkg/tcpip/network/ipv6/ipv6_test.go
@@ -80,7 +80,7 @@ func testReceiveICMP(t *testing.T, s *stack.Stack, e *channel.Endpoint, src, dst
 		Data: hdr.View().ToVectorisedView(),
 	}))
 
-	stats := s.Stats().ICMP.V6PacketsReceived
+	stats := s.Stats().ICMP.V6.PacketsReceived
 
 	if got := stats.NeighborAdvert.Value(); got != want {
 		t.Fatalf("got NeighborAdvert = %d, want = %d", got, want)
diff --git a/pkg/tcpip/network/ipv6/mld.go b/pkg/tcpip/network/ipv6/mld.go
index 560c5e01e..4c06b3f0c 100644
--- a/pkg/tcpip/network/ipv6/mld.go
+++ b/pkg/tcpip/network/ipv6/mld.go
@@ -125,7 +125,7 @@ func (mld *mldState) initializeAll() {
 }
 
 func (mld *mldState) writePacket(destAddress, groupAddress tcpip.Address, mldType header.ICMPv6Type) *tcpip.Error {
-	sentStats := mld.ep.protocol.stack.Stats().ICMP.V6PacketsSent
+	sentStats := mld.ep.protocol.stack.Stats().ICMP.V6.PacketsSent
 	var mldStat *tcpip.StatCounter
 	switch mldType {
 	case header.ICMPv6MulticastListenerReport:
diff --git a/pkg/tcpip/network/ipv6/ndp.go b/pkg/tcpip/network/ipv6/ndp.go
index 0b6428200..8cb7d4dab 100644
--- a/pkg/tcpip/network/ipv6/ndp.go
+++ b/pkg/tcpip/network/ipv6/ndp.go
@@ -724,7 +724,7 @@ func (ndp *ndpState) sendDADPacket(addr tcpip.Address, addressEndpoint stack.Add
 		Data:               buffer.View(icmp).ToVectorisedView(),
 	})
 
-	sent := ndp.ep.protocol.stack.Stats().ICMP.V6PacketsSent
+	sent := ndp.ep.protocol.stack.Stats().ICMP.V6.PacketsSent
 	ndp.ep.addIPHeader(header.IPv6Any, snmc, pkt, stack.NetworkHeaderParams{
 		Protocol: header.ICMPv6ProtocolNumber,
 		TTL:      header.NDPHopLimit,
@@ -1846,7 +1846,7 @@ func (ndp *ndpState) startSolicitingRouters() {
 			Data:               buffer.View(icmpData).ToVectorisedView(),
 		})
 
-		sent := ndp.ep.protocol.stack.Stats().ICMP.V6PacketsSent
+		sent := ndp.ep.protocol.stack.Stats().ICMP.V6.PacketsSent
 		ndp.ep.addIPHeader(localAddr, header.IPv6AllRoutersMulticastAddress, pkt, stack.NetworkHeaderParams{
 			Protocol: header.ICMPv6ProtocolNumber,
 			TTL:      header.NDPHopLimit,
diff --git a/pkg/tcpip/network/ipv6/ndp_test.go b/pkg/tcpip/network/ipv6/ndp_test.go
index 56dc4a6ec..e2409306f 100644
--- a/pkg/tcpip/network/ipv6/ndp_test.go
+++ b/pkg/tcpip/network/ipv6/ndp_test.go
@@ -220,7 +220,7 @@ func TestNeighorSolicitationWithSourceLinkLayerOption(t *testing.T) {
 				DstAddr:       lladdr0,
 			})
 
-			invalid := s.Stats().ICMP.V6PacketsReceived.Invalid
+			invalid := s.Stats().ICMP.V6.PacketsReceived.Invalid
 
 			// Invalid count should initially be 0.
 			if got := invalid.Value(); got != 0 {
@@ -326,7 +326,7 @@ func TestNeighorSolicitationWithSourceLinkLayerOptionUsingNeighborCache(t *testi
 				DstAddr:       lladdr0,
 			})
 
-			invalid := s.Stats().ICMP.V6PacketsReceived.Invalid
+			invalid := s.Stats().ICMP.V6.PacketsReceived.Invalid
 
 			// Invalid count should initially be 0.
 			if got := invalid.Value(); got != 0 {
@@ -606,7 +606,7 @@ func TestNeighorSolicitationResponse(t *testing.T) {
 						DstAddr:       test.nsDst,
 					})
 
-					invalid := s.Stats().ICMP.V6PacketsReceived.Invalid
+					invalid := s.Stats().ICMP.V6.PacketsReceived.Invalid
 
 					// Invalid count should initially be 0.
 					if got := invalid.Value(); got != 0 {
@@ -792,7 +792,7 @@ func TestNeighorAdvertisementWithTargetLinkLayerOption(t *testing.T) {
 				DstAddr:       lladdr0,
 			})
 
-			invalid := s.Stats().ICMP.V6PacketsReceived.Invalid
+			invalid := s.Stats().ICMP.V6.PacketsReceived.Invalid
 
 			// Invalid count should initially be 0.
 			if got := invalid.Value(); got != 0 {
@@ -905,7 +905,7 @@ func TestNeighorAdvertisementWithTargetLinkLayerOptionUsingNeighborCache(t *test
 				DstAddr:       lladdr0,
 			})
 
-			invalid := s.Stats().ICMP.V6PacketsReceived.Invalid
+			invalid := s.Stats().ICMP.V6.PacketsReceived.Invalid
 
 			// Invalid count should initially be 0.
 			if got := invalid.Value(); got != 0 {
@@ -1122,7 +1122,7 @@ func TestNDPValidation(t *testing.T) {
 									s.SetForwarding(ProtocolNumber, true)
 								}
 
-								stats := s.Stats().ICMP.V6PacketsReceived
+								stats := s.Stats().ICMP.V6.PacketsReceived
 								invalid := stats.Invalid
 								routerOnly := stats.RouterOnlyPacketsDroppedByHost
 								typStat := typ.statCounter(stats)
@@ -1358,7 +1358,7 @@ func TestRouterAdvertValidation(t *testing.T) {
 						DstAddr:       header.IPv6AllNodesMulticastAddress,
 					})
 
-					stats := s.Stats().ICMP.V6PacketsReceived
+					stats := s.Stats().ICMP.V6.PacketsReceived
 					invalid := stats.Invalid
 					rxRA := stats.RouterAdvert
 
diff --git a/pkg/tcpip/network/multicast_group_test.go b/pkg/tcpip/network/multicast_group_test.go
index d3517c364..5276f1b44 100644
--- a/pkg/tcpip/network/multicast_group_test.go
+++ b/pkg/tcpip/network/multicast_group_test.go
@@ -218,10 +218,10 @@ func TestMGPDisabled(t *testing.T) {
 			protoNum:      ipv6.ProtocolNumber,
 			multicastAddr: ipv6MulticastAddr1,
 			sentReportStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsSent.MulticastListenerReport
+				return s.Stats().ICMP.V6.PacketsSent.MulticastListenerReport
 			},
 			receivedQueryStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsReceived.MulticastListenerQuery
+				return s.Stats().ICMP.V6.PacketsReceived.MulticastListenerQuery
 			},
 			rxQuery: func(e *channel.Endpoint) {
 				createAndInjectMLDPacket(e, mldQuery, 0, header.IPv6Any)
@@ -326,7 +326,7 @@ func TestMGPReceiveCounters(t *testing.T) {
 			maxRespTime:  0,
 			groupAddress: header.IPv6Any,
 			statCounter: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsReceived.MulticastListenerQuery
+				return s.Stats().ICMP.V6.PacketsReceived.MulticastListenerQuery
 			},
 			rxMGPkt: createAndInjectMLDPacket,
 		},
@@ -336,7 +336,7 @@ func TestMGPReceiveCounters(t *testing.T) {
 			maxRespTime:  0,
 			groupAddress: header.IPv6Any,
 			statCounter: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsReceived.MulticastListenerReport
+				return s.Stats().ICMP.V6.PacketsReceived.MulticastListenerReport
 			},
 			rxMGPkt: createAndInjectMLDPacket,
 		},
@@ -346,7 +346,7 @@ func TestMGPReceiveCounters(t *testing.T) {
 			maxRespTime:  0,
 			groupAddress: header.IPv6Any,
 			statCounter: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsReceived.MulticastListenerDone
+				return s.Stats().ICMP.V6.PacketsReceived.MulticastListenerDone
 			},
 			rxMGPkt: createAndInjectMLDPacket,
 		},
@@ -399,10 +399,10 @@ func TestMGPJoinGroup(t *testing.T) {
 			multicastAddr:               ipv6MulticastAddr1,
 			maxUnsolicitedResponseDelay: ipv6.UnsolicitedReportIntervalMax,
 			sentReportStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsSent.MulticastListenerReport
+				return s.Stats().ICMP.V6.PacketsSent.MulticastListenerReport
 			},
 			receivedQueryStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsReceived.MulticastListenerQuery
+				return s.Stats().ICMP.V6.PacketsReceived.MulticastListenerQuery
 			},
 			validateReport: func(t *testing.T, p channel.PacketInfo) {
 				t.Helper()
@@ -497,10 +497,10 @@ func TestMGPLeaveGroup(t *testing.T) {
 			protoNum:      ipv6.ProtocolNumber,
 			multicastAddr: ipv6MulticastAddr1,
 			sentReportStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsSent.MulticastListenerReport
+				return s.Stats().ICMP.V6.PacketsSent.MulticastListenerReport
 			},
 			sentLeaveStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsSent.MulticastListenerDone
+				return s.Stats().ICMP.V6.PacketsSent.MulticastListenerDone
 			},
 			validateReport: func(t *testing.T, p channel.PacketInfo) {
 				t.Helper()
@@ -597,10 +597,10 @@ func TestMGPQueryMessages(t *testing.T) {
 			multicastAddr:               ipv6MulticastAddr1,
 			maxUnsolicitedResponseDelay: ipv6.UnsolicitedReportIntervalMax,
 			sentReportStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsSent.MulticastListenerReport
+				return s.Stats().ICMP.V6.PacketsSent.MulticastListenerReport
 			},
 			receivedQueryStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsReceived.MulticastListenerQuery
+				return s.Stats().ICMP.V6.PacketsReceived.MulticastListenerQuery
 			},
 			rxQuery: func(e *channel.Endpoint, maxRespTime uint8, groupAddress tcpip.Address) {
 				createAndInjectMLDPacket(e, mldQuery, maxRespTime, groupAddress)
@@ -744,10 +744,10 @@ func TestMGPReportMessages(t *testing.T) {
 			protoNum:      ipv6.ProtocolNumber,
 			multicastAddr: ipv6MulticastAddr1,
 			sentReportStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsSent.MulticastListenerReport
+				return s.Stats().ICMP.V6.PacketsSent.MulticastListenerReport
 			},
 			sentLeaveStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsSent.MulticastListenerDone
+				return s.Stats().ICMP.V6.PacketsSent.MulticastListenerDone
 			},
 			rxReport: func(e *channel.Endpoint) {
 				createAndInjectMLDPacket(e, mldReport, 0, ipv6MulticastAddr1)
@@ -877,10 +877,10 @@ func TestMGPWithNICLifecycle(t *testing.T) {
 			finalMulticastAddr:          ipv6MulticastAddr3,
 			maxUnsolicitedResponseDelay: ipv6.UnsolicitedReportIntervalMax,
 			sentReportStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsSent.MulticastListenerReport
+				return s.Stats().ICMP.V6.PacketsSent.MulticastListenerReport
 			},
 			sentLeaveStat: func(s *stack.Stack) *tcpip.StatCounter {
-				return s.Stats().ICMP.V6PacketsSent.MulticastListenerDone
+				return s.Stats().ICMP.V6.PacketsSent.MulticastListenerDone
 			},
 			validateReport: func(t *testing.T, p channel.PacketInfo, addr tcpip.Address) {
 				t.Helper()