decouple token accept from token validation

quic-go · Feb 22, 2022 · f82e447 · f82e447
1 parent b52e3cc
commit f82e447
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/server.go b/server.go
@@ -239,7 +239,9 @@ func (s *baseServer) run() {
 	}
 }
 
-var defaultAcceptToken = func(clientAddr net.Addr, token *Token) bool {
+var defaultAcceptToken = isClientAddressValidationTokenValid
+
+var isClientAddressValidationTokenValid = func(clientAddr net.Addr, token *Token) bool {
 	if token == nil {
 		return false
 	}
@@ -421,10 +423,7 @@ func (s *baseServer) handleInitialImpl(p *receivedPacket, hdr *wire.Header) erro
 			}
 		}
 	}
-
-	clientAddressValidated := s.config.AcceptToken(p.remoteAddr, token)
-
-	if !clientAddressValidated {
+	if !s.config.AcceptToken(p.remoteAddr, token) {
 		go func() {
 			defer p.buffer.Release()
 			if token != nil && token.IsRetryToken {
@@ -485,7 +484,7 @@ func (s *baseServer) handleInitialImpl(p *receivedPacket, hdr *wire.Header) erro
 			s.tlsConf,
 			s.tokenGenerator,
 			s.acceptEarlySessions,
-			clientAddressValidated,
+			isClientAddressValidationTokenValid(p.remoteAddr, token),
 			tracer,
 			tracingID,
 			s.logger,