kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

wayland: remove Object::num_requests

Browse source
This commit is contained in:
Julian Orth 2024-02-06 12:05:03 +01:00
parent 19bd17c7dc
commit 0ac1bb8507
76 changed files with 168 additions and 486 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/client/tasks.rs
View file

@ -55,10 +55,6 @@ async fn receive(data: Rc<Client>) {
}
};
// log::trace!("obj: {}, request: {}, len: {}", obj_id, request, len);
if request >= obj.num_requests() {
data.invalid_request(&*obj, request);
return Err(ClientError::InvalidMethod);
}
if len < 8 {
return Err(ClientError::MessageSizeTooSmall);
}
@ -76,6 +72,12 @@ async fn receive(data: Rc<Client>) {
// log::trace!("{:x?}", data_buf);
let parser = MsgParser::new(&mut buf, &data_buf[..]);
if let Err(e) = obj.handle_request(request, parser) {
if let ClientError::InvalidMethod = e {
if let Ok(obj) = data.objects.get_obj(obj_id) {
data.invalid_request(&*obj, request);
return Err(e);
}
}
return Err(ClientError::RequestError(Box::new(e)));
}
// data.flush();