Define tcpip.Payloader in terms of io.Reader

Fixes #1509.

PiperOrigin-RevId: 353295589

5 files changed, 30 insertions, 15 deletions

diff --git a/pkg/tcpip/tests/integration/forward_test.go b/pkg/tcpip/tests/integration/forward_test.go
index ac9670f9a..aedf1845e 100644
--- a/pkg/tcpip/tests/integration/forward_test.go
+++ b/pkg/tcpip/tests/integration/forward_test.go
@@ -436,9 +436,10 @@ func TestForwarding(t *testing.T) {
 					write := func(ep tcpip.Endpoint, data []byte) {
 						t.Helper()
 
-						dataPayload := tcpip.SlicePayload(data)
+						var r bytes.Reader
+						r.Reset(data)
 						var wOpts tcpip.WriteOptions
-						n, err := ep.Write(dataPayload, wOpts)
+						n, err := ep.Write(&r, wOpts)
 						if err != nil {
 							t.Fatalf("ep.Write(_, %#v): %s", wOpts, err)
 						}
@@ -486,7 +487,7 @@ func TestForwarding(t *testing.T) {
 
 					read(serverCH, serverEP, data, clientAddr)
 
-					data = tcpip.SlicePayload([]byte{5, 6, 7, 8, 9, 10, 11, 12})
+					data = []byte{5, 6, 7, 8, 9, 10, 11, 12}
 					write(serverEP, data)
 					read(epsAndAddrs.clientReadableCH, epsAndAddrs.clientEP, data, serverAddr)
 				})
diff --git a/pkg/tcpip/tests/integration/link_resolution_test.go b/pkg/tcpip/tests/integration/link_resolution_test.go
index 1e13fd6d6..d0d0e4ef2 100644
--- a/pkg/tcpip/tests/integration/link_resolution_test.go
+++ b/pkg/tcpip/tests/integration/link_resolution_test.go
@@ -209,8 +209,10 @@ func TestPing(t *testing.T) {
 			defer ep.Close()
 
 			icmpBuf := test.icmpBuf(t)
+			var r bytes.Reader
+			r.Reset(icmpBuf)
 			wOpts := tcpip.WriteOptions{To: &tcpip.FullAddress{Addr: test.remoteAddr}}
-			if n, err := ep.Write(tcpip.SlicePayload(icmpBuf), wOpts); err != nil {
+			if n, err := ep.Write(&r, wOpts); err != nil {
 				t.Fatalf("ep.Write(_, _): %s", err)
 			} else if want := int64(len(icmpBuf)); n != want {
 				t.Fatalf("got ep.Write(_, _) = (%d, _), want = (%d, _)", n, want)
@@ -360,9 +362,11 @@ func TestTCPLinkResolutionFailure(t *testing.T) {
 			// Wait for an error due to link resolution failing, or the endpoint to be
 			// writable.
 			<-ch
+			var r bytes.Reader
+			r.Reset([]byte{0})
 			var wOpts tcpip.WriteOptions
-			if n, err := clientEP.Write(tcpip.SlicePayload(nil), wOpts); err != test.expectedWriteErr {
-				t.Errorf("got clientEP.Write(nil, %#v) = (%d, %s), want = (_, %s)", wOpts, n, err, test.expectedWriteErr)
+			if n, err := clientEP.Write(&r, wOpts); err != test.expectedWriteErr {
+				t.Errorf("got clientEP.Write(_, %#v) = (%d, %s), want = (_, %s)", wOpts, n, err, test.expectedWriteErr)
 			}
 
 			if test.expectedWriteErr == nil {
diff --git a/pkg/tcpip/tests/integration/loopback_test.go b/pkg/tcpip/tests/integration/loopback_test.go
index 3b13ba04d..761283b66 100644
--- a/pkg/tcpip/tests/integration/loopback_test.go
+++ b/pkg/tcpip/tests/integration/loopback_test.go
@@ -232,7 +232,9 @@ func TestLoopbackAcceptAllInSubnetUDP(t *testing.T) {
 					Port: localPort,
 				},
 			}
-			n, err := sep.Write(tcpip.SlicePayload(data), wopts)
+			var r bytes.Reader
+			r.Reset(data)
+			n, err := sep.Write(&r, wopts)
 			if err != nil {
 				t.Fatalf("sep.Write(_, _): %s", err)
 			}
diff --git a/pkg/tcpip/tests/integration/multicast_broadcast_test.go b/pkg/tcpip/tests/integration/multicast_broadcast_test.go
index ce7c16bd1..9cc12fa58 100644
--- a/pkg/tcpip/tests/integration/multicast_broadcast_test.go
+++ b/pkg/tcpip/tests/integration/multicast_broadcast_test.go
@@ -586,8 +586,10 @@ func TestReuseAddrAndBroadcast(t *testing.T) {
 						Port: localPort,
 					},
 				}
-				data := tcpip.SlicePayload([]byte{byte(i), 2, 3, 4})
-				if n, err := wep.ep.Write(data, writeOpts); err != nil {
+				data := []byte{byte(i), 2, 3, 4}
+				var r bytes.Reader
+				r.Reset(data)
+				if n, err := wep.ep.Write(&r, writeOpts); err != nil {
 					t.Fatalf("eps[%d].Write(_, _): %s", i, err)
 				} else if want := int64(len(data)); n != want {
 					t.Fatalf("got eps[%d].Write(_, _) = (%d, nil), want = (%d, nil)", i, n, want)
diff --git a/pkg/tcpip/tests/integration/route_test.go b/pkg/tcpip/tests/integration/route_test.go
index b222d2b05..35ee7437a 100644
--- a/pkg/tcpip/tests/integration/route_test.go
+++ b/pkg/tcpip/tests/integration/route_test.go
@@ -194,9 +194,11 @@ func TestLocalPing(t *testing.T) {
 				return
 			}
 
-			payload := tcpip.SlicePayload(test.icmpBuf(t))
+			payload := test.icmpBuf(t)
+			var r bytes.Reader
+			r.Reset(payload)
 			var wOpts tcpip.WriteOptions
-			if n, err := ep.Write(payload, wOpts); err != nil {
+			if n, err := ep.Write(&r, wOpts); err != nil {
 				t.Fatalf("ep.Write(%#v, %#v): %s", payload, wOpts, err)
 			} else if n != int64(len(payload)) {
 				t.Fatalf("got ep.Write(%#v, %#v) = (%d, nil), want = (%d, nil)", payload, wOpts, n, len(payload))
@@ -329,12 +331,14 @@ func TestLocalUDP(t *testing.T) {
 						Port: 80,
 					}
 
-					clientPayload := tcpip.SlicePayload([]byte{1, 2, 3, 4})
+					clientPayload := []byte{1, 2, 3, 4}
 					{
+						var r bytes.Reader
+						r.Reset(clientPayload)
 						wOpts := tcpip.WriteOptions{
 							To: &serverAddr,
 						}
-						if n, err := client.Write(clientPayload, wOpts); err != subTest.expectedWriteErr {
+						if n, err := client.Write(&r, wOpts); err != subTest.expectedWriteErr {
 							t.Fatalf("got client.Write(%#v, %#v) = (%d, %s), want = (_, %s)", clientPayload, wOpts, n, err, subTest.expectedWriteErr)
 						} else if subTest.expectedWriteErr != nil {
 							// Nothing else to test if we expected not to be able to send the
@@ -376,12 +380,14 @@ func TestLocalUDP(t *testing.T) {
 						}
 					}
 
-					serverPayload := tcpip.SlicePayload([]byte{1, 2, 3, 4})
+					serverPayload := []byte{1, 2, 3, 4}
 					{
+						var r bytes.Reader
+						r.Reset(serverPayload)
 						wOpts := tcpip.WriteOptions{
 							To: &clientAddr,
 						}
-						if n, err := server.Write(serverPayload, wOpts); err != nil {
+						if n, err := server.Write(&r, wOpts); err != nil {
 							t.Fatalf("server.Write(%#v, %#v): %s", serverPayload, wOpts, err)
 						} else if n != int64(len(serverPayload)) {
 							t.Fatalf("got server.Write(%#v, %#v) = (%d, nil), want = (%d, nil)", serverPayload, wOpts, n, len(serverPayload))