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

- add mailimf_field_add helper to reduce number of strdup()s

Browse Source 
- make build_body_text avoid char*
This commit is contained in:
holger krekel
2019-09-21 18:17:59 +02:00
parent a134ace787
commit d3dfe02ef1
1 changed files with 61 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
src/dc_mimefactory.rs
View File

@@ -435,26 +435,12 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
.map(|s| format!("/{}", s)) .map(|s| format!("/{}", s))
.unwrap_or_default(); .unwrap_or_default();
let version = get_version_str(); let version = get_version_str();
mailimf_fields_add( let headerval = format!("Delta Chat Core {}{}", version, os_part);
imf_fields, add_mailimf_field(imf_fields, "X-Mailer", &headerval);
mailimf_field_new_custom( add_mailimf_field(imf_fields, "Chat-Version", "1.0");
"X-Mailer".strdup(),
format!("Delta Chat Core {}{}", version, os_part).strdup(),
),
);
mailimf_fields_add(
imf_fields,
mailimf_field_new_custom("Chat-Version".strdup(), "1.0".strdup()),
);
if 0 != factory.req_mdn { if 0 != factory.req_mdn {
mailimf_fields_add( let headerval = to_string(factory.from_addr);
imf_fields, add_mailimf_field(imf_fields, "Chat-Disposition-Notification-To", &headerval);
mailimf_field_new_custom(
"Chat-Disposition-Notification-To".strdup(),
strdup(factory.from_addr),
),
);
} }
message = mailmime_new_message_data(0 as *mut mailmime); message = mailmime_new_message_data(0 as *mut mailmime);
mailmime_set_imf_fields(message, imf_fields); mailmime_set_imf_fields(message, imf_fields);
@@ -466,10 +452,7 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
let mut placeholdertext = None; let mut placeholdertext = None;
if chat.typ == Chattype::VerifiedGroup { if chat.typ == Chattype::VerifiedGroup {
mailimf_fields_add( add_mailimf_field(imf_fields, "Chat-Verified", "1");
imf_fields,
mailimf_field_new_custom("Chat-Verified".strdup(), "1".strdup()),
);
force_plaintext = 0; force_plaintext = 0;
e2ee_guaranteed = true; e2ee_guaranteed = true;
min_verified = 2 min_verified = 2
@@ -497,27 +480,28 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
/* build header etc. */ /* build header etc. */
let command = factory.msg.param.get_cmd(); let command = factory.msg.param.get_cmd();
if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup { if chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup {
mailimf_fields_add( add_mailimf_field(imf_fields, "Chat-Group-ID", &chat.grpid);
imf_fields,
mailimf_field_new_custom("Chat-Group-ID".strdup(), chat.grpid.strdup()), // we can't use add_mailimf_field() because
); // dc_encode_header_words returns char* and most of its call sites
mailimf_fields_add( // use it rather directly to pass something to the
// low-level mailimf_* API.
let res = mailimf_fields_add(
imf_fields, imf_fields,
mailimf_field_new_custom( mailimf_field_new_custom(
"Chat-Group-Name".strdup(), "Chat-Group-Name".strdup(),
dc_encode_header_words(&chat.name), dc_encode_header_words(&chat.name),
), ),
); );
assert!(res == MAILIMF_NO_ERROR as i32);
if command == SystemMessage::MemberRemovedFromGroup { if command == SystemMessage::MemberRemovedFromGroup {
let email_to_remove = factory.msg.param.get(Param::Arg).unwrap_or_default(); let email_to_remove = factory.msg.param.get(Param::Arg).unwrap_or_default();
if !email_to_remove.is_empty() { if !email_to_remove.is_empty() {
mailimf_fields_add( add_mailimf_field(
imf_fields, imf_fields,
mailimf_field_new_custom( "Chat-Group-Member-Removed",
"Chat-Group-Member-Removed".strdup(), &email_to_remove,
email_to_remove.strdup(),
),
); );
} }
} else if command == SystemMessage::MemberAddedToGroup { } else if command == SystemMessage::MemberAddedToGroup {
@@ -525,13 +509,7 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
do_gossip = 1; do_gossip = 1;
let email_to_add = msg.param.get(Param::Arg).unwrap_or_default(); let email_to_add = msg.param.get(Param::Arg).unwrap_or_default();
if !email_to_add.is_empty() { if !email_to_add.is_empty() {
mailimf_fields_add( add_mailimf_field(imf_fields, "Chat-Group-Member-Added", &email_to_add);
imf_fields,
mailimf_field_new_custom(
"Chat-Group-Member-Added".strdup(),
email_to_add.strdup(),
),
);
grpimage = chat.param.get(Param::ProfileImage); grpimage = chat.param.get(Param::ProfileImage);
} }
if 0 != msg.param.get_int(Param::Arg2).unwrap_or_default() & 0x1 { if 0 != msg.param.get_int(Param::Arg2).unwrap_or_default() & 0x1 {
@@ -540,51 +518,27 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
"sending secure-join message \'{}\' >>>>>>>>>>>>>>>>>>>>>>>>>", "sending secure-join message \'{}\' >>>>>>>>>>>>>>>>>>>>>>>>>",
"vg-member-added", "vg-member-added",
); );
mailimf_fields_add( add_mailimf_field(imf_fields, "Secure-Join", "vg-member-added");
imf_fields,
mailimf_field_new_custom(
"Secure-Join".strdup(),
"vg-member-added".strdup(),
),
);
} }
} else if command == SystemMessage::GroupNameChanged { } else if command == SystemMessage::GroupNameChanged {
let msg = &factory.msg; let msg = &factory.msg;
let value_to_add = msg.param.get(Param::Arg).unwrap_or_default(); let value_to_add = msg.param.get(Param::Arg).unwrap_or_default();
mailimf_fields_add(
imf_fields, add_mailimf_field(imf_fields, "Chat-Group-Name-Changed", &value_to_add);
mailimf_field_new_custom(
"Chat-Group-Name-Changed".strdup(),
value_to_add.strdup(),
),
);
} else if command == SystemMessage::GroupImageChanged { } else if command == SystemMessage::GroupImageChanged {
let msg = &factory.msg; let msg = &factory.msg;
grpimage = msg.param.get(Param::Arg); grpimage = msg.param.get(Param::Arg);
if grpimage.is_none() { if grpimage.is_none() {
mailimf_fields_add( add_mailimf_field(imf_fields, "Chat-Group-Image", "0");
imf_fields,
mailimf_field_new_custom("Chat-Group-Image".strdup(), "0".strdup()),
);
} }
} }
} }
if command == SystemMessage::LocationStreamingEnabled { if command == SystemMessage::LocationStreamingEnabled {
mailimf_fields_add( add_mailimf_field(imf_fields, "Chat-Content", "location-streaming-enabled");
imf_fields,
mailimf_field_new_custom(
"Chat-Content".strdup(),
"location-streaming-enabled".strdup(),
),
);
} }
if command == SystemMessage::AutocryptSetupMessage { if command == SystemMessage::AutocryptSetupMessage {
mailimf_fields_add( add_mailimf_field(imf_fields, "Autocrypt-Setup-Message", "v1");
imf_fields,
mailimf_field_new_custom("Autocrypt-Setup-Message".strdup(), "v1".strdup()),
);
placeholdertext = Some( placeholdertext = Some(
factory factory
.context .context
@@ -600,45 +554,29 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
context, context,
"sending secure-join message \'{}\' >>>>>>>>>>>>>>>>>>>>>>>>>", step, "sending secure-join message \'{}\' >>>>>>>>>>>>>>>>>>>>>>>>>", step,
); );
mailimf_fields_add( add_mailimf_field(imf_fields, "Secure-Join", &step);
imf_fields,
mailimf_field_new_custom("Secure-Join".strdup(), step.strdup()),
);
let param2 = msg.param.get(Param::Arg2).unwrap_or_default(); let param2 = msg.param.get(Param::Arg2).unwrap_or_default();
if !param2.is_empty() { if !param2.is_empty() {
mailimf_fields_add( add_mailimf_field(
imf_fields, imf_fields,
mailimf_field_new_custom( if step == "vg-request-with-auth" || step == "vc-request-with-auth" {
if step == "vg-request-with-auth" || step == "vc-request-with-auth" "Secure-Join-Auth"
{ } else {
"Secure-Join-Auth".strdup() "Secure-Join-Invitenumber"
} else { },
"Secure-Join-Invitenumber".strdup() param2,
}, )
param2.strdup(),
),
);
} }
let fingerprint = msg.param.get(Param::Arg3).unwrap_or_default(); let fingerprint = msg.param.get(Param::Arg3).unwrap_or_default();
if !fingerprint.is_empty() { if !fingerprint.is_empty() {
mailimf_fields_add( add_mailimf_field(imf_fields, "Secure-Join-Fingerprint", &fingerprint);
imf_fields,
mailimf_field_new_custom(
"Secure-Join-Fingerprint".strdup(),
fingerprint.strdup(),
),
);
} }
let grpid = match msg.param.get(Param::Arg4) { match msg.param.get(Param::Arg4) {
Some(id) => id.strdup(), Some(id) => {
None => std::ptr::null_mut(), add_mailimf_field(imf_fields, "Secure-Join-Group", &id);
}
None => {}
}; };
if !grpid.is_null() {
mailimf_fields_add(
imf_fields,
mailimf_field_new_custom("Secure-Join-Group".strdup(), grpid),
);
}
} }
} }
@@ -648,13 +586,11 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
meta.type_0 = Viewtype::Image; meta.type_0 = Viewtype::Image;
meta.param.set(Param::File, grpimage); meta.param.set(Param::File, grpimage);
let mut filename_as_sent = ptr::null_mut(); let res = build_body_file(context, &meta, "group-image");
meta_part = build_body_file(context, &meta, "group-image", &mut filename_as_sent); meta_part = res.0;
let filename_as_sent = res.1;
if !meta_part.is_null() { if !meta_part.is_null() {
mailimf_fields_add( add_mailimf_field(imf_fields, "Chat-Group-Image", &filename_as_sent)
imf_fields,
mailimf_field_new_custom("Chat-Group-Image".strdup(), filename_as_sent),
);
} }
} }
@@ -663,10 +599,7 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
|| factory.msg.type_0 == Viewtype::Video || factory.msg.type_0 == Viewtype::Video
{ {
if factory.msg.type_0 == Viewtype::Voice { if factory.msg.type_0 == Viewtype::Voice {
mailimf_fields_add( add_mailimf_field(imf_fields, "Chat-Voice-Message", "1");
imf_fields,
mailimf_field_new_custom("Chat-Voice-Message".strdup(), "1".strdup()),
);
} }
let duration_ms = factory let duration_ms = factory
.msg .msg
@@ -674,13 +607,8 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
.get_int(Param::Duration) .get_int(Param::Duration)
.unwrap_or_default(); .unwrap_or_default();
if duration_ms > 0 { if duration_ms > 0 {
mailimf_fields_add( let dur = duration_ms.to_string();
imf_fields, add_mailimf_field(imf_fields, "Chat-Duration", &dur);
mailimf_field_new_custom(
"Chat-Duration".strdup(),
duration_ms.to_string().strdup(),
),
);
} }
} }
afwd_email = factory.msg.param.exists(Param::Forwarded); afwd_email = factory.msg.param.exists(Param::Forwarded);
@@ -733,8 +661,7 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
set_error(factory, &error); set_error(factory, &error);
ok_to_continue = false; ok_to_continue = false;
} else { } else {
let file_part: *mut mailmime = let (file_part, _) = build_body_file(context, &factory.msg, "");
build_body_file(context, &factory.msg, "", ptr::null_mut());
if !file_part.is_null() { if !file_part.is_null() {
mailmime_smart_add_part(message, file_part); mailmime_smart_add_part(message, file_part);
parts += 1 parts += 1
@@ -927,7 +854,7 @@ pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory
success success
} }
unsafe fn get_subject( fn get_subject(
context: &Context, context: &Context,
chat: Option<&Chat>, chat: Option<&Chat>,
msg: &mut Message, msg: &mut Message,
@@ -963,6 +890,15 @@ unsafe fn set_error(factory: *mut MimeFactory, text: &str) {
(*factory).error = text.strdup(); (*factory).error = text.strdup();
} }
pub unsafe fn add_mailimf_field(fields: *mut mailimf_fields, name: &str, value: &str) {
let field = mailimf_field_new_custom(name.strdup(), value.strdup());
let res = mailimf_fields_add(fields, field);
assert!(
res as u32 == MAILIMF_NO_ERROR,
"could not create mailimf field"
);
}
unsafe fn build_body_text(text: &str) -> *mut mailmime { unsafe fn build_body_text(text: &str) -> *mut mailmime {
let mime_fields: *mut mailmime_fields; let mime_fields: *mut mailmime_fields;
let message_part: *mut mailmime; let message_part: *mut mailmime;
@@ -992,13 +928,13 @@ unsafe fn build_body_file(
context: &Context, context: &Context,
msg: &Message, msg: &Message,
base_name: &str, base_name: &str,
ret_file_name_as_sent: *mut *mut libc::c_char, ) -> (*mut mailmime, String) {
) -> *mut mailmime {
let needs_ext: bool; let needs_ext: bool;
let mime_fields: *mut mailmime_fields; let mime_fields: *mut mailmime_fields;
let mut mime_sub: *mut mailmime = ptr::null_mut(); let mut mime_sub: *mut mailmime = ptr::null_mut();
let content: *mut mailmime_content; let content: *mut mailmime_content;
let path_filename = msg.param.get(Param::File); let path_filename = msg.param.get(Param::File);
let mut filename_to_send = "".to_string();
let mut mimetype = msg let mut mimetype = msg
.param .param
@@ -1011,7 +947,7 @@ unsafe fn build_body_file(
if let Some(ref path_filename) = path_filename { if let Some(ref path_filename) = path_filename {
let suffix = dc_get_filesuffix_lc(path_filename); let suffix = dc_get_filesuffix_lc(path_filename);
let filename_to_send = if msg.type_0 == Viewtype::Voice { filename_to_send = if msg.type_0 == Viewtype::Voice {
let ts = chrono::Utc.timestamp(msg.timestamp_sort as i64, 0); let ts = chrono::Utc.timestamp(msg.timestamp_sort as i64, 0);
let suffix = if !suffix.is_null() { let suffix = if !suffix.is_null() {
@@ -1149,16 +1085,13 @@ unsafe fn build_body_file(
.to_c_string() .to_c_string()
.unwrap(); .unwrap();
mailmime_set_body_file(mime_sub, dc_strdup(abs_path.as_ptr())); mailmime_set_body_file(mime_sub, dc_strdup(abs_path.as_ptr()));
if !ret_file_name_as_sent.is_null() {
*ret_file_name_as_sent = filename_to_send.strdup();
}
} }
} }
free(mimetype as *mut libc::c_void); free(mimetype as *mut libc::c_void);
free(filename_encoded as *mut libc::c_void); free(filename_encoded as *mut libc::c_void);
mime_sub (mime_sub, filename_to_send)
} }
/******************************************************************************* /*******************************************************************************