Give the ICMP Code its own type

This is  a preparatory commit for a larger commit working on
ICMP generation in error cases.
This is removal of technical debt and cleanup in the gvisor code
as part of gvisor issue 2211.

Updates #2211.

PiperOrigin-RevId: 326615389

4 files changed, 14 insertions, 8 deletions

diff --git a/test/packetimpact/tests/ipv6_fragment_reassembly_test.go b/test/packetimpact/tests/ipv6_fragment_reassembly_test.go
index b5f94ad4b..a24c85566 100644
--- a/test/packetimpact/tests/ipv6_fragment_reassembly_test.go
+++ b/test/packetimpact/tests/ipv6_fragment_reassembly_test.go
@@ -67,7 +67,7 @@ func TestIPv6FragmentReassembly(t *testing.T) {
 	rIP := tcpip.Address(net.ParseIP(testbench.RemoteIPv6).To16())
 	icmpv6 := testbench.ICMPv6{
 		Type:    testbench.ICMPv6Type(header.ICMPv6EchoRequest),
-		Code:    testbench.Byte(0),
+		Code:    testbench.ICMPv6Code(header.ICMPv6UnusedCode),
 		Payload: icmpv6EchoPayload,
 	}
 	icmpv6Bytes, err := icmpv6.ToBytes()
@@ -89,7 +89,7 @@ func TestIPv6FragmentReassembly(t *testing.T) {
 		},
 		&testbench.ICMPv6{
 			Type:     testbench.ICMPv6Type(header.ICMPv6EchoRequest),
-			Code:     testbench.Byte(0),
+			Code:     testbench.ICMPv6Code(header.ICMPv6UnusedCode),
 			Payload:  icmpv6EchoPayload,
 			Checksum: &cksum,
 		})
@@ -116,7 +116,7 @@ func TestIPv6FragmentReassembly(t *testing.T) {
 		},
 		&testbench.ICMPv6{
 			Type: testbench.ICMPv6Type(header.ICMPv6EchoReply),
-			Code: testbench.Byte(0),
+			Code: testbench.ICMPv6Code(header.ICMPv6UnusedCode),
 		},
 	}, time.Second)
 	if err != nil {
diff --git a/test/packetimpact/tests/ipv6_unknown_options_action_test.go b/test/packetimpact/tests/ipv6_unknown_options_action_test.go
index d7d63cbd2..e79d74476 100644
--- a/test/packetimpact/tests/ipv6_unknown_options_action_test.go
+++ b/test/packetimpact/tests/ipv6_unknown_options_action_test.go
@@ -172,7 +172,7 @@ func TestIPv6UnknownOptionAction(t *testing.T) {
 				&testbench.IPv6{},
 				&testbench.ICMPv6{
 					Type:    testbench.ICMPv6Type(header.ICMPv6ParamProblem),
-					Code:    testbench.Byte(2),
+					Code:    testbench.ICMPv6Code(header.ICMPv6UnknownOption),
 					Payload: icmpv6Payload,
 				},
 			}, time.Second)
diff --git a/test/packetimpact/tests/tcp_network_unreachable_test.go b/test/packetimpact/tests/tcp_network_unreachable_test.go
index 900352fa1..2f57dff19 100644
--- a/test/packetimpact/tests/tcp_network_unreachable_test.go
+++ b/test/packetimpact/tests/tcp_network_unreachable_test.go
@@ -72,7 +72,9 @@ func TestTCPSynSentUnreachable(t *testing.T) {
 	if !ok {
 		t.Fatalf("expected %s to be TCP", tcpLayers[tcpLayer])
 	}
-	var icmpv4 testbench.ICMPv4 = testbench.ICMPv4{Type: testbench.ICMPv4Type(header.ICMPv4DstUnreachable), Code: testbench.Uint8(header.ICMPv4HostUnreachable)}
+	var icmpv4 testbench.ICMPv4 = testbench.ICMPv4{
+		Type: testbench.ICMPv4Type(header.ICMPv4DstUnreachable),
+		Code: testbench.ICMPv4Code(header.ICMPv4HostUnreachable)}
 	layers = append(layers, &icmpv4, ip, tcp)
 	rawConn.SendFrameStateless(t, layers)
 
@@ -126,7 +128,7 @@ func TestTCPSynSentUnreachable6(t *testing.T) {
 	}
 	var icmpv6 testbench.ICMPv6 = testbench.ICMPv6{
 		Type: testbench.ICMPv6Type(header.ICMPv6DstUnreachable),
-		Code: testbench.Uint8(header.ICMPv6NetworkUnreachable),
+		Code: testbench.ICMPv6Code(header.ICMPv6NetworkUnreachable),
 		// Per RFC 4443 3.1, the payload contains 4 zeroed bytes.
 		Payload: []byte{0, 0, 0, 0},
 	}
diff --git a/test/packetimpact/tests/udp_icmp_error_propagation_test.go b/test/packetimpact/tests/udp_icmp_error_propagation_test.go
index b47ddb6c3..df35d16c8 100644
--- a/test/packetimpact/tests/udp_icmp_error_propagation_test.go
+++ b/test/packetimpact/tests/udp_icmp_error_propagation_test.go
@@ -62,9 +62,13 @@ func (e icmpError) String() string {
 func (e icmpError) ToICMPv4() *testbench.ICMPv4 {
 	switch e {
 	case portUnreachable:
-		return &testbench.ICMPv4{Type: testbench.ICMPv4Type(header.ICMPv4DstUnreachable), Code: testbench.Uint8(header.ICMPv4PortUnreachable)}
+		return &testbench.ICMPv4{
+			Type: testbench.ICMPv4Type(header.ICMPv4DstUnreachable),
+			Code: testbench.ICMPv4Code(header.ICMPv4PortUnreachable)}
 	case timeToLiveExceeded:
-		return &testbench.ICMPv4{Type: testbench.ICMPv4Type(header.ICMPv4TimeExceeded), Code: testbench.Uint8(header.ICMPv4TTLExceeded)}
+		return &testbench.ICMPv4{
+			Type: testbench.ICMPv4Type(header.ICMPv4TimeExceeded),
+			Code: testbench.ICMPv4Code(header.ICMPv4TTLExceeded)}
 	}
 	return nil
 }