hedgewars: comparison rust/hedgewars-server/src/server/network.rs

equal deleted inserted replaced

-:455865ccd36c
+:6e6632068a33
 let client = NetworkClient::new(id, client_socket, addr);
 info!("client {} ({}) added", client.id, client.peer_addr);
 entry.insert(client);
 }
-fn flush_server_messages(&mut self) {
+fn flush_server_messages(&mut self, mut response: handlers::Response) {
-debug!("{} pending server messages", self.server.output.len());
+debug!("{} pending server messages", response.len());
-for (clients, message) in self.server.output.drain(..) {
+let output = response.extract_messages(&mut self.server);
+for (clients, message) in output {
 debug!("Message {:?} to {:?}", message, clients);
 let msg_string = message.to_raw_protocol();
 for client_id in clients {
 if let Some(client) = self.clients.get_mut(client_id) {
 client.send_string(&msg_string);
 poll,
 client_id,
 self.create_client_socket(client_socket)?,
 addr,
 );
-self.flush_server_messages();
+//TODO: create response for initial messages
 Ok(())
 }
 fn operation_failed(
 &e,
 "Error while reading from client socket",
 )?,
 }
-self.flush_server_messages();
+if !response.is_empty() {
+self.flush_server_messages(response);
+}
 if !self.server.removed_clients.is_empty() {
 let ids: Vec<_> = self.server.removed_clients.drain(..).collect();
 for client_id in ids {
 self.deregister_client(poll, client_id);