mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 04:07:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

remove unused initialVersion variable in session

Browse source
This commit is contained in:
Marten Seemann 2020-12-18 12:00:17 +07:00
parent 9693a46d31
commit ad7d90779a
4 changed files with 3 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client.go
View file

@ -281,7 +281,6 @@ func (c *client) dial(ctx context.Context) error {
c.config,
c.tlsConf,
c.initialPacketNumber,
c.version,
c.use0RTT,
c.hasNegotiatedVersion,
c.tracer,

14
client_test.go
View file

@ -39,7 +39,6 @@ var _ = Describe("Client", func() {
conf *Config,
tlsConf *tls.Config,
initialPacketNumber protocol.PacketNumber,
initialVersion protocol.VersionNumber,
enable0RTT bool,
hasNegotiatedVersion bool,
tracer logging.ConnectionTracer,
@ -127,7 +126,6 @@ var _ = Describe("Client", func() {
_ *Config,
_ *tls.Config,
_ protocol.PacketNumber,
_ protocol.VersionNumber,
_ bool,
_ bool,
_ logging.ConnectionTracer,
@ -160,7 +158,6 @@ var _ = Describe("Client", func() {
_ *Config,
tlsConf *tls.Config,
_ protocol.PacketNumber,
_ protocol.VersionNumber,
_ bool,
_ bool,
_ logging.ConnectionTracer,
@ -193,7 +190,6 @@ var _ = Describe("Client", func() {
_ *Config,
tlsConf *tls.Config,
_ protocol.PacketNumber,
_ protocol.VersionNumber,
_ bool,
_ bool,
_ logging.ConnectionTracer,
@ -232,7 +228,6 @@ var _ = Describe("Client", func() {
_ *Config,
_ *tls.Config,
_ protocol.PacketNumber,
_ protocol.VersionNumber,
enable0RTT bool,
_ bool,
_ logging.ConnectionTracer,
@ -275,7 +270,6 @@ var _ = Describe("Client", func() {
_ *Config,
_ *tls.Config,
_ protocol.PacketNumber,
_ protocol.VersionNumber,
enable0RTT bool,
_ bool,
_ logging.ConnectionTracer,
@ -323,7 +317,6 @@ var _ = Describe("Client", func() {
_ *Config,
_ *tls.Config,
_ protocol.PacketNumber,
_ protocol.VersionNumber,
_ bool,
_ bool,
_ logging.ConnectionTracer,
@ -366,7 +359,6 @@ var _ = Describe("Client", func() {
_ *Config,
_ *tls.Config,
_ protocol.PacketNumber,
_ protocol.VersionNumber,
_ bool,
_ bool,
_ logging.ConnectionTracer,
@ -418,7 +410,6 @@ var _ = Describe("Client", func() {
_ *Config,
_ *tls.Config,
_ protocol.PacketNumber,
_ protocol.VersionNumber,
_ bool,
_ bool,
_ logging.ConnectionTracer,
@ -538,7 +529,6 @@ var _ = Describe("Client", func() {
configP *Config,
_ *tls.Config,
_ protocol.PacketNumber,
_ protocol.VersionNumber, /* initial version */
_ bool,
_ bool,
_ logging.ConnectionTracer,
@ -580,7 +570,6 @@ var _ = Describe("Client", func() {
configP *Config,
_ *tls.Config,
pn protocol.PacketNumber,
version protocol.VersionNumber,
_ bool,
hasNegotiatedVersion bool,
_ logging.ConnectionTracer,
@ -591,7 +580,6 @@ var _ = Describe("Client", func() {
sess.EXPECT().HandshakeComplete().Return(context.Background())
if counter == 0 {
Expect(pn).To(BeZero())
Expect(version).To(Equal(initialVersion))
Expect(hasNegotiatedVersion).To(BeFalse())
sess.EXPECT().run().Return(&errCloseForRecreating{
nextPacketNumber: 109,
@ -599,8 +587,6 @@ var _ = Describe("Client", func() {
})
} else {
Expect(pn).To(Equal(protocol.PacketNumber(109)))
Expect(version).ToNot(Equal(initialVersion))
Expect(version).To(Equal(protocol.VersionNumber(789)))
Expect(hasNegotiatedVersion).To(BeTrue())
sess.EXPECT().run()
}

9
session.go
View file

@ -132,10 +132,9 @@ type session struct {
srcConnIDLen int
perspective protocol.Perspective
initialVersion protocol.VersionNumber // if version negotiation is performed, this is the version we initially tried
version protocol.VersionNumber
config *Config
perspective protocol.Perspective
version protocol.VersionNumber
config *Config
conn sendConn
sendQueue *sendQueue
@ -356,7 +355,6 @@ var newClientSession = func(
conf *Config,
tlsConf *tls.Config,
initialPacketNumber protocol.PacketNumber,
initialVersion protocol.VersionNumber,
enable0RTT bool,
hasNegotiatedVersion bool,
tracer logging.ConnectionTracer,
@ -374,7 +372,6 @@ var newClientSession = func(
logID: destConnID.String(),
logger: logger,
tracer: tracer,
initialVersion: initialVersion,
versionNegotiated: hasNegotiatedVersion,
version: v,
}

1
session_test.go
View file

@ -2225,7 +2225,6 @@ var _ = Describe("Client Session", func() {
quicConf,
tlsConf,
42, // initial packet number
protocol.VersionTLS,
false,
false,
tracer,