moparisthebest/imapfilter
1
0
Fork 0
mirror of https://github.com/moparisthebest/imapfilter synced 2024-12-21 23:28:49 -05:00
Code Issues Releases Wiki Activity

Correct the TRYCREATE functionality

Browse Source 
It's better not to continuesly try to create a mailbox, when the server
continues to report TRYCREATE.

When appending messages it failed to create a mailbox when the mailbox
didn't exist and the server responded with TRYCREATE.
This commit is contained in:
Lefteris Chatzimparmpas 2012-02-19 14:58:36 +01:00
parent cf33e1bb61
commit 644d6988ed
3 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/imapfilter.h
View File

@ -181,7 +181,7 @@ int request_idle(session *ssn);
/* response.c */
int response_generic(session *ssn, int tag);
int response_continuation(session *ssn);
int response_continuation(session *ssn, int tag);
int response_greeting(session *ssn);
int response_capability(session *ssn, int tag);
int response_authenticate(session *ssn, int tag, unsigned char **cont);

70
src/request.c
View File

@ -603,25 +603,18 @@ request_copy(session *ssn, const char *mesg, const char *mbox)
m = apply_namespace(mbox, ssn->ns.prefix, ssn->ns.delim);
do {
TRY(t = send_request(ssn, "UID COPY %s \"%s\"", mesg, m));
TRY(r = response_generic(ssn, t));
if (r == STATUS_TRYCREATE) {
TRY(t = send_request(ssn, "CREATE \"%s\"", m));
TRY(response_generic(ssn, t));
if (get_option_boolean("subscribe")) {
TRY(t = send_request(ssn, "SUBSCRIBE \"%s\"", m));
TRY(response_generic(ssn, t));
}
TRY(t = send_request(ssn, "UID COPY %s \"%s\"", mesg, m));
TRY(r = response_generic(ssn, t));
switch (r) {
case STATUS_TRYCREATE:
TRY(t = send_request(ssn, "CREATE \"%s\"", m));
TRY(response_generic(ssn, t));
if (get_option_boolean("subscribe")) {
TRY(t = send_request(ssn, "SUBSCRIBE \"%s\"",
m));
TRY(response_generic(ssn, t));
}
break;
case -1:
return -1;
break;
}
} while (r == STATUS_TRYCREATE);
}
return r;
}
@ -639,33 +632,30 @@ request_append(session *ssn, const char *mbox, const char *mesg, size_t
m = apply_namespace(mbox, ssn->ns.prefix, ssn->ns.delim);
do {
TRY(t = send_request(ssn, "APPEND \"%s\"%s%s%s%s%s%s {%d}", m,
(flags ? " (" : ""), (flags ? flags : ""),
(flags ? ")" : ""), (date ? " \"" : ""),
(date ? date : ""), (date ? "\"" : ""), mesglen));
TRY(r = response_continuation(ssn, t));
if (r == STATUS_TRYCREATE) {
TRY(t = send_request(ssn, "CREATE \"%s\"", m));
TRY(response_generic(ssn, t));
if (get_option_boolean("subscribe")) {
TRY(t = send_request(ssn, "SUBSCRIBE \"%s\"", m));
TRY(response_generic(ssn, t));
}
TRY(t = send_request(ssn, "APPEND \"%s\"%s%s%s%s%s%s {%d}", m,
(flags ? " (" : ""), (flags ? flags : ""),
(flags ? ")" : ""), (date ? " \"" : ""),
(date ? date : ""), (date ? "\"" : ""), mesglen));
TRY(r = response_continuation(ssn));
TRY(r = response_continuation(ssn, t));
}
switch (r) {
case STATUS_CONTINUE:
TRY(send_continuation(ssn, mesg, mesglen));
TRY(r = response_generic(ssn, t));
break;
case STATUS_TRYCREATE:
TRY(t = send_request(ssn, "CREATE \"%s\"", m));
TRY(response_generic(ssn, t));
if (get_option_boolean("subscribe")) {
TRY(t = send_request(ssn, "SUBSCRIBE \"%s\"",
m));
TRY(response_generic(ssn, t));
}
break;
case -1:
return -1;
break;
}
} while (r == STATUS_TRYCREATE);
if (r == STATUS_CONTINUE) {
TRY(send_continuation(ssn, mesg, mesglen));
TRY(r = response_generic(ssn, t));
}
return r;
}
@ -774,7 +764,7 @@ request_idle(session *ssn)
ri = 0;
TRY(t = send_request(ssn, "IDLE"));
TRY(r = response_continuation(ssn));
TRY(r = response_continuation(ssn, t));
if (r == STATUS_CONTINUE) {
TRY(ri = response_idle(ssn, t));
TRY(send_continuation(ssn, "DONE", strlen("DONE")));

17
src/response.c
View File

@ -240,8 +240,9 @@ response_generic(session *ssn, int tag)
* Get server data and make sure there is a continuation response inside them.
*/
int
response_continuation(session *ssn)
response_continuation(session *ssn, int tag)
{
int r;
ssize_t n;
buffer_reset(&ibuf);
@ -255,9 +256,17 @@ response_continuation(session *ssn)
if (check_bye(ibuf.data))
return STATUS_BYE;
} while (!check_continuation(ibuf.data));
} while ((r = check_tag(ibuf.data, ssn, tag)) == STATUS_NONE &&
!check_continuation(ibuf.data));
return STATUS_CONTINUE;
if (r == STATUS_NO &&
(check_trycreate(ibuf.data) || get_option_boolean("create")))
return STATUS_TRYCREATE;
if (r == STATUS_NONE)
return STATUS_CONTINUE;
return r;
}
@ -348,7 +357,7 @@ response_authenticate(session *ssn, int tag, unsigned char **cont)
re = &responses[RESPONSE_AUTHENTICATE];
if ((r = response_continuation(ssn)) == STATUS_CONTINUE &&
if ((r = response_continuation(ssn, tag)) == STATUS_CONTINUE &&
!regexec(re->preg, ibuf.data, re->nmatch, re->pmatch, 0))
*cont = (unsigned char *)xstrndup(ibuf.data +
re->pmatch[1].rm_so, re->pmatch[1].rm_eo -