diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-11-25 17:40:04 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-11-25 17:40:04 +0000 |
| commit | 56d7dc03b7dd9c53d326b62564d4e0b2669d7d85 (patch) | |
| tree | ab71c6ea3aa7ab273a9384c3962276eb931fe8e9 /pkg/tcpip/transport | |
| parent | 4fa69943460af8f1648d821778ef331589ac6558 (diff) | |
| parent | 1641338b14204ea941c547cf4c1a70665922ca05 (diff) | |
Merge release-20191114.0-28-g1641338 (automated)
Diffstat (limited to 'pkg/tcpip/transport')
| -rw-r--r-- | pkg/tcpip/transport/tcp/connect.go | 1 | ||||
| -rw-r--r-- | pkg/tcpip/transport/udp/endpoint.go | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkg/tcpip/transport/tcp/connect.go b/pkg/tcpip/transport/tcp/connect.go index f14f0ca65..4206db8b6 100644 --- a/pkg/tcpip/transport/tcp/connect.go +++ b/pkg/tcpip/transport/tcp/connect.go @@ -647,6 +647,7 @@ func buildTCPHdr(r *stack.Route, id stack.TransportEndpointID, pkt *tcpip.Packet off := pkt.DataOffset // Initialize the header. tcp := header.TCP(hdr.Prepend(header.TCPMinimumSize + optLen)) + pkt.TransportHeader = buffer.View(tcp) tcp.Encode(&header.TCPFields{ SrcPort: id.LocalPort, DstPort: id.RemotePort, diff --git a/pkg/tcpip/transport/udp/endpoint.go b/pkg/tcpip/transport/udp/endpoint.go index 23c1da717..24cb88c13 100644 --- a/pkg/tcpip/transport/udp/endpoint.go +++ b/pkg/tcpip/transport/udp/endpoint.go @@ -823,8 +823,9 @@ func sendUDP(r *stack.Route, data buffer.VectorisedView, localPort, remotePort u ttl = r.DefaultTTL() } if err := r.WritePacket(nil /* gso */, stack.NetworkHeaderParams{Protocol: ProtocolNumber, TTL: ttl, TOS: tos}, tcpip.PacketBuffer{ - Header: hdr, - Data: data, + Header: hdr, + Data: data, + TransportHeader: buffer.View(udp), }); err != nil { r.Stats().UDP.PacketSendErrors.Increment() return err |