Abstract out making a cancel message

[btrtrc.git] / connection.go

diff --git a/connection.go b/connection.go
index 9b102eb87dcac0e4305abf5bdcba8091d1f21099..c5c6c95743132debd5daec1457a04678b846c943 100644 (file)
--- a/connection.go
+++ b/connection.go
@@ -355,12 +355,7 @@ func (cn *connection) fillWriteBuffer(msg func(pp.Message) bool) {
                for r := range cn.requests {
                        cn.deleteRequest(r)
                        // log.Printf("%p: cancelling request: %v", cn, r)
-                       if !msg(pp.Message{
-                               Type:   pp.Cancel,
-                               Index:  r.Index,
-                               Begin:  r.Begin,
-                               Length: r.Length,
-                       }) {
+                       if !msg(makeCancelMessage(r)) {
                                return
                        }
                }