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

Use DC_LP_* constants in configure module

Browse Source
This commit is contained in:
Alexander Krotov
2019-09-14 13:20:58 +03:00
parent f9ce6c7c81
commit 51bf875826
1 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/configure/mod.rs
View File

@@ -1,7 +1,6 @@
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC}; use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
use crate::constants::Event; use crate::constants::*;
use crate::constants::DC_CREATE_MVBOX;
use crate::context::Context; use crate::context::Context;
use crate::dc_tools::*; use crate::dc_tools::*;
use crate::e2ee; use crate::e2ee;
@@ -283,13 +282,14 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: &Job) {
} }
} }
if param.send_port == 0 { if param.send_port == 0 {
param.send_port = if 0 != param.server_flags & 0x10000 { param.send_port =
587 if 0 != param.server_flags & DC_LP_SMTP_SOCKET_STARTTLS as i32 {
} else if 0 != param.server_flags & 0x40000 { 587
25 } else if 0 != param.server_flags & DC_LP_SMTP_SOCKET_PLAIN as i32 {
} else { 25
465 } else {
} 465
}
} }
if param.send_user.is_empty() && !param.mail_user.is_empty() { if param.send_user.is_empty() && !param.mail_user.is_empty() {
param.send_user = param.mail_user.clone(); param.send_user = param.mail_user.clone();
@@ -297,24 +297,30 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: &Job) {
if param.send_pw.is_empty() && !param.mail_pw.is_empty() { if param.send_pw.is_empty() && !param.mail_pw.is_empty() {
param.send_pw = param.mail_pw.clone() param.send_pw = param.mail_pw.clone()
} }
if !dc_exactly_one_bit_set(param.server_flags & (0x2 | 0x4)) { if !dc_exactly_one_bit_set(param.server_flags & DC_LP_AUTH_FLAGS as i32) {
param.server_flags &= !(0x2 | 0x4); param.server_flags &= !(DC_LP_AUTH_FLAGS as i32);
param.server_flags |= 0x4 param.server_flags |= DC_LP_AUTH_NORMAL as i32
}
if !dc_exactly_one_bit_set(param.server_flags & (0x100 | 0x200 | 0x400)) {
param.server_flags &= !(0x100 | 0x200 | 0x400);
param.server_flags |= if param.send_port == 143 { 0x100 } else { 0x200 }
} }
if !dc_exactly_one_bit_set( if !dc_exactly_one_bit_set(
param.server_flags & (0x10000 | 0x20000 | 0x40000), param.server_flags & DC_LP_IMAP_SOCKET_FLAGS as i32,
) { ) {
param.server_flags &= !(0x10000 | 0x20000 | 0x40000); param.server_flags &= !(DC_LP_IMAP_SOCKET_FLAGS as i32);
param.server_flags |= if param.send_port == 587 { param.server_flags |= if param.send_port == 143 {
0x10000 DC_LP_IMAP_SOCKET_STARTTLS as i32
} else if param.send_port == 25 {
0x40000
} else { } else {
0x20000 DC_LP_IMAP_SOCKET_SSL as i32
}
}
if !dc_exactly_one_bit_set(
param.server_flags & (DC_LP_SMTP_SOCKET_FLAGS as i32),
) {
param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
param.server_flags |= if param.send_port == 587 {
DC_LP_SMTP_SOCKET_STARTTLS as i32
} else if param.send_port == 25 {
DC_LP_SMTP_SOCKET_PLAIN as i32
} else {
DC_LP_SMTP_SOCKET_SSL as i32
} }
} }
/* do we have a complete configuration? */ /* do we have a complete configuration? */
@@ -428,8 +434,8 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: &Job) {
success = false; success = false;
} else { } else {
progress!(context, 850); progress!(context, 850);
param.server_flags &= !(0x10000 | 0x20000 | 0x40000); param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
param.server_flags |= 0x10000; param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
param.send_port = 587; param.send_port = 587;
info!(context, "Trying: {}", &param); info!(context, "Trying: {}", &param);
@@ -444,8 +450,8 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: &Job) {
success = false; success = false;
} else { } else {
progress!(context, 860); progress!(context, 860);
param.server_flags &= !(0x10000 | 0x20000 | 0x40000); param.server_flags &= !(DC_LP_SMTP_SOCKET_FLAGS as i32);
param.server_flags |= 0x10000; param.server_flags |= DC_LP_SMTP_SOCKET_STARTTLS as i32;
param.send_port = 25; param.send_port = 25;
info!(context, "Trying: {}", &param); info!(context, "Trying: {}", &param);