Merge pull request #1025 from lucas-clemente/fix-964

ignore STOP_WAITINGs, derive lower bound for packets to include in ACK

internal/mocks/gen.go

@@ -3,6 +3,8 @@ package mocks
 //go:generate sh -c "./mockgen_internal.sh mockhandshake handshake/mint_tls.go github.com/lucas-clemente/quic-go/internal/handshake MintTLS"
 //go:generate sh -c "./mockgen_internal.sh mocks tls_extension_handler.go github.com/lucas-clemente/quic-go/internal/handshake TLSExtensionHandler"
 //go:generate sh -c "./mockgen_internal.sh mocks stream_flow_controller.go github.com/lucas-clemente/quic-go/internal/flowcontrol StreamFlowController"
+//go:generate sh -c "./mockgen_internal.sh mocks sent_packet_handler.go github.com/lucas-clemente/quic-go/ackhandler SentPacketHandler"
+//go:generate sh -c "./mockgen_internal.sh mocks received_packet_handler.go github.com/lucas-clemente/quic-go/ackhandler ReceivedPacketHandler"
 //go:generate sh -c "./mockgen_internal.sh mocks connection_flow_controller.go github.com/lucas-clemente/quic-go/internal/flowcontrol ConnectionFlowController"
 //go:generate sh -c "./mockgen_internal.sh mockcrypto crypto/aead.go github.com/lucas-clemente/quic-go/internal/crypto AEAD"
 //go:generate sh -c "./mockgen_stream.sh mocks stream.go github.com/lucas-clemente/quic-go StreamI"

internal/mocks/received_packet_handler.go

