lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not exclude oversized messages from remote trashing

Browse Source 
... as otherwise these messages would be just lost.

the assumption is that opposite-side trashing is used only for locally
generated messages whose size we control. it's also more consistent with
same-side trashing, where even oversized messages would be trashed.

the exclusion was broken anyway, as we failed to query the size of old
messages, particularly after 70bad661.
This commit is contained in:
Oswald Buddenhagen 2022-04-12 12:18:09 +02:00
parent d92c62022a
commit 4b0c5a0cd5
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/sync.c
View File

@ -1579,27 +1579,16 @@ msgs_flags_set( sync_vars_t *svars, int t )
debug( "was already trashed\n" ); debug( "was already trashed\n" );
continue; continue;
} }
debug( "- trashing\n" );
trash_total[t]++;
stats();
svars->trash_pending[t]++;
if (!remote) { if (!remote) {
debug( "- trashing\n" );
trash_total[t]++;
stats();
svars->trash_pending[t]++;
tv = nfmalloc( sizeof(*tv) ); tv = nfmalloc( sizeof(*tv) );
tv->aux = AUX; tv->aux = AUX;
tv->msg = tmsg; tv->msg = tmsg;
svars->drv[t]->trash_msg( svars->ctx[t], tmsg, msg_trashed, tv ); svars->drv[t]->trash_msg( svars->ctx[t], tmsg, msg_trashed, tv );
} else { } else {
if (tmsg->size > svars->ctx[t^1]->conf->max_size) {
// This is questionable, as these messages are actually lost
// (no upgradable dummies here).
// However, this is an unlikely configuration to start with ...
debug( "is too big\n" );
continue;
}
debug( "- trashing\n" );
trash_total[t]++;
stats();
svars->trash_pending[t]++;
cv = nfmalloc( sizeof(*cv) ); cv = nfmalloc( sizeof(*cv) );
cv->cb = msg_rtrashed; cv->cb = msg_rtrashed;
cv->aux = INV_AUX; cv->aux = INV_AUX;