TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-10 00:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/packet: remove {get,put}{16,32} indirection to encoding/binary.

Browse Source 
name              old time/op    new time/op    delta
Decode/tcp4-8       28.8ns ± 2%    13.1ns ± 4%  -54.44%  (p=0.008 n=5+5)
Decode/tcp6-8       20.6ns ± 1%    12.6ns ± 2%  -38.72%  (p=0.008 n=5+5)
Decode/udp4-8       28.2ns ± 1%    12.1ns ± 4%  -57.01%  (p=0.008 n=5+5)
Decode/udp6-8       20.0ns ± 6%    12.1ns ± 2%  -39.38%  (p=0.008 n=5+5)
Decode/icmp4-8      21.7ns ± 2%    11.5ns ± 1%  -47.01%  (p=0.008 n=5+5)
Decode/icmp6-8      14.1ns ± 2%    11.8ns ± 4%  -16.60%  (p=0.008 n=5+5)
Decode/unknown-8    9.43ns ± 2%    9.30ns ± 3%     ~     (p=0.222 n=5+5)

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2020-11-10 19:09:47 -08:00
committed by Dave Anderson
parent 55b1221db2
commit 22bf48f37c
4 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
net/packet/ip4.go
View File

@@ -5,6 +5,7 @@
package packet
import (
"encoding/binary"
"fmt"
"net"
@@ -21,13 +22,13 @@ func NewIP4(b net.IP) IP4 {
if b4 == nil {
panic(fmt.Sprintf("To4(%v) failed", b))
}
return IP4(get32(b4))
return IP4(binary.BigEndian.Uint32(b4))
}
// IPFromNetaddr converts a netaddr.IP to an IP.
func IP4FromNetaddr(ip netaddr.IP) IP4 {
ipbytes := ip.As4()
return IP4(get32(ipbytes[:]))
return IP4(binary.BigEndian.Uint32(ipbytes[:]))
}
// Netaddr converts an IP to a netaddr.IP.
@@ -71,16 +72,16 @@ func (h IP4Header) Marshal(buf []byte) error {
buf[0] = 0x40 | (ip4HeaderLength >> 2) // IPv4
buf[1] = 0x00 // DHCP, ECN
put16(buf[2:4], uint16(len(buf)))
put16(buf[4:6], h.IPID)
put16(buf[6:8], 0) // flags, offset
buf[8] = 64 // TTL
binary.BigEndian.PutUint16(buf[2:4], uint16(len(buf)))
binary.BigEndian.PutUint16(buf[4:6], h.IPID)
binary.BigEndian.PutUint16(buf[6:8], 0) // flags, offset
buf[8] = 64 // TTL
buf[9] = uint8(h.IPProto)
put16(buf[10:12], 0) // blank IP header checksum
put32(buf[12:16], uint32(h.SrcIP))
put32(buf[16:20], uint32(h.DstIP))
binary.BigEndian.PutUint16(buf[10:12], 0) // blank IP header checksum
binary.BigEndian.PutUint32(buf[12:16], uint32(h.SrcIP))
binary.BigEndian.PutUint32(buf[16:20], uint32(h.DstIP))
put16(buf[10:12], ipChecksum(buf[0:20]))
binary.BigEndian.PutUint16(buf[10:12], ipChecksum(buf[0:20]))
return nil
}
@@ -97,11 +98,11 @@ func (h IP4Header) MarshalPseudo(buf []byte) error {
}
length := len(buf) - ip4HeaderLength
put32(buf[8:12], uint32(h.SrcIP))
put32(buf[12:16], uint32(h.DstIP))
binary.BigEndian.PutUint32(buf[8:12], uint32(h.SrcIP))
binary.BigEndian.PutUint32(buf[12:16], uint32(h.DstIP))
buf[16] = 0x0
buf[17] = uint8(h.IPProto)
put16(buf[18:20], uint16(length))
binary.BigEndian.PutUint16(buf[18:20], uint16(length))
return nil
}