indexer, global: Change protocol names in VERSION line

Dovecot IPC protocols generally use the -server and -client suffix.

diff --git a/src/doveadm/doveadm-mail-index.c b/src/doveadm/doveadm-mail-index.c
index 524f373a11f8ab95bebe36e2924755558bba2b99..10b93d8accb5f9d5a3670820960e757d4275af93 100644 (file)
--- a/src/doveadm/doveadm-mail-index.c
+++ b/src/doveadm/doveadm-mail-index.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 
 #define INDEXER_SOCKET_NAME "indexer"
-#define INDEXER_HANDSHAKE "VERSION\tindexer\t1\t0\n"
+#define INDEXER_HANDSHAKE "VERSION\tindexer-client\t1\t0\n"
 
 struct index_cmd_context {
        struct doveadm_mail_cmd_context ctx;

diff --git a/src/indexer/indexer-client.c b/src/indexer/indexer-client.c
index ea557c0329667ac777816d6c753bc9c4614c6f3b..a69805ccbcc116249194b61b284ce24be9342693 100644 (file)
--- a/src/indexer/indexer-client.c
+++ b/src/indexer/indexer-client.c
@@ -156,8 +156,8 @@ static const struct connection_vfuncs indexer_client_vfuncs = {
 };
 
 static const struct connection_settings indexer_client_set = {
-       .service_name_in = "indexer",
-       .service_name_out = "indexer",
+       .service_name_in = "indexer-client",
+       .service_name_out = "indexer-server",
        .major_version = INDEXER_CLIENT_PROTOCOL_MAJOR_VERSION,
        .minor_version = INDEXER_CLIENT_PROTOCOL_MINOR_VERSION,
        .input_max_size = SIZE_MAX,

diff --git a/src/lib-storage/index/index-mailbox-size.c b/src/lib-storage/index/index-mailbox-size.c
index 35b1081dd5b3fb94c8de62c46f2d7bba629ce76a..401ad546e735f007ef3d909fae6cce72a0feb396 100644 (file)
--- a/src/lib-storage/index/index-mailbox-size.c
+++ b/src/lib-storage/index/index-mailbox-size.c
@@ -37,7 +37,7 @@
 #define VSIZE_UPDATE_MAX_LOCK_SECS 10
 
 #define INDEXER_SOCKET_NAME "indexer"
-#define INDEXER_HANDSHAKE "VERSION\tindexer\t1\t0\n"
+#define INDEXER_HANDSHAKE "VERSION\tindexer-client\t1\t0\n"
 
 struct mailbox_vsize_update {
        struct mailbox *box;

diff --git a/src/plugins/fts/fts-indexer.c b/src/plugins/fts/fts-indexer.c
index 4d8a36674a25cd05702b68b0c97f8827183146df..ec07d924befa51832105703e26e085bf82e93908 100644 (file)
--- a/src/plugins/fts/fts-indexer.c
+++ b/src/plugins/fts/fts-indexer.c
@@ -201,8 +201,8 @@ static void fts_indexer_idle_timeout(struct connection *conn)
 
 static const struct connection_settings indexer_client_set =
 {
-       .service_name_in = "indexer",
-       .service_name_out = "indexer",
+       .service_name_in = "indexer-server",
+       .service_name_out = "indexer-client",
        .major_version = 1,
        .minor_version = 0,
        .client_connect_timeout_msecs = 2000,
@@ -272,7 +272,7 @@ int fts_indexer_init(struct fts_backend *backend, struct mailbox *box,
        return ctx->failed || ret < 0 ? -1 : 1;
 }
 
-#define INDEXER_HANDSHAKE "VERSION\tindexer\t1\t0\n"
+#define INDEXER_HANDSHAKE "VERSION\tindexer-client\t1\t0\n"
 
 int fts_indexer_cmd(struct mail_user *user, const char *cmd,
                    const char **path_r)

diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index d6ada73094c7134bc53639048250e12840cf8f56..389f06034acf7aaa7e1c9758dc8141473ac5c539 100644 (file)
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -31,7 +31,7 @@
        MODULE_CONTEXT_REQUIRE(obj, fts_mailbox_list_module)
 
 #define INDEXER_SOCKET_NAME "indexer"
-#define INDEXER_HANDSHAKE "VERSION\tindexer\t1\t0\n"
+#define INDEXER_HANDSHAKE "VERSION\tindexer-client\t1\t0\n"
 
 struct fts_mailbox_list {
        union mailbox_list_module_context module_ctx;