"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/lib-index/mail-index-transaction-export.c" between
dovecot-2.3.16.tar.gz and dovecot-2.3.17.tar.gz

About: Dovecot is an IMAP and POP3 server, written with security primarily in mind.

mail-index-transaction-export.c  (dovecot-2.3.16)	:	mail-index-transaction-export.c  (dovecot-2.3.17)
skipping to change at line 209		skipping to change at line 209
struct mail_transaction_ext_hdr_update32 u32;		struct mail_transaction_ext_hdr_update32 u32;
size_t offset;		size_t offset;
bool started = FALSE, use_32 = hdr->alloc_size >= 65536;		bool started = FALSE, use_32 = hdr->alloc_size >= 65536;
i_zero(&u);		i_zero(&u);
i_zero(&u32);		i_zero(&u32);
data = hdr->data;		data = hdr->data;
mask = hdr->mask;		mask = hdr->mask;
buf = t_buffer_create(256);		buf = buffer_create_dynamic(default_pool, 256);
for (offset = 0; offset <= hdr->alloc_size; offset++) {		for (offset = 0; offset <= hdr->alloc_size; offset++) {
if (offset < hdr->alloc_size && mask[offset] != 0) {		if (offset < hdr->alloc_size && mask[offset] != 0) {
if (!started) {		if (!started) {
u32.offset = offset;		u32.offset = offset;
started = TRUE;		started = TRUE;
}		}
} else {		} else {
if (started) {		if (started) {
u32.size = offset - u32.offset;		u32.size = offset - u32.offset;
if (use_32)		if (use_32)
skipping to change at line 236		skipping to change at line 236
i_assert(u32.offset + u32.size <= ext_hdr_size);		i_assert(u32.offset + u32.size <= ext_hdr_size);
buffer_append(buf, data + u32.offset, u32.size);		buffer_append(buf, data + u32.offset, u32.size);
started = FALSE;		started = FALSE;
}		}
}		}
}		}
if (buf->used % 4 != 0)		if (buf->used % 4 != 0)
buffer_append_zero(buf, 4 - buf->used % 4);		buffer_append_zero(buf, 4 - buf->used % 4);
log_append_buffer(ctx, buf, use_32 ? MAIL_TRANSACTION_EXT_HDR_UPDATE32 :		log_append_buffer(ctx, buf, use_32 ? MAIL_TRANSACTION_EXT_HDR_UPDATE32 :
MAIL_TRANSACTION_EXT_HDR_UPDATE);		MAIL_TRANSACTION_EXT_HDR_UPDATE);
		buffer_free(&buf);
}		}
static void		static void
mail_transaction_log_append_ext_intros(struct mail_index_export_context *ctx)		mail_transaction_log_append_ext_intros(struct mail_index_export_context *ctx)
{		{
struct mail_index_transaction *t = ctx->trans;		struct mail_index_transaction *t = ctx->trans;
const struct mail_transaction_ext_intro *resize;		const struct mail_transaction_ext_intro *resize;
const struct mail_index_transaction_ext_hdr_update *hdrs;		const struct mail_index_transaction_ext_hdr_update *hdrs;
struct mail_transaction_ext_reset ext_reset;		struct mail_transaction_ext_reset ext_reset;
unsigned int resize_count, ext_count = 0;		unsigned int resize_count, ext_count = 0;
skipping to change at line 533		skipping to change at line 534
}		}
i_assert((append_ctx->output->used > 0) == (*changes_r != 0));		i_assert((append_ctx->output->used > 0) == (*changes_r != 0));
append_ctx->index_sync_transaction = t->sync_transaction;		append_ctx->index_sync_transaction = t->sync_transaction;
append_ctx->tail_offset_changed = t->tail_offset_changed;		append_ctx->tail_offset_changed = t->tail_offset_changed;
append_ctx->want_fsync =		append_ctx->want_fsync =
(t->view->index->set.fsync_mask & change_mask) != 0 ||		(t->view->index->set.fsync_mask & change_mask) != 0 ||
(t->flags & MAIL_INDEX_TRANSACTION_FLAG_FSYNC) != 0;		(t->flags & MAIL_INDEX_TRANSACTION_FLAG_FSYNC) != 0;
}		}
static unsigned int
count_modseq_incs_with(struct mail_index_transaction *t,
ARRAY_TYPE(seq_range) *tmp_seqs,
const ARRAY_TYPE(seq_range) *orig_seqs)
{
if (!array_is_created(orig_seqs))
return 0;
array_clear(tmp_seqs);
array_append_array(tmp_seqs, orig_seqs);
mail_index_transaction_seq_range_to_uid(t, tmp_seqs);
return array_count(tmp_seqs) > 0 ? 1 : 0;
}
static unsigned int
mail_index_transaction_keywords_count_modseq_incs(struct mail_index_transaction
*t)
{
const struct mail_index_transaction_keyword_update *update;
ARRAY_TYPE(seq_range) tmp_seqs;
unsigned int count = 0;
i_array_init(&tmp_seqs, 64);
array_foreach_modifiable(&t->keyword_updates, update) {
count += count_modseq_incs_with(t, &tmp_seqs, &update->add_seq);
count += count_modseq_incs_with(t, &tmp_seqs, &update->remove_seq
);
}
array_free(&tmp_seqs);
return count;
}
static bool
transaction_flag_updates_have_non_internal(struct mail_index_transaction *t)
{
struct mail_transaction_log_file *file = t->view->index->log->head;
const uint8_t internal_flags =
MAIL_INDEX_MAIL_FLAG_BACKEND | MAIL_INDEX_MAIL_FLAG_DIRTY;
const struct mail_index_flag_update *u;
const unsigned int hdr_version =
MAIL_TRANSACTION_LOG_HDR_VERSION(&file->hdr);
if (!MAIL_TRANSACTION_LOG_VERSION_HAVE(hdr_version, HIDE_INTERNAL_MODSEQS
)) {
/* this check can be a bit racy if the call isn't done while
transaction log is locked. practically it won't matter
now though. */
return array_count(&t->updates) > 0;
}
array_foreach(&t->updates, u) {
uint8_t changed_flags = u->add_flags | u->remove_flags;
if ((changed_flags & ~internal_flags) != 0)
return TRUE;
}
return FALSE;
}
uint64_t mail_index_transaction_get_highest_modseq(struct mail_index_transaction
*t)
{
struct mail_transaction_log_file *file = t->view->index->log->head;
uint64_t new_highest_modseq = file->sync_highest_modseq;
i_assert(file->locked);
if (new_highest_modseq == 0) {
/* highest-modseq tracking isn't enabled in this transaction
log file. This shouldn't happen with logs created since
v2.2.26+, because initial_modseq is always set. We don't
also bother checking if this transaction itself enables the
highest-modseq tracking, because it's always done as a
standalone transaction in mail_index_modseq_enable(),
which doesn't care about this function. */
i_warning("%s: Requested highest-modseq for transaction, "
"but modseq tracking isn't enabled for the file "
"(this shouldn't happen)", file->filepath);
return 0;
}
/* finish everything that can affect highest-modseq */
mail_index_transaction_finish_so_far(t);
/* NOTE: keep in sync with mail_transaction_update_modseq() */
if (array_is_created(&t->appends) && array_count(&t->appends) > 0) {
/* sorting may change the order of keyword_updates, */
new_highest_modseq++;
}
if (array_is_created(&t->updates) &&
transaction_flag_updates_have_non_internal(t))
new_highest_modseq++;
if (array_is_created(&t->keyword_updates)) {
new_highest_modseq +=
mail_index_transaction_keywords_count_modseq_incs(t);
}
if (t->attribute_updates != NULL)
new_highest_modseq++;
/* NOTE: the order of modseq_updates and everything following it
must match mail_index_transaction_export(). */
if (array_is_created(&t->modseq_updates)) {
const struct mail_transaction_modseq_update *mu;
/* mail_index_update_highest_modseq() is handled here also,
as a special case of uid==0. */
array_foreach(&t->modseq_updates, mu) {
uint64_t modseq = ((uint64_t)mu->modseq_high32 << 32) |
mu->modseq_low32;
if (new_highest_modseq < modseq)
new_highest_modseq = modseq;
}
}
if (array_is_created(&t->expunges) && array_count(&t->expunges) > 0 &&
(t->flags & MAIL_INDEX_TRANSACTION_FLAG_EXTERNAL) != 0)
new_highest_modseq++;
return new_highest_modseq;
}
End of changes. 3 change blocks.
1 lines changed or deleted		2 lines changed or added

---