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

fixed udp bug

main
Kyle Johnsen 2022-01-20 00:56:15 -05:00
parent e35ec560d4
commit 1629adcc12
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.rs
View File

@ -549,26 +549,34 @@ fn udp_listen(client_mutex: Arc<RwLock<HashMap<u32, Arc<Client>>>>, _room_mutex:
//read the group name //read the group name
let group_name_size = buf[5]; let group_name_size = buf[5];
let message_vec = buf[6..].to_vec(); let message_vec = buf[6..packet_size].to_vec();
let (group_name_bytes, message_bytes) = message_vec.split_at(group_name_size as usize); let (group_name_bytes, message_bytes) = message_vec.split_at(group_name_size as usize);
let group_name = String::from_utf8(group_name_bytes.to_vec()).unwrap(); let group_name = String::from_utf8(group_name_bytes.to_vec()).unwrap();
let clients = client_mutex.read().unwrap(); let clients = client_mutex.read().unwrap();
let client = clients.get(&client_id).unwrap(); let client = clients.get(&client_id).unwrap();
let groups = client.groups.read().unwrap(); let groups = client.groups.read().unwrap();
let clients = groups.get(&group_name).unwrap(); if groups.contains_key(&group_name) {
//we need to form a new message without the group name
let mut message_to_send = vec![];
message_to_send.push(3u8);
message_to_send.extend([buf[1],buf[2],buf[3],buf[4]]);
message_to_send.extend(message_bytes);
for v in clients.iter() {
let ip = v.ip.read().unwrap(); let clients = groups.get(&group_name).unwrap();
let port = v.port.read().unwrap();
match s.send_to(&message_bytes,SocketAddr::new(*ip, *port)) {
Ok(_)=> (),
Err(_) => {println!("Error sending to person in room. They probably left");} //we need to form a new message without the group name
let mut message_to_send = vec![];
message_to_send.push(3u8);
message_to_send.extend([buf[1],buf[2],buf[3],buf[4]]);
message_to_send.extend(message_bytes);
for v in clients.iter() {
let ip = v.ip.read().unwrap();
let port = v.port.read().unwrap();
match s.send_to(&message_to_send,SocketAddr::new(*ip, *port)) {
Ok(_)=> (),
Err(_) => {println!("Error sending to person in room. They probably left");}
}
} }
} }
} }