netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Replace calculateChecksum w/ the unrolled version.

Browse Source 
Fixes #1656

PiperOrigin-RevId: 291703760
This commit is contained in:
Bhasker Hariharan
2020-01-27 05:34:34 -08:00
committed by gVisor bot
parent 68514d4ba3
commit 6b43cf791a
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tcpip/header/checksum.go
+9 -6
View File
@@ -160,20 +160,23 @@ func unrolledCalculateChecksum(buf []byte, odd bool, initial uint32) (uint16, bo
return ChecksumCombine(uint16(v), uint16(v>>16)), odd
}
// Checksum calculates the checksum (as defined in RFC 1071) of the bytes in the
// given byte array.
// ChecksumOld calculates the checksum (as defined in RFC 1071) of the bytes in
// the given byte array. This function uses a non-optimized implementation. Its
// only retained for reference and to use as a benchmark/test. Most code should
// use the header.Checksum function.
//
// The initial checksum must have been computed on an even number of bytes.
func Checksum(buf []byte, initial uint16) uint16 {
func ChecksumOld(buf []byte, initial uint16) uint16 {
s, _ := calculateChecksum(buf, false, uint32(initial))
return s
}
// UnrolledChecksum calculates the checksum (as defined in RFC 1071) of the
// bytes in the given byte array.
// Checksum calculates the checksum (as defined in RFC 1071) of the bytes in the
// given byte array. This function uses an optimized unrolled version of the
// checksum algorithm.
//
// The initial checksum must have been computed on an even number of bytes.
func UnrolledChecksum(buf []byte, initial uint16) uint16 {
func Checksum(buf []byte, initial uint16) uint16 {
s, _ := unrolledCalculateChecksum(buf, false, uint32(initial))
return s
}
pkg/tcpip/header/checksum_test.go
+3 -3
View File
@@ -128,8 +128,8 @@ func TestChecksum(t *testing.T) {
}
for i := range testCases {
testCases[i].csumOrig = header.Checksum(testCases[i].buf, testCases[i].initial)
testCases[i].csumNew = header.UnrolledChecksum(testCases[i].buf, testCases[i].initial)
testCases[i].csumOrig = header.ChecksumOld(testCases[i].buf, testCases[i].initial)
testCases[i].csumNew = header.Checksum(testCases[i].buf, testCases[i].initial)
if got, want := testCases[i].csumNew, testCases[i].csumOrig; got != want {
t.Fatalf("new checksum for (buf = %x, initial = %d) does not match old got: %d, want: %d", testCases[i].buf, testCases[i].initial, got, want)
}
@@ -143,8 +143,8 @@ func BenchmarkChecksum(b *testing.B) {
fn func([]byte, uint16) uint16
name string
}{
{header.ChecksumOld, fmt.Sprintf("checksum_old")},
{header.Checksum, fmt.Sprintf("checksum")},
{header.UnrolledChecksum, fmt.Sprintf("unrolled_checksum")},
}
for _, csumImpl := range checkSumImpls {