vel
/
VelNet-Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small bug fix and attempt to fix random server locking by taking a lock only after reads from the client have completed

main
Kyle Johnsen 2022-02-07 08:15:12 -05:00
parent e1b13614e3
commit a263c0d028
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@ -126,13 +126,14 @@ fn read_rooms_message(_stream: &mut TcpStream, client: &Arc<Client>){
let rooms = client.rooms_mutex.read().unwrap(); let rooms = client.rooms_mutex.read().unwrap();
let mut rooms_vec = vec![]; let mut rooms_vec = vec![];
for (k,v) in rooms.iter() { for (k,v) in rooms.iter() {
let room_name = &client.application.read().unwrap().to_string(); let app_name = client.application.read().unwrap();
if !k.starts_with(room_name) {
if !k.starts_with(&app_name.to_string()) {
continue; continue;
} }
let clients = v.clients.read().unwrap(); let clients = v.clients.read().unwrap();
let mut iter = k.chars(); let mut iter = k.chars();
let app_name = client.application.read().unwrap();
iter.by_ref().nth(app_name.len()); iter.by_ref().nth(app_name.len());
let application_stripped_room = iter.as_str(); let application_stripped_room = iter.as_str();
@ -335,7 +336,7 @@ fn read_join_message(stream: &mut TcpStream, client: &Arc<Client>){
//byte,shortstring //byte,shortstring
let short_room_name = read_short_string(stream); let short_room_name = read_short_string(stream);
let application = client.application.read().unwrap().to_string(); let application = client.application.read().unwrap().to_string();
let mut extended_room_name = format!("{}_{}", application, short_room_name); let extended_room_name = format!("{}_{}", application, short_room_name);
println!("Got room message {}",short_room_name); println!("Got room message {}",short_room_name);
@ -508,10 +509,13 @@ fn read_send_message(stream: &mut TcpStream, client: &Arc<Client>, message_type:
} }
fn read_group_message(stream: &mut TcpStream, client: &Arc<Client>){ fn read_group_message(stream: &mut TcpStream, client: &Arc<Client>){
let mut groups = client.groups.write().unwrap();
let group = read_short_string(stream); let group = read_short_string(stream);
println!("Got group message {}",&group);
let id_bytes = read_vec(stream); let id_bytes = read_vec(stream);
let num = id_bytes.len(); let num = id_bytes.len();
let mut groups = client.groups.write().unwrap();
let clients = client.clients_mutex.read().unwrap(); let clients = client.clients_mutex.read().unwrap();
let mut group_clients = vec![]; let mut group_clients = vec![];
let mut i = 0; let mut i = 0;