rust/hedgewars-server/src/server/network.rs
changeset 14870 ce98c37826a7
parent 14847 eef1f76150fe
child 14907 c156273b57de
equal deleted inserted replaced
14869:9078d787d491 14870:ce98c37826a7
   490         handlers::handle_client_accept(&mut self.server, client_id, &mut response);
   490         handlers::handle_client_accept(&mut self.server, client_id, &mut response);
   491         self.handle_response(response, poll);
   491         self.handle_response(response, poll);
   492     }
   492     }
   493 
   493 
   494     pub fn accept_client(&mut self, poll: &Poll, server_token: mio::Token) -> io::Result<()> {
   494     pub fn accept_client(&mut self, poll: &Poll, server_token: mio::Token) -> io::Result<()> {
   495         let (client_socket, addr) = self.listener.accept()?;
   495 
   496         info!("Connected: {}", addr);
       
   497 
   496 
   498         match server_token {
   497         match server_token {
   499             utils::SERVER_TOKEN => {
   498             utils::SERVER_TOKEN => {
       
   499                 let (client_socket, addr) = self.listener.accept()?;
       
   500                 info!("Connected(plaintext): {}", addr);
   500                 let client_id =
   501                 let client_id =
   501                     self.register_client(poll, self.create_client_socket(client_socket)?, addr);
   502                     self.register_client(poll, self.create_client_socket(client_socket)?, addr);
   502                 self.init_client(poll, client_id);
   503                 self.init_client(poll, client_id);
   503             }
   504             }
   504             #[cfg(feature = "tls-connections")]
   505             #[cfg(feature = "tls-connections")]
   505             utils::SECURE_SERVER_TOKEN => {
   506             utils::SECURE_SERVER_TOKEN => {
       
   507                 let (client_socket, addr) = self.ssl.listener.accept()?;
       
   508                 info!("Connected(TLS): {}", addr);
   506                 self.register_client(poll, self.create_client_secure_socket(client_socket)?, addr);
   509                 self.register_client(poll, self.create_client_secure_socket(client_socket)?, addr);
   507             }
   510             }
   508             _ => unreachable!(),
   511             _ => unreachable!(),
   509         }
   512         }
   510 
   513