Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-04 05:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix and implement ffi tranlation

Browse Source
This commit is contained in:
dignifiedquire
2019-09-15 19:31:07 +02:00
committed by Floris Bruynooghe
parent 5486ac5b9f
commit 0bf3d20e07
8 changed files with 80 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
deltachat-ffi/src/lib.rs
View File

@@ -22,7 +22,6 @@ use std::sync::RwLock;
use libc::uintptr_t;
use num_traits::{FromPrimitive, ToPrimitive};
use deltachat::constants::Event;
use deltachat::contact::Contact;
use deltachat::context::Context;
use deltachat::dc_tools::{as_path, as_str, dc_strdup, to_string, OsStrExt, StrExt};
@@ -66,7 +65,7 @@ unsafe impl Sync for ContextWrapper {}
/// @param data2 depends on the event parameter
/// @return return 0 unless stated otherwise in the event parameter documentation
pub type dc_callback_t =
unsafe extern "C" fn(_: &dc_context_t, _: Event, _: uintptr_t, _: uintptr_t) -> uintptr_t;
unsafe extern "C" fn(_: &dc_context_t, _: i32, _: uintptr_t, _: uintptr_t) -> uintptr_t;
/// Struct representing the deltachat context.
///
@@ -81,12 +80,8 @@ impl ContextWrapper {
/// called and an actual [Context] exists.
///
/// This function makes it easy to log an error.
fn error(&self, msg: &str) {
if let Some(cb) = self.cb {
let msg_c =
CString::new(msg).unwrap_or(CString::new("[invalid error message]").unwrap());
unsafe { cb(self, Event::ERROR, 0, msg_c.as_ptr() as libc::uintptr_t) };
}
unsafe fn error(&self, msg: &str) {
self.translate_cb(Event::Error(msg.to_string()));
}
/// Unlock the context and execute a closure with it.
@@ -112,11 +107,72 @@ impl ContextWrapper {
match guard.as_ref() {
Some(ref ctx) => Ok(ctxfn(ctx)),
None => {
self.error("context not open");
unsafe { self.error("context not open") };
Err(())
}
}
}
/// Translates the callback from the rust style to the C-style version.
unsafe fn translate_cb(&self, event: Event) -> uintptr_t {
match self.cb {
Some(ffi_cb) => {
let event_id = event.as_id();
match event {
Event::Info(msg)
| Event::SmtpConnected(msg)
| Event::ImapConnected(msg)
| Event::SmtpMessageSent(msg)
| Event::Warning(msg)
| Event::Error(msg)
| Event::ErrorNetwork(msg)
| Event::ErrorSelfNotInGroup(msg) => {
let data2 = CString::new(msg).unwrap();
ffi_cb(self, event_id, 0, data2.as_ptr() as uintptr_t)
}
Event::MsgsChanged { chat_id, msg_id }
| Event::IncomingMsg { chat_id, msg_id }
| Event::MsgDelivered { chat_id, msg_id }
| Event::MsgFailed { chat_id, msg_id }
| Event::MsgRead { chat_id, msg_id } => {
ffi_cb(self, event_id, chat_id as uintptr_t, msg_id as uintptr_t)
}
Event::ChatModified(chat_id) => ffi_cb(self, event_id, chat_id as uintptr_t, 0),
Event::ContactsChanged(id) | Event::LocationChanged(id) => {
let id = id.unwrap_or_default();
ffi_cb(self, event_id, id as uintptr_t, 0)
}
Event::ConfigureProgress(progress) | Event::ImexProgress(progress) => {
ffi_cb(self, event_id, progress as uintptr_t, 0)
}
Event::ImexFileWritten(file) => {
let data1 = file.to_c_string().unwrap();
ffi_cb(self, event_id, data1.as_ptr() as uintptr_t, 0)
}
Event::SecurejoinInviterProgress {
contact_id,
progress,
}
| Event::SecurejoinJoinerProgress {
contact_id,
progress,
} => ffi_cb(
self,
event_id,
contact_id as uintptr_t,
progress as uintptr_t,
),
Event::GetString { id, count } => ffi_cb(
self,
event_id,
id.to_u32().unwrap_or_default() as uintptr_t,
count as uintptr_t,
),
}
}
None => 0,
}
}
}
#[no_mangle]
@@ -175,13 +231,8 @@ pub unsafe extern "C" fn dc_open(
return 0;
}
let ffi_context = &*context;
let rust_cb = move |_ctx: &Context, evt: Event| ffi_context.translate_cb(evt);
let rust_cb =
move |_ctx: &Context, evt: Event, d0: uintptr_t, d1: uintptr_t| match ffi_context.cb {
Some(ffi_cb) => ffi_cb(ffi_context, evt, d0, d1),
None => 0,
};
let ffi_context = &mut *context;
let ctx = if blobdir.is_null() {
Context::new(
Box::new(rust_cb),

7
examples/repl/main.rs
View File

@@ -65,11 +65,8 @@ fn receive_event(_context: &Context, event: Event) -> libc::uintptr_t {
Event::Error(msg) => {
println!("\x1b[31m[DC_EVENT_ERROR] {}\x1b[0m", msg);
}
Event::ErrorNetwork(c, msg) => {
println!(
"\x1b[31m[DC_EVENT_ERROR_NETWORK] first={}, msg={}\x1b[0m",
c, msg
);
Event::ErrorNetwork(msg) => {
println!("\x1b[31m[DC_EVENT_ERROR_NETWORK] msg={}\x1b[0m", msg);
}
Event::ErrorSelfNotInGroup(msg) => {
println!("\x1b[31m[DC_EVENT_ERROR_SELF_NOT_IN_GROUP] {}\x1b[0m", msg);

5
examples/simple.rs
View File

@@ -23,10 +23,7 @@ fn cb(_ctx: &Context, event: Event) -> usize {
print!(" progress: {}\n", progress);
0
}
Event::Info(msg)
| Event::Warning(msg)
| Event::Error(msg)
| Event::ErrorNetwork(_, msg) => {
Event::Info(msg) | Event::Warning(msg) | Event::Error(msg) | Event::ErrorNetwork(msg) => {
print!(" {}\n", msg);
0
}

6
src/dc_receive_imf.rs
View File

@@ -102,15 +102,15 @@ pub unsafe fn dc_receive_imf(
free(rfc724_mid.cast());
if let Some(create_event_to_send) = create_event_to_send {
for (msg_id, insert_id) in created_db_entries {
for (chat_id, msg_id) in created_db_entries {
let event = match create_event_to_send {
CreateEvent::MsgsChanged => Event::MsgsChanged {
msg_id: *msg_id as u32,
chat_id: *insert_id as u32,
chat_id: *chat_id as u32,
},
CreateEvent::IncomingMsg => Event::IncomingMsg {
msg_id: *msg_id as u32,
chat_id: *insert_id as u32,
chat_id: *chat_id as u32,
},
};
context.call_cb(event);

5
src/events.rs
View File

@@ -81,12 +81,9 @@ pub enum Event {
/// it is probably more useful to report this to the user
/// instead of the string from data2.
///
/// @param data1 (usize) 1=first/new network error, should be reported the user;
/// 0=subsequent network error, should be logged only
/// @param data2 (String) string
/// @return 0
#[strum(props(id = "401"))]
ErrorNetwork(usize, String),
ErrorNetwork(String),
/// An action cannot be performed because the user is not in the group.
/// Reported eg. after a call to

13
src/imap.rs
View File

@@ -440,13 +440,10 @@ impl Imap {
emit_event!(
context,
Event::ErrorNetwork(
0,
format!(
"Could not connect to IMAP-server {}:{}. ({})",
imap_server, imap_port, err
)
)
Event::ErrorNetwork(format!(
"Could not connect to IMAP-server {}:{}. ({})",
imap_server, imap_port, err
))
);
return false;
@@ -464,7 +461,7 @@ impl Imap {
Err((err, _)) => {
emit_event!(
context,
Event::ErrorNetwork(0, format!("Cannot login ({})", err))
Event::ErrorNetwork(format!("Cannot login ({})", err))
);
self.unsetup_handle(context);

2
src/param.rs
View File

@@ -94,7 +94,7 @@ impl fmt::Display for Params {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
for (i, (key, value)) in self.inner.iter().enumerate() {
if i > 0 {
write!(f, "\n")?;
writeln!(f)?;
}
write!(f, "{}={}", *key as u8 as char, value)?;
}

2
src/smtp.rs
View File

@@ -52,7 +52,7 @@ impl Smtp {
}
if lp.send_server.is_empty() || lp.send_port == 0 {
context.call_cb(Event::ErrorNetwork(0, "SMTP bad parameters.".into()));
context.call_cb(Event::ErrorNetwork("SMTP bad parameters.".into()));
}
self.from = if let Ok(addr) = EmailAddress::new(lp.addr.clone()) {