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

replace gotos with ok_to_continue

Browse Source
This commit is contained in:
Simon Laux
2019-08-12 03:18:28 +02:00
committed by holger krekel
parent dfd58961f7
commit b440c3636b
1 changed files with 64 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
src/dc_configure.rs
View File

@@ -104,7 +104,6 @@ pub fn dc_stop_ongoing_process(context: &Context) {
#[allow(non_snake_case, unused_must_use)] #[allow(non_snake_case, unused_must_use)]
pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_job_t) { pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_job_t) {
let flags: libc::c_int; let flags: libc::c_int;
let mut current_block: u64;
let mut success = false; let mut success = false;
let mut imap_connected_here = false; let mut imap_connected_here = false;
let mut smtp_connected_here = false; let mut smtp_connected_here = false;
@@ -152,12 +151,13 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
if param.addr.is_empty() { if param.addr.is_empty() {
error!(context, 0, "Please enter an email address.",); error!(context, 0, "Please enter an email address.",);
} else { } else {
let ok_to_continue0;
if 0 != param.server_flags & 0x2 { if 0 != param.server_flags & 0x2 {
// the used oauth2 addr may differ, check this. // the used oauth2 addr may differ, check this.
// if dc_get_oauth2_addr() is not available in the oauth2 implementation, // if dc_get_oauth2_addr() is not available in the oauth2 implementation,
// just use the given one. // just use the given one.
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = 2927484062889439186; ok_to_continue0 = false;
} else { } else {
context.call_cb( context.call_cb(
Event::CONFIGURE_PROGRESS, Event::CONFIGURE_PROGRESS,
@@ -181,7 +181,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
.ok(); .ok();
} }
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = 2927484062889439186; ok_to_continue0 = false;
} else { } else {
context.call_cb( context.call_cb(
Event::CONFIGURE_PROGRESS, Event::CONFIGURE_PROGRESS,
@@ -194,16 +194,15 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
}) as uintptr_t, }) as uintptr_t,
0 as uintptr_t, 0 as uintptr_t,
); );
current_block = 7746103178988627676; ok_to_continue0 = true;
} }
} }
} else { } else {
current_block = 7746103178988627676; ok_to_continue0 = true;
} }
match current_block { if ok_to_continue0 {
2927484062889439186 => {}
_ => {
let parsed: addr::Result<addr::Email> = param.addr.parse(); let parsed: addr::Result<addr::Email> = param.addr.parse();
let mut ok_to_continue7 = false;
if parsed.is_err() { if parsed.is_err() {
error!(context, 0, "Bad email-address."); error!(context, 0, "Bad email-address.");
} else { } else {
@@ -233,6 +232,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
&& param.send_user.is_empty() && param.send_user.is_empty()
&& param.server_flags & !0x2 == 0 && param.server_flags & !0x2 == 0
{ {
let ok_to_continue1;
/*&&param->mail_user ==NULL -- the user can enter a loginname which is used by autoconfig then */ /*&&param->mail_user ==NULL -- the user can enter a loginname which is used by autoconfig then */
/*&&param->send_pw ==NULL -- the password cannot be auto-configured and is no criterion for autoconfig or not */ /*&&param->send_pw ==NULL -- the password cannot be auto-configured and is no criterion for autoconfig or not */
/* flags but OAuth2 avoid autoconfig */ /* flags but OAuth2 avoid autoconfig */
@@ -247,7 +247,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
param_autoconfig = param_autoconfig =
moz_autoconfigure(context, &url, &param); moz_autoconfigure(context, &url, &param);
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = 2927484062889439186; ok_to_continue1 = false;
} else { } else {
context.call_cb( context.call_cb(
Event::CONFIGURE_PROGRESS, Event::CONFIGURE_PROGRESS,
@@ -261,14 +261,13 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
as uintptr_t, as uintptr_t,
0 as uintptr_t, 0 as uintptr_t,
); );
current_block = 13325891313334703151; ok_to_continue1 = true;
} }
} else { } else {
current_block = 13325891313334703151; ok_to_continue1 = true;
} }
match current_block { if ok_to_continue1 {
2927484062889439186 => {} let ok_to_continue2;
_ => {
if param_autoconfig.is_none() { if param_autoconfig.is_none() {
// the doc does not mention `emailaddress=`, however, Thunderbird adds it, see https://releases.mozilla.org/pub/thunderbird/ , which makes some sense // the doc does not mention `emailaddress=`, however, Thunderbird adds it, see https://releases.mozilla.org/pub/thunderbird/ , which makes some sense
let url = format!( let url = format!(
@@ -279,7 +278,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
param_autoconfig = param_autoconfig =
moz_autoconfigure(context, &url, &param); moz_autoconfigure(context, &url, &param);
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = 2927484062889439186; ok_to_continue2 = false;
} else { } else {
context.call_cb( context.call_cb(
Event::CONFIGURE_PROGRESS, Event::CONFIGURE_PROGRESS,
@@ -293,19 +292,17 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
as uintptr_t, as uintptr_t,
0 as uintptr_t, 0 as uintptr_t,
); );
current_block = 5597585068398118923; ok_to_continue2 = true;
} }
} else { } else {
current_block = 5597585068398118923; ok_to_continue2 = true;
} }
match current_block { if ok_to_continue2 {
2927484062889439186 => {}
_ => {
let mut i: libc::c_int = 0; let mut i: libc::c_int = 0;
let ok_to_continue3;
loop { loop {
if !(i <= 1) { if !(i <= 1) {
current_block = ok_to_continue3 = true;
12961834331865314435;
break; break;
} }
if param_autoconfig.is_none() { if param_autoconfig.is_none() {
@@ -325,8 +322,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
); );
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = ok_to_continue3 = false;
2927484062889439186;
break; break;
} }
context.call_cb( context.call_cb(
@@ -344,9 +340,8 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
} }
i += 1 i += 1
} }
match current_block { if ok_to_continue3 {
2927484062889439186 => {} let ok_to_continue4;
_ => {
if param_autoconfig.is_none() { if param_autoconfig.is_none() {
let url = format!( let url = format!(
"http://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}", "http://autoconfig.{}/mail/config-v1.1.xml?emailaddress={}",
@@ -359,8 +354,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
); );
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = ok_to_continue4 = false;
2927484062889439186;
} else { } else {
context.call_cb( context.call_cb(
Event::CONFIGURE_PROGRESS, Event::CONFIGURE_PROGRESS,
@@ -374,16 +368,13 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
as uintptr_t, as uintptr_t,
0, 0,
); );
current_block = ok_to_continue4 = true;
10778260831612459202;
} }
} else { } else {
current_block = ok_to_continue4 = true;
10778260831612459202;
} }
match current_block { if ok_to_continue4 {
2927484062889439186 => {} let ok_to_continue5;
_ => {
if param_autoconfig if param_autoconfig
.is_none() .is_none()
{ {
@@ -399,8 +390,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
); );
if s.shall_stop_ongoing if s.shall_stop_ongoing
{ {
current_block = ok_to_continue5 = false;
2927484062889439186;
} else { } else {
context.call_cb( context.call_cb(
Event::CONFIGURE_PROGRESS, Event::CONFIGURE_PROGRESS,
@@ -413,17 +403,13 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
}, },
0 0
); );
current_block = ok_to_continue5 = true;
5207889489643863322;
} }
} else { } else {
current_block = ok_to_continue5 = true;
5207889489643863322;
} }
match current_block { if ok_to_continue5 {
2927484062889439186 => { let ok_to_continue6;
}
_ => {
/* B. If we have no configuration yet, search configuration in Thunderbird's centeral database */ /* B. If we have no configuration yet, search configuration in Thunderbird's centeral database */
if param_autoconfig if param_autoconfig
.is_none() .is_none()
@@ -442,9 +428,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
); );
if s.shall_stop_ongoing if s.shall_stop_ongoing
{ {
current_block ok_to_continue6 = false;
=
2927484062889439186;
} else { } else {
context.call_cb( context.call_cb(
Event::CONFIGURE_PROGRESS, Event::CONFIGURE_PROGRESS,
@@ -456,24 +440,12 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
500 500
}, },
0); 0);
current_block ok_to_continue6 = true;
=
2798392256336243897;
} }
} else { } else {
current_block ok_to_continue6 = true;
=
2798392256336243897;
} }
match current_block if ok_to_continue6 {
{
2927484062889439186
=>
{
}
_
=>
{
if let Some(ref cfg) = param_autoconfig if let Some(ref cfg) = param_autoconfig
{ {
let r = dc_loginparam_get_readable(cfg); let r = dc_loginparam_get_readable(cfg);
@@ -507,27 +479,18 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
param.server_flags param.server_flags
|= |=
keep_flags; keep_flags;
current_block ok_to_continue7 = true;
=
3024367268842933116;
}
} }
}
} }
}
} }
}
} }
} }
} }
}
} }
} else { } else {
current_block = 3024367268842933116; ok_to_continue7 = true;
} }
match current_block { if ok_to_continue7 {
2927484062889439186 => {}
_ => {
if param.mail_server.is_empty() { if param.mail_server.is_empty() {
param.mail_server = param.mail_server =
format!("imap.{}", param_domain,) format!("imap.{}", param_domain,)
@@ -628,10 +591,11 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
); );
/* try to connect to IMAP - if we did not got an autoconfig, /* try to connect to IMAP - if we did not got an autoconfig,
do some further tries with different settings and username variations */ do some further tries with different settings and username variations */
let ok_to_continue8;
let mut username_variation = 0; let mut username_variation = 0;
loop { loop {
if !(username_variation <= 1) { if !(username_variation <= 1) {
current_block = 14187386403465544025; ok_to_continue8 = true;
break; break;
} }
let r_0 = dc_loginparam_get_readable(&param); let r_0 = dc_loginparam_get_readable(&param);
@@ -643,16 +607,16 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
.unwrap() .unwrap()
.connect(context, &param) .connect(context, &param)
{ {
current_block = 14187386403465544025; ok_to_continue8 = true;
break; break;
} }
if !param_autoconfig.is_none() { if !param_autoconfig.is_none() {
current_block = 2927484062889439186; ok_to_continue8 = false;
break; break;
} }
// probe STARTTLS/993 // probe STARTTLS/993
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = 2927484062889439186; ok_to_continue8 = false;
break; break;
} }
context.call_cb( context.call_cb(
@@ -680,12 +644,12 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
.unwrap() .unwrap()
.connect(context, &param) .connect(context, &param)
{ {
current_block = 14187386403465544025; ok_to_continue8 = true;
break; break;
} }
// probe STARTTLS/143 // probe STARTTLS/143
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = 2927484062889439186; ok_to_continue8 = false;
break; break;
} }
context.call_cb( context.call_cb(
@@ -712,16 +676,16 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
.unwrap() .unwrap()
.connect(context, &param) .connect(context, &param)
{ {
current_block = 14187386403465544025; ok_to_continue8 = true;
break; break;
} }
if 0 != username_variation { if 0 != username_variation {
current_block = 2927484062889439186; ok_to_continue8 = false;
break; break;
} }
// next probe round with only the localpart of the email-address as the loginname // next probe round with only the localpart of the email-address as the loginname
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = 2927484062889439186; ok_to_continue8 = false;
break; break;
} }
context.call_cb( context.call_cb(
@@ -759,9 +723,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
username_variation += 1 username_variation += 1
} }
match current_block { if ok_to_continue8 {
2927484062889439186 => {}
_ => {
imap_connected_here = true; imap_connected_here = true;
if !s.shall_stop_ongoing { if !s.shall_stop_ongoing {
context.call_cb( context.call_cb(
@@ -776,6 +738,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
as uintptr_t, as uintptr_t,
0 as uintptr_t, 0 as uintptr_t,
); );
let ok_to_continue9;
/* try to connect to SMTP - if we did not got an autoconfig, the first try was SSL-465 and we do a second try with STARTTLS-587 */ /* try to connect to SMTP - if we did not got an autoconfig, the first try was SSL-465 and we do a second try with STARTTLS-587 */
if !context if !context
.smtp .smtp
@@ -785,11 +748,9 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
.connect(context, &param) .connect(context, &param)
{ {
if !param_autoconfig.is_none() { if !param_autoconfig.is_none() {
current_block = ok_to_continue9 = false;
2927484062889439186;
} else if s.shall_stop_ongoing { } else if s.shall_stop_ongoing {
current_block = ok_to_continue9 = false;
2927484062889439186;
} else { } else {
context.call_cb( context.call_cb(
Event::CONFIGURE_PROGRESS, Event::CONFIGURE_PROGRESS,
@@ -825,8 +786,7 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
.connect(context, &param) .connect(context, &param)
{ {
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = ok_to_continue9 = false;
2927484062889439186;
} else { } else {
context.call_cb( context.call_cb(
Event::CONFIGURE_PROGRESS, Event::CONFIGURE_PROGRESS,
@@ -872,24 +832,19 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
context, &param, context, &param,
) )
{ {
current_block = ok_to_continue9 = false;
2927484062889439186;
} else { } else {
current_block = ok_to_continue9 = true;
5083741289379115417;
} }
} }
} else { } else {
current_block = ok_to_continue9 = true;
5083741289379115417;
} }
} }
} else { } else {
current_block = 5083741289379115417; ok_to_continue9 = true;
} }
match current_block { if ok_to_continue9 {
2927484062889439186 => {}
_ => {
smtp_connected_here = true; smtp_connected_here = true;
if !s.shall_stop_ongoing { if !s.shall_stop_ongoing {
context.call_cb( context.call_cb(
@@ -1027,21 +982,16 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
} }
} }
} }
}
} }
} }
}
} }
} }
}
} }
} }
}
} }
} }
} }
} }
}
} }
if imap_connected_here { if imap_connected_here {
context.inbox.read().unwrap().disconnect(context); context.inbox.read().unwrap().disconnect(context);
@@ -1320,7 +1270,6 @@ unsafe fn outlk_autodiscover(
url__: &str, url__: &str,
param_in: &dc_loginparam_t, param_in: &dc_loginparam_t,
) -> Option<dc_loginparam_t> { ) -> Option<dc_loginparam_t> {
let current_block: u64;
let mut xml_raw: *mut libc::c_char = 0 as *mut libc::c_char; let mut xml_raw: *mut libc::c_char = 0 as *mut libc::c_char;
let mut url = url__.strdup(); let mut url = url__.strdup();
let mut outlk_ad = outlk_autodiscover_t { let mut outlk_ad = outlk_autodiscover_t {
@@ -1332,10 +1281,11 @@ unsafe fn outlk_autodiscover(
config: [0 as *mut libc::c_char; 6], config: [0 as *mut libc::c_char; 6],
redirect: 0 as *mut libc::c_char, redirect: 0 as *mut libc::c_char,
}; };
let ok_to_continue;
let mut i = 0; let mut i = 0;
loop { loop {
if !(i < 10) { if !(i < 10) {
current_block = 11584701595673473500; ok_to_continue = true;
break; break;
} }
memset( memset(
@@ -1345,7 +1295,7 @@ unsafe fn outlk_autodiscover(
); );
xml_raw = read_autoconf_file(context, url); xml_raw = read_autoconf_file(context, url);
if xml_raw.is_null() { if xml_raw.is_null() {
current_block = 3070887585260837332; ok_to_continue = false;
break; break;
} }
let mut saxparser: dc_saxparser_t = dc_saxparser_t { let mut saxparser: dc_saxparser_t = dc_saxparser_t {
@@ -1368,7 +1318,7 @@ unsafe fn outlk_autodiscover(
if !(!outlk_ad.config[5usize].is_null() if !(!outlk_ad.config[5usize].is_null()
&& 0 != *outlk_ad.config[5usize].offset(0isize) as libc::c_int) && 0 != *outlk_ad.config[5usize].offset(0isize) as libc::c_int)
{ {
current_block = 11584701595673473500; ok_to_continue = true;
break; break;
} }
free(url as *mut libc::c_void); free(url as *mut libc::c_void);
@@ -1380,8 +1330,7 @@ unsafe fn outlk_autodiscover(
i += 1; i += 1;
} }
match current_block { if ok_to_continue {
11584701595673473500 => {
if outlk_ad.out.mail_server.is_empty() if outlk_ad.out.mail_server.is_empty()
|| outlk_ad.out.mail_port == 0 || outlk_ad.out.mail_port == 0
|| outlk_ad.out.send_server.is_empty() || outlk_ad.out.send_server.is_empty()
@@ -1395,8 +1344,6 @@ unsafe fn outlk_autodiscover(
return None; return None;
} }
}
_ => {}
} }
free(url as *mut libc::c_void); free(url as *mut libc::c_void);
free(xml_raw as *mut libc::c_void); free(xml_raw as *mut libc::c_void);