Mercurial > dovecot > core-2.2
annotate src/doveadm/dsync/dsync-ibc-stream.c @ 20633:d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Fri, 01 Jul 2016 14:30:24 +0300 |
| parents | 40ce04c672a4 |
| children | 5c0470a8b5a7 |
| rev | line source |
|---|---|
|
19552
0f22db71df7a
global: freshen copyright
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
19318
diff
changeset
|
1 /* Copyright (c) 2013-2016 Dovecot authors, see the included COPYING file */ |
| 14584 | 2 |
| 3 #include "lib.h" | |
| 4 #include "array.h" | |
| 5 #include "fd-set-nonblock.h" | |
| 6 #include "safe-mkstemp.h" | |
| 7 #include "ioloop.h" | |
| 8 #include "istream.h" | |
| 9 #include "istream-seekable.h" | |
| 10 #include "istream-dot.h" | |
| 11 #include "ostream.h" | |
| 12 #include "str.h" | |
| 13 #include "strescape.h" | |
| 14 #include "master-service.h" | |
| 15 #include "mail-cache.h" | |
| 16 #include "mail-storage-private.h" | |
| 17 #include "dsync-serializer.h" | |
| 18 #include "dsync-deserializer.h" | |
| 19 #include "dsync-mail.h" | |
| 20 #include "dsync-mailbox.h" | |
| 21 #include "dsync-mailbox-state.h" | |
| 22 #include "dsync-mailbox-tree.h" | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
23 #include "dsync-ibc-private.h" |
| 14584 | 24 |
| 25 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
26 #define DSYNC_IBC_STREAM_OUTBUF_THROTTLE_SIZE (1024*128) |
| 14584 | 27 |
| 28 #define DSYNC_PROTOCOL_VERSION_MAJOR 3 | |
|
19646
25f06710e671
dsync: When comparing headers' hashes to match messages, try to normalize the input.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
19552
diff
changeset
|
29 #define DSYNC_PROTOCOL_VERSION_MINOR 4 |
|
25f06710e671
dsync: When comparing headers' hashes to match messages, try to normalize the input.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
19552
diff
changeset
|
30 #define DSYNC_HANDSHAKE_VERSION "VERSION\tdsync\t3\t4\n" |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
31 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
32 #define DSYNC_PROTOCOL_MINOR_HAVE_ATTRIBUTES 1 |
|
16381
e0156c479a12
dsync: Previous have_save_guids change somewhat broke compatibility with earlier dsync versions.
Timo Sirainen <tss@iki.fi>
parents:
16380
diff
changeset
|
33 #define DSYNC_PROTOCOL_MINOR_HAVE_SAVE_GUID 2 |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
34 #define DSYNC_PROTOCOL_MINOR_HAVE_FINISH 3 |
|
19646
25f06710e671
dsync: When comparing headers' hashes to match messages, try to normalize the input.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
19552
diff
changeset
|
35 #define DSYNC_PROTOCOL_MINOR_HAVE_HDR_HASH_V2 4 |
| 14584 | 36 |
| 37 enum item_type { | |
| 38 ITEM_NONE, | |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
39 ITEM_DONE, |
| 14584 | 40 |
| 41 ITEM_HANDSHAKE, | |
| 42 ITEM_MAILBOX_STATE, | |
| 43 ITEM_MAILBOX_TREE_NODE, | |
| 44 ITEM_MAILBOX_DELETE, | |
| 45 ITEM_MAILBOX, | |
| 46 | |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
47 ITEM_MAILBOX_ATTRIBUTE, |
| 14584 | 48 ITEM_MAIL_CHANGE, |
| 49 ITEM_MAIL_REQUEST, | |
| 50 ITEM_MAIL, | |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
51 ITEM_FINISH, |
| 14584 | 52 |
| 53 ITEM_MAILBOX_CACHE_FIELD, | |
| 54 | |
| 55 ITEM_END_OF_LIST | |
| 56 }; | |
| 57 | |
| 58 #define END_OF_LIST_LINE "." | |
| 59 static const struct { | |
| 60 /* full human readable name of the item */ | |
| 61 const char *name; | |
| 62 /* unique character identifying the item */ | |
| 63 char chr; | |
| 64 const char *required_keys; | |
| 65 const char *optional_keys; | |
|
16222
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
66 unsigned int min_minor_version; |
| 14584 | 67 } items[ITEM_END_OF_LIST+1] = { |
|
16222
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
68 { NULL, '\0', NULL, NULL, 0 }, |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
69 { .name = "done", |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
70 .chr = 'X', |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
71 .optional_keys = "" |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
72 }, |
| 14584 | 73 { .name = "handshake", |
| 74 .chr = 'H', | |
|
15782
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
75 .required_keys = "hostname", |
|
16110
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
76 .optional_keys = "sync_ns_prefix sync_box sync_box_guid sync_type " |
|
18177
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
77 "debug sync_visible_namespaces exclude_mailboxes " |
|
16563
c2c09416d8a4
dsync: Recent changes broke remote dsync
Timo Sirainen <tss@iki.fi>
parents:
16561
diff
changeset
|
78 "send_mail_requests backup_send backup_recv lock_timeout " |
|
19021
3fc9658c9712
dsync: Added -D parameter to disable mailbox renaming.
Timo Sirainen <tss@iki.fi>
parents:
19014
diff
changeset
|
79 "no_mail_sync no_mailbox_renames no_backup_overwrite purge_remote " |
|
20633
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
80 "no_notify sync_since_timestamp sync_max_size sync_flags " |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
81 "virtual_all_box" |
| 14584 | 82 }, |
| 83 { .name = "mailbox_state", | |
| 84 .chr = 'S', | |
| 85 .required_keys = "mailbox_guid last_uidvalidity last_common_uid " | |
|
17284
cd6079c61c2b
dsync: Fixed new dsync versions to work again with older versions.
Timo Sirainen <tss@iki.fi>
parents:
17282
diff
changeset
|
86 "last_common_modseq last_common_pvt_modseq", |
|
cd6079c61c2b
dsync: Fixed new dsync versions to work again with older versions.
Timo Sirainen <tss@iki.fi>
parents:
17282
diff
changeset
|
87 .optional_keys = "last_messages_count changes_during_sync" |
| 14584 | 88 }, |
| 89 { .name = "mailbox_tree_node", | |
| 90 .chr = 'N', | |
| 91 .required_keys = "name existence", | |
|
15231
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
92 .optional_keys = "mailbox_guid uid_validity uid_next " |
|
15035
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
93 "last_renamed_or_created subscribed last_subscription_change" |
| 14584 | 94 }, |
| 95 { .name = "mailbox_delete", | |
| 96 .chr = 'D', | |
| 97 .required_keys = "hierarchy_sep", | |
|
16380
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
98 .optional_keys = "mailboxes dirs unsubscribes" |
| 14584 | 99 }, |
| 100 { .name = "mailbox", | |
| 101 .chr = 'B', | |
|
15496
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
102 .required_keys = "mailbox_guid uid_validity uid_next messages_count " |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
103 "first_recent_uid highest_modseq highest_pvt_modseq", |
|
16977
8a7ecddca4ad
dsync: Support syncing storages with 128bit GUIDs <-> string GUIDs.
Timo Sirainen <tss@iki.fi>
parents:
16940
diff
changeset
|
104 .optional_keys = "mailbox_lost cache_fields have_guids have_save_guids have_only_guid128" |
| 14584 | 105 }, |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
106 { .name = "mailbox_attribute", |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
107 .chr = 'A', |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
108 .required_keys = "type key", |
|
16222
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
109 .optional_keys = "value stream deleted last_change modseq", |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
110 .min_minor_version = DSYNC_PROTOCOL_MINOR_HAVE_ATTRIBUTES |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
111 }, |
| 14584 | 112 { .name = "mail_change", |
| 113 .chr = 'C', | |
| 114 .required_keys = "type uid", | |
|
17296
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
115 .optional_keys = "guid hdr_hash modseq pvt_modseq " |
| 14584 | 116 "add_flags remove_flags final_flags " |
| 117 "keywords_reset keyword_changes" | |
| 118 }, | |
| 119 { .name = "mail_request", | |
| 120 .chr = 'R', | |
| 121 .optional_keys = "guid uid" | |
| 122 }, | |
| 123 { .name = "mail", | |
| 124 .chr = 'M', | |
|
17296
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
125 .optional_keys = "guid uid pop3_uidl pop3_order received_date saved_date stream" |
| 14584 | 126 }, |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
127 { .name = "finish", |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
128 .chr = 'F', |
|
20458
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
129 .optional_keys = "error mail_error require_full_resync", |
|
18394
89cbb9347de7
dsync: Don't try to use the new "finish" state with old dsync versions.
Timo Sirainen <tss@iki.fi>
parents:
18375
diff
changeset
|
130 .min_minor_version = DSYNC_PROTOCOL_MINOR_HAVE_FINISH |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
131 }, |
| 14584 | 132 { .name = "mailbox_cache_field", |
| 133 .chr = 'c', | |
| 134 .required_keys = "name decision", | |
| 135 .optional_keys = "last_used" | |
| 136 }, | |
| 137 | |
|
16222
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
138 { "end_of_list", '\0', NULL, NULL, 0 } |
| 14584 | 139 }; |
| 140 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
141 struct dsync_ibc_stream { |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
142 struct dsync_ibc ibc; |
| 14584 | 143 |
| 144 char *name, *temp_path_prefix; | |
|
19014
11b107c8dc05
dsync: Added -T parameter to specify the I/O stall timeout.
Timo Sirainen <tss@iki.fi>
parents:
18394
diff
changeset
|
145 unsigned int timeout_secs; |
| 14584 | 146 struct istream *input; |
| 147 struct ostream *output; | |
| 148 struct io *io; | |
| 149 struct timeout *to; | |
| 150 | |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
151 unsigned int minor_version; |
| 14584 | 152 struct dsync_serializer *serializers[ITEM_END_OF_LIST]; |
| 153 struct dsync_deserializer *deserializers[ITEM_END_OF_LIST]; | |
| 154 | |
| 155 pool_t ret_pool; | |
| 156 struct dsync_deserializer_decoder *cur_decoder; | |
| 157 | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
158 struct istream *value_output, *value_input; |
| 14584 | 159 struct dsync_mail *cur_mail; |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
160 struct dsync_mailbox_attribute *cur_attr; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
161 char value_output_last; |
| 14584 | 162 |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
163 enum item_type last_recv_item, last_sent_item; |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
164 unsigned int last_recv_item_eol:1; |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
165 unsigned int last_sent_item_eol:1; |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
166 |
| 14584 | 167 unsigned int version_received:1; |
| 168 unsigned int handshake_received:1; | |
| 169 unsigned int has_pending_data:1; | |
|
20197
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
170 unsigned int finish_received:1; |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
171 unsigned int done_received:1; |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
172 unsigned int stopped:1; |
| 14584 | 173 }; |
| 174 | |
|
19090
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
175 static const char *dsync_ibc_stream_get_state(struct dsync_ibc_stream *ibc) |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
176 { |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
177 if (!ibc->version_received) |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
178 return "version not received"; |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
179 else if (!ibc->handshake_received) |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
180 return "handshake not received"; |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
181 |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
182 return t_strdup_printf("last sent=%s%s, last recv=%s%s", |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
183 items[ibc->last_sent_item].name, |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
184 ibc->last_sent_item_eol ? " (EOL)" : "", |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
185 items[ibc->last_recv_item].name, |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
186 ibc->last_recv_item_eol ? " (EOL)" : ""); |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
187 } |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
188 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
189 static void dsync_ibc_stream_stop(struct dsync_ibc_stream *ibc) |
| 14584 | 190 { |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
191 ibc->stopped = TRUE; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
192 i_stream_close(ibc->input); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
193 o_stream_close(ibc->output); |
| 14584 | 194 io_loop_stop(current_ioloop); |
| 195 } | |
| 196 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
197 static int dsync_ibc_stream_read_mail_stream(struct dsync_ibc_stream *ibc) |
| 14584 | 198 { |
|
15483
fc6873897e8b
dsync: Minor (probably unnecessary) fix for i_stream_read() API usage.
Timo Sirainen <tss@iki.fi>
parents:
15482
diff
changeset
|
199 do { |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
200 i_stream_skip(ibc->value_input, |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
201 i_stream_get_data_size(ibc->value_input)); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
202 } while (i_stream_read(ibc->value_input) > 0); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
203 if (ibc->value_input->eof) { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
204 if (ibc->value_input->stream_errno != 0) { |
|
19090
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
205 i_error("dsync(%s): read(%s) failed: %s (%s)", ibc->name, |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
206 i_stream_get_name(ibc->value_input), |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
207 i_stream_get_error(ibc->value_input), |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
208 dsync_ibc_stream_get_state(ibc)); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
209 dsync_ibc_stream_stop(ibc); |
| 14584 | 210 return -1; |
| 211 } | |
| 212 /* finished reading the mail stream */ | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
213 i_assert(ibc->value_input->eof); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
214 i_stream_seek(ibc->value_input, 0); |
|
15463
f9e8cbb2792d
dsync: Fixed hangs with remote dsyncing
Timo Sirainen <tss@iki.fi>
parents:
15231
diff
changeset
|
215 ibc->has_pending_data = TRUE; |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
216 ibc->value_input = NULL; |
| 14584 | 217 return 1; |
| 218 } | |
| 219 return 0; | |
| 220 } | |
| 221 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
222 static void dsync_ibc_stream_input(struct dsync_ibc_stream *ibc) |
| 14584 | 223 { |
|
17777
647162da8423
dsync: Reset I/O timeout every time when receiving input.
Timo Sirainen <tss@iki.fi>
parents:
17497
diff
changeset
|
224 timeout_reset(ibc->to); |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
225 if (ibc->value_input != NULL) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
226 if (dsync_ibc_stream_read_mail_stream(ibc) == 0) |
| 14584 | 227 return; |
| 228 } | |
|
15594
5bb80a6491eb
dsync: Fixes to handling output stream buffering.
Timo Sirainen <tss@iki.fi>
parents:
15592
diff
changeset
|
229 o_stream_cork(ibc->output); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
230 ibc->ibc.io_callback(ibc->ibc.io_context); |
|
15594
5bb80a6491eb
dsync: Fixes to handling output stream buffering.
Timo Sirainen <tss@iki.fi>
parents:
15592
diff
changeset
|
231 o_stream_uncork(ibc->output); |
| 14584 | 232 } |
| 233 | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
234 static int dsync_ibc_stream_send_value_stream(struct dsync_ibc_stream *ibc) |
| 14584 | 235 { |
| 236 const unsigned char *data; | |
| 237 unsigned char add; | |
| 238 size_t i, size; | |
| 239 int ret; | |
| 240 | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
241 while ((ret = i_stream_read_data(ibc->value_output, |
| 14584 | 242 &data, &size, 0)) > 0) { |
| 243 add = '\0'; | |
| 244 for (i = 0; i < size; i++) { | |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
245 if (data[i] == '.' && |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
246 ((i == 0 && ibc->value_output_last == '\n') || |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
247 (i > 0 && data[i-1] == '\n'))) { |
| 14584 | 248 /* escape the dot */ |
| 249 add = '.'; | |
| 250 break; | |
| 251 } | |
| 252 } | |
| 253 | |
| 254 if (i > 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
255 o_stream_nsend(ibc->output, data, i); |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
256 ibc->value_output_last = data[i-1]; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
257 i_stream_skip(ibc->value_output, i); |
| 14584 | 258 } |
| 259 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
260 if (o_stream_get_buffer_used_size(ibc->output) >= 4096) { |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
261 if ((ret = o_stream_flush(ibc->output)) < 0) { |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
262 dsync_ibc_stream_stop(ibc); |
| 14584 | 263 return -1; |
| 264 } | |
| 265 if (ret == 0) { | |
| 266 /* continue later */ | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
267 o_stream_set_flush_pending(ibc->output, TRUE); |
| 14584 | 268 return 0; |
| 269 } | |
| 270 } | |
| 271 | |
| 272 if (add != '\0') { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
273 o_stream_nsend(ibc->output, &add, 1); |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
274 ibc->value_output_last = add; |
| 14584 | 275 } |
| 276 } | |
| 277 i_assert(ret == -1); | |
| 278 | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
279 if (ibc->value_output->stream_errno != 0) { |
|
19090
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
280 i_error("dsync(%s): read(%s) failed: %s (%s)", |
|
16940
38f404297728
dsync: Use i_stream_get_error() instead of just errno in stream error messages.
Timo Sirainen <tss@iki.fi>
parents:
16801
diff
changeset
|
281 ibc->name, i_stream_get_name(ibc->value_output), |
|
19090
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
282 i_stream_get_error(ibc->value_output), |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
283 dsync_ibc_stream_get_state(ibc)); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
284 dsync_ibc_stream_stop(ibc); |
| 14584 | 285 return -1; |
| 286 } | |
| 287 | |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
288 /* finished sending the stream. use "CRLF." instead of "LF." just in |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
289 case we're sending binary data that ends with CR. */ |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
290 o_stream_nsend_str(ibc->output, "\r\n.\r\n"); |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
291 i_stream_unref(&ibc->value_output); |
| 14584 | 292 return 1; |
| 293 } | |
| 294 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
295 static int dsync_ibc_stream_output(struct dsync_ibc_stream *ibc) |
| 14584 | 296 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
297 struct ostream *output = ibc->output; |
| 14584 | 298 int ret; |
| 299 | |
|
15482
6f940b2bfbe6
dsync: Fixed hang when sending mail stream to remote dsync.
Timo Sirainen <tss@iki.fi>
parents:
15481
diff
changeset
|
300 o_stream_cork(ibc->output); |
| 14584 | 301 if ((ret = o_stream_flush(output)) < 0) |
| 302 ret = 1; | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
303 else if (ibc->value_output != NULL) { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
304 if (dsync_ibc_stream_send_value_stream(ibc) < 0) |
| 14584 | 305 ret = 1; |
| 306 } | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
307 timeout_reset(ibc->to); |
| 14584 | 308 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
309 if (!dsync_ibc_is_send_queue_full(&ibc->ibc)) |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
310 ibc->ibc.io_callback(ibc->ibc.io_context); |
|
15482
6f940b2bfbe6
dsync: Fixed hang when sending mail stream to remote dsync.
Timo Sirainen <tss@iki.fi>
parents:
15481
diff
changeset
|
311 o_stream_uncork(ibc->output); |
| 14584 | 312 return ret; |
| 313 } | |
| 314 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
315 static void dsync_ibc_stream_timeout(struct dsync_ibc_stream *ibc) |
| 14584 | 316 { |
|
19090
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
317 i_error("dsync(%s): I/O has stalled, no activity for %u seconds (%s)", |
|
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
318 ibc->name, ibc->timeout_secs, dsync_ibc_stream_get_state(ibc)); |
|
15986
f6377e089dee
dsync: If I/O gets stalled, log the state in which it happened.
Timo Sirainen <tss@iki.fi>
parents:
15836
diff
changeset
|
319 ibc->ibc.timeout = TRUE; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
320 dsync_ibc_stream_stop(ibc); |
| 14584 | 321 } |
| 322 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
323 static void dsync_ibc_stream_init(struct dsync_ibc_stream *ibc) |
| 14584 | 324 { |
| 325 unsigned int i; | |
| 326 | |
|
17192
a1c153c70bb9
Use io_add_istream() wherever possible.
Timo Sirainen <tss@iki.fi>
parents:
17170
diff
changeset
|
327 ibc->io = io_add_istream(ibc->input, dsync_ibc_stream_input, ibc); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
328 o_stream_set_no_error_handling(ibc->output, TRUE); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
329 o_stream_set_flush_callback(ibc->output, dsync_ibc_stream_output, ibc); |
|
19014
11b107c8dc05
dsync: Added -T parameter to specify the I/O stall timeout.
Timo Sirainen <tss@iki.fi>
parents:
18394
diff
changeset
|
330 ibc->to = timeout_add(ibc->timeout_secs * 1000, |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
331 dsync_ibc_stream_timeout, ibc); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
332 o_stream_cork(ibc->output); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
333 o_stream_nsend_str(ibc->output, DSYNC_HANDSHAKE_VERSION); |
| 14584 | 334 |
| 335 /* initialize serializers and send their headers to remote */ | |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
336 for (i = ITEM_DONE + 1; i < ITEM_END_OF_LIST; i++) T_BEGIN { |
| 14584 | 337 const char *keys; |
| 338 | |
| 339 keys = items[i].required_keys == NULL ? items[i].optional_keys : | |
| 340 t_strconcat(items[i].required_keys, " ", | |
| 341 items[i].optional_keys, NULL); | |
| 342 if (keys != NULL) { | |
| 343 i_assert(items[i].chr != '\0'); | |
| 344 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
345 ibc->serializers[i] = |
| 14584 | 346 dsync_serializer_init(t_strsplit_spaces(keys, " ")); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
347 o_stream_nsend(ibc->output, &items[i].chr, 1); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
348 o_stream_nsend_str(ibc->output, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
349 dsync_serializer_encode_header_line(ibc->serializers[i])); |
| 14584 | 350 } |
| 351 } T_END; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
352 o_stream_nsend_str(ibc->output, ".\n"); |
|
15594
5bb80a6491eb
dsync: Fixes to handling output stream buffering.
Timo Sirainen <tss@iki.fi>
parents:
15592
diff
changeset
|
353 o_stream_uncork(ibc->output); |
| 14584 | 354 } |
| 355 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
356 static void dsync_ibc_stream_deinit(struct dsync_ibc *_ibc) |
| 14584 | 357 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
358 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
|
16669
960f827b7579
dsync: Memory leak fix at deinit.
Timo Sirainen <tss@iki.fi>
parents:
16665
diff
changeset
|
359 unsigned int i; |
| 14584 | 360 |
|
16669
960f827b7579
dsync: Memory leak fix at deinit.
Timo Sirainen <tss@iki.fi>
parents:
16665
diff
changeset
|
361 for (i = ITEM_DONE + 1; i < ITEM_END_OF_LIST; i++) { |
|
960f827b7579
dsync: Memory leak fix at deinit.
Timo Sirainen <tss@iki.fi>
parents:
16665
diff
changeset
|
362 if (ibc->serializers[i] != NULL) |
|
960f827b7579
dsync: Memory leak fix at deinit.
Timo Sirainen <tss@iki.fi>
parents:
16665
diff
changeset
|
363 dsync_serializer_deinit(&ibc->serializers[i]); |
|
960f827b7579
dsync: Memory leak fix at deinit.
Timo Sirainen <tss@iki.fi>
parents:
16665
diff
changeset
|
364 if (ibc->deserializers[i] != NULL) |
|
960f827b7579
dsync: Memory leak fix at deinit.
Timo Sirainen <tss@iki.fi>
parents:
16665
diff
changeset
|
365 dsync_deserializer_deinit(&ibc->deserializers[i]); |
|
960f827b7579
dsync: Memory leak fix at deinit.
Timo Sirainen <tss@iki.fi>
parents:
16665
diff
changeset
|
366 } |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
367 if (ibc->cur_decoder != NULL) |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
368 dsync_deserializer_decode_finish(&ibc->cur_decoder); |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
369 if (ibc->value_output != NULL) |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
370 i_stream_unref(&ibc->value_output); |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
371 else { |
|
20197
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
372 /* If the remote has not told us that they are closing we |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
373 notify remote that we're closing. this is mainly to avoid |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
374 "read() failed: EOF" errors on failing dsyncs. |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
375 |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
376 Avoid a race condition: |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
377 We do not tell the remote we are closing if they have |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
378 already told us because they close the |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
379 connection after sending ITEM_DONE and will |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
380 not be ever receive anything else from us unless |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
381 it just happens to get combined into the same packet |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
382 as a previous response and is already in the buffer. |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
383 */ |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
384 if (!ibc->done_received && !ibc->finish_received) { |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
385 o_stream_nsend_str(ibc->output, |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
386 t_strdup_printf("%c\n", items[ITEM_DONE].chr)); |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
387 } |
|
17497
de20b4fa60ac
Added (void) prefix for ignoring return values we don't care about.
Timo Sirainen <tss@iki.fi>
parents:
17296
diff
changeset
|
388 (void)o_stream_nfinish(ibc->output); |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
389 } |
| 14584 | 390 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
391 timeout_remove(&ibc->to); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
392 if (ibc->io != NULL) |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
393 io_remove(&ibc->io); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
394 i_stream_destroy(&ibc->input); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
395 o_stream_destroy(&ibc->output); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
396 pool_unref(&ibc->ret_pool); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
397 i_free(ibc->temp_path_prefix); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
398 i_free(ibc->name); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
399 i_free(ibc); |
| 14584 | 400 } |
| 401 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
402 static int dsync_ibc_stream_next_line(struct dsync_ibc_stream *ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
403 const char **line_r) |
| 14584 | 404 { |
|
16673
64464646c020
dsync: Stream disconnection error message improvement
Timo Sirainen <tss@iki.fi>
parents:
16669
diff
changeset
|
405 string_t *error; |
| 14584 | 406 const char *line; |
| 17252 | 407 ssize_t ret; |
| 14584 | 408 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
409 line = i_stream_next_line(ibc->input); |
| 14584 | 410 if (line != NULL) { |
| 411 *line_r = line; | |
| 412 return 1; | |
| 413 } | |
| 414 /* try reading some */ | |
| 17252 | 415 if ((ret = i_stream_read(ibc->input)) == -1) { |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
416 if (ibc->stopped) |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
417 return -1; |
|
16673
64464646c020
dsync: Stream disconnection error message improvement
Timo Sirainen <tss@iki.fi>
parents:
16669
diff
changeset
|
418 error = t_str_new(128); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
419 if (ibc->input->stream_errno != 0) { |
|
16940
38f404297728
dsync: Use i_stream_get_error() instead of just errno in stream error messages.
Timo Sirainen <tss@iki.fi>
parents:
16801
diff
changeset
|
420 str_printfa(error, "read(%s) failed: %s", ibc->name, |
|
38f404297728
dsync: Use i_stream_get_error() instead of just errno in stream error messages.
Timo Sirainen <tss@iki.fi>
parents:
16801
diff
changeset
|
421 i_stream_get_error(ibc->input)); |
| 14584 | 422 } else { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
423 i_assert(ibc->input->eof); |
|
16673
64464646c020
dsync: Stream disconnection error message improvement
Timo Sirainen <tss@iki.fi>
parents:
16669
diff
changeset
|
424 str_printfa(error, "read(%s) failed: EOF", ibc->name); |
| 14584 | 425 } |
|
19090
3abdcbde7f39
dsync: If remote disconnects, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19089
diff
changeset
|
426 str_printfa(error, " (%s)", dsync_ibc_stream_get_state(ibc)); |
|
16673
64464646c020
dsync: Stream disconnection error message improvement
Timo Sirainen <tss@iki.fi>
parents:
16669
diff
changeset
|
427 i_error("%s", str_c(error)); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
428 dsync_ibc_stream_stop(ibc); |
| 14584 | 429 return -1; |
| 430 } | |
| 17252 | 431 i_assert(ret >= 0); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
432 *line_r = i_stream_next_line(ibc->input); |
| 14584 | 433 if (*line_r == NULL) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
434 ibc->has_pending_data = FALSE; |
| 14584 | 435 return 0; |
| 436 } | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
437 ibc->has_pending_data = TRUE; |
| 14584 | 438 return 1; |
| 439 } | |
| 440 | |
|
14629
c93ca5e46a8a
Marked functions parameters that are allowed to be NULL. Some APIs were also changed.
Timo Sirainen <tss@iki.fi>
parents:
14584
diff
changeset
|
441 static void ATTR_FORMAT(3, 4) ATTR_NULL(2) |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
442 dsync_ibc_input_error(struct dsync_ibc_stream *ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
443 struct dsync_deserializer_decoder *decoder, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
444 const char *fmt, ...) |
| 14584 | 445 { |
| 446 va_list args; | |
| 447 const char *error; | |
| 448 | |
| 449 va_start(args, fmt); | |
| 450 error = t_strdup_vprintf(fmt, args); | |
| 451 if (decoder == NULL) | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
452 i_error("dsync(%s): %s", ibc->name, error); |
| 14584 | 453 else { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
454 i_error("dsync(%s): %s: %s", ibc->name, |
| 14584 | 455 dsync_deserializer_decoder_get_name(decoder), error); |
| 456 } | |
| 457 va_end(args); | |
| 458 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
459 dsync_ibc_stream_stop(ibc); |
| 14584 | 460 } |
| 461 | |
| 462 static void | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
463 dsync_ibc_stream_send_string(struct dsync_ibc_stream *ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
464 const string_t *str) |
| 14584 | 465 { |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
466 i_assert(ibc->value_output == NULL); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
467 o_stream_nsend(ibc->output, str_data(str), str_len(str)); |
| 14584 | 468 } |
| 469 | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
470 static int seekable_fd_callback(const char **path_r, void *context) |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
471 { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
472 struct dsync_ibc_stream *ibc = context; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
473 string_t *path; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
474 int fd; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
475 |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
476 path = t_str_new(128); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
477 str_append(path, ibc->temp_path_prefix); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
478 fd = safe_mkstemp(path, 0600, (uid_t)-1, (gid_t)-1); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
479 if (fd == -1) { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
480 i_error("safe_mkstemp(%s) failed: %m", str_c(path)); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
481 return -1; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
482 } |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
483 |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
484 /* we just want the fd, unlink it */ |
|
19136
fefaa6d09a81
Replaced unlink() calls with i_unlink*() wherever possible.
Timo Sirainen <tss@iki.fi>
parents:
19090
diff
changeset
|
485 if (i_unlink(str_c(path)) < 0) { |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
486 /* shouldn't happen.. */ |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
487 i_close_fd(&fd); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
488 return -1; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
489 } |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
490 |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
491 *path_r = str_c(path); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
492 return fd; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
493 } |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
494 |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
495 static struct istream * |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
496 dsync_ibc_stream_input_stream(struct dsync_ibc_stream *ibc) |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
497 { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
498 struct istream *inputs[2]; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
499 |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
500 inputs[0] = i_stream_create_dot(ibc->input, FALSE); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
501 inputs[1] = NULL; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
502 ibc->value_input = i_stream_create_seekable(inputs, MAIL_READ_FULL_BLOCK_SIZE, |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
503 seekable_fd_callback, ibc); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
504 i_stream_unref(&inputs[0]); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
505 |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
506 return ibc->value_input; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
507 } |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
508 |
|
15036
5943cace4e05
dsync: Renamed "io" slave to "stream".
Timo Sirainen <tss@iki.fi>
parents:
15035
diff
changeset
|
509 static int |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
510 dsync_ibc_check_missing_deserializers(struct dsync_ibc_stream *ibc) |
| 14584 | 511 { |
| 512 unsigned int i; | |
| 513 int ret = 0; | |
| 514 | |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
515 for (i = ITEM_DONE + 1; i < ITEM_END_OF_LIST; i++) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
516 if (ibc->deserializers[i] == NULL && |
|
16222
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
517 ibc->minor_version >= items[i].min_minor_version && |
| 14584 | 518 (items[i].required_keys != NULL || |
| 519 items[i].optional_keys != NULL)) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
520 dsync_ibc_input_error(ibc, NULL, |
| 14584 | 521 "Remote didn't handshake deserializer for %s", |
| 522 items[i].name); | |
| 523 ret = -1; | |
| 524 } | |
| 525 } | |
| 526 return ret; | |
| 527 } | |
| 528 | |
| 529 static bool | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
530 dsync_ibc_stream_handshake(struct dsync_ibc_stream *ibc, const char *line) |
| 14584 | 531 { |
| 532 enum item_type item = ITEM_NONE; | |
| 533 const char *const *required_keys, *error; | |
| 534 unsigned int i; | |
| 535 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
536 if (ibc->handshake_received) |
| 14584 | 537 return TRUE; |
| 538 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
539 if (!ibc->version_received) { |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
540 if (!version_string_verify_full(line, "dsync", |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
541 DSYNC_PROTOCOL_VERSION_MAJOR, |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
542 &ibc->minor_version)) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
543 dsync_ibc_input_error(ibc, NULL, |
| 14584 | 544 "Remote dsync doesn't use compatible protocol"); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
545 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 546 } |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
547 ibc->version_received = TRUE; |
| 14584 | 548 return FALSE; |
| 549 } | |
| 550 | |
| 551 if (strcmp(line, END_OF_LIST_LINE) == 0) { | |
| 552 /* finished handshaking */ | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
553 if (dsync_ibc_check_missing_deserializers(ibc) < 0) |
| 14584 | 554 return FALSE; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
555 ibc->handshake_received = TRUE; |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
556 ibc->last_recv_item = ITEM_HANDSHAKE; |
| 14584 | 557 return FALSE; |
| 558 } | |
| 559 | |
| 560 for (i = 1; i < ITEM_END_OF_LIST; i++) { | |
| 561 if (items[i].chr == line[0]) { | |
| 562 item = i; | |
| 563 break; | |
| 564 } | |
| 565 } | |
| 566 if (item == ITEM_NONE) { | |
| 567 /* unknown deserializer, ignore */ | |
| 568 return FALSE; | |
| 569 } | |
| 570 | |
| 571 required_keys = items[item].required_keys == NULL ? NULL : | |
| 572 t_strsplit(items[item].required_keys, " "); | |
| 573 if (dsync_deserializer_init(items[item].name, | |
| 574 required_keys, line + 1, | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
575 &ibc->deserializers[item], &error) < 0) { |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
576 dsync_ibc_input_error(ibc, NULL, |
| 14584 | 577 "Remote sent invalid handshake for %s: %s", |
| 578 items[item].name, error); | |
| 579 } | |
| 580 return FALSE; | |
| 581 } | |
| 582 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
583 static enum dsync_ibc_recv_ret |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
584 dsync_ibc_stream_input_next(struct dsync_ibc_stream *ibc, enum item_type item, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
585 struct dsync_deserializer_decoder **decoder_r) |
| 14584 | 586 { |
| 587 enum item_type line_item = ITEM_NONE; | |
| 588 const char *line, *error; | |
| 589 unsigned int i; | |
| 590 | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
591 i_assert(ibc->value_input == NULL); |
| 14584 | 592 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
593 timeout_reset(ibc->to); |
| 14584 | 594 |
| 595 do { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
596 if (dsync_ibc_stream_next_line(ibc, &line) <= 0) |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
597 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
598 } while (!dsync_ibc_stream_handshake(ibc, line)); |
| 14584 | 599 |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
600 ibc->last_recv_item = item; |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
601 ibc->last_recv_item_eol = FALSE; |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
602 |
| 14584 | 603 if (strcmp(line, END_OF_LIST_LINE) == 0) { |
| 604 /* end of this list */ | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
605 ibc->last_recv_item_eol = TRUE; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
606 return DSYNC_IBC_RECV_RET_FINISHED; |
| 14584 | 607 } |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
608 if (line[0] == items[ITEM_DONE].chr) { |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
609 /* remote cleanly closed the connection, possibly because of |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
610 some failure (which it should have logged). we don't want to |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
611 log any stream errors anyway after this. */ |
|
20197
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
612 ibc->done_received = TRUE; |
|
15767
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
613 dsync_ibc_stream_stop(ibc); |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
614 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
615 |
|
93a8a32adfd8
dsync: Don't log read() failed: EOF when remote intentionally fails early.
Timo Sirainen <tss@iki.fi>
parents:
15750
diff
changeset
|
616 } |
| 14584 | 617 for (i = 1; i < ITEM_END_OF_LIST; i++) { |
| 618 if (*line == items[i].chr) { | |
| 619 line_item = i; | |
| 620 break; | |
| 621 } | |
| 622 } | |
| 623 if (line_item != item) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
624 dsync_ibc_input_error(ibc, NULL, |
| 14584 | 625 "Received unexpected input %c != %c", |
| 626 *line, items[item].chr); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
627 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 628 } |
| 629 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
630 if (ibc->cur_decoder != NULL) |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
631 dsync_deserializer_decode_finish(&ibc->cur_decoder); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
632 if (dsync_deserializer_decode_begin(ibc->deserializers[item], |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
633 line+1, &ibc->cur_decoder, |
| 14584 | 634 &error) < 0) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
635 dsync_ibc_input_error(ibc, NULL, "Invalid input to %s: %s", |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
636 items[item].name, error); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
637 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 638 } |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
639 *decoder_r = ibc->cur_decoder; |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
640 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 641 } |
| 642 | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
643 static struct dsync_serializer_encoder * |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
644 dsync_ibc_send_encode_begin(struct dsync_ibc_stream *ibc, enum item_type item) |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
645 { |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
646 ibc->last_sent_item = item; |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
647 ibc->last_sent_item_eol = FALSE; |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
648 return dsync_serializer_encode_begin(ibc->serializers[item]); |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
649 } |
|
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
650 |
| 14584 | 651 static void |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
652 dsync_ibc_stream_send_handshake(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
653 const struct dsync_ibc_settings *set) |
| 14584 | 654 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
655 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 656 struct dsync_serializer_encoder *encoder; |
| 657 string_t *str = t_str_new(128); | |
| 658 char sync_type[2]; | |
| 659 | |
| 660 str_append_c(str, items[ITEM_HANDSHAKE].chr); | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
661 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_HANDSHAKE); |
|
15782
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
662 dsync_serializer_encode_add(encoder, "hostname", set->hostname); |
|
17170
08f1c7af0ac0
dsync: Support multiple -n parameters.
Timo Sirainen <tss@iki.fi>
parents:
17130
diff
changeset
|
663 if (set->sync_ns_prefixes != NULL) { |
| 14584 | 664 dsync_serializer_encode_add(encoder, "sync_ns_prefix", |
|
17170
08f1c7af0ac0
dsync: Support multiple -n parameters.
Timo Sirainen <tss@iki.fi>
parents:
17130
diff
changeset
|
665 set->sync_ns_prefixes); |
| 14584 | 666 } |
|
15471
88ac919f8afe
dsync: Added back support for syncing only one mailbox (-m parameter)
Timo Sirainen <tss@iki.fi>
parents:
15470
diff
changeset
|
667 if (set->sync_box != NULL) |
|
88ac919f8afe
dsync: Added back support for syncing only one mailbox (-m parameter)
Timo Sirainen <tss@iki.fi>
parents:
15470
diff
changeset
|
668 dsync_serializer_encode_add(encoder, "sync_box", set->sync_box); |
|
18180
39d00448490f
dsync: If same GUID already exists in storage, try to copy it instead of recreating the mail.
Timo Sirainen <tss@iki.fi>
parents:
18177
diff
changeset
|
669 if (set->virtual_all_box != NULL) { |
|
39d00448490f
dsync: If same GUID already exists in storage, try to copy it instead of recreating the mail.
Timo Sirainen <tss@iki.fi>
parents:
18177
diff
changeset
|
670 dsync_serializer_encode_add(encoder, "virtual_all_box", |
|
39d00448490f
dsync: If same GUID already exists in storage, try to copy it instead of recreating the mail.
Timo Sirainen <tss@iki.fi>
parents:
18177
diff
changeset
|
671 set->virtual_all_box); |
|
39d00448490f
dsync: If same GUID already exists in storage, try to copy it instead of recreating the mail.
Timo Sirainen <tss@iki.fi>
parents:
18177
diff
changeset
|
672 } |
|
16398
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
673 if (set->exclude_mailboxes != NULL) { |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
674 string_t *substr = t_str_new(64); |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
675 unsigned int i; |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
676 |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
677 for (i = 0; set->exclude_mailboxes[i] != NULL; i++) { |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
678 if (i != 0) |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
679 str_append_c(substr, '\t'); |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
680 str_append_tabescaped(substr, set->exclude_mailboxes[i]); |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
681 } |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
682 dsync_serializer_encode_add(encoder, "exclude_mailboxes", |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
683 str_c(substr)); |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
684 } |
|
16110
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
685 if (!guid_128_is_empty(set->sync_box_guid)) { |
|
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
686 dsync_serializer_encode_add(encoder, "sync_box_guid", |
|
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
687 guid_128_to_string(set->sync_box_guid)); |
|
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
688 } |
| 14584 | 689 |
| 690 sync_type[0] = sync_type[1] = '\0'; | |
| 691 switch (set->sync_type) { | |
| 692 case DSYNC_BRAIN_SYNC_TYPE_UNKNOWN: | |
| 693 break; | |
| 694 case DSYNC_BRAIN_SYNC_TYPE_FULL: | |
| 695 sync_type[0] = 'f'; | |
| 696 break; | |
| 697 case DSYNC_BRAIN_SYNC_TYPE_CHANGED: | |
| 698 sync_type[0] = 'c'; | |
| 699 break; | |
| 700 case DSYNC_BRAIN_SYNC_TYPE_STATE: | |
| 701 sync_type[0] = 's'; | |
| 702 break; | |
| 703 } | |
|
15782
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
704 if (sync_type[0] != '\0') |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
705 dsync_serializer_encode_add(encoder, "sync_type", sync_type); |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
706 if (set->lock_timeout > 0) { |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
707 dsync_serializer_encode_add(encoder, "lock_timeout", |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
708 t_strdup_printf("%u", set->lock_timeout)); |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
709 } |
|
18177
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
710 if (set->sync_since_timestamp > 0) { |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
711 dsync_serializer_encode_add(encoder, "sync_since_timestamp", |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
712 t_strdup_printf("%ld", (long)set->sync_since_timestamp)); |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
713 } |
|
20633
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
714 if (set->sync_max_size > 0) { |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
715 dsync_serializer_encode_add(encoder, "sync_max_size", |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
716 t_strdup_printf("%llu", (unsigned long long)set->sync_max_size)); |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
717 } |
|
18181
35e4a6ae8d85
dsync: Added -F parameter to sync only mails with[out] specific flag.
Timo Sirainen <tss@iki.fi>
parents:
18180
diff
changeset
|
718 if (set->sync_flags != NULL) { |
|
35e4a6ae8d85
dsync: Added -F parameter to sync only mails with[out] specific flag.
Timo Sirainen <tss@iki.fi>
parents:
18180
diff
changeset
|
719 dsync_serializer_encode_add(encoder, "sync_flags", |
|
35e4a6ae8d85
dsync: Added -F parameter to sync only mails with[out] specific flag.
Timo Sirainen <tss@iki.fi>
parents:
18180
diff
changeset
|
720 set->sync_flags); |
|
35e4a6ae8d85
dsync: Added -F parameter to sync only mails with[out] specific flag.
Timo Sirainen <tss@iki.fi>
parents:
18180
diff
changeset
|
721 } |
|
15744
b4e2b3b54f0a
dsync: Renamed "guid_requests" to "mail_requests"
Timo Sirainen <tss@iki.fi>
parents:
15715
diff
changeset
|
722 if ((set->brain_flags & DSYNC_BRAIN_FLAG_SEND_MAIL_REQUESTS) != 0) |
|
b4e2b3b54f0a
dsync: Renamed "guid_requests" to "mail_requests"
Timo Sirainen <tss@iki.fi>
parents:
15715
diff
changeset
|
723 dsync_serializer_encode_add(encoder, "send_mail_requests", ""); |
|
15231
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
724 if ((set->brain_flags & DSYNC_BRAIN_FLAG_BACKUP_SEND) != 0) |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
725 dsync_serializer_encode_add(encoder, "backup_send", ""); |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
726 if ((set->brain_flags & DSYNC_BRAIN_FLAG_BACKUP_RECV) != 0) |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
727 dsync_serializer_encode_add(encoder, "backup_recv", ""); |
|
15464
af3b86a16ac3
dsync: Added debugging and rawlogging support.
Timo Sirainen <tss@iki.fi>
parents:
15463
diff
changeset
|
728 if ((set->brain_flags & DSYNC_BRAIN_FLAG_DEBUG) != 0) |
|
af3b86a16ac3
dsync: Added debugging and rawlogging support.
Timo Sirainen <tss@iki.fi>
parents:
15463
diff
changeset
|
729 dsync_serializer_encode_add(encoder, "debug", ""); |
|
15836
607758d425e7
dsync: Renamed -a parameter to -N. It also now skips invisible namespaces.
Timo Sirainen <tss@iki.fi>
parents:
15783
diff
changeset
|
730 if ((set->brain_flags & DSYNC_BRAIN_FLAG_SYNC_VISIBLE_NAMESPACES) != 0) |
|
607758d425e7
dsync: Renamed -a parameter to -N. It also now skips invisible namespaces.
Timo Sirainen <tss@iki.fi>
parents:
15783
diff
changeset
|
731 dsync_serializer_encode_add(encoder, "sync_visible_namespaces", ""); |
|
16560
2e6829462405
dsync: Send DSYNC_BRAIN_FLAG_NO_MAIL_SYNC via ibc-stream to slave brain.
Timo Sirainen <tss@iki.fi>
parents:
16415
diff
changeset
|
732 if ((set->brain_flags & DSYNC_BRAIN_FLAG_NO_MAIL_SYNC) != 0) |
|
2e6829462405
dsync: Send DSYNC_BRAIN_FLAG_NO_MAIL_SYNC via ibc-stream to slave brain.
Timo Sirainen <tss@iki.fi>
parents:
16415
diff
changeset
|
733 dsync_serializer_encode_add(encoder, "no_mail_sync", ""); |
|
19021
3fc9658c9712
dsync: Added -D parameter to disable mailbox renaming.
Timo Sirainen <tss@iki.fi>
parents:
19014
diff
changeset
|
734 if ((set->brain_flags & DSYNC_BRAIN_FLAG_NO_MAILBOX_RENAMES) != 0) |
|
3fc9658c9712
dsync: Added -D parameter to disable mailbox renaming.
Timo Sirainen <tss@iki.fi>
parents:
19014
diff
changeset
|
735 dsync_serializer_encode_add(encoder, "no_mailbox_renames", ""); |
|
16561
0144704e1b99
dsync: Added -1 parameter to do a "one way sync" without reverting changes.
Timo Sirainen <tss@iki.fi>
parents:
16560
diff
changeset
|
736 if ((set->brain_flags & DSYNC_BRAIN_FLAG_NO_BACKUP_OVERWRITE) != 0) |
|
0144704e1b99
dsync: Added -1 parameter to do a "one way sync" without reverting changes.
Timo Sirainen <tss@iki.fi>
parents:
16560
diff
changeset
|
737 dsync_serializer_encode_add(encoder, "no_backup_overwrite", ""); |
|
16801
56be613e8ece
dsync: Added -P parameter to do a purge for the remote storage after syncing.
Timo Sirainen <tss@iki.fi>
parents:
16681
diff
changeset
|
738 if ((set->brain_flags & DSYNC_BRAIN_FLAG_PURGE_REMOTE) != 0) |
|
56be613e8ece
dsync: Added -P parameter to do a purge for the remote storage after syncing.
Timo Sirainen <tss@iki.fi>
parents:
16681
diff
changeset
|
739 dsync_serializer_encode_add(encoder, "purge_remote", ""); |
|
19318
f9a143c630a5
dsync: Added DSYNC_BRAIN_FLAG_NO_NOTIFY to enable MAILBOX_TRANSACTION_FLAG_NO_NOTIFY
Timo Sirainen <tss@iki.fi>
parents:
19191
diff
changeset
|
740 if ((set->brain_flags & DSYNC_BRAIN_FLAG_NO_NOTIFY) != 0) |
|
f9a143c630a5
dsync: Added DSYNC_BRAIN_FLAG_NO_NOTIFY to enable MAILBOX_TRANSACTION_FLAG_NO_NOTIFY
Timo Sirainen <tss@iki.fi>
parents:
19191
diff
changeset
|
741 dsync_serializer_encode_add(encoder, "no_notify", ""); |
|
20595
40ce04c672a4
dsync: Add support for features
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
20458
diff
changeset
|
742 if ((set->brain_flags & DSYNC_BRAIN_FLAG_EMPTY_HDR_WORKAROUND) != 0) |
|
40ce04c672a4
dsync: Add support for features
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
20458
diff
changeset
|
743 dsync_serializer_encode_add(encoder, "empty_hdr_workaround", ""); |
| 14584 | 744 |
| 745 dsync_serializer_encode_finish(&encoder, str); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
746 dsync_ibc_stream_send_string(ibc, str); |
| 14584 | 747 } |
| 748 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
749 static enum dsync_ibc_recv_ret |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
750 dsync_ibc_stream_recv_handshake(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
751 const struct dsync_ibc_settings **set_r) |
| 14584 | 752 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
753 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 754 struct dsync_deserializer_decoder *decoder; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
755 struct dsync_ibc_settings *set; |
| 14584 | 756 const char *value; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
757 pool_t pool = ibc->ret_pool; |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
758 enum dsync_ibc_recv_ret ret; |
| 14584 | 759 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
760 ret = dsync_ibc_stream_input_next(ibc, ITEM_HANDSHAKE, &decoder); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
761 if (ret != DSYNC_IBC_RECV_RET_OK) { |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
762 if (ret != DSYNC_IBC_RECV_RET_TRYAGAIN) { |
| 14584 | 763 i_error("dsync(%s): Unexpected input in handshake", |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
764 ibc->name); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
765 dsync_ibc_stream_stop(ibc); |
| 14584 | 766 } |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
767 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 768 } |
| 769 | |
| 770 p_clear(pool); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
771 set = p_new(pool, struct dsync_ibc_settings, 1); |
| 14584 | 772 |
|
15782
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
773 value = dsync_deserializer_decode_get(decoder, "hostname"); |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
774 set->hostname = p_strdup(pool, value); |
|
16665
7057d4ad8891
dsync: After reading remote hostname, use it for the log messages instead of IP.
Timo Sirainen <tss@iki.fi>
parents:
16563
diff
changeset
|
775 /* now that we know the remote's hostname, use it for the |
|
7057d4ad8891
dsync: After reading remote hostname, use it for the log messages instead of IP.
Timo Sirainen <tss@iki.fi>
parents:
16563
diff
changeset
|
776 stream's name */ |
|
7057d4ad8891
dsync: After reading remote hostname, use it for the log messages instead of IP.
Timo Sirainen <tss@iki.fi>
parents:
16563
diff
changeset
|
777 i_free(ibc->name); |
|
7057d4ad8891
dsync: After reading remote hostname, use it for the log messages instead of IP.
Timo Sirainen <tss@iki.fi>
parents:
16563
diff
changeset
|
778 ibc->name = i_strdup(set->hostname); |
|
7057d4ad8891
dsync: After reading remote hostname, use it for the log messages instead of IP.
Timo Sirainen <tss@iki.fi>
parents:
16563
diff
changeset
|
779 |
| 14584 | 780 if (dsync_deserializer_decode_try(decoder, "sync_ns_prefix", &value)) |
|
17170
08f1c7af0ac0
dsync: Support multiple -n parameters.
Timo Sirainen <tss@iki.fi>
parents:
17130
diff
changeset
|
781 set->sync_ns_prefixes = p_strdup(pool, value); |
|
15471
88ac919f8afe
dsync: Added back support for syncing only one mailbox (-m parameter)
Timo Sirainen <tss@iki.fi>
parents:
15470
diff
changeset
|
782 if (dsync_deserializer_decode_try(decoder, "sync_box", &value)) |
|
88ac919f8afe
dsync: Added back support for syncing only one mailbox (-m parameter)
Timo Sirainen <tss@iki.fi>
parents:
15470
diff
changeset
|
783 set->sync_box = p_strdup(pool, value); |
|
18180
39d00448490f
dsync: If same GUID already exists in storage, try to copy it instead of recreating the mail.
Timo Sirainen <tss@iki.fi>
parents:
18177
diff
changeset
|
784 if (dsync_deserializer_decode_try(decoder, "virtual_all_box", &value)) |
|
39d00448490f
dsync: If same GUID already exists in storage, try to copy it instead of recreating the mail.
Timo Sirainen <tss@iki.fi>
parents:
18177
diff
changeset
|
785 set->virtual_all_box = p_strdup(pool, value); |
|
16110
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
786 if (dsync_deserializer_decode_try(decoder, "sync_box_guid", &value) && |
|
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
787 guid_128_from_string(value, set->sync_box_guid) < 0) { |
|
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
788 dsync_ibc_input_error(ibc, decoder, |
|
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
789 "Invalid sync_box_guid: %s", value); |
|
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
790 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
c51873a8e0d9
doveadm sync/backup: Added -g <guid> to sync only the specified mailbox (by GUID)
Timo Sirainen <tss@iki.fi>
parents:
16109
diff
changeset
|
791 } |
|
16398
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
792 if (dsync_deserializer_decode_try(decoder, "exclude_mailboxes", &value) && |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
793 *value != '\0') { |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
794 char **boxes = p_strsplit_tabescaped(pool, value); |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
795 set->exclude_mailboxes = (const void *)boxes; |
|
4883a8e1db13
dsync: Added -x parameter to exclude mailboxes from sync.
Timo Sirainen <tss@iki.fi>
parents:
16381
diff
changeset
|
796 } |
| 14584 | 797 if (dsync_deserializer_decode_try(decoder, "sync_type", &value)) { |
| 798 switch (value[0]) { | |
| 799 case 'f': | |
| 800 set->sync_type = DSYNC_BRAIN_SYNC_TYPE_FULL; | |
| 801 break; | |
| 802 case 'c': | |
| 803 set->sync_type = DSYNC_BRAIN_SYNC_TYPE_CHANGED; | |
| 804 break; | |
| 805 case 's': | |
| 806 set->sync_type = DSYNC_BRAIN_SYNC_TYPE_STATE; | |
| 807 break; | |
| 808 default: | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
809 dsync_ibc_input_error(ibc, decoder, |
| 14584 | 810 "Unknown sync_type: %s", value); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
811 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 812 } |
| 813 } | |
|
15782
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
814 if (dsync_deserializer_decode_try(decoder, "lock_timeout", &value)) { |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
815 if (str_to_uint(value, &set->lock_timeout) < 0 || |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
816 set->lock_timeout == 0) { |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
817 dsync_ibc_input_error(ibc, decoder, |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
818 "Invalid lock_timeout: %s", value); |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
819 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
820 } |
|
6f024e0289da
dsync: -l parameter locking is now done on the server with "lower" hostname.
Timo Sirainen <tss@iki.fi>
parents:
15767
diff
changeset
|
821 } |
|
18177
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
822 if (dsync_deserializer_decode_try(decoder, "sync_since_timestamp", &value)) { |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
823 if (str_to_time(value, &set->sync_since_timestamp) < 0 || |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
824 set->sync_since_timestamp == 0) { |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
825 dsync_ibc_input_error(ibc, decoder, |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
826 "Invalid sync_since_timestamp: %s", value); |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
827 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
828 } |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
829 } |
|
20633
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
830 if (dsync_deserializer_decode_try(decoder, "sync_max_size", &value)) { |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
831 if (str_to_uoff(value, &set->sync_max_size) < 0 || |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
832 set->sync_max_size == 0) { |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
833 dsync_ibc_input_error(ibc, decoder, |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
834 "Invalid sync_max_size: %s", value); |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
835 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
836 } |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
837 } |
|
18181
35e4a6ae8d85
dsync: Added -F parameter to sync only mails with[out] specific flag.
Timo Sirainen <tss@iki.fi>
parents:
18180
diff
changeset
|
838 if (dsync_deserializer_decode_try(decoder, "sync_flags", &value)) |
|
35e4a6ae8d85
dsync: Added -F parameter to sync only mails with[out] specific flag.
Timo Sirainen <tss@iki.fi>
parents:
18180
diff
changeset
|
839 set->sync_flags = p_strdup(pool, value); |
|
15744
b4e2b3b54f0a
dsync: Renamed "guid_requests" to "mail_requests"
Timo Sirainen <tss@iki.fi>
parents:
15715
diff
changeset
|
840 if (dsync_deserializer_decode_try(decoder, "send_mail_requests", &value)) |
|
b4e2b3b54f0a
dsync: Renamed "guid_requests" to "mail_requests"
Timo Sirainen <tss@iki.fi>
parents:
15715
diff
changeset
|
841 set->brain_flags |= DSYNC_BRAIN_FLAG_SEND_MAIL_REQUESTS; |
|
15231
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
842 if (dsync_deserializer_decode_try(decoder, "backup_send", &value)) |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
843 set->brain_flags |= DSYNC_BRAIN_FLAG_BACKUP_SEND; |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
844 if (dsync_deserializer_decode_try(decoder, "backup_recv", &value)) |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
845 set->brain_flags |= DSYNC_BRAIN_FLAG_BACKUP_RECV; |
|
15464
af3b86a16ac3
dsync: Added debugging and rawlogging support.
Timo Sirainen <tss@iki.fi>
parents:
15463
diff
changeset
|
846 if (dsync_deserializer_decode_try(decoder, "debug", &value)) |
|
af3b86a16ac3
dsync: Added debugging and rawlogging support.
Timo Sirainen <tss@iki.fi>
parents:
15463
diff
changeset
|
847 set->brain_flags |= DSYNC_BRAIN_FLAG_DEBUG; |
|
15836
607758d425e7
dsync: Renamed -a parameter to -N. It also now skips invisible namespaces.
Timo Sirainen <tss@iki.fi>
parents:
15783
diff
changeset
|
848 if (dsync_deserializer_decode_try(decoder, "sync_visible_namespaces", &value)) |
|
607758d425e7
dsync: Renamed -a parameter to -N. It also now skips invisible namespaces.
Timo Sirainen <tss@iki.fi>
parents:
15783
diff
changeset
|
849 set->brain_flags |= DSYNC_BRAIN_FLAG_SYNC_VISIBLE_NAMESPACES; |
|
16560
2e6829462405
dsync: Send DSYNC_BRAIN_FLAG_NO_MAIL_SYNC via ibc-stream to slave brain.
Timo Sirainen <tss@iki.fi>
parents:
16415
diff
changeset
|
850 if (dsync_deserializer_decode_try(decoder, "no_mail_sync", &value)) |
|
2e6829462405
dsync: Send DSYNC_BRAIN_FLAG_NO_MAIL_SYNC via ibc-stream to slave brain.
Timo Sirainen <tss@iki.fi>
parents:
16415
diff
changeset
|
851 set->brain_flags |= DSYNC_BRAIN_FLAG_NO_MAIL_SYNC; |
|
19021
3fc9658c9712
dsync: Added -D parameter to disable mailbox renaming.
Timo Sirainen <tss@iki.fi>
parents:
19014
diff
changeset
|
852 if (dsync_deserializer_decode_try(decoder, "no_mailbox_renames", &value)) |
|
3fc9658c9712
dsync: Added -D parameter to disable mailbox renaming.
Timo Sirainen <tss@iki.fi>
parents:
19014
diff
changeset
|
853 set->brain_flags |= DSYNC_BRAIN_FLAG_NO_MAILBOX_RENAMES; |
|
16561
0144704e1b99
dsync: Added -1 parameter to do a "one way sync" without reverting changes.
Timo Sirainen <tss@iki.fi>
parents:
16560
diff
changeset
|
854 if (dsync_deserializer_decode_try(decoder, "no_backup_overwrite", &value)) |
|
0144704e1b99
dsync: Added -1 parameter to do a "one way sync" without reverting changes.
Timo Sirainen <tss@iki.fi>
parents:
16560
diff
changeset
|
855 set->brain_flags |= DSYNC_BRAIN_FLAG_NO_BACKUP_OVERWRITE; |
|
16801
56be613e8ece
dsync: Added -P parameter to do a purge for the remote storage after syncing.
Timo Sirainen <tss@iki.fi>
parents:
16681
diff
changeset
|
856 if (dsync_deserializer_decode_try(decoder, "purge_remote", &value)) |
|
56be613e8ece
dsync: Added -P parameter to do a purge for the remote storage after syncing.
Timo Sirainen <tss@iki.fi>
parents:
16681
diff
changeset
|
857 set->brain_flags |= DSYNC_BRAIN_FLAG_PURGE_REMOTE; |
|
19318
f9a143c630a5
dsync: Added DSYNC_BRAIN_FLAG_NO_NOTIFY to enable MAILBOX_TRANSACTION_FLAG_NO_NOTIFY
Timo Sirainen <tss@iki.fi>
parents:
19191
diff
changeset
|
858 if (dsync_deserializer_decode_try(decoder, "no_notify", &value)) |
|
f9a143c630a5
dsync: Added DSYNC_BRAIN_FLAG_NO_NOTIFY to enable MAILBOX_TRANSACTION_FLAG_NO_NOTIFY
Timo Sirainen <tss@iki.fi>
parents:
19191
diff
changeset
|
859 set->brain_flags |= DSYNC_BRAIN_FLAG_NO_NOTIFY; |
|
20595
40ce04c672a4
dsync: Add support for features
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
20458
diff
changeset
|
860 if (dsync_deserializer_decode_try(decoder, "empty_hdr_workaround", &value)) |
|
40ce04c672a4
dsync: Add support for features
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
20458
diff
changeset
|
861 set->brain_flags |= DSYNC_BRAIN_FLAG_EMPTY_HDR_WORKAROUND; |
|
19646
25f06710e671
dsync: When comparing headers' hashes to match messages, try to normalize the input.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
19552
diff
changeset
|
862 set->hdr_hash_v2 = ibc->minor_version >= DSYNC_PROTOCOL_MINOR_HAVE_HDR_HASH_V2; |
| 14584 | 863 |
| 864 *set_r = set; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
865 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 866 } |
| 867 | |
| 868 static void | |
|
16222
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
869 dsync_ibc_stream_send_end_of_list(struct dsync_ibc *_ibc, |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
870 enum dsync_ibc_eol_type type) |
| 14584 | 871 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
872 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 873 |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
874 i_assert(ibc->value_output == NULL); |
| 14584 | 875 |
|
16222
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
876 switch (type) { |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
877 case DSYNC_IBC_EOL_MAILBOX_ATTRIBUTE: |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
878 if (ibc->minor_version < DSYNC_PROTOCOL_MINOR_HAVE_ATTRIBUTES) |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
879 return; |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
880 break; |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
881 default: |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
882 break; |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
883 } |
|
d79cf48f1072
dsync: Fixed talking to earlier dsync without mailbox attribute support.
Timo Sirainen <tss@iki.fi>
parents:
16110
diff
changeset
|
884 |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
885 ibc->last_sent_item_eol = TRUE; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
886 o_stream_nsend_str(ibc->output, END_OF_LIST_LINE"\n"); |
| 14584 | 887 } |
| 888 | |
| 889 static void | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
890 dsync_ibc_stream_send_mailbox_state(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
891 const struct dsync_mailbox_state *state) |
| 14584 | 892 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
893 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 894 struct dsync_serializer_encoder *encoder; |
| 895 string_t *str = t_str_new(128); | |
| 896 | |
| 897 str_append_c(str, items[ITEM_MAILBOX_STATE].chr); | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
898 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_MAILBOX_STATE); |
| 14584 | 899 dsync_serializer_encode_add(encoder, "mailbox_guid", |
| 900 guid_128_to_string(state->mailbox_guid)); | |
| 901 dsync_serializer_encode_add(encoder, "last_uidvalidity", | |
| 902 dec2str(state->last_uidvalidity)); | |
| 903 dsync_serializer_encode_add(encoder, "last_common_uid", | |
| 904 dec2str(state->last_common_uid)); | |
| 905 dsync_serializer_encode_add(encoder, "last_common_modseq", | |
| 906 dec2str(state->last_common_modseq)); | |
|
15496
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
907 dsync_serializer_encode_add(encoder, "last_common_pvt_modseq", |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
908 dec2str(state->last_common_pvt_modseq)); |
|
17282
9669c9a8984f
dsync: Include messages_count in the mailbox states.
Timo Sirainen <tss@iki.fi>
parents:
17252
diff
changeset
|
909 dsync_serializer_encode_add(encoder, "last_messages_count", |
|
9669c9a8984f
dsync: Include messages_count in the mailbox states.
Timo Sirainen <tss@iki.fi>
parents:
17252
diff
changeset
|
910 dec2str(state->last_messages_count)); |
|
15783
502a50925641
dsync: Merge last-common-* values from both local and remote when they differ.
Timo Sirainen <tss@iki.fi>
parents:
15782
diff
changeset
|
911 if (state->changes_during_sync) |
|
502a50925641
dsync: Merge last-common-* values from both local and remote when they differ.
Timo Sirainen <tss@iki.fi>
parents:
15782
diff
changeset
|
912 dsync_serializer_encode_add(encoder, "changes_during_sync", ""); |
| 14584 | 913 |
| 914 dsync_serializer_encode_finish(&encoder, str); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
915 dsync_ibc_stream_send_string(ibc, str); |
| 14584 | 916 } |
| 917 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
918 static enum dsync_ibc_recv_ret |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
919 dsync_ibc_stream_recv_mailbox_state(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
920 struct dsync_mailbox_state *state_r) |
| 14584 | 921 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
922 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 923 struct dsync_deserializer_decoder *decoder; |
| 924 const char *value; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
925 enum dsync_ibc_recv_ret ret; |
| 14584 | 926 |
| 927 memset(state_r, 0, sizeof(*state_r)); | |
| 928 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
929 ret = dsync_ibc_stream_input_next(ibc, ITEM_MAILBOX_STATE, &decoder); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
930 if (ret != DSYNC_IBC_RECV_RET_OK) |
| 14584 | 931 return ret; |
| 932 | |
| 933 value = dsync_deserializer_decode_get(decoder, "mailbox_guid"); | |
| 934 if (guid_128_from_string(value, state_r->mailbox_guid) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
935 dsync_ibc_input_error(ibc, decoder, "Invalid mailbox_guid"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
936 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 937 } |
| 938 value = dsync_deserializer_decode_get(decoder, "last_uidvalidity"); | |
| 939 if (str_to_uint32(value, &state_r->last_uidvalidity) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
940 dsync_ibc_input_error(ibc, decoder, "Invalid last_uidvalidity"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
941 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 942 } |
| 943 value = dsync_deserializer_decode_get(decoder, "last_common_uid"); | |
|
15494
b7d8027a8f74
dsync: Fixed parsing mailbox state from remote dsync.
Timo Sirainen <tss@iki.fi>
parents:
15483
diff
changeset
|
944 if (str_to_uint32(value, &state_r->last_common_uid) < 0) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
945 dsync_ibc_input_error(ibc, decoder, "Invalid last_common_uid"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
946 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 947 } |
| 948 value = dsync_deserializer_decode_get(decoder, "last_common_modseq"); | |
|
15494
b7d8027a8f74
dsync: Fixed parsing mailbox state from remote dsync.
Timo Sirainen <tss@iki.fi>
parents:
15483
diff
changeset
|
949 if (str_to_uint64(value, &state_r->last_common_modseq) < 0) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
950 dsync_ibc_input_error(ibc, decoder, "Invalid last_common_modseq"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
951 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 952 } |
|
15496
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
953 value = dsync_deserializer_decode_get(decoder, "last_common_pvt_modseq"); |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
954 if (str_to_uint64(value, &state_r->last_common_pvt_modseq) < 0) { |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
955 dsync_ibc_input_error(ibc, decoder, "Invalid last_common_pvt_modseq"); |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
956 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
957 } |
|
17286
507aee5fef6d
dsync: Yet another fix to working with old versions.
Timo Sirainen <tss@iki.fi>
parents:
17284
diff
changeset
|
958 if (dsync_deserializer_decode_try(decoder, "last_messages_count", &value) && |
|
507aee5fef6d
dsync: Yet another fix to working with old versions.
Timo Sirainen <tss@iki.fi>
parents:
17284
diff
changeset
|
959 str_to_uint32(value, &state_r->last_messages_count) < 0) { |
|
17282
9669c9a8984f
dsync: Include messages_count in the mailbox states.
Timo Sirainen <tss@iki.fi>
parents:
17252
diff
changeset
|
960 dsync_ibc_input_error(ibc, decoder, "Invalid last_messages_count"); |
|
9669c9a8984f
dsync: Include messages_count in the mailbox states.
Timo Sirainen <tss@iki.fi>
parents:
17252
diff
changeset
|
961 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
9669c9a8984f
dsync: Include messages_count in the mailbox states.
Timo Sirainen <tss@iki.fi>
parents:
17252
diff
changeset
|
962 } |
|
15783
502a50925641
dsync: Merge last-common-* values from both local and remote when they differ.
Timo Sirainen <tss@iki.fi>
parents:
15782
diff
changeset
|
963 if (dsync_deserializer_decode_try(decoder, "changes_during_sync", &value)) |
|
502a50925641
dsync: Merge last-common-* values from both local and remote when they differ.
Timo Sirainen <tss@iki.fi>
parents:
15782
diff
changeset
|
964 state_r->changes_during_sync = TRUE; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
965 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 966 } |
| 967 | |
| 968 static void | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
969 dsync_ibc_stream_send_mailbox_tree_node(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
970 const char *const *name, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
971 const struct dsync_mailbox_node *node) |
| 14584 | 972 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
973 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 974 struct dsync_serializer_encoder *encoder; |
| 975 string_t *str, *namestr; | |
| 976 | |
| 977 i_assert(*name != NULL); | |
| 978 | |
| 979 str = t_str_new(128); | |
| 980 str_append_c(str, items[ITEM_MAILBOX_TREE_NODE].chr); | |
| 981 | |
| 982 /* convert all hierarchy separators to tabs. mailbox names really | |
| 983 aren't supposed to have any tabs, but escape them anyway if there | |
| 984 are. */ | |
| 985 namestr = t_str_new(128); | |
| 986 for (; *name != NULL; name++) { | |
|
15068
002e0a120c2a
Renamed str_tabescape_write() to str_append_tabescaped()
Timo Sirainen <tss@iki.fi>
parents:
15037
diff
changeset
|
987 str_append_tabescaped(namestr, *name); |
| 14584 | 988 str_append_c(namestr, '\t'); |
| 989 } | |
| 990 str_truncate(namestr, str_len(namestr)-1); | |
| 991 | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
992 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_MAILBOX_TREE_NODE); |
| 14584 | 993 dsync_serializer_encode_add(encoder, "name", str_c(namestr)); |
| 994 switch (node->existence) { | |
| 995 case DSYNC_MAILBOX_NODE_NONEXISTENT: | |
| 996 dsync_serializer_encode_add(encoder, "existence", "n"); | |
| 997 break; | |
| 998 case DSYNC_MAILBOX_NODE_EXISTS: | |
| 999 dsync_serializer_encode_add(encoder, "existence", "y"); | |
| 1000 break; | |
| 1001 case DSYNC_MAILBOX_NODE_DELETED: | |
| 1002 dsync_serializer_encode_add(encoder, "existence", "d"); | |
| 1003 break; | |
| 1004 } | |
| 1005 | |
| 1006 if (!guid_128_is_empty(node->mailbox_guid)) { | |
| 1007 dsync_serializer_encode_add(encoder, "mailbox_guid", | |
| 1008 guid_128_to_string(node->mailbox_guid)); | |
| 1009 } | |
| 1010 if (node->uid_validity != 0) { | |
| 1011 dsync_serializer_encode_add(encoder, "uid_validity", | |
| 1012 dec2str(node->uid_validity)); | |
| 1013 } | |
|
15231
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
1014 if (node->uid_next != 0) { |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
1015 dsync_serializer_encode_add(encoder, "uid_next", |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
1016 dec2str(node->uid_next)); |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
1017 } |
|
15035
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1018 if (node->last_renamed_or_created != 0) { |
|
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1019 dsync_serializer_encode_add(encoder, "last_renamed_or_created", |
|
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1020 dec2str(node->last_renamed_or_created)); |
| 14584 | 1021 } |
| 1022 if (node->last_subscription_change != 0) { | |
| 1023 dsync_serializer_encode_add(encoder, "last_subscription_change", | |
| 1024 dec2str(node->last_subscription_change)); | |
| 1025 } | |
| 1026 if (node->subscribed) | |
| 1027 dsync_serializer_encode_add(encoder, "subscribed", ""); | |
| 1028 dsync_serializer_encode_finish(&encoder, str); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1029 dsync_ibc_stream_send_string(ibc, str); |
| 14584 | 1030 } |
| 1031 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1032 static enum dsync_ibc_recv_ret |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1033 dsync_ibc_stream_recv_mailbox_tree_node(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1034 const char *const **name_r, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1035 const struct dsync_mailbox_node **node_r) |
| 14584 | 1036 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1037 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 1038 struct dsync_deserializer_decoder *decoder; |
| 1039 struct dsync_mailbox_node *node; | |
| 1040 const char *value; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1041 enum dsync_ibc_recv_ret ret; |
| 14584 | 1042 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1043 ret = dsync_ibc_stream_input_next(ibc, ITEM_MAILBOX_TREE_NODE, &decoder); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1044 if (ret != DSYNC_IBC_RECV_RET_OK) |
| 14584 | 1045 return ret; |
| 1046 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1047 p_clear(ibc->ret_pool); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1048 node = p_new(ibc->ret_pool, struct dsync_mailbox_node, 1); |
| 14584 | 1049 |
| 1050 value = dsync_deserializer_decode_get(decoder, "name"); | |
| 1051 if (*value == '\0') { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1052 dsync_ibc_input_error(ibc, decoder, "Empty name"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1053 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1054 } |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1055 *name_r = (void *)p_strsplit_tabescaped(ibc->ret_pool, value); |
| 14584 | 1056 |
| 1057 value = dsync_deserializer_decode_get(decoder, "existence"); | |
| 1058 switch (*value) { | |
| 1059 case 'n': | |
| 1060 node->existence = DSYNC_MAILBOX_NODE_NONEXISTENT; | |
| 1061 break; | |
| 1062 case 'y': | |
| 1063 node->existence = DSYNC_MAILBOX_NODE_EXISTS; | |
| 1064 break; | |
| 1065 case 'd': | |
| 1066 node->existence = DSYNC_MAILBOX_NODE_DELETED; | |
| 1067 break; | |
| 1068 } | |
| 1069 | |
| 1070 if (dsync_deserializer_decode_try(decoder, "mailbox_guid", &value) && | |
| 1071 guid_128_from_string(value, node->mailbox_guid) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1072 dsync_ibc_input_error(ibc, decoder, "Invalid mailbox_guid"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1073 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1074 } |
| 1075 if (dsync_deserializer_decode_try(decoder, "uid_validity", &value) && | |
| 1076 str_to_uint32(value, &node->uid_validity) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1077 dsync_ibc_input_error(ibc, decoder, "Invalid uid_validity"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1078 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1079 } |
|
15231
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
1080 if (dsync_deserializer_decode_try(decoder, "uid_next", &value) && |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
1081 str_to_uint32(value, &node->uid_next) < 0) { |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
1082 dsync_ibc_input_error(ibc, decoder, "Invalid uid_next"); |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
1083 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
454d0563927d
doveadm: "backup" command is working again.
Timo Sirainen <tss@iki.fi>
parents:
15068
diff
changeset
|
1084 } |
|
15035
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1085 if (dsync_deserializer_decode_try(decoder, "last_renamed_or_created", &value) && |
|
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1086 str_to_time(value, &node->last_renamed_or_created) < 0) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1087 dsync_ibc_input_error(ibc, decoder, "Invalid last_renamed_or_created"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1088 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1089 } |
| 1090 if (dsync_deserializer_decode_try(decoder, "last_subscription_change", &value) && | |
| 1091 str_to_time(value, &node->last_subscription_change) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1092 dsync_ibc_input_error(ibc, decoder, "Invalid last_subscription_change"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1093 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1094 } |
| 1095 if (dsync_deserializer_decode_try(decoder, "subscribed", &value)) | |
| 1096 node->subscribed = TRUE; | |
| 1097 | |
| 1098 *node_r = node; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1099 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 1100 } |
| 1101 | |
| 1102 static void | |
|
16380
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1103 dsync_ibc_stream_encode_delete(string_t *str, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1104 struct dsync_serializer_encoder *encoder, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1105 const struct dsync_mailbox_delete *deletes, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1106 unsigned int count, const char *key, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1107 enum dsync_mailbox_delete_type type) |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1108 { |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1109 unsigned int i; |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1110 |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1111 str_truncate(str, 0); |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1112 for (i = 0; i < count; i++) { |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1113 if (deletes[i].type == type) { |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1114 str_append(str, guid_128_to_string(deletes[i].guid)); |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1115 str_printfa(str, " %ld ", (long)deletes[i].timestamp); |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1116 } |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1117 } |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1118 if (str_len(str) > 0) { |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1119 str_truncate(str, str_len(str)-1); |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1120 dsync_serializer_encode_add(encoder, key, str_c(str)); |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1121 } |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1122 } |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1123 |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1124 static void |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1125 dsync_ibc_stream_send_mailbox_deletes(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1126 const struct dsync_mailbox_delete *deletes, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1127 unsigned int count, char hierarchy_sep) |
| 14584 | 1128 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1129 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 1130 struct dsync_serializer_encoder *encoder; |
|
15035
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1131 string_t *str, *substr; |
| 14584 | 1132 char sep[2]; |
| 1133 | |
| 1134 str = t_str_new(128); | |
| 1135 str_append_c(str, items[ITEM_MAILBOX_DELETE].chr); | |
| 1136 | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
1137 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_MAILBOX_DELETE); |
| 14584 | 1138 sep[0] = hierarchy_sep; sep[1] = '\0'; |
| 1139 dsync_serializer_encode_add(encoder, "hierarchy_sep", sep); | |
| 1140 | |
|
15035
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1141 substr = t_str_new(128); |
|
16380
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1142 dsync_ibc_stream_encode_delete(substr, encoder, deletes, count, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1143 "mailboxes", |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1144 DSYNC_MAILBOX_DELETE_TYPE_MAILBOX); |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1145 dsync_ibc_stream_encode_delete(substr, encoder, deletes, count, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1146 "dirs", |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1147 DSYNC_MAILBOX_DELETE_TYPE_DIR); |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1148 dsync_ibc_stream_encode_delete(substr, encoder, deletes, count, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1149 "unsubscribes", |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1150 DSYNC_MAILBOX_DELETE_TYPE_UNSUBSCRIBE); |
| 14584 | 1151 dsync_serializer_encode_finish(&encoder, str); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1152 dsync_ibc_stream_send_string(ibc, str); |
| 14584 | 1153 } |
| 1154 | |
| 1155 ARRAY_DEFINE_TYPE(dsync_mailbox_delete, struct dsync_mailbox_delete); | |
| 1156 static int | |
| 1157 decode_mailbox_deletes(ARRAY_TYPE(dsync_mailbox_delete) *deletes, | |
|
16380
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1158 const char *value, enum dsync_mailbox_delete_type type) |
| 14584 | 1159 { |
| 1160 struct dsync_mailbox_delete *del; | |
|
15035
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1161 const char *const *tmp; |
| 14584 | 1162 unsigned int i; |
| 1163 | |
|
15035
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1164 tmp = t_strsplit(value, " "); |
|
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1165 for (i = 0; tmp[i] != NULL; i += 2) { |
| 14584 | 1166 del = array_append_space(deletes); |
|
16380
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1167 del->type = type; |
|
15035
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1168 if (guid_128_from_string(tmp[i], del->guid) < 0) |
|
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1169 return -1; |
|
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1170 if (tmp[i+1] == NULL || |
|
0af20585964d
dsync: Rewritten syncing for mailbox renames.
Timo Sirainen <tss@iki.fi>
parents:
14691
diff
changeset
|
1171 str_to_time(tmp[i+1], &del->timestamp) < 0) |
| 14584 | 1172 return -1; |
| 1173 } | |
| 1174 return 0; | |
| 1175 } | |
| 1176 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1177 static enum dsync_ibc_recv_ret |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1178 dsync_ibc_stream_recv_mailbox_deletes(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1179 const struct dsync_mailbox_delete **deletes_r, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1180 unsigned int *count_r, char *hierarchy_sep_r) |
| 14584 | 1181 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1182 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 1183 struct dsync_deserializer_decoder *decoder; |
| 1184 ARRAY_TYPE(dsync_mailbox_delete) deletes; | |
| 1185 const char *value; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1186 enum dsync_ibc_recv_ret ret; |
| 14584 | 1187 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1188 ret = dsync_ibc_stream_input_next(ibc, ITEM_MAILBOX_DELETE, &decoder); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1189 if (ret != DSYNC_IBC_RECV_RET_OK) |
| 14584 | 1190 return ret; |
| 1191 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1192 p_clear(ibc->ret_pool); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1193 p_array_init(&deletes, ibc->ret_pool, 16); |
| 14584 | 1194 |
| 1195 value = dsync_deserializer_decode_get(decoder, "hierarchy_sep"); | |
| 1196 if (strlen(value) != 1) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1197 dsync_ibc_input_error(ibc, decoder, "Invalid hierarchy_sep"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1198 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1199 } |
| 1200 *hierarchy_sep_r = value[0]; | |
| 1201 | |
| 1202 if (dsync_deserializer_decode_try(decoder, "mailboxes", &value) && | |
|
16380
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1203 decode_mailbox_deletes(&deletes, value, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1204 DSYNC_MAILBOX_DELETE_TYPE_MAILBOX) < 0) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1205 dsync_ibc_input_error(ibc, decoder, "Invalid mailboxes"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1206 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1207 } |
| 1208 if (dsync_deserializer_decode_try(decoder, "dirs", &value) && | |
|
16380
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1209 decode_mailbox_deletes(&deletes, value, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1210 DSYNC_MAILBOX_DELETE_TYPE_DIR) < 0) { |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1211 dsync_ibc_input_error(ibc, decoder, "Invalid dirs"); |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1212 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1213 } |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1214 if (dsync_deserializer_decode_try(decoder, "unsubscribes", &value) && |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1215 decode_mailbox_deletes(&deletes, value, |
|
9878986a028d
dsync: Fixed unsubscribing from an already deleted mailbox.
Timo Sirainen <tss@iki.fi>
parents:
16376
diff
changeset
|
1216 DSYNC_MAILBOX_DELETE_TYPE_UNSUBSCRIBE) < 0) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1217 dsync_ibc_input_error(ibc, decoder, "Invalid dirs"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1218 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1219 } |
| 1220 *deletes_r = array_get(&deletes, count_r); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1221 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 1222 } |
| 1223 | |
| 1224 static const char * | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1225 get_cache_fields(struct dsync_ibc_stream *ibc, |
| 14584 | 1226 const struct dsync_mailbox *dsync_box) |
| 1227 { | |
| 1228 struct dsync_serializer_encoder *encoder; | |
| 1229 string_t *str; | |
| 1230 const struct mailbox_cache_field *cache_fields; | |
| 1231 unsigned int i, count; | |
| 1232 char decision[3]; | |
| 1233 | |
| 1234 cache_fields = array_get(&dsync_box->cache_fields, &count); | |
| 1235 if (count == 0) | |
| 1236 return ""; | |
| 1237 | |
| 1238 str = t_str_new(128); | |
| 1239 for (i = 0; i < count; i++) { | |
| 1240 const struct mailbox_cache_field *field = &cache_fields[i]; | |
| 1241 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1242 encoder = dsync_serializer_encode_begin(ibc->serializers[ITEM_MAILBOX_CACHE_FIELD]); |
| 14584 | 1243 dsync_serializer_encode_add(encoder, "name", field->name); |
| 1244 | |
| 1245 memset(decision, 0, sizeof(decision)); | |
| 1246 switch (field->decision & ~MAIL_CACHE_DECISION_FORCED) { | |
| 1247 case MAIL_CACHE_DECISION_NO: | |
| 1248 decision[0] = 'n'; | |
| 1249 break; | |
| 1250 case MAIL_CACHE_DECISION_TEMP: | |
| 1251 decision[0] = 't'; | |
| 1252 break; | |
| 1253 case MAIL_CACHE_DECISION_YES: | |
| 1254 decision[0] = 'y'; | |
| 1255 break; | |
| 1256 } | |
| 1257 i_assert(decision[0] != '\0'); | |
| 1258 if ((field->decision & MAIL_CACHE_DECISION_FORCED) != 0) | |
| 1259 decision[1] = 'F'; | |
| 1260 dsync_serializer_encode_add(encoder, "decision", decision); | |
| 1261 if (field->last_used != 0) { | |
| 1262 dsync_serializer_encode_add(encoder, "last_used", | |
| 1263 dec2str(field->last_used)); | |
| 1264 } | |
| 1265 dsync_serializer_encode_finish(&encoder, str); | |
| 1266 } | |
| 1267 if (i > 0) { | |
| 1268 /* remove the trailing LF */ | |
| 1269 str_truncate(str, str_len(str)-1); | |
| 1270 } | |
| 1271 return str_c(str); | |
| 1272 } | |
| 1273 | |
| 1274 static void | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1275 dsync_ibc_stream_send_mailbox(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1276 const struct dsync_mailbox *dsync_box) |
| 14584 | 1277 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1278 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 1279 struct dsync_serializer_encoder *encoder; |
| 1280 string_t *str = t_str_new(128); | |
| 1281 const char *value; | |
| 1282 | |
| 1283 str_append_c(str, items[ITEM_MAILBOX].chr); | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
1284 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_MAILBOX); |
| 14584 | 1285 dsync_serializer_encode_add(encoder, "mailbox_guid", |
| 1286 guid_128_to_string(dsync_box->mailbox_guid)); | |
| 1287 | |
| 1288 if (dsync_box->mailbox_lost) | |
| 1289 dsync_serializer_encode_add(encoder, "mailbox_lost", ""); | |
|
15750
5a1fc3723371
dsync: Automatically figure out which mailboxes can sync with message GUIDs.
Timo Sirainen <tss@iki.fi>
parents:
15744
diff
changeset
|
1290 if (dsync_box->have_guids) |
|
5a1fc3723371
dsync: Automatically figure out which mailboxes can sync with message GUIDs.
Timo Sirainen <tss@iki.fi>
parents:
15744
diff
changeset
|
1291 dsync_serializer_encode_add(encoder, "have_guids", ""); |
|
16376
c6fee677172a
dsync: Don't try to sync with GUIDs if we can't set them on the needed side.
Timo Sirainen <tss@iki.fi>
parents:
16222
diff
changeset
|
1292 if (dsync_box->have_save_guids) |
|
c6fee677172a
dsync: Don't try to sync with GUIDs if we can't set them on the needed side.
Timo Sirainen <tss@iki.fi>
parents:
16222
diff
changeset
|
1293 dsync_serializer_encode_add(encoder, "have_save_guids", ""); |
|
16977
8a7ecddca4ad
dsync: Support syncing storages with 128bit GUIDs <-> string GUIDs.
Timo Sirainen <tss@iki.fi>
parents:
16940
diff
changeset
|
1294 if (dsync_box->have_only_guid128) |
|
8a7ecddca4ad
dsync: Support syncing storages with 128bit GUIDs <-> string GUIDs.
Timo Sirainen <tss@iki.fi>
parents:
16940
diff
changeset
|
1295 dsync_serializer_encode_add(encoder, "have_only_guid128", ""); |
| 14584 | 1296 dsync_serializer_encode_add(encoder, "uid_validity", |
| 1297 dec2str(dsync_box->uid_validity)); | |
| 1298 dsync_serializer_encode_add(encoder, "uid_next", | |
| 1299 dec2str(dsync_box->uid_next)); | |
| 1300 dsync_serializer_encode_add(encoder, "messages_count", | |
| 1301 dec2str(dsync_box->messages_count)); | |
| 1302 dsync_serializer_encode_add(encoder, "first_recent_uid", | |
| 1303 dec2str(dsync_box->first_recent_uid)); | |
| 1304 dsync_serializer_encode_add(encoder, "highest_modseq", | |
| 1305 dec2str(dsync_box->highest_modseq)); | |
|
15496
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1306 dsync_serializer_encode_add(encoder, "highest_pvt_modseq", |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1307 dec2str(dsync_box->highest_pvt_modseq)); |
| 14584 | 1308 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1309 value = get_cache_fields(ibc, dsync_box); |
| 14584 | 1310 if (value != NULL) |
| 1311 dsync_serializer_encode_add(encoder, "cache_fields", value); | |
| 1312 | |
| 1313 dsync_serializer_encode_finish(&encoder, str); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1314 dsync_ibc_stream_send_string(ibc, str); |
| 14584 | 1315 } |
| 1316 | |
| 1317 static int | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1318 parse_cache_field(struct dsync_ibc_stream *ibc, struct dsync_mailbox *box, |
| 14584 | 1319 const char *value) |
| 1320 { | |
| 1321 struct dsync_deserializer_decoder *decoder; | |
| 1322 struct mailbox_cache_field field; | |
| 1323 const char *error; | |
| 1324 int ret = 0; | |
| 1325 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1326 if (dsync_deserializer_decode_begin(ibc->deserializers[ITEM_MAILBOX_CACHE_FIELD], |
| 14584 | 1327 value, &decoder, &error) < 0) { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1328 dsync_ibc_input_error(ibc, NULL, |
| 14584 | 1329 "cache_field: Invalid input: %s", error); |
| 1330 return -1; | |
| 1331 } | |
| 1332 | |
| 1333 memset(&field, 0, sizeof(field)); | |
| 1334 value = dsync_deserializer_decode_get(decoder, "name"); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1335 field.name = p_strdup(ibc->ret_pool, value); |
| 14584 | 1336 |
| 1337 value = dsync_deserializer_decode_get(decoder, "decision"); | |
| 1338 switch (*value) { | |
| 1339 case 'n': | |
| 1340 field.decision = MAIL_CACHE_DECISION_NO; | |
| 1341 break; | |
| 1342 case 't': | |
| 1343 field.decision = MAIL_CACHE_DECISION_TEMP; | |
| 1344 break; | |
| 1345 case 'y': | |
| 1346 field.decision = MAIL_CACHE_DECISION_YES; | |
| 1347 break; | |
| 1348 default: | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1349 dsync_ibc_input_error(ibc, decoder, "Invalid decision: %s", |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1350 value); |
| 14584 | 1351 ret = -1; |
| 1352 break; | |
| 1353 } | |
| 1354 if (value[1] == 'F') | |
| 1355 field.decision |= MAIL_CACHE_DECISION_FORCED; | |
| 1356 | |
| 1357 if (dsync_deserializer_decode_try(decoder, "last_used", &value) && | |
| 1358 str_to_time(value, &field.last_used) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1359 dsync_ibc_input_error(ibc, decoder, "Invalid last_used"); |
| 14584 | 1360 ret = -1; |
| 1361 } | |
| 1362 array_append(&box->cache_fields, &field, 1); | |
| 1363 | |
| 1364 dsync_deserializer_decode_finish(&decoder); | |
| 1365 return ret; | |
| 1366 } | |
| 1367 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1368 static enum dsync_ibc_recv_ret |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1369 dsync_ibc_stream_recv_mailbox(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1370 const struct dsync_mailbox **dsync_box_r) |
| 14584 | 1371 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1372 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1373 pool_t pool = ibc->ret_pool; |
| 14584 | 1374 struct dsync_deserializer_decoder *decoder; |
| 1375 struct dsync_mailbox *box; | |
| 1376 const char *value; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1377 enum dsync_ibc_recv_ret ret; |
| 14584 | 1378 |
| 1379 p_clear(pool); | |
| 1380 box = p_new(pool, struct dsync_mailbox, 1); | |
| 1381 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1382 ret = dsync_ibc_stream_input_next(ibc, ITEM_MAILBOX, &decoder); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1383 if (ret != DSYNC_IBC_RECV_RET_OK) |
| 14584 | 1384 return ret; |
| 1385 | |
| 1386 value = dsync_deserializer_decode_get(decoder, "mailbox_guid"); | |
| 1387 if (guid_128_from_string(value, box->mailbox_guid) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1388 dsync_ibc_input_error(ibc, decoder, "Invalid mailbox_guid"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1389 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1390 } |
| 1391 | |
| 1392 if (dsync_deserializer_decode_try(decoder, "mailbox_lost", &value)) | |
| 1393 box->mailbox_lost = TRUE; | |
|
15750
5a1fc3723371
dsync: Automatically figure out which mailboxes can sync with message GUIDs.
Timo Sirainen <tss@iki.fi>
parents:
15744
diff
changeset
|
1394 if (dsync_deserializer_decode_try(decoder, "have_guids", &value)) |
|
5a1fc3723371
dsync: Automatically figure out which mailboxes can sync with message GUIDs.
Timo Sirainen <tss@iki.fi>
parents:
15744
diff
changeset
|
1395 box->have_guids = TRUE; |
|
16381
e0156c479a12
dsync: Previous have_save_guids change somewhat broke compatibility with earlier dsync versions.
Timo Sirainen <tss@iki.fi>
parents:
16380
diff
changeset
|
1396 if (dsync_deserializer_decode_try(decoder, "have_save_guids", &value) || |
|
e0156c479a12
dsync: Previous have_save_guids change somewhat broke compatibility with earlier dsync versions.
Timo Sirainen <tss@iki.fi>
parents:
16380
diff
changeset
|
1397 (box->have_guids && ibc->minor_version < DSYNC_PROTOCOL_MINOR_HAVE_SAVE_GUID)) |
|
16376
c6fee677172a
dsync: Don't try to sync with GUIDs if we can't set them on the needed side.
Timo Sirainen <tss@iki.fi>
parents:
16222
diff
changeset
|
1398 box->have_save_guids = TRUE; |
|
16977
8a7ecddca4ad
dsync: Support syncing storages with 128bit GUIDs <-> string GUIDs.
Timo Sirainen <tss@iki.fi>
parents:
16940
diff
changeset
|
1399 if (dsync_deserializer_decode_try(decoder, "have_only_guid128", &value)) |
|
8a7ecddca4ad
dsync: Support syncing storages with 128bit GUIDs <-> string GUIDs.
Timo Sirainen <tss@iki.fi>
parents:
16940
diff
changeset
|
1400 box->have_only_guid128 = TRUE; |
| 14584 | 1401 value = dsync_deserializer_decode_get(decoder, "uid_validity"); |
| 1402 if (str_to_uint32(value, &box->uid_validity) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1403 dsync_ibc_input_error(ibc, decoder, "Invalid uid_validity"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1404 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1405 } |
| 1406 value = dsync_deserializer_decode_get(decoder, "uid_next"); | |
| 1407 if (str_to_uint32(value, &box->uid_next) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1408 dsync_ibc_input_error(ibc, decoder, "Invalid uid_next"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1409 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1410 } |
| 1411 value = dsync_deserializer_decode_get(decoder, "messages_count"); | |
| 1412 if (str_to_uint32(value, &box->messages_count) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1413 dsync_ibc_input_error(ibc, decoder, "Invalid messages_count"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1414 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1415 } |
| 1416 value = dsync_deserializer_decode_get(decoder, "first_recent_uid"); | |
| 1417 if (str_to_uint32(value, &box->first_recent_uid) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1418 dsync_ibc_input_error(ibc, decoder, "Invalid first_recent_uid"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1419 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1420 } |
| 1421 value = dsync_deserializer_decode_get(decoder, "highest_modseq"); | |
| 1422 if (str_to_uint64(value, &box->highest_modseq) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1423 dsync_ibc_input_error(ibc, decoder, "Invalid highest_modseq"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1424 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1425 } |
|
15496
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1426 value = dsync_deserializer_decode_get(decoder, "highest_pvt_modseq"); |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1427 if (str_to_uint64(value, &box->highest_pvt_modseq) < 0) { |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1428 dsync_ibc_input_error(ibc, decoder, "Invalid highest_pvt_modseq"); |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1429 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1430 } |
| 14584 | 1431 |
| 1432 p_array_init(&box->cache_fields, pool, 32); | |
| 1433 if (dsync_deserializer_decode_try(decoder, "cache_fields", &value)) { | |
| 1434 const char *const *fields = t_strsplit(value, "\n"); | |
| 1435 for (; *fields != NULL; fields++) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1436 if (parse_cache_field(ibc, box, *fields) < 0) |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1437 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1438 } |
| 1439 } | |
| 1440 | |
| 1441 *dsync_box_r = box; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1442 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 1443 } |
| 1444 | |
| 1445 static void | |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1446 dsync_ibc_stream_send_mailbox_attribute(struct dsync_ibc *_ibc, |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1447 const struct dsync_mailbox_attribute *attr) |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1448 { |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1449 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1450 struct dsync_serializer_encoder *encoder; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1451 string_t *str = t_str_new(128); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1452 char type[2]; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1453 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1454 if (ibc->minor_version < DSYNC_PROTOCOL_MINOR_HAVE_ATTRIBUTES) |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1455 return; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1456 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1457 str_append_c(str, items[ITEM_MAILBOX_ATTRIBUTE].chr); |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
1458 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_MAILBOX_ATTRIBUTE); |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1459 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1460 type[0] = type[1] = '\0'; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1461 switch (attr->type) { |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1462 case MAIL_ATTRIBUTE_TYPE_PRIVATE: |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1463 type[0] = 'p'; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1464 break; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1465 case MAIL_ATTRIBUTE_TYPE_SHARED: |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1466 type[0] = 's'; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1467 break; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1468 } |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1469 i_assert(type[0] != '\0'); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1470 dsync_serializer_encode_add(encoder, "type", type); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1471 dsync_serializer_encode_add(encoder, "key", attr->key); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1472 if (attr->value != NULL) |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1473 dsync_serializer_encode_add(encoder, "value", attr->value); |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1474 else if (attr->value_stream != NULL) |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1475 dsync_serializer_encode_add(encoder, "stream", ""); |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1476 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1477 if (attr->deleted) |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1478 dsync_serializer_encode_add(encoder, "deleted", ""); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1479 if (attr->last_change != 0) { |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1480 dsync_serializer_encode_add(encoder, "last_change", |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1481 dec2str(attr->last_change)); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1482 } |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1483 if (attr->modseq != 0) { |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1484 dsync_serializer_encode_add(encoder, "modseq", |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1485 dec2str(attr->modseq)); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1486 } |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1487 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1488 dsync_serializer_encode_finish(&encoder, str); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1489 dsync_ibc_stream_send_string(ibc, str); |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1490 |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1491 if (attr->value_stream != NULL) { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1492 ibc->value_output_last = '\0'; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1493 ibc->value_output = attr->value_stream; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1494 i_stream_ref(ibc->value_output); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1495 (void)dsync_ibc_stream_send_value_stream(ibc); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1496 } |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1497 } |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1498 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1499 static enum dsync_ibc_recv_ret |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1500 dsync_ibc_stream_recv_mailbox_attribute(struct dsync_ibc *_ibc, |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1501 const struct dsync_mailbox_attribute **attr_r) |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1502 { |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1503 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1504 pool_t pool = ibc->ret_pool; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1505 struct dsync_deserializer_decoder *decoder; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1506 struct dsync_mailbox_attribute *attr; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1507 const char *value; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1508 enum dsync_ibc_recv_ret ret; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1509 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1510 if (ibc->minor_version < DSYNC_PROTOCOL_MINOR_HAVE_ATTRIBUTES) |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1511 return DSYNC_IBC_RECV_RET_FINISHED; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1512 |
|
16109
acb88f199704
dsync: Fixed syncing attribute streams.
Timo Sirainen <tss@iki.fi>
parents:
16052
diff
changeset
|
1513 if (ibc->value_input != NULL) { |
|
acb88f199704
dsync: Fixed syncing attribute streams.
Timo Sirainen <tss@iki.fi>
parents:
16052
diff
changeset
|
1514 /* wait until the mail's stream has been read */ |
|
acb88f199704
dsync: Fixed syncing attribute streams.
Timo Sirainen <tss@iki.fi>
parents:
16052
diff
changeset
|
1515 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
acb88f199704
dsync: Fixed syncing attribute streams.
Timo Sirainen <tss@iki.fi>
parents:
16052
diff
changeset
|
1516 } |
|
acb88f199704
dsync: Fixed syncing attribute streams.
Timo Sirainen <tss@iki.fi>
parents:
16052
diff
changeset
|
1517 |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1518 if (ibc->cur_attr != NULL) { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1519 /* finished reading the stream, return the mail now */ |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1520 *attr_r = ibc->cur_attr; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1521 ibc->cur_attr = NULL; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1522 return DSYNC_IBC_RECV_RET_OK; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1523 } |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1524 |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1525 p_clear(pool); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1526 attr = p_new(pool, struct dsync_mailbox_attribute, 1); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1527 |
|
16051
46b223892373
dsync: Fixed sending mailbox attributes with stream ibc.
Timo Sirainen <tss@iki.fi>
parents:
16025
diff
changeset
|
1528 ret = dsync_ibc_stream_input_next(ibc, ITEM_MAILBOX_ATTRIBUTE, &decoder); |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1529 if (ret != DSYNC_IBC_RECV_RET_OK) |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1530 return ret; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1531 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1532 value = dsync_deserializer_decode_get(decoder, "type"); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1533 switch (*value) { |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1534 case 'p': |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1535 attr->type = MAIL_ATTRIBUTE_TYPE_PRIVATE; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1536 break; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1537 case 's': |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1538 attr->type = MAIL_ATTRIBUTE_TYPE_SHARED; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1539 break; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1540 default: |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1541 dsync_ibc_input_error(ibc, decoder, "Invalid type: %s", value); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1542 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1543 } |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1544 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1545 value = dsync_deserializer_decode_get(decoder, "key"); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1546 attr->key = p_strdup(pool, value); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1547 |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1548 if (dsync_deserializer_decode_try(decoder, "stream", &value)) { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1549 attr->value_stream = dsync_ibc_stream_input_stream(ibc); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1550 if (dsync_ibc_stream_read_mail_stream(ibc) <= 0) { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1551 ibc->cur_attr = attr; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1552 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1553 } |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1554 /* already finished reading the stream */ |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1555 i_assert(ibc->value_input == NULL); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1556 } else if (dsync_deserializer_decode_try(decoder, "value", &value)) |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1557 attr->value = p_strdup(pool, value); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1558 if (dsync_deserializer_decode_try(decoder, "deleted", &value)) |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1559 attr->deleted = TRUE; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1560 if (dsync_deserializer_decode_try(decoder, "last_change", &value) && |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1561 str_to_time(value, &attr->last_change) < 0) { |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1562 dsync_ibc_input_error(ibc, decoder, "Invalid last_change"); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1563 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1564 } |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1565 if (dsync_deserializer_decode_try(decoder, "modseq", &value) && |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1566 str_to_uint64(value, &attr->modseq) < 0) { |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1567 dsync_ibc_input_error(ibc, decoder, "Invalid modseq"); |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1568 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1569 } |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1570 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1571 *attr_r = attr; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1572 return DSYNC_IBC_RECV_RET_OK; |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1573 } |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1574 |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
1575 static void |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1576 dsync_ibc_stream_send_change(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1577 const struct dsync_mail_change *change) |
| 14584 | 1578 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1579 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 1580 struct dsync_serializer_encoder *encoder; |
| 1581 string_t *str = t_str_new(128); | |
| 1582 char type[2]; | |
| 1583 | |
| 1584 str_append_c(str, items[ITEM_MAIL_CHANGE].chr); | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
1585 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_MAIL_CHANGE); |
| 14584 | 1586 |
| 1587 type[0] = type[1] = '\0'; | |
| 1588 switch (change->type) { | |
| 1589 case DSYNC_MAIL_CHANGE_TYPE_SAVE: | |
| 1590 type[0] = 's'; | |
| 1591 break; | |
| 1592 case DSYNC_MAIL_CHANGE_TYPE_EXPUNGE: | |
| 1593 type[0] = 'e'; | |
| 1594 break; | |
| 1595 case DSYNC_MAIL_CHANGE_TYPE_FLAG_CHANGE: | |
| 1596 type[0] = 'f'; | |
| 1597 break; | |
| 1598 } | |
| 1599 i_assert(type[0] != '\0'); | |
| 1600 dsync_serializer_encode_add(encoder, "type", type); | |
| 1601 dsync_serializer_encode_add(encoder, "uid", dec2str(change->uid)); | |
| 1602 if (change->guid != NULL) | |
| 1603 dsync_serializer_encode_add(encoder, "guid", change->guid); | |
| 1604 if (change->hdr_hash != NULL) { | |
| 1605 dsync_serializer_encode_add(encoder, "hdr_hash", | |
| 1606 change->hdr_hash); | |
| 1607 } | |
| 1608 if (change->modseq != 0) { | |
| 1609 dsync_serializer_encode_add(encoder, "modseq", | |
| 1610 dec2str(change->modseq)); | |
| 1611 } | |
|
15496
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1612 if (change->pvt_modseq != 0) { |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1613 dsync_serializer_encode_add(encoder, "pvt_modseq", |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1614 dec2str(change->pvt_modseq)); |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1615 } |
| 14584 | 1616 if (change->add_flags != 0) { |
| 1617 dsync_serializer_encode_add(encoder, "add_flags", | |
| 1618 t_strdup_printf("%x", change->add_flags)); | |
| 1619 } | |
| 1620 if (change->remove_flags != 0) { | |
| 1621 dsync_serializer_encode_add(encoder, "remove_flags", | |
| 1622 t_strdup_printf("%x", change->remove_flags)); | |
| 1623 } | |
| 1624 if (change->final_flags != 0) { | |
| 1625 dsync_serializer_encode_add(encoder, "final_flags", | |
| 1626 t_strdup_printf("%x", change->final_flags)); | |
| 1627 } | |
| 1628 if (change->keywords_reset) | |
| 1629 dsync_serializer_encode_add(encoder, "keywords_reset", ""); | |
| 1630 | |
| 1631 if (array_is_created(&change->keyword_changes) && | |
| 1632 array_count(&change->keyword_changes) > 0) { | |
| 1633 string_t *kw_str = t_str_new(128); | |
| 1634 const char *const *changes; | |
| 1635 unsigned int i, count; | |
| 1636 | |
| 1637 changes = array_get(&change->keyword_changes, &count); | |
|
15068
002e0a120c2a
Renamed str_tabescape_write() to str_append_tabescaped()
Timo Sirainen <tss@iki.fi>
parents:
15037
diff
changeset
|
1638 str_append_tabescaped(kw_str, changes[0]); |
| 14584 | 1639 for (i = 1; i < count; i++) { |
| 1640 str_append_c(kw_str, '\t'); | |
|
15068
002e0a120c2a
Renamed str_tabescape_write() to str_append_tabescaped()
Timo Sirainen <tss@iki.fi>
parents:
15037
diff
changeset
|
1641 str_append_tabescaped(kw_str, changes[i]); |
| 14584 | 1642 } |
| 1643 dsync_serializer_encode_add(encoder, "keyword_changes", | |
| 1644 str_c(kw_str)); | |
| 1645 } | |
|
18177
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
1646 if (change->received_timestamp > 0) { |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
1647 dsync_serializer_encode_add(encoder, "received_timestamp", |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
1648 t_strdup_printf("%lx", (unsigned long)change->received_timestamp)); |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
1649 } |
|
20633
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
1650 if (change->virtual_size > 0) { |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
1651 dsync_serializer_encode_add(encoder, "virtual_size", |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
1652 t_strdup_printf("%llx", (unsigned long long)change->virtual_size)); |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
1653 } |
| 14584 | 1654 |
| 1655 dsync_serializer_encode_finish(&encoder, str); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1656 dsync_ibc_stream_send_string(ibc, str); |
| 14584 | 1657 } |
| 1658 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1659 static enum dsync_ibc_recv_ret |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1660 dsync_ibc_stream_recv_change(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1661 const struct dsync_mail_change **change_r) |
| 14584 | 1662 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1663 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1664 pool_t pool = ibc->ret_pool; |
| 14584 | 1665 struct dsync_deserializer_decoder *decoder; |
| 1666 struct dsync_mail_change *change; | |
| 1667 const char *value; | |
|
19038
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1668 unsigned int uintval; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1669 enum dsync_ibc_recv_ret ret; |
| 14584 | 1670 |
| 1671 p_clear(pool); | |
| 1672 change = p_new(pool, struct dsync_mail_change, 1); | |
| 1673 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1674 ret = dsync_ibc_stream_input_next(ibc, ITEM_MAIL_CHANGE, &decoder); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1675 if (ret != DSYNC_IBC_RECV_RET_OK) |
| 14584 | 1676 return ret; |
| 1677 | |
| 1678 value = dsync_deserializer_decode_get(decoder, "type"); | |
| 1679 switch (*value) { | |
| 1680 case 's': | |
| 1681 change->type = DSYNC_MAIL_CHANGE_TYPE_SAVE; | |
| 1682 break; | |
| 1683 case 'e': | |
| 1684 change->type = DSYNC_MAIL_CHANGE_TYPE_EXPUNGE; | |
| 1685 break; | |
| 1686 case 'f': | |
| 1687 change->type = DSYNC_MAIL_CHANGE_TYPE_FLAG_CHANGE; | |
| 1688 break; | |
| 1689 default: | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1690 dsync_ibc_input_error(ibc, decoder, "Invalid type: %s", value); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1691 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1692 } |
| 1693 | |
| 1694 value = dsync_deserializer_decode_get(decoder, "uid"); | |
| 1695 if (str_to_uint32(value, &change->uid) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1696 dsync_ibc_input_error(ibc, decoder, "Invalid uid"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1697 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1698 } |
| 1699 | |
| 1700 if (dsync_deserializer_decode_try(decoder, "guid", &value)) | |
| 1701 change->guid = p_strdup(pool, value); | |
| 1702 if (dsync_deserializer_decode_try(decoder, "hdr_hash", &value)) | |
| 1703 change->hdr_hash = p_strdup(pool, value); | |
| 1704 if (dsync_deserializer_decode_try(decoder, "modseq", &value) && | |
| 1705 str_to_uint64(value, &change->modseq) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1706 dsync_ibc_input_error(ibc, decoder, "Invalid modseq"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1707 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1708 } |
|
15496
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1709 if (dsync_deserializer_decode_try(decoder, "pvt_modseq", &value) && |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1710 str_to_uint64(value, &change->pvt_modseq) < 0) { |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1711 dsync_ibc_input_error(ibc, decoder, "Invalid pvt_modseq"); |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1712 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
5d90e2aa1ba8
dsync: Use private modseqs to support syncing private flags in shared mailboxes.
Timo Sirainen <tss@iki.fi>
parents:
15494
diff
changeset
|
1713 } |
| 14584 | 1714 |
|
19038
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1715 if (dsync_deserializer_decode_try(decoder, "add_flags", &value)) { |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1716 if (str_to_uint_hex(value, &uintval) < 0 || |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1717 uintval > (uint8_t)-1) { |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1718 dsync_ibc_input_error(ibc, decoder, |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1719 "Invalid add_flags: %s", value); |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1720 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1721 } |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1722 change->add_flags = uintval; |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1723 } |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1724 if (dsync_deserializer_decode_try(decoder, "remove_flags", &value)) { |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1725 if (str_to_uint_hex(value, &uintval) < 0 || |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1726 uintval > (uint8_t)-1) { |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1727 dsync_ibc_input_error(ibc, decoder, |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1728 "Invalid remove_flags: %s", value); |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1729 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1730 } |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1731 change->remove_flags = uintval; |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1732 } |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1733 if (dsync_deserializer_decode_try(decoder, "final_flags", &value)) { |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1734 if (str_to_uint_hex(value, &uintval) < 0 || |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1735 uintval > (uint8_t)-1) { |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1736 dsync_ibc_input_error(ibc, decoder, |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1737 "Invalid final_flags: %s", value); |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1738 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1739 } |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1740 change->final_flags = uintval; |
|
f8ab4f979e92
Removed all invocations of strtoll() and friends.
Stephan Bosch <stephan@rename-it.nl>
parents:
19021
diff
changeset
|
1741 } |
| 14584 | 1742 if (dsync_deserializer_decode_try(decoder, "keywords_reset", &value)) |
| 1743 change->keywords_reset = TRUE; | |
| 1744 | |
| 1745 if (dsync_deserializer_decode_try(decoder, "keyword_changes", &value) && | |
| 1746 *value != '\0') { | |
| 1747 const char *const *changes = t_strsplit_tab(value); | |
| 1748 unsigned int i, count = str_array_length(changes); | |
| 1749 | |
| 1750 p_array_init(&change->keyword_changes, pool, count); | |
| 1751 for (i = 0; i < count; i++) { | |
| 1752 value = p_strdup(pool, changes[i]); | |
| 1753 array_append(&change->keyword_changes, &value, 1); | |
| 1754 } | |
| 1755 } | |
|
18177
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
1756 if (dsync_deserializer_decode_try(decoder, "received_timestamp", &value) && |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
1757 str_to_time(value, &change->received_timestamp) < 0) { |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
1758 dsync_ibc_input_error(ibc, decoder, "Invalid received_timestamp"); |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
1759 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
f393f63764e0
dsync: Added -t <timestamp> parameter to save only mails newer than <timestamp>
Timo Sirainen <tss@iki.fi>
parents:
18137
diff
changeset
|
1760 } |
|
20633
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
1761 if (dsync_deserializer_decode_try(decoder, "virtual_size", &value) && |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
1762 str_to_uoff(value, &change->virtual_size) < 0) { |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
1763 dsync_ibc_input_error(ibc, decoder, "Invalid virtual_size"); |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
1764 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
d54651ba988a
doveadm sync/backup: Added -S <max size> parameter to skip too large mails.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20595
diff
changeset
|
1765 } |
| 14584 | 1766 |
| 1767 *change_r = change; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1768 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 1769 } |
| 1770 | |
| 1771 static void | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1772 dsync_ibc_stream_send_mail_request(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1773 const struct dsync_mail_request *request) |
| 14584 | 1774 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1775 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 1776 struct dsync_serializer_encoder *encoder; |
| 1777 string_t *str = t_str_new(128); | |
| 1778 | |
| 1779 str_append_c(str, items[ITEM_MAIL_REQUEST].chr); | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
1780 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_MAIL_REQUEST); |
| 14584 | 1781 if (request->guid != NULL) |
| 1782 dsync_serializer_encode_add(encoder, "guid", request->guid); | |
| 1783 if (request->uid != 0) { | |
| 1784 dsync_serializer_encode_add(encoder, "uid", | |
| 1785 dec2str(request->uid)); | |
| 1786 } | |
| 1787 dsync_serializer_encode_finish(&encoder, str); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1788 dsync_ibc_stream_send_string(ibc, str); |
| 14584 | 1789 } |
| 1790 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1791 static enum dsync_ibc_recv_ret |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1792 dsync_ibc_stream_recv_mail_request(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1793 const struct dsync_mail_request **request_r) |
| 14584 | 1794 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1795 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 1796 struct dsync_deserializer_decoder *decoder; |
| 1797 struct dsync_mail_request *request; | |
| 1798 const char *value; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1799 enum dsync_ibc_recv_ret ret; |
| 14584 | 1800 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1801 p_clear(ibc->ret_pool); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1802 request = p_new(ibc->ret_pool, struct dsync_mail_request, 1); |
| 14584 | 1803 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1804 ret = dsync_ibc_stream_input_next(ibc, ITEM_MAIL_REQUEST, &decoder); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1805 if (ret != DSYNC_IBC_RECV_RET_OK) |
| 14584 | 1806 return ret; |
| 1807 | |
| 1808 if (dsync_deserializer_decode_try(decoder, "guid", &value)) | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1809 request->guid = p_strdup(ibc->ret_pool, value); |
| 14584 | 1810 if (dsync_deserializer_decode_try(decoder, "uid", &value) && |
| 1811 str_to_uint32(value, &request->uid) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1812 dsync_ibc_input_error(ibc, decoder, "Invalid uid"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1813 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1814 } |
| 1815 | |
| 1816 *request_r = request; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1817 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 1818 } |
| 1819 | |
| 1820 static void | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1821 dsync_ibc_stream_send_mail(struct dsync_ibc *_ibc, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1822 const struct dsync_mail *mail) |
| 14584 | 1823 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1824 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 1825 struct dsync_serializer_encoder *encoder; |
| 1826 string_t *str = t_str_new(128); | |
| 1827 | |
|
17845
d2e1b3f6d13b
dsync: Added DSYNC_BRAIN_FLAG_NO_MAIL_PREFETCH to avoid opening mails unnecessarily.
Timo Sirainen <tss@iki.fi>
parents:
17777
diff
changeset
|
1828 i_assert(!mail->minimal_fields); |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1829 i_assert(ibc->value_output == NULL); |
| 14584 | 1830 |
| 1831 str_append_c(str, items[ITEM_MAIL].chr); | |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
1832 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_MAIL); |
| 14584 | 1833 if (mail->guid != NULL) |
| 1834 dsync_serializer_encode_add(encoder, "guid", mail->guid); | |
| 1835 if (mail->uid != 0) | |
| 1836 dsync_serializer_encode_add(encoder, "uid", dec2str(mail->uid)); | |
| 1837 if (mail->pop3_uidl != NULL) { | |
| 1838 dsync_serializer_encode_add(encoder, "pop3_uidl", | |
| 1839 mail->pop3_uidl); | |
| 1840 } | |
| 1841 if (mail->pop3_order > 0) { | |
| 1842 dsync_serializer_encode_add(encoder, "pop3_order", | |
| 1843 dec2str(mail->pop3_order)); | |
| 1844 } | |
| 1845 if (mail->received_date > 0) { | |
| 1846 dsync_serializer_encode_add(encoder, "received_date", | |
| 1847 dec2str(mail->received_date)); | |
| 1848 } | |
|
17296
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
1849 if (mail->saved_date != 0) { |
|
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
1850 dsync_serializer_encode_add(encoder, "saved_date", |
|
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
1851 dec2str(mail->saved_date)); |
|
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
1852 } |
| 14584 | 1853 if (mail->input != NULL) |
| 1854 dsync_serializer_encode_add(encoder, "stream", ""); | |
| 1855 | |
| 1856 dsync_serializer_encode_finish(&encoder, str); | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1857 dsync_ibc_stream_send_string(ibc, str); |
| 14584 | 1858 |
| 1859 if (mail->input != NULL) { | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1860 ibc->value_output_last = '\0'; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1861 ibc->value_output = mail->input; |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1862 i_stream_ref(ibc->value_output); |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1863 (void)dsync_ibc_stream_send_value_stream(ibc); |
| 14584 | 1864 } |
| 1865 } | |
| 1866 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1867 static enum dsync_ibc_recv_ret |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1868 dsync_ibc_stream_recv_mail(struct dsync_ibc *_ibc, struct dsync_mail **mail_r) |
| 14584 | 1869 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1870 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1871 pool_t pool = ibc->ret_pool; |
| 14584 | 1872 struct dsync_deserializer_decoder *decoder; |
| 1873 struct dsync_mail *mail; | |
| 1874 const char *value; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1875 enum dsync_ibc_recv_ret ret; |
| 14584 | 1876 |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1877 if (ibc->value_input != NULL) { |
| 14584 | 1878 /* wait until the mail's stream has been read */ |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1879 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1880 } |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1881 if (ibc->cur_mail != NULL) { |
| 14584 | 1882 /* finished reading the stream, return the mail now */ |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1883 *mail_r = ibc->cur_mail; |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1884 ibc->cur_mail = NULL; |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1885 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 1886 } |
| 1887 | |
| 1888 p_clear(pool); | |
| 1889 mail = p_new(pool, struct dsync_mail, 1); | |
| 1890 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1891 ret = dsync_ibc_stream_input_next(ibc, ITEM_MAIL, &decoder); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1892 if (ret != DSYNC_IBC_RECV_RET_OK) |
| 14584 | 1893 return ret; |
| 1894 | |
| 1895 if (dsync_deserializer_decode_try(decoder, "guid", &value)) | |
| 1896 mail->guid = p_strdup(pool, value); | |
| 1897 if (dsync_deserializer_decode_try(decoder, "uid", &value) && | |
| 1898 str_to_uint32(value, &mail->uid) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1899 dsync_ibc_input_error(ibc, decoder, "Invalid uid"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1900 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1901 } |
| 1902 if (dsync_deserializer_decode_try(decoder, "pop3_uidl", &value)) | |
| 1903 mail->pop3_uidl = p_strdup(pool, value); | |
| 1904 if (dsync_deserializer_decode_try(decoder, "pop3_order", &value) && | |
| 1905 str_to_uint(value, &mail->pop3_order) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1906 dsync_ibc_input_error(ibc, decoder, "Invalid pop3_order"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1907 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1908 } |
| 1909 if (dsync_deserializer_decode_try(decoder, "received_date", &value) && | |
| 1910 str_to_time(value, &mail->received_date) < 0) { | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1911 dsync_ibc_input_error(ibc, decoder, "Invalid received_date"); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1912 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1913 } |
|
17296
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
1914 if (dsync_deserializer_decode_try(decoder, "saved_date", &value) && |
|
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
1915 str_to_time(value, &mail->saved_date) < 0) { |
|
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
1916 dsync_ibc_input_error(ibc, decoder, "Invalid saved_date"); |
|
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
1917 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
99a4788770cb
dsync: saved-date doesn't need to be looked up until mail body is being read.
Timo Sirainen <tss@iki.fi>
parents:
17286
diff
changeset
|
1918 } |
| 14584 | 1919 if (dsync_deserializer_decode_try(decoder, "stream", &value)) { |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1920 mail->input = dsync_ibc_stream_input_stream(ibc); |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1921 if (dsync_ibc_stream_read_mail_stream(ibc) <= 0) { |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1922 ibc->cur_mail = mail; |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1923 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
| 14584 | 1924 } |
| 1925 /* already finished reading the stream */ | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1926 i_assert(ibc->value_input == NULL); |
| 14584 | 1927 } |
| 1928 | |
| 1929 *mail_r = mail; | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
1930 return DSYNC_IBC_RECV_RET_OK; |
| 14584 | 1931 } |
| 1932 | |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1933 static void |
|
18371
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1934 dsync_ibc_stream_send_finish(struct dsync_ibc *_ibc, const char *error, |
|
20458
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
1935 enum mail_error mail_error, |
|
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
1936 bool require_full_resync) |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1937 { |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1938 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1939 struct dsync_serializer_encoder *encoder; |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1940 string_t *str = t_str_new(128); |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1941 |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1942 str_append_c(str, items[ITEM_FINISH].chr); |
|
19089
3ab749f1ed71
dsync: If we disconnect with I/O timeout, log the last sent/recv state.
Timo Sirainen <tss@iki.fi>
parents:
19038
diff
changeset
|
1943 encoder = dsync_ibc_send_encode_begin(ibc, ITEM_FINISH); |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1944 if (error != NULL) |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1945 dsync_serializer_encode_add(encoder, "error", error); |
|
18371
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1946 if (mail_error != 0) { |
|
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1947 dsync_serializer_encode_add(encoder, "mail_error", |
|
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1948 dec2str(mail_error)); |
|
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1949 } |
|
20458
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
1950 if (require_full_resync) |
|
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
1951 dsync_serializer_encode_add(encoder, "require_full_resync", ""); |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1952 dsync_serializer_encode_finish(&encoder, str); |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1953 dsync_ibc_stream_send_string(ibc, str); |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1954 } |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1955 |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1956 static enum dsync_ibc_recv_ret |
|
18371
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1957 dsync_ibc_stream_recv_finish(struct dsync_ibc *_ibc, const char **error_r, |
|
20458
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
1958 enum mail_error *mail_error_r, |
|
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
1959 bool *require_full_resync_r) |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1960 { |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1961 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1962 struct dsync_deserializer_decoder *decoder; |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1963 const char *value; |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1964 enum dsync_ibc_recv_ret ret; |
|
18375
cf74e2179dce
dsync: Fixed returning wrong mail_error in some remote dsync.
Timo Sirainen <tss@iki.fi>
parents:
18371
diff
changeset
|
1965 int i = 0; |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1966 |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1967 *error_r = NULL; |
|
18371
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1968 *mail_error_r = 0; |
|
20458
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
1969 *require_full_resync_r = FALSE; |
|
18371
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1970 |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1971 p_clear(ibc->ret_pool); |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1972 |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1973 if (ibc->minor_version < DSYNC_PROTOCOL_MINOR_HAVE_FINISH) |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1974 return DSYNC_IBC_RECV_RET_OK; |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1975 |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1976 ret = dsync_ibc_stream_input_next(ibc, ITEM_FINISH, &decoder); |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1977 if (ret != DSYNC_IBC_RECV_RET_OK) |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1978 return ret; |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1979 |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1980 if (dsync_deserializer_decode_try(decoder, "error", &value)) |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1981 *error_r = p_strdup(ibc->ret_pool, value); |
|
18371
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1982 if (dsync_deserializer_decode_try(decoder, "mail_error", &value) && |
|
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1983 str_to_int(value, &i) < 0) { |
|
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1984 dsync_ibc_input_error(ibc, decoder, "Invalid mail_error"); |
|
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1985 return DSYNC_IBC_RECV_RET_TRYAGAIN; |
|
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1986 } |
|
20458
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
1987 if (dsync_deserializer_decode_try(decoder, "require_full_resync", &value)) |
|
16f9c0a46cbb
dsync: When full resync is wanted in a stateful sync, output empty state.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents:
20197
diff
changeset
|
1988 *require_full_resync_r = TRUE; |
|
18371
b900b50085fc
dsync: Use storage's mail_error to choose the doveadm exit code.
Timo Sirainen <tss@iki.fi>
parents:
18351
diff
changeset
|
1989 *mail_error_r = i; |
|
20197
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
1990 |
|
dbe3a138adb1
dsync: race condition where done/finish is received after one side has closed
J. Nick Koston <nick@cpanel.net>
parents:
19646
diff
changeset
|
1991 ibc->finish_received = TRUE; |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1992 return DSYNC_IBC_RECV_RET_OK; |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1993 } |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
1994 |
|
15632
40dd9a080b6e
dsync: Close mail streams earlier on failures to avoid assert-crashing
Timo Sirainen <tss@iki.fi>
parents:
15594
diff
changeset
|
1995 static void dsync_ibc_stream_close_mail_streams(struct dsync_ibc *_ibc) |
|
40dd9a080b6e
dsync: Close mail streams earlier on failures to avoid assert-crashing
Timo Sirainen <tss@iki.fi>
parents:
15594
diff
changeset
|
1996 { |
|
40dd9a080b6e
dsync: Close mail streams earlier on failures to avoid assert-crashing
Timo Sirainen <tss@iki.fi>
parents:
15594
diff
changeset
|
1997 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
|
40dd9a080b6e
dsync: Close mail streams earlier on failures to avoid assert-crashing
Timo Sirainen <tss@iki.fi>
parents:
15594
diff
changeset
|
1998 |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
1999 if (ibc->value_output != NULL) { |
|
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
2000 i_stream_unref(&ibc->value_output); |
|
15632
40dd9a080b6e
dsync: Close mail streams earlier on failures to avoid assert-crashing
Timo Sirainen <tss@iki.fi>
parents:
15594
diff
changeset
|
2001 dsync_ibc_stream_stop(ibc); |
|
40dd9a080b6e
dsync: Close mail streams earlier on failures to avoid assert-crashing
Timo Sirainen <tss@iki.fi>
parents:
15594
diff
changeset
|
2002 } |
|
40dd9a080b6e
dsync: Close mail streams earlier on failures to avoid assert-crashing
Timo Sirainen <tss@iki.fi>
parents:
15594
diff
changeset
|
2003 } |
|
40dd9a080b6e
dsync: Close mail streams earlier on failures to avoid assert-crashing
Timo Sirainen <tss@iki.fi>
parents:
15594
diff
changeset
|
2004 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2005 static bool dsync_ibc_stream_is_send_queue_full(struct dsync_ibc *_ibc) |
| 14584 | 2006 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2007 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 2008 size_t bytes; |
| 2009 | |
|
16052
0e5a359b7b7f
lib-storage: Mailbox attributes can now be accessed via istreams.
Timo Sirainen <tss@iki.fi>
parents:
16051
diff
changeset
|
2010 if (ibc->value_output != NULL) |
| 14584 | 2011 return TRUE; |
| 2012 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2013 bytes = o_stream_get_buffer_used_size(ibc->output); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2014 if (bytes < DSYNC_IBC_STREAM_OUTBUF_THROTTLE_SIZE) |
| 14584 | 2015 return FALSE; |
| 2016 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2017 o_stream_set_flush_pending(ibc->output, TRUE); |
| 14584 | 2018 return TRUE; |
| 2019 } | |
| 2020 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2021 static bool dsync_ibc_stream_has_pending_data(struct dsync_ibc *_ibc) |
| 14584 | 2022 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2023 struct dsync_ibc_stream *ibc = (struct dsync_ibc_stream *)_ibc; |
| 14584 | 2024 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2025 return ibc->has_pending_data; |
| 14584 | 2026 } |
| 2027 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2028 static const struct dsync_ibc_vfuncs dsync_ibc_stream_vfuncs = { |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2029 dsync_ibc_stream_deinit, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2030 dsync_ibc_stream_send_handshake, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2031 dsync_ibc_stream_recv_handshake, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2032 dsync_ibc_stream_send_end_of_list, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2033 dsync_ibc_stream_send_mailbox_state, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2034 dsync_ibc_stream_recv_mailbox_state, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2035 dsync_ibc_stream_send_mailbox_tree_node, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2036 dsync_ibc_stream_recv_mailbox_tree_node, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2037 dsync_ibc_stream_send_mailbox_deletes, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2038 dsync_ibc_stream_recv_mailbox_deletes, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2039 dsync_ibc_stream_send_mailbox, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2040 dsync_ibc_stream_recv_mailbox, |
|
16025
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
2041 dsync_ibc_stream_send_mailbox_attribute, |
|
c6082de4bf5b
dsync: Added support for syncing mailbox attributes.
Timo Sirainen <tss@iki.fi>
parents:
15986
diff
changeset
|
2042 dsync_ibc_stream_recv_mailbox_attribute, |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2043 dsync_ibc_stream_send_change, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2044 dsync_ibc_stream_recv_change, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2045 dsync_ibc_stream_send_mail_request, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2046 dsync_ibc_stream_recv_mail_request, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2047 dsync_ibc_stream_send_mail, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2048 dsync_ibc_stream_recv_mail, |
|
18351
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
2049 dsync_ibc_stream_send_finish, |
|
b4dbe64c0032
dsync: Added an extra "finish" state to allow slave-dsync to report error to master-dsync.
Timo Sirainen <tss@iki.fi>
parents:
18181
diff
changeset
|
2050 dsync_ibc_stream_recv_finish, |
|
15632
40dd9a080b6e
dsync: Close mail streams earlier on failures to avoid assert-crashing
Timo Sirainen <tss@iki.fi>
parents:
15594
diff
changeset
|
2051 dsync_ibc_stream_close_mail_streams, |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2052 dsync_ibc_stream_is_send_queue_full, |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2053 dsync_ibc_stream_has_pending_data |
| 14584 | 2054 }; |
| 2055 | |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2056 struct dsync_ibc * |
|
15464
af3b86a16ac3
dsync: Added debugging and rawlogging support.
Timo Sirainen <tss@iki.fi>
parents:
15463
diff
changeset
|
2057 dsync_ibc_init_stream(struct istream *input, struct ostream *output, |
|
19014
11b107c8dc05
dsync: Added -T parameter to specify the I/O stall timeout.
Timo Sirainen <tss@iki.fi>
parents:
18394
diff
changeset
|
2058 const char *name, const char *temp_path_prefix, |
|
11b107c8dc05
dsync: Added -T parameter to specify the I/O stall timeout.
Timo Sirainen <tss@iki.fi>
parents:
18394
diff
changeset
|
2059 unsigned int timeout_secs) |
| 14584 | 2060 { |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2061 struct dsync_ibc_stream *ibc; |
| 14584 | 2062 |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2063 ibc = i_new(struct dsync_ibc_stream, 1); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2064 ibc->ibc.v = dsync_ibc_stream_vfuncs; |
|
15464
af3b86a16ac3
dsync: Added debugging and rawlogging support.
Timo Sirainen <tss@iki.fi>
parents:
15463
diff
changeset
|
2065 ibc->input = input; |
|
af3b86a16ac3
dsync: Added debugging and rawlogging support.
Timo Sirainen <tss@iki.fi>
parents:
15463
diff
changeset
|
2066 ibc->output = output; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2067 ibc->name = i_strdup(name); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2068 ibc->temp_path_prefix = i_strdup(temp_path_prefix); |
|
19014
11b107c8dc05
dsync: Added -T parameter to specify the I/O stall timeout.
Timo Sirainen <tss@iki.fi>
parents:
18394
diff
changeset
|
2069 ibc->timeout_secs = timeout_secs; |
|
15037
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2070 ibc->ret_pool = pool_alloconly_create("ibc stream data", 2048); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2071 dsync_ibc_stream_init(ibc); |
|
920756cd29b8
dsync: Renamed "slave" to "ibc" (= inter-brain communicator)
Timo Sirainen <tss@iki.fi>
parents:
15036
diff
changeset
|
2072 return &ibc->ibc; |
| 14584 | 2073 } |