Merge pull request #276 from moredure/patch-1

use only seqno instead of full outboundPacket in channel

1 files changed, 5 insertions, 5 deletions

diff --git a/internal/transfer/block_write_stream.go b/internal/transfer/block_write_stream.go
index 4d2f6cf..0f47cb0 100644
--- a/internal/transfer/block_write_stream.go
+++ b/internal/transfer/block_write_stream.go
@@ -55,7 +55,7 @@ type blockWriteStream struct {
 	offset int64
 	closed bool
 
-	packets chan outboundPacket
+	packets chan int
 	seqno   int
 
 	ackError        error
@@ -91,7 +91,7 @@ func newBlockWriteStream(conn io.ReadWriter, offset int64) *blockWriteStream {
 		conn:       conn,
 		offset:     offset,
 		seqno:      1,
-		packets:    make(chan outboundPacket, maxPacketsInQueue),
+		packets:    make(chan int, maxPacketsInQueue),
 		acksDone:   make(chan struct{}),
 		heartbeats: make(chan struct{}),
 	}
@@ -163,7 +163,7 @@ func (s *blockWriteStream) finish() error {
 		checksums: []byte{},
 		data:      []byte{},
 	}
-	s.packets <- lastPacket
+	s.packets <- lastPacket.seqno
 
 	err := s.writePacket(lastPacket)
 	if err != nil {
@@ -191,7 +191,7 @@ func (s *blockWriteStream) flush(force bool) error {
 
 	for s.buf.Len() > 0 && (force || s.buf.Len() >= outboundPacketSize) {
 		packet := s.makePacket()
-		s.packets <- packet
+		s.packets <- packet.seqno
 		s.offset += int64(len(packet.data))
 		s.seqno++
 
@@ -281,7 +281,7 @@ Acks:
 			}
 		}
 
-		if seqno != p.seqno {
+		if seqno != p {
 			s.ackError = ErrInvalidSeqno
 			break Acks
 		}