From 81ae6d44ec1b5023b96f363eda59a6d983f96673 Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Thu, 7 Jul 2016 18:22:31 +0200 Subject: [PATCH] introduce protocol.VersionWhatever for when the version doesn't matter ref #83 --- protocol/version.go | 1 + stream_framer.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/protocol/version.go b/protocol/version.go index bf646c2c..5607c290 100644 --- a/protocol/version.go +++ b/protocol/version.go @@ -16,6 +16,7 @@ const ( Version32 Version33 Version34 + VersionWhatever = 0 // for when the version doesn't matter ) // SupportedVersions lists the versions that the server supports diff --git a/stream_framer.go b/stream_framer.go index cf68a52d..c1ba63a3 100644 --- a/stream_framer.go +++ b/stream_framer.go @@ -96,7 +96,7 @@ func (f *streamFramer) maybePopFrameForRetransmission(maxLen protocol.ByteCount) frame := f.retransmissionQueue[0] frame.DataLenPresent = true - frameHeaderLen, _ := frame.MinLength(0) // can never error + frameHeaderLen, _ := frame.MinLength(protocol.VersionWhatever) // can never error if maxLen < frameHeaderLen { return nil } @@ -122,7 +122,7 @@ func (f *streamFramer) maybePopNormalFrame(maxLen protocol.ByteCount) *frames.St frame.StreamID = s.streamID // not perfect, but thread-safe since writeOffset is only written when getting data frame.Offset = s.writeOffset - frameHeaderLen, _ := frame.MinLength(0) // can never error + frameHeaderLen, _ := frame.MinLength(protocol.VersionWhatever) // can never error if maxLen < frameHeaderLen { continue }