BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-11 02:06:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

man the download protocol sucks

Browse Source
This commit is contained in:
Luuk van Oijen
2023-11-15 21:25:57 +01:00
parent 8735824495
commit 596a7234ed
2 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/server/client.rs
View File

@@ -24,10 +24,6 @@ use super::packet::*;
static ATOMIC_ID_COUNTER: AtomicU8 = AtomicU8::new(0);
lazy_static! {
static ref CLIENT_MOD_PROGRESS: Mutex<HashMap<usize, usize>> = Mutex::new(HashMap::new());
}
#[derive(PartialEq)]
pub enum ClientState {
None,
@@ -179,11 +175,6 @@ impl Client {
// }
// }
// We now delete existing data for this client ID, just in case.
// TODO: This seems like a recipe for disaster
let mut lock = CLIENT_MOD_PROGRESS.lock().await;
lock.remove(&(self.id as usize));
// TODO: Check client version
trace!("Client version packet");
self.socket.readable().await?;
@@ -251,23 +242,23 @@ impl Client {
match packet.data[0] as char {
'S' if packet.data.len() > 1 => match packet.data[1] as char {
'R' => {
// let file_packet = if config.mods.len() == 0 {
// RawPacket::from_code('-')
// } else {
// let mut file_data = String::new();
// for (name, size) in &config.mods {
// let mut mod_name = name.clone();
// if mod_name.starts_with("/") == false {
// mod_name = format!("/{mod_name}");
// }
// file_data.push_str(&format!("{mod_name};"));
// }
// for (name, size) in &config.mods {
// file_data.push_str(&format!("{size};"));
// }
// RawPacket::from_str(&file_data)
// };
let file_packet = RawPacket::from_code('-');
let file_packet = if config.mods.len() == 0 {
RawPacket::from_code('-')
} else {
let mut file_data = String::new();
for (name, size) in &config.mods {
let mut mod_name = name.clone();
if mod_name.starts_with("/") == false {
mod_name = format!("/{mod_name}");
}
file_data.push_str(&format!("{mod_name};"));
}
for (name, size) in &config.mods {
file_data.push_str(&format!("{size};"));
}
RawPacket::from_str(&file_data)
};
// let file_packet = RawPacket::from_code('-');
self.write_packet(Packet::Raw(file_packet))
.await?;
}