dovecot/core-2.2: src/director/doveadm-connection.c annotate

annotate src/director/doveadm-connection.c @ 20970:d653bcdff8a2

director: Code cleanup - Give tab-unescaped args to all doveadm command handlers.

author	Timo Sirainen <timo.sirainen@dovecot.fi>
date	Mon, 24 Oct 2016 20:21:36 +0300
parents	193f82412af9
children	39d96d2dad95

rev	line source
19552 0f22db71df7a global: freshen copyright Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19497 diff changeset	1 /* Copyright (c) 2010-2016 Dovecot authors, see the included COPYING file */
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	2
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	3 #include "lib.h"
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	4 #include "ioloop.h"
15187 02451e967a06 Renamed network.[ch] to net.[ch]. Timo Sirainen <tss@iki.fi> parents: 14682 diff changeset	5 #include "net.h"
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	6 #include "istream.h"
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	7 #include "ostream.h"
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	8 #include "array.h"
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	9 #include "str.h"
18067 a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	10 #include "strescape.h"
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	11 #include "llist.h"
11373 26cfc1c3a4b1 director: Update connection count when client disconnects. Timo Sirainen <tss@iki.fi> parents: 11355 diff changeset	12 #include "master-service.h"
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	13 #include "user-directory.h"
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	14 #include "mail-host.h"
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	15 #include "director.h"
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	16 #include "director-host.h"
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	17 #include "director-request.h"
13320 63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	18 #include "director-connection.h"
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	19 #include "doveadm-connection.h"
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	20
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	21 #include <unistd.h>
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	22
11458 4274d1549fa0 Added version_string_verify() and removed code duplication with it. Timo Sirainen <tss@iki.fi> parents: 11373 diff changeset	23 #define DOVEADM_PROTOCOL_VERSION_MAJOR 1
4274d1549fa0 Added version_string_verify() and removed code duplication with it. Timo Sirainen <tss@iki.fi> parents: 11373 diff changeset	24 #define DOVEADM_HANDSHAKE "VERSION\tdirector-doveadm\t1\t0\n"
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	25
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	26 #define MAX_VALID_VHOST_COUNT 1000
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	27
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	28 struct doveadm_connection {
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	29 struct doveadm_connection prev, next;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	30
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	31 int fd;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	32 struct io *io;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	33 struct istream *input;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	34 struct ostream *output;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	35 struct director *dir;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	36
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	37 unsigned int handshaked:1;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	38 };
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	39
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	40 static struct doveadm_connection *doveadm_connections;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	41
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	42 static void doveadm_connection_deinit(struct doveadm_connection **_conn);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	43
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	44 static void doveadm_cmd_host_list(struct doveadm_connection *conn)
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	45 {
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	46 struct mail_host const hostp;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	47 string_t *str = t_str_new(1024);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	48
11352 19336bddada2 director: Code cleanup - keep mail hosts in a struct rather than in static variables. Timo Sirainen <tss@iki.fi> parents: 11351 diff changeset	49 array_foreach(mail_hosts_get(conn->dir->mail_hosts), hostp) {
18067 a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	50 str_printfa(str, "%s\t%u\t%u\t",
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	51 net_ip2addr(&(hostp)->ip), (hostp)->vhost_count,
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	52 (*hostp)->user_count);
19408 7e47f561ad49 director: Code cleanup - access host->tag via mail_host_get_tag() Timo Sirainen <tss@iki.fi> parents: 19407 diff changeset	53 str_append_tabescaped(str, mail_host_get_tag(*hostp));
18729 0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	54 str_printfa(str, "\t%c\t%ld", (*hostp)->down ? 'D' : 'U',
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	55 (long)(*hostp)->last_updown_change);
18067 a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	56 str_append_c(str, '\n');
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	57 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	58 str_append_c(str, '\n');
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	59 o_stream_nsend(conn->output, str_data(str), str_len(str));
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	60 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	61
12986 c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	62 static void doveadm_cmd_host_list_removed(struct doveadm_connection *conn)
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	63 {
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	64 struct mail_host_list *orig_hosts_list;
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	65 struct mail_host const orig_hosts, const cur_hosts;
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	66 unsigned int i, j, orig_hosts_count, cur_hosts_count;
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	67 string_t *str = t_str_new(1024);
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	68 int ret;
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	69
18065 b9df3d654710 director: Added director_consistent_hashing setting. Timo Sirainen <tss@iki.fi> parents: 18062 diff changeset	70 orig_hosts_list = mail_hosts_init(conn->dir->set->director_consistent_hashing);
12986 c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	71 (void)mail_hosts_parse_and_add(orig_hosts_list,
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	72 conn->dir->set->director_mail_servers);
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	73
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	74 orig_hosts = array_get(mail_hosts_get(orig_hosts_list),
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	75 &orig_hosts_count);
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	76 cur_hosts = array_get(mail_hosts_get(conn->dir->mail_hosts),
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	77 &cur_hosts_count);
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	78
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	79 /* the hosts are sorted by IP */
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	80 for (i = j = 0; i < orig_hosts_count && j < cur_hosts_count; ) {
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	81 ret = net_ip_cmp(&orig_hosts[i]->ip, &cur_hosts[j]->ip);
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	82 if (ret == 0)
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	83 i++, j++;
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	84 else if (ret > 0)
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	85 j++;
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	86 else {
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	87 str_printfa(str, "%s\n",
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	88 net_ip2addr(&orig_hosts[i]->ip));
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	89 i++;
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	90 }
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	91 }
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	92 for (; i < orig_hosts_count; i++)
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	93 str_printfa(str, "%s\n", net_ip2addr(&orig_hosts[i]->ip));
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	94 str_append_c(str, '\n');
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	95 o_stream_nsend(conn->output, str_data(str), str_len(str));
12986 c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	96
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	97 mail_hosts_deinit(&orig_hosts_list);
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	98 }
c838d40bd38e doveadm: Added "director dump" command. Timo Sirainen <tss@iki.fi> parents: 12782 diff changeset	99
18062 ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	100 static void doveadm_director_append_status(struct director dir, string_t str)
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	101 {
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	102 if (!dir->ring_handshaked)
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	103 str_append(str, "handshaking");
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	104 else if (dir->ring_synced)
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	105 str_append(str, "synced");
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	106 else {
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	107 str_printfa(str, "syncing - last sync %d secs ago",
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	108 (int)(ioloop_time - dir->ring_last_sync_time));
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	109 }
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	110 }
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	111
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	112 static void
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	113 doveadm_director_connection_append_status(struct director_connection *conn,
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	114 string_t *str)
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	115 {
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	116 if (!director_connection_is_handshaked(conn))
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	117 str_append(str, "handshaking");
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	118 else if (director_connection_is_synced(conn))
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	119 str_append(str, "synced");
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	120 else
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	121 str_append(str, "syncing");
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	122 }
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	123
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	124 static void
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	125 doveadm_director_host_append_status(struct director *dir,
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	126 const struct director_host *host,
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	127 string_t *str)
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	128 {
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	129 struct director_connection *conn = NULL;
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	130
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	131 if (dir->left != NULL &&
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	132 director_connection_get_host(dir->left) == host)
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	133 conn = dir->left;
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	134 else if (dir->right != NULL &&
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	135 director_connection_get_host(dir->right) == host)
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	136 conn = dir->right;
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	137 else {
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	138 /* we might have a connection that is being connected */
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	139 struct director_connection const connp;
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	140
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	141 array_foreach(&dir->connections, connp) {
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	142 if (director_connection_get_host(*connp) == host) {
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	143 conn = *connp;
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	144 break;
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	145 }
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	146 }
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	147 }
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	148
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	149 if (conn != NULL)
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	150 doveadm_director_connection_append_status(conn, str);
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	151 }
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	152
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	153 static void doveadm_cmd_director_list(struct doveadm_connection *conn)
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	154 {
13320 63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	155 struct director *dir = conn->dir;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	156 struct director_host const hostp;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	157 string_t *str = t_str_new(1024);
13320 63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	158 const char *type;
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	159 bool left, right;
14432 366b9e5fc85c director: Don't communicate with directors that recently sent invalid input. Timo Sirainen <tss@iki.fi> parents: 14292 diff changeset	160 time_t last_failed;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	161
13320 63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	162 array_foreach(&dir->dir_hosts, hostp) {
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	163 const struct director_host host = hostp;
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	164
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	165 left = dir->left != NULL &&
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	166 director_connection_get_host(dir->left) == host;
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	167 right = dir->right != NULL &&
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	168 director_connection_get_host(dir->right) == host;
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	169
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	170 if (host->removed)
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	171 type = "removed";
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	172 else if (dir->self_host == host)
13320 63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	173 type = "self";
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	174 else if (left)
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	175 type = right ? "l+r" : "left";
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	176 else if (right)
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	177 type = "right";
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	178 else
63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	179 type = "";
14432 366b9e5fc85c director: Don't communicate with directors that recently sent invalid input. Timo Sirainen <tss@iki.fi> parents: 14292 diff changeset	180
366b9e5fc85c director: Don't communicate with directors that recently sent invalid input. Timo Sirainen <tss@iki.fi> parents: 14292 diff changeset	181 last_failed = I_MAX(host->last_network_failure,
366b9e5fc85c director: Don't communicate with directors that recently sent invalid input. Timo Sirainen <tss@iki.fi> parents: 14292 diff changeset	182 host->last_protocol_failure);
18062 ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	183 str_printfa(str, "%s\t%u\t%s\t%lu\t",
13320 63680f6e21a2 director: Updated DIRECTOR-LIST doveadm command. Timo Sirainen <tss@iki.fi> parents: 13045 diff changeset	184 net_ip2addr(&host->ip), host->port, type,
14432 366b9e5fc85c director: Don't communicate with directors that recently sent invalid input. Timo Sirainen <tss@iki.fi> parents: 14292 diff changeset	185 (unsigned long)last_failed);
18062 ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	186 if (dir->self_host == host)
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	187 doveadm_director_append_status(dir, str);
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	188 else
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	189 doveadm_director_host_append_status(dir, host, str);
ade6dcace5cd doveadm director ring status shows now more information Timo Sirainen <tss@iki.fi> parents: 17725 diff changeset	190 str_append_c(str, '\n');
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	191 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	192 str_append_c(str, '\n');
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	193 o_stream_nsend(conn->output, str_data(str), str_len(str));
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	194 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	195
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	196 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	197 doveadm_cmd_director_add(struct doveadm_connection *conn,
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	198 const char const args)
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	199 {
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	200 struct director_host *host;
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	201 struct ip_addr ip;
19035 aabfe48db1cf Changed type of internet port values to in_port_t everywhere. Stephan Bosch <stephan@rename-it.nl> parents: 18729 diff changeset	202 in_port_t port = conn->dir->self_port;
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	203
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	204 if (args[0] == NULL \|\|
20968 2a7e47e01509 director: Make sure IP address parsing works in DIRECTOR-ADD/REMOVE Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20967 diff changeset	205 net_addr2ip(args[0], &ip) < 0 \|\|
19035 aabfe48db1cf Changed type of internet port values to in_port_t everywhere. Stephan Bosch <stephan@rename-it.nl> parents: 18729 diff changeset	206 (args[1] != NULL && net_str2port(args[1], &port) < 0)) {
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	207 i_error("doveadm sent invalid DIRECTOR-ADD parameters");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	208 return -1;
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	209 }
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	210
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	211 if (director_host_lookup(conn->dir, &ip, port) == NULL) {
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	212 host = director_host_add(conn->dir, &ip, port);
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	213 director_notify_ring_added(host, conn->dir->self_host);
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	214 }
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	215 o_stream_nsend(conn->output, "OK\n", 3);
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	216 return 1;
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	217 }
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	218
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	219 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	220 doveadm_cmd_director_remove(struct doveadm_connection *conn,
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	221 const char const args)
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	222 {
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	223 struct director_host *host;
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	224 struct ip_addr ip;
19035 aabfe48db1cf Changed type of internet port values to in_port_t everywhere. Stephan Bosch <stephan@rename-it.nl> parents: 18729 diff changeset	225 in_port_t port = 0;
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	226
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	227 if (args[0] == NULL \|\|
20968 2a7e47e01509 director: Make sure IP address parsing works in DIRECTOR-ADD/REMOVE Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20967 diff changeset	228 net_addr2ip(args[0], &ip) < 0 \|\|
19035 aabfe48db1cf Changed type of internet port values to in_port_t everywhere. Stephan Bosch <stephan@rename-it.nl> parents: 18729 diff changeset	229 (args[1] != NULL && net_str2port(args[1], &port) < 0)) {
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	230 i_error("doveadm sent invalid DIRECTOR-REMOVE parameters");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	231 return -1;
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	232 }
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	233
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	234 host = port != 0 ?
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	235 director_host_lookup(conn->dir, &ip, port) :
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	236 director_host_lookup_ip(conn->dir, &ip);
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	237 if (host == NULL)
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	238 o_stream_nsend_str(conn->output, "NOTFOUND\n");
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	239 else {
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	240 director_ring_remove(host, conn->dir->self_host);
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	241 o_stream_nsend(conn->output, "OK\n", 3);
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	242 }
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	243 return 1;
14571 42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	244 }
42cca8a1d179 director: Implemented ability to remove directors from a running ring. Timo Sirainen <tss@iki.fi> parents: 14471 diff changeset	245
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	246 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	247 doveadm_cmd_host_set_or_update(struct doveadm_connection *conn,
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	248 const char const args, bool update)
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	249 {
11352 19336bddada2 director: Code cleanup - keep mail hosts in a struct rather than in static variables. Timo Sirainen <tss@iki.fi> parents: 11351 diff changeset	250 struct director *dir = conn->dir;
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	251 const char ip_str, tag = "";
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	252 struct mail_host *host;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	253 struct ip_addr ip;
15904 d3cf06639864 Replaced all -1U and (unsigned int)-1 with UINT_MAX. Timo Sirainen <tss@iki.fi> parents: 15715 diff changeset	254 unsigned int vhost_count = UINT_MAX;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	255
18067 a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	256 ip_str = args[0];
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	257 if (ip_str != NULL) {
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	258 tag = strchr(ip_str, '@');
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	259 if (tag == NULL)
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	260 tag = "";
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	261 else
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	262 ip_str = t_strdup_until(ip_str, tag++);
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	263 }
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	264 if (ip_str == NULL \|\| net_addr2ip(ip_str, &ip) < 0 \|\|
19078 7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	265 (args[1] != NULL && str_to_uint(args[1], &vhost_count) < 0) \|\|
7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	266 (args[1] == NULL && update)) {
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	267 i_error("doveadm sent invalid %s parameters",
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	268 update ? "HOST-UPDATE" : "HOST-SET");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	269 return -1;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	270 }
15904 d3cf06639864 Replaced all -1U and (unsigned int)-1 with UINT_MAX. Timo Sirainen <tss@iki.fi> parents: 15715 diff changeset	271 if (vhost_count > MAX_VALID_VHOST_COUNT && vhost_count != UINT_MAX) {
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	272 o_stream_nsend_str(conn->output, "vhost count too large\n");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	273 return 1;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	274 }
11352 19336bddada2 director: Code cleanup - keep mail hosts in a struct rather than in static variables. Timo Sirainen <tss@iki.fi> parents: 11351 diff changeset	275 host = mail_host_lookup(dir->mail_hosts, &ip);
19078 7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	276 if (host == NULL) {
7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	277 if (update) {
7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	278 o_stream_nsend_str(conn->output, "NOTFOUND\n");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	279 return 1;
19078 7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	280 }
18067 a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	281 host = mail_host_add_ip(dir->mail_hosts, &ip, tag);
19497 1d2999cfe0a4 director: If doveadm attempts to change tag for an existing host, return error. Timo Sirainen <tss@iki.fi> parents: 19437 diff changeset	282 } else if (tag[0] != '\0' && strcmp(mail_host_get_tag(host), tag) != 0) {
1d2999cfe0a4 director: If doveadm attempts to change tag for an existing host, return error. Timo Sirainen <tss@iki.fi> parents: 19437 diff changeset	283 o_stream_nsend_str(conn->output, "host tag can't be changed\n");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	284 return 1;
19288 5939512ff017 director: Don't allow doveadm to update backend's state if the state is already being changed. Timo Sirainen <tss@iki.fi> parents: 19078 diff changeset	285 } else if (host->desynced) {
5939512ff017 director: Don't allow doveadm to update backend's state if the state is already being changed. Timo Sirainen <tss@iki.fi> parents: 19078 diff changeset	286 o_stream_nsend_str(conn->output,
5939512ff017 director: Don't allow doveadm to update backend's state if the state is already being changed. Timo Sirainen <tss@iki.fi> parents: 19078 diff changeset	287 "host is already being updated - try again later\n");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	288 return 1;
19078 7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	289 }
15904 d3cf06639864 Replaced all -1U and (unsigned int)-1 with UINT_MAX. Timo Sirainen <tss@iki.fi> parents: 15715 diff changeset	290 if (vhost_count != UINT_MAX)
19407 39cfca637d60 director: Code cleanup - make most mail_host_() list parameters unnecessary. Timo Sirainen <tss@iki.fi>* parents: 19288 diff changeset	291 mail_host_set_vhost_count(host, vhost_count);
19078 7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	292 /* NOTE: we don't support changing a tag for an existing host.
18067 a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	293 it needs to be removed first. otherwise it would be a bit ugly to
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	294 handle. */
11629 a07aa85f68c9 director: Lots of fixes. It should be pretty stable now. Timo Sirainen <tss@iki.fi> parents: 11585 diff changeset	295 director_update_host(dir, dir->self_host, NULL, host);
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	296
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	297 o_stream_nsend(conn->output, "OK\n", 3);
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	298 return 1;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	299 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	300
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	301 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	302 doveadm_cmd_host_set(struct doveadm_connection conn, const char const *args)
19078 7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	303 {
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	304 return doveadm_cmd_host_set_or_update(conn, args, FALSE);
19078 7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	305 }
7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	306
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	307 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	308 doveadm_cmd_host_update(struct doveadm_connection conn, const char const *args)
19078 7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	309 {
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	310 return doveadm_cmd_host_set_or_update(conn, args, TRUE);
19078 7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	311 }
7ac9ec913a39 doveadm director update command added. Timo Sirainen <tss@iki.fi> parents: 19035 diff changeset	312
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	313 static int
18729 0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	314 doveadm_cmd_host_updown(struct doveadm_connection *conn, bool down,
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	315 const char const args)
18729 0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	316 {
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	317 struct mail_host *host;
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	318 struct ip_addr ip;
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	319
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	320 if (args[0] == NULL \|\| net_addr2ip(args[0], &ip) < 0) {
18729 0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	321 i_error("doveadm sent invalid %s parameters: %s",
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	322 down ? "HOST-DOWN" : "HOST-UP",
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	323 args[0] == NULL ? "" : args[0]);
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	324 return -1;
18729 0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	325 }
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	326 host = mail_host_lookup(conn->dir->mail_hosts, &ip);
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	327 if (host == NULL) {
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	328 o_stream_nsend_str(conn->output, "NOTFOUND\n");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	329 return 1;
18729 0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	330 }
19288 5939512ff017 director: Don't allow doveadm to update backend's state if the state is already being changed. Timo Sirainen <tss@iki.fi> parents: 19078 diff changeset	331 if (host->down == down)
5939512ff017 director: Don't allow doveadm to update backend's state if the state is already being changed. Timo Sirainen <tss@iki.fi> parents: 19078 diff changeset	332 ;
5939512ff017 director: Don't allow doveadm to update backend's state if the state is already being changed. Timo Sirainen <tss@iki.fi> parents: 19078 diff changeset	333 else if (host->desynced) {
5939512ff017 director: Don't allow doveadm to update backend's state if the state is already being changed. Timo Sirainen <tss@iki.fi> parents: 19078 diff changeset	334 o_stream_nsend_str(conn->output,
5939512ff017 director: Don't allow doveadm to update backend's state if the state is already being changed. Timo Sirainen <tss@iki.fi> parents: 19078 diff changeset	335 "host is already being updated - try again later\n");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	336 return 1;
19288 5939512ff017 director: Don't allow doveadm to update backend's state if the state is already being changed. Timo Sirainen <tss@iki.fi> parents: 19078 diff changeset	337 } else {
19407 39cfca637d60 director: Code cleanup - make most mail_host_() list parameters unnecessary. Timo Sirainen <tss@iki.fi>* parents: 19288 diff changeset	338 mail_host_set_down(host, down, ioloop_time);
18729 0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	339 director_update_host(conn->dir, conn->dir->self_host,
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	340 NULL, host);
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	341 }
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	342 o_stream_nsend(conn->output, "OK\n", 3);
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	343 return 1;
18729 0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	344 }
0ee3e734249a director: Added "up" vs "down" states and doveadm director up/down commands. Timo Sirainen <tss@iki.fi> parents: 18709 diff changeset	345
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	346 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	347 doveadm_cmd_host_remove(struct doveadm_connection *conn,
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	348 const char const args)
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	349 {
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	350 struct mail_host *host;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	351 struct ip_addr ip;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	352
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	353 if (args[0] == NULL \|\| net_addr2ip(args[0], &ip) < 0) {
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	354 i_error("doveadm sent invalid HOST-REMOVE parameters");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	355 return -1;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	356 }
11352 19336bddada2 director: Code cleanup - keep mail hosts in a struct rather than in static variables. Timo Sirainen <tss@iki.fi> parents: 11351 diff changeset	357 host = mail_host_lookup(conn->dir->mail_hosts, &ip);
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	358 if (host == NULL)
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	359 o_stream_nsend_str(conn->output, "NOTFOUND\n");
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	360 else {
11629 a07aa85f68c9 director: Lots of fixes. It should be pretty stable now. Timo Sirainen <tss@iki.fi> parents: 11585 diff changeset	361 director_remove_host(conn->dir, conn->dir->self_host,
a07aa85f68c9 director: Lots of fixes. It should be pretty stable now. Timo Sirainen <tss@iki.fi> parents: 11585 diff changeset	362 NULL, host);
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	363 o_stream_nsend(conn->output, "OK\n", 3);
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	364 }
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	365 return 1;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	366 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	367
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	368 static void
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	369 doveadm_cmd_host_flush_all(struct doveadm_connection *conn)
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	370 {
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	371 struct mail_host const hostp;
17725 bd381e882485 director: Log a warning when using "director host flush" for all hosts. Timo Sirainen <tss@iki.fi> parents: 17418 diff changeset	372 unsigned int total_user_count = 0;
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	373
11629 a07aa85f68c9 director: Lots of fixes. It should be pretty stable now. Timo Sirainen <tss@iki.fi> parents: 11585 diff changeset	374 array_foreach(mail_hosts_get(conn->dir->mail_hosts), hostp) {
17725 bd381e882485 director: Log a warning when using "director host flush" for all hosts. Timo Sirainen <tss@iki.fi> parents: 17418 diff changeset	375 total_user_count += (*hostp)->user_count;
11629 a07aa85f68c9 director: Lots of fixes. It should be pretty stable now. Timo Sirainen <tss@iki.fi> parents: 11585 diff changeset	376 director_flush_host(conn->dir, conn->dir->self_host,
a07aa85f68c9 director: Lots of fixes. It should be pretty stable now. Timo Sirainen <tss@iki.fi> parents: 11585 diff changeset	377 NULL, *hostp);
a07aa85f68c9 director: Lots of fixes. It should be pretty stable now. Timo Sirainen <tss@iki.fi> parents: 11585 diff changeset	378 }
17725 bd381e882485 director: Log a warning when using "director host flush" for all hosts. Timo Sirainen <tss@iki.fi> parents: 17418 diff changeset	379 i_warning("Flushed all backend hosts with %u users. This is an unsafe "
bd381e882485 director: Log a warning when using "director host flush" for all hosts. Timo Sirainen <tss@iki.fi> parents: 17418 diff changeset	380 "operation and may cause the same users to end up in multiple backends.",
bd381e882485 director: Log a warning when using "director host flush" for all hosts. Timo Sirainen <tss@iki.fi> parents: 17418 diff changeset	381 total_user_count);
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	382 o_stream_nsend(conn->output, "OK\n", 3);
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	383 }
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	384
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	385 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	386 doveadm_cmd_host_flush(struct doveadm_connection conn, const char const *args)
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	387 {
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	388 struct mail_host *host;
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	389 struct ip_addr ip;
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	390
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	391 if (args[0] == NULL \|\| args[0][0] == '\0') {
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	392 doveadm_cmd_host_flush_all(conn);
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	393 return 1;
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	394 }
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	395
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	396 if (net_addr2ip(args[0], &ip) < 0) {
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	397 i_error("doveadm sent invalid HOST-FLUSH parameters");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	398 return -1;
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	399 }
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	400 host = mail_host_lookup(conn->dir->mail_hosts, &ip);
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	401 if (host == NULL)
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	402 o_stream_nsend_str(conn->output, "NOTFOUND\n");
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	403 else {
11629 a07aa85f68c9 director: Lots of fixes. It should be pretty stable now. Timo Sirainen <tss@iki.fi> parents: 11585 diff changeset	404 director_flush_host(conn->dir, conn->dir->self_host,
a07aa85f68c9 director: Lots of fixes. It should be pretty stable now. Timo Sirainen <tss@iki.fi> parents: 11585 diff changeset	405 NULL, host);
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	406 o_stream_nsend(conn->output, "OK\n", 3);
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	407 }
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	408 return 1;
11355 ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	409 }
ef1de95396d4 Added doveadm director flush command for dropping user associations from memory. Timo Sirainen <tss@iki.fi> parents: 11353 diff changeset	410
18709 618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	411 static void
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	412 director_host_reset_users(struct director dir, struct director_host src,
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	413 struct mail_host *host)
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	414 {
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	415 struct user_directory_iter *iter;
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	416 struct user *user;
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	417 struct mail_host *new_host;
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	418
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	419 if (dir->right != NULL)
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	420 director_connection_cork(dir->right);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	421
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	422 iter = user_directory_iter_init(dir->users);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	423 while ((user = user_directory_iter_next(iter)) != NULL) {
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	424 if (user->host != host)
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	425 continue;
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	426 new_host = mail_host_get_by_hash(dir->mail_hosts,
19408 7e47f561ad49 director: Code cleanup - access host->tag via mail_host_get_tag() Timo Sirainen <tss@iki.fi> parents: 19407 diff changeset	427 user->username_hash,
7e47f561ad49 director: Code cleanup - access host->tag via mail_host_get_tag() Timo Sirainen <tss@iki.fi> parents: 19407 diff changeset	428 mail_host_get_tag(host));
18709 618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	429 if (new_host != host) T_BEGIN {
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	430 director_move_user(dir, src, NULL,
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	431 user->username_hash, new_host);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	432 } T_END;
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	433 }
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	434 user_directory_iter_deinit(&iter);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	435 if (dir->right != NULL)
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	436 director_connection_uncork(dir->right);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	437 }
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	438
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	439 static void
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	440 doveadm_cmd_host_reset_users_all(struct doveadm_connection *conn)
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	441 {
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	442 struct mail_host const hostp;
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	443
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	444 array_foreach(mail_hosts_get(conn->dir->mail_hosts), hostp)
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	445 director_host_reset_users(conn->dir, conn->dir->self_host, *hostp);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	446 o_stream_nsend(conn->output, "OK\n", 3);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	447 }
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	448
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	449 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	450 doveadm_cmd_host_reset_users(struct doveadm_connection *conn,
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	451 const char const args)
18709 618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	452 {
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	453 struct mail_host *host;
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	454 struct ip_addr ip;
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	455
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	456 if (args[0] == NULL \|\| args[0][0] == '\0') {
18709 618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	457 doveadm_cmd_host_reset_users_all(conn);
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	458 return 1;
18709 618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	459 }
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	460
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	461 if (net_addr2ip(args[0], &ip) < 0) {
18709 618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	462 i_error("doveadm sent invalid HOST-RESET-USERS parameters");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	463 return -1;
18709 618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	464 }
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	465 host = mail_host_lookup(conn->dir->mail_hosts, &ip);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	466 if (host == NULL)
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	467 o_stream_nsend_str(conn->output, "NOTFOUND\n");
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	468 else {
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	469 director_host_reset_users(conn->dir, conn->dir->self_host, host);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	470 o_stream_nsend(conn->output, "OK\n", 3);
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	471 }
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	472 return 1;
18709 618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	473 }
618c8d76bc5d director: Added HOST-RESET-USERS command to move users to their hash-assigned hosts. Timo Sirainen <tss@iki.fi> parents: 18541 diff changeset	474
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	475 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	476 doveadm_cmd_user_lookup(struct doveadm_connection *conn,
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	477 const char const args)
11351 c57c1ff9c5f1 doveadm director status username now returns which server the user is assigned to. Timo Sirainen <tss@iki.fi> parents: 11322 diff changeset	478 {
c57c1ff9c5f1 doveadm director status username now returns which server the user is assigned to. Timo Sirainen <tss@iki.fi> parents: 11322 diff changeset	479 struct user *user;
11353 1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	480 struct mail_host *host;
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	481 const char username, tag;
11353 1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	482 unsigned int username_hash;
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	483 string_t *str = t_str_new(256);
11351 c57c1ff9c5f1 doveadm director status username now returns which server the user is assigned to. Timo Sirainen <tss@iki.fi> parents: 11322 diff changeset	484
18067 a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	485 if (args[0] == NULL) {
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	486 username = "";
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	487 tag = "";
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	488 } else {
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	489 username = args[0];
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	490 tag = args[1] != NULL ? args[1] : "";
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	491 }
a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	492 if (str_to_uint(username, &username_hash) < 0)
18541 04ac1a15e6e4 director: Fixed "doveadm director status <user>" lookup to return "Current" correctly. Timo Sirainen <tss@iki.fi> parents: 18137 diff changeset	493 username_hash = user_directory_get_username_hash(conn->dir->users, username);
11353 1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	494
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	495 /* get user's current host */
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	496 user = user_directory_lookup(conn->dir->users, username_hash);
11351 c57c1ff9c5f1 doveadm director status username now returns which server the user is assigned to. Timo Sirainen <tss@iki.fi> parents: 11322 diff changeset	497 if (user == NULL)
11353 1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	498 str_append(str, "\t0");
11351 c57c1ff9c5f1 doveadm director status username now returns which server the user is assigned to. Timo Sirainen <tss@iki.fi> parents: 11322 diff changeset	499 else {
11353 1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	500 str_printfa(str, "%s\t%u", net_ip2addr(&user->host->ip),
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	501 user->timestamp +
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	502 conn->dir->set->director_user_expire);
11351 c57c1ff9c5f1 doveadm director status username now returns which server the user is assigned to. Timo Sirainen <tss@iki.fi> parents: 11322 diff changeset	503 }
11353 1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	504
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	505 /* get host if it wasn't in user directory */
18067 a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	506 host = mail_host_get_by_hash(conn->dir->mail_hosts, username_hash, tag);
11353 1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	507 if (host == NULL)
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	508 str_append(str, "\t");
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	509 else
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	510 str_printfa(str, "\t%s", net_ip2addr(&host->ip));
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	511
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	512 /* get host with default configuration */
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	513 host = mail_host_get_by_hash(conn->dir->orig_config_hosts,
18067 a7e830b9b967 director: Added support for backend cluster "tags". Timo Sirainen <tss@iki.fi> parents: 18065 diff changeset	514 username_hash, tag);
11353 1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	515 if (host == NULL)
19437 ac30316bed82 director: Fixed "doveadm director status user@domain" not to hang due to missing LF. Timo Sirainen <tss@iki.fi> parents: 19408 diff changeset	516 str_append(str, "\t\n");
11353 1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	517 else
1bc3d5589c5a doveadm director status user: Show more ways of what user's potential hosts are. Timo Sirainen <tss@iki.fi> parents: 11352 diff changeset	518 str_printfa(str, "\t%s\n", net_ip2addr(&host->ip));
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	519 o_stream_nsend(conn->output, str_data(str), str_len(str));
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	520 return 1;
11351 c57c1ff9c5f1 doveadm director status username now returns which server the user is assigned to. Timo Sirainen <tss@iki.fi> parents: 11322 diff changeset	521 }
c57c1ff9c5f1 doveadm director status username now returns which server the user is assigned to. Timo Sirainen <tss@iki.fi> parents: 11322 diff changeset	522
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	523 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	524 doveadm_cmd_user_list(struct doveadm_connection conn, const char const *args)
11823 4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	525 {
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	526 struct user_directory_iter *iter;
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	527 struct user *user;
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	528 struct ip_addr ip;
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	529
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	530 if (args[0] != NULL && args[0][0] != '\0') {
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	531 if (net_addr2ip(args[0], &ip) < 0) {
11823 4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	532 i_error("doveadm sent invalid USER-LIST parameters");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	533 return -1;
11823 4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	534 }
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	535 } else {
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	536 ip.family = 0;
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	537 }
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	538
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	539 iter = user_directory_iter_init(conn->dir->users);
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	540 while ((user = user_directory_iter_next(iter)) != NULL) {
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	541 if (ip.family == 0 \|\|
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	542 net_ip_compare(&ip, &user->host->ip)) T_BEGIN {
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	543 unsigned int expire_time = user->timestamp +
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	544 conn->dir->set->director_user_expire;
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	545
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	546 o_stream_nsend_str(conn->output, t_strdup_printf(
11823 4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	547 "%u\t%u\t%s\n",
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	548 user->username_hash, expire_time,
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	549 net_ip2addr(&user->host->ip)));
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	550 } T_END;
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	551 }
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	552 user_directory_iter_deinit(&iter);
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	553 o_stream_nsend(conn->output, "\n", 1);
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	554 return 1;
11823 4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	555 }
4138737f41e6 doveadm: Added "director map" command to list user -> host mappings. Timo Sirainen <tss@iki.fi> parents: 11629 diff changeset	556
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	557 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	558 doveadm_cmd_user_move(struct doveadm_connection conn, const char const *args)
13045 79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	559 {
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	560 unsigned int username_hash;
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	561 struct user *user;
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	562 struct mail_host *host;
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	563 struct ip_addr ip;
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	564
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	565 if (args[0] == NULL \|\| args[1] == NULL \|\|
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	566 net_addr2ip(args[1], &ip) < 0) {
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	567 i_error("doveadm sent invalid USER-MOVE parameters");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	568 return -1;
13045 79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	569 }
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	570 host = mail_host_lookup(conn->dir->mail_hosts, &ip);
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	571 if (host == NULL) {
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	572 o_stream_nsend_str(conn->output, "NOTFOUND\n");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	573 return 1;
13045 79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	574 }
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	575
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	576 if (str_to_uint(args[0], &username_hash) < 0)
20969 193f82412af9 director: USER-MOVE didn't handle non-hash username correctly. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20968 diff changeset	577 username_hash = user_directory_get_username_hash(conn->dir->users, args[0]);
13045 79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	578 user = user_directory_lookup(conn->dir->users, username_hash);
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	579 if (user != NULL && user->kill_state != USER_KILL_STATE_NONE) {
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	580 o_stream_nsend_str(conn->output, "TRYAGAIN\n");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	581 return 1;
13045 79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	582 }
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	583
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	584 director_move_user(conn->dir, conn->dir->self_host, NULL,
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	585 username_hash, host);
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	586 o_stream_nsend(conn->output, "OK\n", 3);
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	587 return 1;
13045 79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	588 }
79f9dce5d5fd director: Added support for moving user to another server with "doveadm director move". Timo Sirainen <tss@iki.fi> parents: 12986 diff changeset	589
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	590 static int
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	591 doveadm_cmd_user_kick(struct doveadm_connection conn, const char const *args)
17418 64808a9703db doveadm director kick command added. Timo Sirainen <tss@iki.fi> parents: 17130 diff changeset	592 {
64808a9703db doveadm director kick command added. Timo Sirainen <tss@iki.fi> parents: 17130 diff changeset	593 if (args[0] == NULL) {
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	594 i_error("doveadm sent invalid USER-KICK parameters");
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	595 return -1;
17418 64808a9703db doveadm director kick command added. Timo Sirainen <tss@iki.fi> parents: 17130 diff changeset	596 }
64808a9703db doveadm director kick command added. Timo Sirainen <tss@iki.fi> parents: 17130 diff changeset	597
64808a9703db doveadm director kick command added. Timo Sirainen <tss@iki.fi> parents: 17130 diff changeset	598 director_kick_user(conn->dir, conn->dir->self_host, NULL, args[0]);
64808a9703db doveadm director kick command added. Timo Sirainen <tss@iki.fi> parents: 17130 diff changeset	599 o_stream_nsend(conn->output, "OK\n", 3);
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	600 return 1;
17418 64808a9703db doveadm director kick command added. Timo Sirainen <tss@iki.fi> parents: 17130 diff changeset	601 }
64808a9703db doveadm director kick command added. Timo Sirainen <tss@iki.fi> parents: 17130 diff changeset	602
20967 1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	603 static int
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	604 doveadm_connection_cmd(struct doveadm_connection conn, const char line)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	605 {
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	606 const char cmd, const *args;
20967 1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	607 int ret = 1;
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	608
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	609 args = t_strsplit_tabescaped(line);
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	610 if (args[0] == NULL) {
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	611 i_error("doveadm sent empty command line");
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	612 return -1;
20967 1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	613 }
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	614 cmd = args[0];
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	615 args++;
20967 1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	616
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	617 if (strcmp(cmd, "HOST-LIST") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	618 doveadm_cmd_host_list(conn);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	619 else if (strcmp(cmd, "HOST-LIST-REMOVED") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	620 doveadm_cmd_host_list_removed(conn);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	621 else if (strcmp(cmd, "DIRECTOR-LIST") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	622 doveadm_cmd_director_list(conn);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	623 else if (strcmp(cmd, "DIRECTOR-ADD") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	624 ret = doveadm_cmd_director_add(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	625 else if (strcmp(cmd, "DIRECTOR-REMOVE") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	626 ret = doveadm_cmd_director_remove(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	627 else if (strcmp(cmd, "HOST-SET") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	628 ret = doveadm_cmd_host_set(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	629 else if (strcmp(cmd, "HOST-UPDATE") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	630 ret = doveadm_cmd_host_update(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	631 else if (strcmp(cmd, "HOST-UP") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	632 ret = doveadm_cmd_host_updown(conn, FALSE, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	633 else if (strcmp(cmd, "HOST-DOWN") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	634 ret = doveadm_cmd_host_updown(conn, TRUE, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	635 else if (strcmp(cmd, "HOST-REMOVE") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	636 ret = doveadm_cmd_host_remove(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	637 else if (strcmp(cmd, "HOST-FLUSH") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	638 ret = doveadm_cmd_host_flush(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	639 else if (strcmp(cmd, "HOST-RESET-USERS") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	640 ret = doveadm_cmd_host_reset_users(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	641 else if (strcmp(cmd, "USER-LOOKUP") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	642 ret = doveadm_cmd_user_lookup(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	643 else if (strcmp(cmd, "USER-LIST") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	644 ret = doveadm_cmd_user_list(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	645 else if (strcmp(cmd, "USER-MOVE") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	646 ret = doveadm_cmd_user_move(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	647 else if (strcmp(cmd, "USER-KICK") == 0)
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	648 ret = doveadm_cmd_user_kick(conn, args);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	649 else {
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	650 i_error("doveadm sent unknown command: %s", line);
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	651 ret = -1;
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	652 }
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	653 return ret;
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	654 }
1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	655
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	656 static void doveadm_connection_input(struct doveadm_connection *conn)
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	657 {
20967 1be6845a989b director: Code cleanup - moved command handling to its own function. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20963 diff changeset	658 const char *line;
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	659 int ret = 1;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	660
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	661 if (!conn->handshaked) {
11894 06a7435b6f53 director: If doveadm connection disconnects before handshake, don't loop forever. Timo Sirainen <tss@iki.fi> parents: 11823 diff changeset	662 if ((line = i_stream_read_next_line(conn->input)) == NULL) {
06a7435b6f53 director: If doveadm connection disconnects before handshake, don't loop forever. Timo Sirainen <tss@iki.fi> parents: 11823 diff changeset	663 if (conn->input->eof \|\| conn->input->stream_errno != 0)
06a7435b6f53 director: If doveadm connection disconnects before handshake, don't loop forever. Timo Sirainen <tss@iki.fi> parents: 11823 diff changeset	664 doveadm_connection_deinit(&conn);
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	665 return;
11894 06a7435b6f53 director: If doveadm connection disconnects before handshake, don't loop forever. Timo Sirainen <tss@iki.fi> parents: 11823 diff changeset	666 }
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	667
11458 4274d1549fa0 Added version_string_verify() and removed code duplication with it. Timo Sirainen <tss@iki.fi> parents: 11373 diff changeset	668 if (!version_string_verify(line, "director-doveadm",
4274d1549fa0 Added version_string_verify() and removed code duplication with it. Timo Sirainen <tss@iki.fi> parents: 11373 diff changeset	669 DOVEADM_PROTOCOL_VERSION_MAJOR)) {
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	670 i_error("doveadm not compatible with this server "
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	671 "(mixed old and new binaries?)");
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	672 doveadm_connection_deinit(&conn);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	673 return;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	674 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	675 conn->handshaked = TRUE;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	676 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	677
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	678 while ((line = i_stream_read_next_line(conn->input)) != NULL && ret > 0) {
20970 d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	679 T_BEGIN {
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	680 ret = doveadm_connection_cmd(conn, line);
d653bcdff8a2 director: Code cleanup - Give tab-unescaped args to all doveadm command handlers. Timo Sirainen <timo.sirainen@dovecot.fi> parents: 20969 diff changeset	681 } T_END;
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	682 }
20963 076b552163d2 director: Code cleanup - allow commands handlers to stop processing input Timo Sirainen <timo.sirainen@dovecot.fi> parents: 19552 diff changeset	683 if (conn->input->eof \|\| conn->input->stream_errno != 0 \|\| ret < 0)
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	684 doveadm_connection_deinit(&conn);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	685 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	686
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	687 struct doveadm_connection *
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	688 doveadm_connection_init(struct director *dir, int fd)
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	689 {
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	690 struct doveadm_connection *conn;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	691
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	692 conn = i_new(struct doveadm_connection, 1);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	693 conn->fd = fd;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	694 conn->dir = dir;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	695 conn->input = i_stream_create_fd(conn->fd, 1024, FALSE);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	696 conn->output = o_stream_create_fd(conn->fd, (size_t)-1, FALSE);
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	697 o_stream_set_no_error_handling(conn->output, TRUE);
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	698 conn->io = io_add(conn->fd, IO_READ, doveadm_connection_input, conn);
14681 ca37d1577291 Added o_stream_nsend() and related functions to make delayed error handling safer. Timo Sirainen <tss@iki.fi>* parents: 14571 diff changeset	699 o_stream_nsend_str(conn->output, DOVEADM_HANDSHAKE);
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	700
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	701 DLLIST_PREPEND(&doveadm_connections, conn);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	702 return conn;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	703 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	704
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	705 static void doveadm_connection_deinit(struct doveadm_connection **_conn)
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	706 {
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	707 struct doveadm_connection conn = _conn;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	708
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	709 *_conn = NULL;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	710
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	711 DLLIST_REMOVE(&doveadm_connections, conn);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	712 io_remove(&conn->io);
11322 12316378922e director: Memory leak fix. Timo Sirainen <tss@iki.fi> parents: 11321 diff changeset	713 i_stream_unref(&conn->input);
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	714 o_stream_unref(&conn->output);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	715 if (close(conn->fd) < 0)
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	716 i_error("close(doveadm connection) failed: %m");
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	717 i_free(conn);
11373 26cfc1c3a4b1 director: Update connection count when client disconnects. Timo Sirainen <tss@iki.fi> parents: 11355 diff changeset	718
26cfc1c3a4b1 director: Update connection count when client disconnects. Timo Sirainen <tss@iki.fi> parents: 11355 diff changeset	719 master_service_client_connection_destroyed(master_service);
11321 5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	720 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	721
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	722 void doveadm_connections_deinit(void)
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	723 {
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	724 while (doveadm_connections != NULL) {
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	725 struct doveadm_connection *conn = doveadm_connections;
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	726
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	727 doveadm_connection_deinit(&conn);
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	728 }
5f350b5ff6d9 Added initial implementation of a director process (for NFS users). Timo Sirainen <tss@iki.fi> parents: diff changeset	729 }

Mercurial > dovecot > core-2.2

annotate src/director/doveadm-connection.c @ 20970:d653bcdff8a2