3344/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-04-19 17:26:36 +08:00
parent f7e2938e6b
commit 5c42b4a1e8
7 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugin/plugins.rs
View File

@@ -1,6 +1,6 @@
use std::{
collections::HashMap,
ffi::c_char,
ffi::{c_char, c_void},
path::Path,
sync::{Arc, RwLock},
};
@@ -176,13 +176,13 @@ pub fn load_plugin(path: &str) -> ResultType<()> {
fn handle_event(method: &[u8], id: &str, event: &[u8]) -> ResultType<()> {
match PLUGINS.read().unwrap().get(id) {
Some(plugin) => {
let ret = (plugin.fn_call)(method.as_ptr() as _, event.as_ptr(), event.len());
let ret = (plugin.fn_call)(method.as_ptr() as _, event.as_ptr() as _, event.len());
if ret.is_null() {
Ok(())
} else {
let (code, msg) = get_code_msg_from_ret(ret);
unsafe {
libc::free(ret);
libc::free(ret as _);
}
bail!(
"Failed to handle plugin event, id: {}, method: {}, code: {}, msg: {}",
@@ -213,7 +213,7 @@ pub fn handle_client_event(id: &str, event: &[u8]) -> Option<Message> {
Some(plugin) => {
let ret = (plugin.fn_call)(
METHOD_HANDLE_PEER.as_ptr() as _,
event.as_ptr(),
event.as_ptr() as _,
event.len(),
);
if ret.is_null() {
@@ -221,13 +221,10 @@ pub fn handle_client_event(id: &str, event: &[u8]) -> Option<Message> {
} else {
let (code, msg) = get_code_msg_from_ret(ret);
unsafe {
libc::free(ret);
libc::free(ret as _);
}
if code > ERR_RUSTDESK_HANDLE_BASE && code < ERR_PLUGIN_HANDLE_BASE {
let name = match PLUGINS.read().unwrap().get(id) {
Some(plugin) => plugin.desc.as_ref().unwrap().name(),
None => "",
};
let name = plugin.desc.as_ref().unwrap().name();
match code {
ERR_CALL_NOT_SUPPORTED_METHOD => Some(make_plugin_response(
id,