Correctly use active_connection_id

QUIC-Tracker · May 5, 2020 · e493443 · e493443
1 parent 9a51e69
commit e493443
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/scenarii/connection_migration.go b/scenarii/connection_migration.go
@@ -23,7 +23,6 @@ func NewConnectionMigrationScenario() *ConnectionMigrationScenario {
 	return &ConnectionMigrationScenario{AbstractScenario{name: "connection_migration", version: 1}}
 }
 func (s *ConnectionMigrationScenario) Run(conn *qt.Connection, trace *qt.Trace, preferredPath string, debug bool) {
-	conn.TLSTPHandler.ActiveConnectionIdLimit = 1
 	connAgents := s.CompleteHandshake(conn, trace, CM_TLSHandshakeFailed)
 	if connAgents == nil {
 		return

diff --git a/scenarii/connection_migration_v4_v6.go b/scenarii/connection_migration_v4_v6.go
@@ -41,7 +41,7 @@ func (s *ConnectionMigrationv4v6Scenario) Run(conn *qt.Connection, trace *qt.Tra
 		return
 	}
 
-	if conn.TLSTPHandler.ReceivedParameters.ActiveConnectionIdLimit == 0 {
+	if conn.TLSTPHandler.ReceivedParameters.ActiveConnectionIdLimit < 0 {
 		trace.ErrorCode = CM46_NoCIDAllowed
 		return
 	}

diff --git a/scenarii/new_connection_id.go b/scenarii/new_connection_id.go
@@ -34,7 +34,7 @@ func (s *NewConnectionIDScenario) Run(conn *qt.Connection, trace *qt.Trace, pref
 	}
 	defer connAgents.CloseConnection(false, 0, "")
 
-	if conn.TLSTPHandler.ReceivedParameters.ActiveConnectionIdLimit == 0 {
+	if conn.TLSTPHandler.ReceivedParameters.ActiveConnectionIdLimit < 2 {
 		trace.ErrorCode = NCI_NoCIDAllowed
 		return
 	}

diff --git a/transport_parameters.go b/transport_parameters.go
@@ -119,7 +119,9 @@ func (h *TLSTransportParameterHandler) GetExtensionData() ([]byte, error) {
 	addParameter(InitialMaxStreamsBidi, h.QuicTransportParameters.MaxBidiStreams)
 	addParameter(InitialMaxStreamsUni, h.QuicTransportParameters.MaxUniStreams)
 	addParameter(IdleTimeout, h.QuicTransportParameters.IdleTimeout)
-	addParameter(ActiveConnectionIdLimit, h.QuicTransportParameters.ActiveConnectionIdLimit)
+	if h.QuicTransportParameters.ActiveConnectionIdLimit > 1 {
+		addParameter(ActiveConnectionIdLimit, h.QuicTransportParameters.ActiveConnectionIdLimit)
+	}
 	if h.QuicTransportParameters.MaxPacketSize > 0 {
 		addParameter(MaxPacketSize, h.QuicTransportParameters.MaxPacketSize)
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
-    	if conn.TLSTPHandler.ReceivedParameters.ActiveConnectionIdLimit == 0 {
+    	if conn.TLSTPHandler.ReceivedParameters.ActiveConnectionIdLimit < 0 {
     		trace.ErrorCode = CM46_NoCIDAllowed
     		return
     	}
@@ Expand Down @@