Per-connection ServerConfigs

quinn-proto/src/endpoint.rs

@@ -507,6 +507,7 @@ impl Endpoint {
         mut incoming: Incoming,
         now: Instant,
         buf: &mut BytesMut,
+        server_config: Option<Arc<ServerConfig>>,
     ) -> Result<(ConnectionHandle, Connection), AcceptError> {
         let packet_number = incoming.packet.header.number.expand(0);
         let InitialHeader {
@@ -531,7 +532,8 @@ impl Endpoint {
             });
         }
 
-        let server_config = self.server_config.as_ref().unwrap().clone();
+        let server_config =
+            server_config.unwrap_or_else(|| self.server_config.as_ref().unwrap().clone());
 
         if incoming
             .crypto

quinn-proto/src/tests/util.rs

@@ -456,7 +456,7 @@ impl TestEndpoint {
         now: Instant,
     ) -> Result<ConnectionHandle, ConnectionError> {
         let mut buf = BytesMut::new();
-        match self.endpoint.accept(incoming, now, &mut buf) {
+        match self.endpoint.accept(incoming, now, &mut buf, None) {
             Ok((ch, conn)) => {
                 self.connections.insert(ch, conn);
                 self.accepted = Some(Ok(ch));

quinn/src/endpoint.rs

@@ -359,13 +359,19 @@ pub(crate) struct EndpointInner {
 }
 
 impl EndpointInner {
-    pub(crate) fn accept(&self, incoming: proto::Incoming) -> Result<Connecting, ConnectionError> {
+    pub(crate) fn accept(
+        &self,
+        incoming: proto::Incoming,
+        server_config: Option<Arc<ServerConfig>>,
+    ) -> Result<Connecting, ConnectionError> {
         let mut state = self.state.lock().unwrap();
         let mut response_buffer = BytesMut::new();
-        match state
-            .inner
-            .accept(incoming, Instant::now(), &mut response_buffer)
-        {
+        match state.inner.accept(
+            incoming,
+            Instant::now(),
+            &mut response_buffer,
+            server_config,
+        ) {
             Ok((handle, conn)) => {
                 let socket = state.socket.clone();
                 let runtime = state.runtime.clone();

quinn/src/incoming.rs

@@ -2,10 +2,11 @@ use std::{
     future::{Future, IntoFuture},
     net::{IpAddr, SocketAddr},
     pin::Pin,
+    sync::Arc,
     task::{Context, Poll},
 };
 
-use proto::ConnectionError;
+use proto::{ConnectionError, ServerConfig};
 use thiserror::Error;
 
 use crate::{
@@ -25,7 +26,20 @@ impl Incoming {
     /// Attempt to accept this incoming connection (an error may still occur)
     pub fn accept(mut self) -> Result<Connecting, ConnectionError> {
         let state = self.0.take().unwrap();
-        state.endpoint.accept(state.inner)
+        state.endpoint.accept(state.inner, None)
+    }
+
+    /// Accept this incoming connection using a custom configuration.
+    ///
+    /// See [`accept()`] for more details.
+    ///
+    /// [`accept()`]: Incoming::accept
+    pub fn accept_with(
+        mut self,
+        server_config: Arc<ServerConfig>,
+    ) -> Result<Connecting, ConnectionError> {
+        let state = self.0.take().unwrap();
+        state.endpoint.accept(state.inner, Some(server_config))
     }
 
     /// Reject this incoming connection attempt