WIP: Session id switch and recycling.

Author: SurfingNerd

crates/net/network-devp2p/src/connection.rs

@@ -236,6 +236,11 @@ impl Connection {
         })
     }
 
+    pub fn switch_session_token(&mut self, token: StreamToken) {
+        trace!(target: "network", "Switching connection token from {:?} to {:?}", self.token, token);
+        self.token = token;
+    }
+
     /// Register this connection with the IO event loop.
     pub fn register_socket<Host: Handler>(
         &self,

crates/net/network-devp2p/src/host.rs

@@ -902,7 +902,7 @@ impl Host {
                             }
 
                             let mut s = session.lock();
-                            self.sessions.register_finalized_handshake(token, s.id());
+                            self.sessions.register_finalized_handshake(&mut s);
                             let (min_peers, mut max_peers, reserved_only, self_id) = {
                                 let info = self.info.read();
                                 let mut max_peers = info.config.max_peers;

crates/net/network-devp2p/src/session.rs

@@ -139,6 +139,18 @@ impl Session {
         })
     }
 
+    pub fn switch_session_token(&mut self, token_id: StreamToken) {
+
+        match &mut self.state {
+            State::Handshake(h) => {
+                error!(target: "network", "Setting token on handshake state is not allowed");
+            },
+            State::Session(s) => {
+                s.connection.switch_session_token(token_id);
+            },
+        }
+    }
+
     fn complete_handshake<Message>(
         &mut self,
         io: &IoContext<Message>,