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

Correctly print non-matching layers

Browse Source 
PiperOrigin-RevId: 346818310
This commit is contained in:
Tamir Duberstein
2020-12-10 10:52:13 -08:00
committed by gVisor bot
parent 65a2242db4
commit a177bfdbc4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/packetimpact/testbench/connections.go
+8 -3
View File
@@ -306,11 +306,11 @@ func (s *tcpState) incoming(received Layer) Layer {
if s.remoteSeqNum != nil {
newIn.SeqNum = Uint32(uint32(*s.remoteSeqNum))
}
if s.localSeqNum != nil && (*tcpReceived.Flags&header.TCPFlagAck) != 0 {
if seq, flags := s.localSeqNum, tcpReceived.Flags; seq != nil && flags != nil && *flags&header.TCPFlagAck != 0 {
// The caller didn't specify an AckNum so we'll expect the calculated one,
// but only if the ACK flag is set because the AckNum is not valid in a
// header if ACK is not set.
newIn.AckNum = Uint32(uint32(*s.localSeqNum))
newIn.AckNum = Uint32(uint32(*seq))
}
return &newIn
}
@@ -615,7 +615,12 @@ func (conn *Connection) ExpectFrame(t *testing.T, layers Layers, timeout time.Du
}
return gotLayers, nil
}
errs = multierr.Combine(errs, &layersError{got: gotLayers, want: conn.incoming(gotLayers)})
want := conn.incoming(layers)
if err := want.merge(layers); err != nil {
errs = multierr.Combine(errs, err)
} else {
errs = multierr.Combine(errs, &layersError{got: gotLayers, want: want})
}
}
}