dsync: Use header hashing version 3

diff --git a/src/doveadm/dsync/dsync-brain-mailbox.c b/src/doveadm/dsync/dsync-brain-mailbox.c
index 937338347e1c39d8276bc9a42a642b5195b36682..454d90ceb48046f04198eaaa22e9312a526aa6cc 100644 (file)
--- a/src/doveadm/dsync/dsync-brain-mailbox.c
+++ b/src/doveadm/dsync/dsync-brain-mailbox.c
@@ -218,8 +218,6 @@ dsync_brain_sync_mailbox_init_remote(struct dsync_brain *brain,
                import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_MAILS_USE_GUID128;
        if (brain->no_notify)
                import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_NO_NOTIFY;
-       if (brain->hdr_hash_v2)
-               import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_HDR_HASH_V2;
        if (brain->empty_hdr_workaround)
                import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_EMPTY_HDR_WORKAROUND;
 
@@ -237,7 +235,7 @@ dsync_brain_sync_mailbox_init_remote(struct dsync_brain *brain,
                                          brain->sync_max_size,
                                          brain->sync_flag,
                                          brain->import_commit_msgs_interval,
-                                         import_flags);
+                                         import_flags, brain->hdr_hash_version);
 }
 
 int dsync_brain_sync_mailbox_open(struct dsync_brain *brain,
@@ -329,8 +327,6 @@ int dsync_brain_sync_mailbox_open(struct dsync_brain *brain,
                exporter_flags |= DSYNC_MAILBOX_EXPORTER_FLAG_TIMESTAMPS;
        if (brain->sync_max_size > 0)
                exporter_flags |= DSYNC_MAILBOX_EXPORTER_FLAG_VSIZES;
-       if (brain->hdr_hash_v2)
-               exporter_flags |= DSYNC_MAILBOX_EXPORTER_FLAG_HDR_HASH_V2;
        if (remote_dsync_box->messages_count == 0) {
                /* remote mailbox is empty - we don't really need to export
                   header hashes since they're not going to match anything
@@ -341,7 +337,8 @@ int dsync_brain_sync_mailbox_open(struct dsync_brain *brain,
        brain->box_exporter = brain->backup_recv ? NULL :
                dsync_mailbox_export_init(brain->box, brain->log_scan,
                                          last_common_uid,
-                                         exporter_flags);
+                                         exporter_flags,
+                                         brain->hdr_hash_version);
        dsync_brain_sync_mailbox_init_remote(brain, remote_dsync_box);
        return 1;
 }

diff --git a/src/doveadm/dsync/dsync-brain-private.h b/src/doveadm/dsync/dsync-brain-private.h
index 670e9670604ed59036a4b43e2f2c54d5cb1296b2..ada231284bf59ac325fccc57c118dfc6bfc73d04 100644 (file)
--- a/src/doveadm/dsync/dsync-brain-private.h
+++ b/src/doveadm/dsync/dsync-brain-private.h
@@ -63,6 +63,7 @@ struct dsync_brain {
        const char *sync_flag;
        char alt_char;
        unsigned int import_commit_msgs_interval;
+       unsigned int hdr_hash_version;
 
        unsigned int lock_timeout;
        int lock_fd;
@@ -116,7 +117,6 @@ struct dsync_brain {
        unsigned int require_full_resync:1;
        unsigned int verbose_proctitle:1;
        unsigned int no_notify:1;
-       unsigned int hdr_hash_v2:1;
        unsigned int failed:1;
        unsigned int empty_hdr_workaround:1;
 };

diff --git a/src/doveadm/dsync/dsync-brain.c b/src/doveadm/dsync/dsync-brain.c
index 173779cf5341e9153ca8a45e2c86f4687abea301..cd65b7167efe052807b4ca76af5b13d6714af7fd 100644 (file)
--- a/src/doveadm/dsync/dsync-brain.c
+++ b/src/doveadm/dsync/dsync-brain.c
@@ -424,6 +424,18 @@ dsync_brain_lock(struct dsync_brain *brain, const char *remote_hostname)
        return brain->lock_fd == -1 ? -1 : 0;
 }
 
+static void
+dsync_brain_set_hdr_hash_version(struct dsync_brain *brain,
+                                const struct dsync_ibc_settings *ibc_set)
+{
+       if (ibc_set->hdr_hash_v3)
+               brain->hdr_hash_version = 3;
+       else if (ibc_set->hdr_hash_v2)
+               brain->hdr_hash_version = 3;
+       else
+               brain->hdr_hash_version = 1;
+}
+
 static bool dsync_brain_master_recv_handshake(struct dsync_brain *brain)
 {
        const struct dsync_ibc_settings *ibc_set;
@@ -439,7 +451,7 @@ static bool dsync_brain_master_recv_handshake(struct dsync_brain *brain)
                        return FALSE;
                }
        }
-       brain->hdr_hash_v2 = ibc_set->hdr_hash_v2;
+       dsync_brain_set_hdr_hash_version(brain, ibc_set);
 
        brain->state = brain->sync_type == DSYNC_BRAIN_SYNC_TYPE_STATE ?
                DSYNC_STATE_MASTER_SEND_LAST_COMMON :
@@ -457,7 +469,7 @@ static bool dsync_brain_slave_recv_handshake(struct dsync_brain *brain)
 
        if (dsync_ibc_recv_handshake(brain->ibc, &ibc_set) == 0)
                return FALSE;
-       brain->hdr_hash_v2 = ibc_set->hdr_hash_v2;
+       dsync_brain_set_hdr_hash_version(brain, ibc_set);
 
        if (ibc_set->lock_timeout > 0) {
                brain->lock_timeout = ibc_set->lock_timeout;

diff --git a/src/doveadm/dsync/dsync-ibc-stream.c b/src/doveadm/dsync/dsync-ibc-stream.c
index 1d2c213d5d4312f806947dc054620d30b8bb9289..7146e29968e6f922cfb361226089e083fdf90118 100644 (file)
--- a/src/doveadm/dsync/dsync-ibc-stream.c
+++ b/src/doveadm/dsync/dsync-ibc-stream.c
@@ -26,13 +26,14 @@
 #define DSYNC_IBC_STREAM_OUTBUF_THROTTLE_SIZE (1024*128)
 
 #define DSYNC_PROTOCOL_VERSION_MAJOR 3
-#define DSYNC_PROTOCOL_VERSION_MINOR 4
-#define DSYNC_HANDSHAKE_VERSION "VERSION\tdsync\t3\t4\n"
+#define DSYNC_PROTOCOL_VERSION_MINOR 5
+#define DSYNC_HANDSHAKE_VERSION "VERSION\tdsync\t3\t5\n"
 
 #define DSYNC_PROTOCOL_MINOR_HAVE_ATTRIBUTES 1
 #define DSYNC_PROTOCOL_MINOR_HAVE_SAVE_GUID 2
 #define DSYNC_PROTOCOL_MINOR_HAVE_FINISH 3
 #define DSYNC_PROTOCOL_MINOR_HAVE_HDR_HASH_V2 4
+#define DSYNC_PROTOCOL_MINOR_HAVE_HDR_HASH_V3 5
 
 enum item_type {
        ITEM_NONE,
@@ -884,6 +885,7 @@ dsync_ibc_stream_recv_handshake(struct dsync_ibc *_ibc,
        if (dsync_deserializer_decode_try(decoder, "empty_hdr_workaround", &value))
                set->brain_flags |= DSYNC_BRAIN_FLAG_EMPTY_HDR_WORKAROUND;
        set->hdr_hash_v2 = ibc->minor_version >= DSYNC_PROTOCOL_MINOR_HAVE_HDR_HASH_V2;
+       set->hdr_hash_v3 = ibc->minor_version >= DSYNC_PROTOCOL_MINOR_HAVE_HDR_HASH_V3;
 
        *set_r = set;
        return DSYNC_IBC_RECV_RET_OK;

diff --git a/src/doveadm/dsync/dsync-ibc.h b/src/doveadm/dsync/dsync-ibc.h
index 7cc8ece9d85fd852f78a0b5b2bcb83bad4520c52..c1f0a2ef9bac8dd7298070e2bd4fb020f82a4c2f 100644 (file)
--- a/src/doveadm/dsync/dsync-ibc.h
+++ b/src/doveadm/dsync/dsync-ibc.h
@@ -68,6 +68,7 @@ struct dsync_ibc_settings {
        enum dsync_brain_sync_type sync_type;
        enum dsync_brain_flags brain_flags;
        bool hdr_hash_v2;
+       bool hdr_hash_v3;
        unsigned int lock_timeout;
        unsigned int import_commit_msgs_interval;
 };

diff --git a/src/doveadm/dsync/dsync-mailbox-export.c b/src/doveadm/dsync/dsync-mailbox-export.c
index 61b3e6a8d4dd36bb2ced3094d0fc65cf82d71a9f..98fe488d770a9dbb912d850d3fd38898839803c1 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-export.c
+++ b/src/doveadm/dsync/dsync-mailbox-export.c
@@ -498,7 +498,8 @@ struct dsync_mailbox_exporter *
 dsync_mailbox_export_init(struct mailbox *box,
                          struct dsync_transaction_log_scan *log_scan,
                          uint32_t last_common_uid,
-                         enum dsync_mailbox_exporter_flags flags)
+                         enum dsync_mailbox_exporter_flags flags,
+                         unsigned int hdr_hash_version)
 {
        struct dsync_mailbox_exporter *exporter;
        pool_t pool;
@@ -520,8 +521,7 @@ dsync_mailbox_export_init(struct mailbox *box,
                (flags & DSYNC_MAILBOX_EXPORTER_FLAG_TIMESTAMPS) != 0;
        exporter->export_virtual_sizes =
                (flags & DSYNC_MAILBOX_EXPORTER_FLAG_VSIZES) != 0;
-       exporter->hdr_hash_version =
-               (flags & DSYNC_MAILBOX_EXPORTER_FLAG_HDR_HASH_V2) ? 2 : 1;
+       exporter->hdr_hash_version = hdr_hash_version;
        exporter->no_hdr_hashes =
                (flags & DSYNC_MAILBOX_EXPORTER_FLAG_NO_HDR_HASHES) != 0;
        p_array_init(&exporter->requested_uids, pool, 16);

diff --git a/src/doveadm/dsync/dsync-mailbox-export.h b/src/doveadm/dsync/dsync-mailbox-export.h
index 364500ef54f53a73a19afd4e1cf818486c224f68..11fa95423036f8da08a4bf548c51bb46c51d83e3 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-export.h
+++ b/src/doveadm/dsync/dsync-mailbox-export.h
@@ -6,7 +6,6 @@ enum dsync_mailbox_exporter_flags {
        DSYNC_MAILBOX_EXPORTER_FLAG_MAILS_HAVE_GUIDS    = 0x02,
        DSYNC_MAILBOX_EXPORTER_FLAG_MINIMAL_DMAIL_FILL  = 0x04,
        DSYNC_MAILBOX_EXPORTER_FLAG_TIMESTAMPS          = 0x08,
-       DSYNC_MAILBOX_EXPORTER_FLAG_HDR_HASH_V2         = 0x10,
        DSYNC_MAILBOX_EXPORTER_FLAG_NO_HDR_HASHES       = 0x20,
        DSYNC_MAILBOX_EXPORTER_FLAG_VSIZES              = 0x40,
 };
@@ -15,7 +14,8 @@ struct dsync_mailbox_exporter *
 dsync_mailbox_export_init(struct mailbox *box,
                          struct dsync_transaction_log_scan *log_scan,
                          uint32_t last_common_uid,
-                         enum dsync_mailbox_exporter_flags flags);
+                         enum dsync_mailbox_exporter_flags flags,
+                         unsigned int hdr_hash_version);
 /* Returns 1 if attribute was returned, 0 if no more attributes, -1 on error */
 int dsync_mailbox_export_next_attr(struct dsync_mailbox_exporter *exporter,
                                   const struct dsync_mailbox_attribute **attr_r);

diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index 12224acac52bb275d3fa80b390d97d6c469640d4..6b3193ff4e362175447240bea9d257069f411974 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -226,7 +226,8 @@ dsync_mailbox_import_init(struct mailbox *box,
                          uoff_t sync_max_size,
                          const char *sync_flag,
                          unsigned int commit_msgs_interval,
-                         enum dsync_mailbox_import_flags flags)
+                         enum dsync_mailbox_import_flags flags,
+                         unsigned int hdr_hash_version)
 {
        struct dsync_mailbox_importer *importer;
        struct mailbox_status status;
@@ -289,8 +290,7 @@ dsync_mailbox_import_init(struct mailbox *box,
                (flags & DSYNC_MAILBOX_IMPORT_FLAG_MAILS_HAVE_GUIDS) != 0;
        importer->mails_use_guid128 =
                (flags & DSYNC_MAILBOX_IMPORT_FLAG_MAILS_USE_GUID128) != 0;
-       importer->hdr_hash_version =
-               (flags & DSYNC_MAILBOX_IMPORT_FLAG_HDR_HASH_V2) != 0 ? 2 : 1;
+       importer->hdr_hash_version = hdr_hash_version;
        importer->empty_hdr_workaround =
                (flags & DSYNC_MAILBOX_IMPORT_FLAG_EMPTY_HDR_WORKAROUND) != 0;
 

diff --git a/src/doveadm/dsync/dsync-mailbox-import.h b/src/doveadm/dsync/dsync-mailbox-import.h
index b9babe5c119a1927ff346b6e90700f744850c123..69505d373c406bc119832898eb892e355012d38e 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-import.h
+++ b/src/doveadm/dsync/dsync-mailbox-import.h
@@ -11,7 +11,6 @@ enum dsync_mailbox_import_flags {
        DSYNC_MAILBOX_IMPORT_FLAG_MAILS_HAVE_GUIDS      = 0x10,
        DSYNC_MAILBOX_IMPORT_FLAG_MAILS_USE_GUID128     = 0x20,
        DSYNC_MAILBOX_IMPORT_FLAG_NO_NOTIFY             = 0x40,
-       DSYNC_MAILBOX_IMPORT_FLAG_HDR_HASH_V2           = 0x80,
        DSYNC_MAILBOX_IMPORT_FLAG_EMPTY_HDR_WORKAROUND  = 0x100
 };
 
@@ -37,7 +36,8 @@ dsync_mailbox_import_init(struct mailbox *box,
                          uoff_t sync_max_size,
                          const char *sync_flag,
                          unsigned int commit_msgs_interval,
-                         enum dsync_mailbox_import_flags flags);
+                         enum dsync_mailbox_import_flags flags,
+                         unsigned int hdr_hash_version);
 int dsync_mailbox_import_attribute(struct dsync_mailbox_importer *importer,
                                   const struct dsync_mailbox_attribute *attr);
 int dsync_mailbox_import_change(struct dsync_mailbox_importer *importer,