@@ -0,0 +1,82 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/lucas-clemente/quic-go/ackhandler (interfaces: ReceivedPacketHandler)
+
+package mocks
+
+import (
+	reflect "reflect"
+	time "time"
+
+	gomock "github.com/golang/mock/gomock"
+	protocol "github.com/lucas-clemente/quic-go/internal/protocol"
+	wire "github.com/lucas-clemente/quic-go/internal/wire"
+)
+
+// MockReceivedPacketHandler is a mock of ReceivedPacketHandler interface
+type MockReceivedPacketHandler struct {
+	ctrl     *gomock.Controller
+	recorder *MockReceivedPacketHandlerMockRecorder
+}
+
+// MockReceivedPacketHandlerMockRecorder is the mock recorder for MockReceivedPacketHandler
+type MockReceivedPacketHandlerMockRecorder struct {
+	mock *MockReceivedPacketHandler
+}
+
+// NewMockReceivedPacketHandler creates a new mock instance
+func NewMockReceivedPacketHandler(ctrl *gomock.Controller) *MockReceivedPacketHandler {
+	mock := &MockReceivedPacketHandler{ctrl: ctrl}
+	mock.recorder = &MockReceivedPacketHandlerMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (_m *MockReceivedPacketHandler) EXPECT() *MockReceivedPacketHandlerMockRecorder {
+	return _m.recorder
+}
+
+// GetAckFrame mocks base method
+func (_m *MockReceivedPacketHandler) GetAckFrame() *wire.AckFrame {
+	ret := _m.ctrl.Call(_m, "GetAckFrame")
+	ret0, _ := ret[0].(*wire.AckFrame)
+	return ret0
+}
+
+// GetAckFrame indicates an expected call of GetAckFrame
+func (_mr *MockReceivedPacketHandlerMockRecorder) GetAckFrame() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetAckFrame", reflect.TypeOf((*MockReceivedPacketHandler)(nil).GetAckFrame))
+}
+
+// GetAlarmTimeout mocks base method
+func (_m *MockReceivedPacketHandler) GetAlarmTimeout() time.Time {
+	ret := _m.ctrl.Call(_m, "GetAlarmTimeout")
+	ret0, _ := ret[0].(time.Time)
+	return ret0
+}
+
+// GetAlarmTimeout indicates an expected call of GetAlarmTimeout
+func (_mr *MockReceivedPacketHandlerMockRecorder) GetAlarmTimeout() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetAlarmTimeout", reflect.TypeOf((*MockReceivedPacketHandler)(nil).GetAlarmTimeout))
+}
+
+// IgnoreBelow mocks base method
+func (_m *MockReceivedPacketHandler) IgnoreBelow(_param0 protocol.PacketNumber) {
+	_m.ctrl.Call(_m, "IgnoreBelow", _param0)
+}
+
+// IgnoreBelow indicates an expected call of IgnoreBelow
+func (_mr *MockReceivedPacketHandlerMockRecorder) IgnoreBelow(arg0 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "IgnoreBelow", reflect.TypeOf((*MockReceivedPacketHandler)(nil).IgnoreBelow), arg0)
+}
+
+// ReceivedPacket mocks base method
+func (_m *MockReceivedPacketHandler) ReceivedPacket(_param0 protocol.PacketNumber, _param1 bool) error {
+	ret := _m.ctrl.Call(_m, "ReceivedPacket", _param0, _param1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// ReceivedPacket indicates an expected call of ReceivedPacket
+func (_mr *MockReceivedPacketHandlerMockRecorder) ReceivedPacket(arg0, arg1 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ReceivedPacket", reflect.TypeOf((*MockReceivedPacketHandler)(nil).ReceivedPacket), arg0, arg1)
+}

internal/mocks/sent_packet_handler.go

@@ -0,0 +1,165 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: github.com/lucas-clemente/quic-go/ackhandler (interfaces: SentPacketHandler)
+
+package mocks
+
+import (
+	reflect "reflect"
+	time "time"
+
+	gomock "github.com/golang/mock/gomock"
+	ackhandler "github.com/lucas-clemente/quic-go/ackhandler"
+	protocol "github.com/lucas-clemente/quic-go/internal/protocol"
+	wire "github.com/lucas-clemente/quic-go/internal/wire"
+)
+
+// MockSentPacketHandler is a mock of SentPacketHandler interface
+type MockSentPacketHandler struct {
+	ctrl     *gomock.Controller
+	recorder *MockSentPacketHandlerMockRecorder
+}
+
+// MockSentPacketHandlerMockRecorder is the mock recorder for MockSentPacketHandler
+type MockSentPacketHandlerMockRecorder struct {
+	mock *MockSentPacketHandler
+}
+
+// NewMockSentPacketHandler creates a new mock instance
+func NewMockSentPacketHandler(ctrl *gomock.Controller) *MockSentPacketHandler {
+	mock := &MockSentPacketHandler{ctrl: ctrl}
+	mock.recorder = &MockSentPacketHandlerMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (_m *MockSentPacketHandler) EXPECT() *MockSentPacketHandlerMockRecorder {
+	return _m.recorder
+}
+
+// DequeuePacketForRetransmission mocks base method
+func (_m *MockSentPacketHandler) DequeuePacketForRetransmission() *ackhandler.Packet {
+	ret := _m.ctrl.Call(_m, "DequeuePacketForRetransmission")
+	ret0, _ := ret[0].(*ackhandler.Packet)
+	return ret0
+}
+
+// DequeuePacketForRetransmission indicates an expected call of DequeuePacketForRetransmission
+func (_mr *MockSentPacketHandlerMockRecorder) DequeuePacketForRetransmission() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "DequeuePacketForRetransmission", reflect.TypeOf((*MockSentPacketHandler)(nil).DequeuePacketForRetransmission))
+}
+
+// GetAlarmTimeout mocks base method
+func (_m *MockSentPacketHandler) GetAlarmTimeout() time.Time {
+	ret := _m.ctrl.Call(_m, "GetAlarmTimeout")
+	ret0, _ := ret[0].(time.Time)
+	return ret0
+}
+
+// GetAlarmTimeout indicates an expected call of GetAlarmTimeout
+func (_mr *MockSentPacketHandlerMockRecorder) GetAlarmTimeout() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetAlarmTimeout", reflect.TypeOf((*MockSentPacketHandler)(nil).GetAlarmTimeout))
+}
+
+// GetLeastUnacked mocks base method
+func (_m *MockSentPacketHandler) GetLeastUnacked() protocol.PacketNumber {
+	ret := _m.ctrl.Call(_m, "GetLeastUnacked")
+	ret0, _ := ret[0].(protocol.PacketNumber)
+	return ret0
+}
+
+// GetLeastUnacked indicates an expected call of GetLeastUnacked
+func (_mr *MockSentPacketHandlerMockRecorder) GetLeastUnacked() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetLeastUnacked", reflect.TypeOf((*MockSentPacketHandler)(nil).GetLeastUnacked))
+}
+
+// GetLowestPacketNotConfirmedAcked mocks base method
+func (_m *MockSentPacketHandler) GetLowestPacketNotConfirmedAcked() protocol.PacketNumber {
+	ret := _m.ctrl.Call(_m, "GetLowestPacketNotConfirmedAcked")
+	ret0, _ := ret[0].(protocol.PacketNumber)
+	return ret0
+}
+
+// GetLowestPacketNotConfirmedAcked indicates an expected call of GetLowestPacketNotConfirmedAcked
+func (_mr *MockSentPacketHandlerMockRecorder) GetLowestPacketNotConfirmedAcked() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetLowestPacketNotConfirmedAcked", reflect.TypeOf((*MockSentPacketHandler)(nil).GetLowestPacketNotConfirmedAcked))
+}
+
+// GetStopWaitingFrame mocks base method
+func (_m *MockSentPacketHandler) GetStopWaitingFrame(_param0 bool) *wire.StopWaitingFrame {
+	ret := _m.ctrl.Call(_m, "GetStopWaitingFrame", _param0)
+	ret0, _ := ret[0].(*wire.StopWaitingFrame)
+	return ret0
+}
+
+// GetStopWaitingFrame indicates an expected call of GetStopWaitingFrame
+func (_mr *MockSentPacketHandlerMockRecorder) GetStopWaitingFrame(arg0 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetStopWaitingFrame", reflect.TypeOf((*MockSentPacketHandler)(nil).GetStopWaitingFrame), arg0)
+}
+
+// OnAlarm mocks base method
+func (_m *MockSentPacketHandler) OnAlarm() {
+	_m.ctrl.Call(_m, "OnAlarm")
+}
+
+// OnAlarm indicates an expected call of OnAlarm
+func (_mr *MockSentPacketHandlerMockRecorder) OnAlarm() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "OnAlarm", reflect.TypeOf((*MockSentPacketHandler)(nil).OnAlarm))
+}
+
+// ReceivedAck mocks base method
+func (_m *MockSentPacketHandler) ReceivedAck(_param0 *wire.AckFrame, _param1 protocol.PacketNumber, _param2 protocol.EncryptionLevel, _param3 time.Time) error {
+	ret := _m.ctrl.Call(_m, "ReceivedAck", _param0, _param1, _param2, _param3)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// ReceivedAck indicates an expected call of ReceivedAck
+func (_mr *MockSentPacketHandlerMockRecorder) ReceivedAck(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ReceivedAck", reflect.TypeOf((*MockSentPacketHandler)(nil).ReceivedAck), arg0, arg1, arg2, arg3)
+}
+
+// SendingAllowed mocks base method
+func (_m *MockSentPacketHandler) SendingAllowed() bool {
+	ret := _m.ctrl.Call(_m, "SendingAllowed")
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// SendingAllowed indicates an expected call of SendingAllowed
+func (_mr *MockSentPacketHandlerMockRecorder) SendingAllowed() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "SendingAllowed", reflect.TypeOf((*MockSentPacketHandler)(nil).SendingAllowed))
+}
+
+// SentPacket mocks base method
+func (_m *MockSentPacketHandler) SentPacket(_param0 *ackhandler.Packet) error {
+	ret := _m.ctrl.Call(_m, "SentPacket", _param0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SentPacket indicates an expected call of SentPacket
+func (_mr *MockSentPacketHandlerMockRecorder) SentPacket(arg0 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "SentPacket", reflect.TypeOf((*MockSentPacketHandler)(nil).SentPacket), arg0)
+}
+
+// SetHandshakeComplete mocks base method
+func (_m *MockSentPacketHandler) SetHandshakeComplete() {
+	_m.ctrl.Call(_m, "SetHandshakeComplete")
+}
+
+// SetHandshakeComplete indicates an expected call of SetHandshakeComplete
+func (_mr *MockSentPacketHandlerMockRecorder) SetHandshakeComplete() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "SetHandshakeComplete", reflect.TypeOf((*MockSentPacketHandler)(nil).SetHandshakeComplete))
+}
+
+// ShouldSendRetransmittablePacket mocks base method
+func (_m *MockSentPacketHandler) ShouldSendRetransmittablePacket() bool {
+	ret := _m.ctrl.Call(_m, "ShouldSendRetransmittablePacket")
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// ShouldSendRetransmittablePacket indicates an expected call of ShouldSendRetransmittablePacket
+func (_mr *MockSentPacketHandlerMockRecorder) ShouldSendRetransmittablePacket() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ShouldSendRetransmittablePacket", reflect.TypeOf((*MockSentPacketHandler)(nil).ShouldSendRetransmittablePacket))
+}