diff --git a/dhcpv4/server.go b/dhcpv4/server.go index 9b0e148..ae7532b 100644 --- a/dhcpv4/server.go +++ b/dhcpv4/server.go @@ -369,4 +369,4 @@ func getSrcIPPort(ipCarrier []byte) (srcaddr []byte, port uint16, err error) { } port = binary.BigEndian.Uint16(ipCarrier[off:]) // TCP and UDP share same port offsets. return srcaddr, port, nil -} \ No newline at end of file +} diff --git a/dhcpv4/server_test.go b/dhcpv4/server_test.go index cf85bac..19b5a93 100644 --- a/dhcpv4/server_test.go +++ b/dhcpv4/server_test.go @@ -355,4 +355,4 @@ func TestServerRediscover(t *testing.T) { if cl.State() != StateBound { t.Errorf("second DORA: want StateBound, got %s", cl.State()) } -} \ No newline at end of file +} diff --git a/examples/httptap/dhcp.go b/examples/httptap/dhcp.go index b1da3a5..296272c 100644 --- a/examples/httptap/dhcp.go +++ b/examples/httptap/dhcp.go @@ -259,8 +259,8 @@ func (d *dhcpInterceptor) buildARPReply(request []byte) { // ARP reply. afrm, _ := arp.NewFrame(buf[sizeEthernet:]) - afrm.SetHardware(1, 6) // Ethernet, 6-byte addresses - afrm.SetProtocol(ethernet.TypeIPv4, 4) // IPv4, 4-byte addresses + afrm.SetHardware(1, 6) // Ethernet, 6-byte addresses + afrm.SetProtocol(ethernet.TypeIPv4, 4) // IPv4, 4-byte addresses afrm.SetOperation(arp.OpReply) replySndrHW, replySndrIP := afrm.Sender4() *replySndrHW = d.svMAC diff --git a/internal/ring.go b/internal/ring.go index bbd1a56..bf73281 100644 --- a/internal/ring.go +++ b/internal/ring.go @@ -11,11 +11,11 @@ import ( ) var ( - ErrRingBufferFull = lneto.ErrBufferFull - errRingNoData = errors.New("lneto/ring: empty write") - errInvalidDiscard = errors.New("lneto/ring: invalid discard amount") - errDiscardExceeds = errors.New("lneto/ring: discard exceeds length") - errOffsetOverflow = errors.New("lneto/ring: offset too large (32 bit overflow)") + ErrRingBufferFull = lneto.ErrBufferFull + errRingNoData = errors.New("lneto/ring: empty write") + errInvalidDiscard = errors.New("lneto/ring: invalid discard amount") + errDiscardExceeds = errors.New("lneto/ring: discard exceeds length") + errOffsetOverflow = errors.New("lneto/ring: offset too large (32 bit overflow)") ) // Ring implements basic Ring buffer functionality. diff --git a/ipv6/frame.go b/ipv6/frame.go index 96695fc..1f7f4c2 100644 --- a/ipv6/frame.go +++ b/ipv6/frame.go @@ -118,7 +118,6 @@ func (i6frm Frame) ClearHeader() { // Validate API. // - // ValidateSize checks the frame's size fields and compares with the actual buffer // the frame. It returns a non-nil error on finding an inconsistency. func (i6frm Frame) ValidateSize(v *lneto.Validator) { diff --git a/tcp/definitions.go b/tcp/definitions.go index 8b731f9..8346800 100644 --- a/tcp/definitions.go +++ b/tcp/definitions.go @@ -16,14 +16,14 @@ var ( errDropSegment error = lneto.ErrPacketDrop errWindowTooLarge = errors.New("invalid window size > 2**16") - errBufferTooSmall error = lneto.ErrShortBuffer - errNeedClosedTCBToOpen = errors.New("need closed TCB to call open") - errInvalidState = errors.New("invalid state") - errConnNotExist = errors.New("connection does not exist") - errConnectionClosing = errors.New("connection closing") - errExpectedSYN = errors.New("seqs:expected SYN") - errBadSegack = errors.New("seqs:bad segack") - errFinwaitExpectedACK = errors.New("seqs:finwait1 expected ACK") + errBufferTooSmall error = lneto.ErrShortBuffer + errNeedClosedTCBToOpen = errors.New("need closed TCB to call open") + errInvalidState = errors.New("invalid state") + errConnNotExist = errors.New("connection does not exist") + errConnectionClosing = errors.New("connection closing") + errExpectedSYN = errors.New("seqs:expected SYN") + errBadSegack = errors.New("seqs:bad segack") + errFinwaitExpectedACK = errors.New("seqs:finwait1 expected ACK") errWindowOverflow = newRejectErr("wnd > 2**16") errSeqNotInWindow = newRejectErr("seq not in snd/rcv.wnd") diff --git a/tcp/frame.go b/tcp/frame.go index 8645566..e5ce8f8 100644 --- a/tcp/frame.go +++ b/tcp/frame.go @@ -177,7 +177,6 @@ func (tfrm Frame) String() string { // Validation API // - // func (tfrm Frame) Validate(v *lneto.Validator) { // tfrm.ValidateSize(v) // tfrm.ValidateExceptCRC(v) diff --git a/tcp/seqsbug_test.go b/tcp/seqsbug_test.go index 9abecec..2d7ec94 100644 --- a/tcp/seqsbug_test.go +++ b/tcp/seqsbug_test.go @@ -214,7 +214,7 @@ func TestWindowReject_ChallengeACK(t *testing.T) { t.Run("SeqNotInWindow", func(t *testing.T) { tcb := setup() retransmit := Segment{ - SEQ: issB, // Before rcv.NXT (issB+512). + SEQ: issB, // Before rcv.NXT (issB+512). ACK: issA, Flags: FlagACK, WND: 64240, @@ -237,7 +237,7 @@ func TestWindowReject_ChallengeACK(t *testing.T) { t.Run("LastNotInWindow", func(t *testing.T) { tcb := setup() seg := Segment{ - SEQ: issB + 512, // At rcv.NXT (in window). + SEQ: issB + 512, // At rcv.NXT (in window). ACK: issA, Flags: FlagACK, WND: 64240,