diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-11-16 19:28:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 19:28:52 -0500 |
| commit | 0135904f7d3e1c0e763adaefe267c736616e3d26 (patch) | |
| tree | c27be7588f98eaea62e0bd0c0087f2b348da9738 /vendor/golang.org/x/net/ipv4/header.go | |
| parent | 0b296dd8c2aefefe89787be5cc627d44cf431150 (diff) | |
| download | chat-0135904f7d3e1c0e763adaefe267c736616e3d26.tar.gz chat-0135904f7d3e1c0e763adaefe267c736616e3d26.tar.bz2 chat-0135904f7d3e1c0e763adaefe267c736616e3d26.zip | |
Upgrading server dependancies (#4566)
Diffstat (limited to 'vendor/golang.org/x/net/ipv4/header.go')
| -rw-r--r-- | vendor/golang.org/x/net/ipv4/header.go | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/vendor/golang.org/x/net/ipv4/header.go b/vendor/golang.org/x/net/ipv4/header.go index 363d9c21a..6dc26d43f 100644 --- a/vendor/golang.org/x/net/ipv4/header.go +++ b/vendor/golang.org/x/net/ipv4/header.go @@ -1,4 +1,4 @@ -// Copyright 2012 The Go Authors. All rights reserved. +// Copyright 2012 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. @@ -63,9 +63,17 @@ func (h *Header) Marshal() ([]byte, error) { b[1] = byte(h.TOS) flagsAndFragOff := (h.FragOff & 0x1fff) | int(h.Flags<<13) switch runtime.GOOS { - case "darwin", "dragonfly", "freebsd", "netbsd": + case "darwin", "dragonfly", "netbsd": nativeEndian.PutUint16(b[2:4], uint16(h.TotalLen)) nativeEndian.PutUint16(b[6:8], uint16(flagsAndFragOff)) + case "freebsd": + if freebsdVersion < 1100000 { + nativeEndian.PutUint16(b[2:4], uint16(h.TotalLen)) + nativeEndian.PutUint16(b[6:8], uint16(flagsAndFragOff)) + } else { + binary.BigEndian.PutUint16(b[2:4], uint16(h.TotalLen)) + binary.BigEndian.PutUint16(b[6:8], uint16(flagsAndFragOff)) + } default: binary.BigEndian.PutUint16(b[2:4], uint16(h.TotalLen)) binary.BigEndian.PutUint16(b[6:8], uint16(flagsAndFragOff)) @@ -113,11 +121,16 @@ func ParseHeader(b []byte) (*Header, error) { h.TotalLen = int(nativeEndian.Uint16(b[2:4])) + hdrlen h.FragOff = int(nativeEndian.Uint16(b[6:8])) case "freebsd": - h.TotalLen = int(nativeEndian.Uint16(b[2:4])) - if freebsdVersion < 1000000 { - h.TotalLen += hdrlen + if freebsdVersion < 1100000 { + h.TotalLen = int(nativeEndian.Uint16(b[2:4])) + if freebsdVersion < 1000000 { + h.TotalLen += hdrlen + } + h.FragOff = int(nativeEndian.Uint16(b[6:8])) + } else { + h.TotalLen = int(binary.BigEndian.Uint16(b[2:4])) + h.FragOff = int(binary.BigEndian.Uint16(b[6:8])) } - h.FragOff = int(nativeEndian.Uint16(b[6:8])) default: h.TotalLen = int(binary.BigEndian.Uint16(b[2:4])) h.FragOff = int(binary.BigEndian.Uint16(b[6:8])) |