From 16848038be73ff4779821799c5d2ce7d53b80b75 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 1 Nov 2018 16:21:50 +0700 Subject: [PATCH] remove unnecessary initial packet number parameter --- client.go | 1 - client_test.go | 12 ------------ packet_packer.go | 3 +-- packet_packer_test.go | 1 - server.go | 3 +-- server_test.go | 2 -- session.go | 4 ---- session_test.go | 2 -- 8 files changed, 2 insertions(+), 26 deletions(-) diff --git a/client.go b/client.go index eaac3eea..6c389b9a 100644 --- a/client.go +++ b/client.go @@ -423,7 +423,6 @@ func (c *client) createNewTLSSession(version protocol.VersionNumber) error { c.tlsConf, params, c.initialVersion, - 1, c.logger, c.version, ) diff --git a/client_test.go b/client_test.go index 51c9a9a4..7482ae14 100644 --- a/client_test.go +++ b/client_test.go @@ -40,7 +40,6 @@ var _ = Describe("Client", func() { tlsConf *tls.Config, params *handshake.TransportParameters, initialVersion protocol.VersionNumber, - initialPacketNumber protocol.PacketNumber, logger utils.Logger, v protocol.VersionNumber, ) (quicSession, error) @@ -143,7 +142,6 @@ var _ = Describe("Client", func() { _ *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { @@ -173,7 +171,6 @@ var _ = Describe("Client", func() { tlsConf *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { @@ -203,7 +200,6 @@ var _ = Describe("Client", func() { _ *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { @@ -240,7 +236,6 @@ var _ = Describe("Client", func() { _ *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { @@ -280,7 +275,6 @@ var _ = Describe("Client", func() { _ *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { @@ -325,7 +319,6 @@ var _ = Describe("Client", func() { _ *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { @@ -366,7 +359,6 @@ var _ = Describe("Client", func() { _ *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { @@ -481,7 +473,6 @@ var _ = Describe("Client", func() { _ *tls.Config, params *handshake.TransportParameters, _ protocol.VersionNumber, /* initial version */ - _ protocol.PacketNumber, _ utils.Logger, versionP protocol.VersionNumber, ) (quicSession, error) { @@ -543,7 +534,6 @@ var _ = Describe("Client", func() { _ *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { @@ -603,7 +593,6 @@ var _ = Describe("Client", func() { _ *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { @@ -642,7 +631,6 @@ var _ = Describe("Client", func() { _ *tls.Config, _ *handshake.TransportParameters, _ protocol.VersionNumber, - _ protocol.PacketNumber, _ utils.Logger, _ protocol.VersionNumber, ) (quicSession, error) { diff --git a/packet_packer.go b/packet_packer.go index ac7f39ce..cadcac54 100644 --- a/packet_packer.go +++ b/packet_packer.go @@ -103,7 +103,6 @@ func newPacketPacker( srcConnID protocol.ConnectionID, initialStream cryptoStream, handshakeStream cryptoStream, - initialPacketNumber protocol.PacketNumber, getPacketNumberLen func(protocol.PacketNumber) protocol.PacketNumberLen, remoteAddr net.Addr, // only used for determining the max packet size token []byte, @@ -125,7 +124,7 @@ func newPacketPacker( framer: framer, acks: acks, getPacketNumberLen: getPacketNumberLen, - packetNumberGenerator: newPacketNumberGenerator(initialPacketNumber, protocol.SkipPacketAveragePeriodLength), + packetNumberGenerator: newPacketNumberGenerator(1, protocol.SkipPacketAveragePeriodLength), maxPacketSize: getMaxPacketSize(remoteAddr), } } diff --git a/packet_packer_test.go b/packet_packer_test.go index a5e50eb4..29a293f1 100644 --- a/packet_packer_test.go +++ b/packet_packer_test.go @@ -76,7 +76,6 @@ var _ = Describe("Packet packer", func() { protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}, initialStream, handshakeStream, - 1, func(protocol.PacketNumber) protocol.PacketNumberLen { return protocol.PacketNumberLen2 }, &net.TCPAddr{}, token, // token diff --git a/server.go b/server.go index e4ca1145..7a4eaefd 100644 --- a/server.go +++ b/server.go @@ -78,7 +78,7 @@ type server struct { sessionHandler packetHandlerManager // set as a member, so they can be set in the tests - newSession func(connection, sessionRunner, protocol.ConnectionID /* original connection ID */, protocol.ConnectionID /* destination connection ID */, protocol.ConnectionID /* source connection ID */, protocol.PacketNumber, *Config, *tls.Config, *handshake.TransportParameters, utils.Logger, protocol.VersionNumber) (quicSession, error) + newSession func(connection, sessionRunner, protocol.ConnectionID /* original connection ID */, protocol.ConnectionID /* destination connection ID */, protocol.ConnectionID /* source connection ID */, *Config, *tls.Config, *handshake.TransportParameters, utils.Logger, protocol.VersionNumber) (quicSession, error) serverError error errorChan chan struct{} @@ -392,7 +392,6 @@ func (s *server) createNewSession( origConnID, destConnID, srcConnID, - 1, s.config, s.tlsConf, params, diff --git a/server_test.go b/server_test.go index 16c7eb05..7d57be38 100644 --- a/server_test.go +++ b/server_test.go @@ -262,7 +262,6 @@ var _ = Describe("Server", func() { origConnID protocol.ConnectionID, destConnID protocol.ConnectionID, srcConnID protocol.ConnectionID, - _ protocol.PacketNumber, _ *Config, _ *tls.Config, _ *handshake.TransportParameters, @@ -346,7 +345,6 @@ var _ = Describe("Server", func() { _ protocol.ConnectionID, _ protocol.ConnectionID, _ protocol.ConnectionID, - _ protocol.PacketNumber, _ *Config, _ *tls.Config, _ *handshake.TransportParameters, diff --git a/session.go b/session.go index 12e164fc..ebd4d3a8 100644 --- a/session.go +++ b/session.go @@ -138,7 +138,6 @@ var newSession = func( origConnID protocol.ConnectionID, destConnID protocol.ConnectionID, srcConnID protocol.ConnectionID, - initialPacketNumber protocol.PacketNumber, conf *Config, tlsConf *tls.Config, params *handshake.TransportParameters, @@ -184,7 +183,6 @@ var newSession = func( s.srcConnID, initialStream, handshakeStream, - initialPacketNumber, s.sentPacketHandler.GetPacketNumberLen, s.RemoteAddr(), nil, // no token @@ -214,7 +212,6 @@ var newClientSession = func( tlsConf *tls.Config, params *handshake.TransportParameters, initialVersion protocol.VersionNumber, - initialPacketNumber protocol.PacketNumber, logger utils.Logger, v protocol.VersionNumber, ) (quicSession, error) { @@ -259,7 +256,6 @@ var newClientSession = func( s.srcConnID, initialStream, handshakeStream, - initialPacketNumber, s.sentPacketHandler.GetPacketNumberLen, s.RemoteAddr(), token, diff --git a/session_test.go b/session_test.go index 5cd10553..3494e070 100644 --- a/session_test.go +++ b/session_test.go @@ -84,7 +84,6 @@ var _ = Describe("Session", func() { protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, protocol.ConnectionID{8, 7, 6, 5, 4, 3, 2, 1}, protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}, - 1, populateServerConfig(&Config{}), nil, // tls.Config nil, // handshake.TransportParameters, @@ -1297,7 +1296,6 @@ var _ = Describe("Client Session", func() { nil, // tls.Config nil, // transport parameters protocol.VersionWhatever, - 1, utils.DefaultLogger, protocol.VersionWhatever, )