annotate src/config/config-connection.c @ 9179:f8460b27db00 HEAD

doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
author Timo Sirainen <tss@iki.fi>
date Thu, 30 Apr 2009 15:02:44 -0400
parents 6324a79d3ee1
children 150a98d2407c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9013
8b616cc6d848 Added dovecof --exec and made deliver use it instead of forking.
Timo Sirainen <tss@iki.fi>
parents: 9002
diff changeset
1 /* Copyright (C) 2005-2009 Dovecot authors, see the included COPYING file */
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
9179
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
3 #include "lib.h"
9087
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
4 #include "array.h"
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
5 #include "llist.h"
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
6 #include "ioloop.h"
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
7 #include "network.h"
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
8 #include "istream.h"
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
9 #include "ostream.h"
9013
8b616cc6d848 Added dovecof --exec and made deliver use it instead of forking.
Timo Sirainen <tss@iki.fi>
parents: 9002
diff changeset
10 #include "env-util.h"
9179
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
11 #include "config-request.h"
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
12 #include "config-connection.h"
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
13
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
14 #include <stdlib.h>
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
15 #include <unistd.h>
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
16
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
17 #define MAX_INBUF_SIZE 1024
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
18
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
19 #define CONFIG_CLIENT_PROTOCOL_MAJOR_VERSION 1
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
20 #define CONFIG_CLIENT_PROTOCOL_MINOR_VERSION 0
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
21
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
22 struct config_connection {
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
23 struct config_connection *prev, *next;
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
24
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
25 int fd;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
26 struct istream *input;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
27 struct ostream *output;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
28 struct io *io;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
29
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
30 unsigned int version_received:1;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
31 unsigned int handshaked:1;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
32 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
33
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
34 struct config_connection *config_connections = NULL;
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
35
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
36 static const char *const *
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
37 config_connection_next_line(struct config_connection *conn)
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
38 {
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
39 const char *line;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
40
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
41 line = i_stream_next_line(conn->input);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
42 if (line == NULL)
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
43 return NULL;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
44
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
45 return t_strsplit(line, "\t");
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
46 }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
47
9179
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
48 static void
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
49 config_request_output(const char *key, const char *value,
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
50 bool list ATTR_UNUSED, void *context)
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
51 {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
52 struct ostream *output = context;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
53
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
54 o_stream_send_str(output, key);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
55 o_stream_send_str(output, "=");
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
56 o_stream_send_str(output, value);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
57 o_stream_send_str(output, "\n");
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
58 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
59
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
60 struct config_request_get_string_ctx {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
61 pool_t pool;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
62 ARRAY_TYPE(const_string) strings;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
63 };
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
64
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
65 static void
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
66 config_request_get_strings(const char *key, const char *value,
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
67 bool list, void *context)
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
68 {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
69 struct config_request_get_string_ctx *ctx = context;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
70
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
71 value = p_strdup_printf(ctx->pool, list ? "-%s=%s" : "%s=%s",
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
72 key, value);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
73 array_append(&ctx->strings, &value, 1);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
74 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
75
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
76 static int config_string_cmp(const void *p1, const void *p2)
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
77 {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
78 const char *s1 = *(const char *const *)p1;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
79 const char *s2 = *(const char *const *)p2;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
80 unsigned int i = 0;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
81
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
82 while (s1[i] == s2[i]) {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
83 if (s1[i] == '\0' || s1[i] == '=')
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
84 return 0;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
85 i++;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
86 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
87
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
88 if (s1[i] == '=')
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
89 return -1;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
90 if (s2[i] == '=')
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
91 return 1;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
92 return s1[i] - s2[i];
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
93 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
94
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
95 static unsigned int prefix_stack_pop(ARRAY_TYPE(uint) *stack)
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
96 {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
97 const unsigned int *indexes;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
98 unsigned int idx, count;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
99
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
100 indexes = array_get(stack, &count);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
101 idx = count <= 1 ? -1U : indexes[count-2];
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
102 array_delete(stack, count-1, 1);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
103 return idx;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
104 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
105
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
106 static void config_connection_request_human(struct ostream *output,
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
107 const char *service,
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
108 enum config_dump_flags flags)
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
109 {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
110 static const char *ident_str = " ";
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
111 ARRAY_TYPE(const_string) prefixes_arr;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
112 ARRAY_TYPE(uint) prefix_idx_stack;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
113 struct config_request_get_string_ctx ctx;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
114 const char **strings, *const *args, *p, *str, *const *prefixes;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
115 const char *key, *value;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
116 unsigned int i, j, count, len, prefix_count, skip_len;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
117 unsigned int indent = 0, prefix_idx = -1U;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
118
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
119 ctx.pool = pool_alloconly_create("config human strings", 10240);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
120 i_array_init(&ctx.strings, 256);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
121 config_request_handle(service, flags, config_request_get_strings, &ctx);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
122
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
123 strings = array_get_modifiable(&ctx.strings, &count);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
124 qsort(strings, count, sizeof(*strings), config_string_cmp);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
125
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
126 p_array_init(&prefixes_arr, ctx.pool, 32);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
127 for (i = 0; i < count && strings[i][0] == '-'; i++) T_BEGIN {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
128 p = strchr(strings[i], '=');
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
129 i_assert(p != NULL);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
130 for (args = t_strsplit(p + 1, " "); *args != NULL; args++) {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
131 str = p_strdup_printf(ctx.pool, "%s/%s/",
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
132 t_strcut(strings[i]+1, '='),
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
133 *args);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
134 array_append(&prefixes_arr, &str, 1);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
135 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
136 } T_END;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
137 prefixes = array_get(&prefixes_arr, &prefix_count);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
138
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
139 p_array_init(&prefix_idx_stack, ctx.pool, 8);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
140 for (; i < count; i++) T_BEGIN {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
141 value = strchr(strings[i], '=');
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
142 i_assert(value != NULL);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
143 key = t_strdup_until(strings[i], value);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
144 value++;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
145
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
146 j = 0;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
147 while (prefix_idx != -1U) {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
148 len = strlen(prefixes[prefix_idx]);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
149 if (strncmp(prefixes[prefix_idx], key, len) != 0) {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
150 prefix_idx = prefix_stack_pop(&prefix_idx_stack);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
151 indent--;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
152 o_stream_send(output, ident_str, indent*2);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
153 o_stream_send_str(output, "}\n");
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
154 } else if (strchr(key + len, '/') == NULL) {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
155 /* keep the prefix */
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
156 j = prefix_count;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
157 break;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
158 } else {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
159 /* subprefix */
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
160 break;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
161 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
162 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
163 for (; j < prefix_count; j++) {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
164 len = strlen(prefixes[j]);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
165 if (strncmp(prefixes[j], key, len) == 0 &&
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
166 strchr(key + len, '/') == NULL) {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
167 key += prefix_idx == -1U ? 0 :
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
168 strlen(prefixes[prefix_idx]);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
169 o_stream_send(output, ident_str, indent*2);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
170 o_stream_send_str(output, t_strcut(key, '/'));
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
171 o_stream_send_str(output, " {\n");
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
172 indent++;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
173 prefix_idx = j;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
174 array_append(&prefix_idx_stack, &prefix_idx, 1);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
175 break;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
176 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
177 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
178 skip_len = prefix_idx == -1U ? 0 : strlen(prefixes[prefix_idx]);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
179 i_assert(strncmp(prefixes[prefix_idx], strings[i], skip_len) == 0);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
180 o_stream_send(output, ident_str, indent*2);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
181 key = strings[i] + skip_len;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
182 value = strchr(key, '=');
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
183 o_stream_send(output, key, value-key);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
184 o_stream_send_str(output, " = ");
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
185 o_stream_send_str(output, value+1);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
186 o_stream_send(output, "\n", 1);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
187 } T_END;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
188
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
189 while (prefix_idx != -1U) {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
190 prefix_idx = prefix_stack_pop(&prefix_idx_stack);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
191 indent--;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
192 o_stream_send(output, ident_str, indent*2);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
193 o_stream_send_str(output, "}\n");
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
194 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
195
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
196 array_free(&ctx.strings);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
197 pool_unref(&ctx.pool);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
198 }
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
199
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
200 static void config_connection_request(struct config_connection *conn,
9087
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
201 const char *const *args,
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
202 enum config_dump_flags flags)
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
203 {
9179
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
204 const char *service = "";
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
205
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
206 /* [<service> [<args>]] */
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
207 if (args[0] != NULL)
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
208 service = args[0];
9087
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
209
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
210 o_stream_cork(conn->output);
9179
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
211 if ((flags & CONFIG_DUMP_FLAG_HUMAN) == 0) {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
212 config_request_handle(service, flags, config_request_output,
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
213 conn->output);
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
214 o_stream_send_str(conn->output, "\n");
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
215 } else {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
216 config_connection_request_human(conn->output, service, flags);
9087
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
217 }
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
218 o_stream_uncork(conn->output);
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
219 }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
220
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
221 static void config_connection_input(void *context)
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
222 {
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
223 struct config_connection *conn = context;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
224 const char *const *args, *line;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
225
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
226 switch (i_stream_read(conn->input)) {
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
227 case -2:
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
228 i_error("BUG: Config client connection sent too much data");
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
229 config_connection_destroy(conn);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
230 return;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
231 case -1:
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
232 config_connection_destroy(conn);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
233 return;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
234 }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
235
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
236 if (!conn->version_received) {
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
237 line = i_stream_next_line(conn->input);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
238 if (line == NULL)
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
239 return;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
240
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
241 if (strncmp(line, "VERSION\t", 8) != 0 ||
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
242 atoi(t_strcut(line + 8, '\t')) !=
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
243 CONFIG_CLIENT_PROTOCOL_MAJOR_VERSION) {
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
244 i_error("Config client not compatible with this server "
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
245 "(mixed old and new binaries?)");
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
246 config_connection_destroy(conn);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
247 return;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
248 }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
249 conn->version_received = TRUE;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
250 }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
251
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
252 while ((args = config_connection_next_line(conn)) != NULL) {
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
253 if (args[0] == NULL)
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
254 continue;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
255 if (strcmp(args[0], "REQ") == 0)
9087
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
256 config_connection_request(conn, args + 1, 0);
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
257 }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
258 }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
259
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
260 struct config_connection *config_connection_create(int fd)
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
261 {
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
262 struct config_connection *conn;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
263
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
264 conn = i_new(struct config_connection, 1);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
265 conn->fd = fd;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
266 conn->input = i_stream_create_fd(fd, MAX_INBUF_SIZE, FALSE);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
267 conn->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
268 conn->io = io_add(fd, IO_READ, config_connection_input, conn);
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
269 DLLIST_PREPEND(&config_connections, conn);
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
270 return conn;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
271 }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
272
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
273 void config_connection_destroy(struct config_connection *conn)
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
274 {
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
275 DLLIST_REMOVE(&config_connections, conn);
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
276
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
277 io_remove(&conn->io);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
278 i_stream_destroy(&conn->input);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
279 o_stream_destroy(&conn->output);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
280 if (close(conn->fd) < 0)
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
281 i_error("close(config conn) failed: %m");
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
282 i_free(conn);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
283 }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
284
9087
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
285 void config_connection_dump_request(int fd, const char *service,
81ff88345441 Some cleanups to the config parsing code.
Timo Sirainen <tss@iki.fi>
parents: 9013
diff changeset
286 enum config_dump_flags flags)
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
287 {
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
288 struct config_connection *conn;
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
289 const char *args[2] = { service, NULL };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
290
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
291 conn = config_connection_create(fd);
9179
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
292 config_connection_request(conn, args, flags);
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
293 config_connection_destroy(conn);
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
294 }
9013
8b616cc6d848 Added dovecof --exec and made deliver use it instead of forking.
Timo Sirainen <tss@iki.fi>
parents: 9002
diff changeset
295
9179
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
296 static void config_request_putenv(const char *key, const char *value,
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
297 bool list ATTR_UNUSED,
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
298 void *context ATTR_UNUSED)
9013
8b616cc6d848 Added dovecof --exec and made deliver use it instead of forking.
Timo Sirainen <tss@iki.fi>
parents: 9002
diff changeset
299 {
9179
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
300 T_BEGIN {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
301 env_put(t_strconcat(t_str_ucase(key), "=", value, NULL));
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
302 } T_END;
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
303 }
9013
8b616cc6d848 Added dovecof --exec and made deliver use it instead of forking.
Timo Sirainen <tss@iki.fi>
parents: 9002
diff changeset
304
9179
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
305 void config_connection_putenv(const char *service)
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
306 {
f8460b27db00 doveconf: With -p only protocol-specific settings are returned. -n and -a return human-readable output.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
307 config_request_handle(service, 0, config_request_putenv, NULL);
9013
8b616cc6d848 Added dovecof --exec and made deliver use it instead of forking.
Timo Sirainen <tss@iki.fi>
parents: 9002
diff changeset
308 }
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
309
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
310 void config_connections_destroy_all(void)
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
311 {
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
312 while (config_connections != NULL)
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
313 config_connection_destroy(config_connections);
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9087
diff changeset
314 }