annotate src/lib-dict/dict-client.c @ 4385:2c4a39afea07 HEAD

Fixes
author Timo Sirainen <tss@iki.fi>
date Fri, 16 Jun 2006 14:42:59 +0300
parents 51a1d0fbbc94
children b5d4c1e9a492
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
1 /* Copyright (C) 2005 Timo Sirainen */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
3 #include "lib.h"
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
4 #include "str.h"
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
5 #include "network.h"
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
6 #include "istream.h"
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
7 #include "ostream.h"
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
8 #include "dict-private.h"
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
9 #include "dict-client.h"
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
10
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
11 #include <unistd.h>
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
12 #include <fcntl.h>
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
13
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
14 struct client_dict {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
15 struct dict dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
16
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
17 pool_t pool;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
18 int fd;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
19 const char *uri;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
20 const char *username;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
21 const char *path;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
22
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
23 struct istream *input;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
24 struct ostream *output;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
25
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
26 unsigned int connect_counter;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
27 unsigned int transaction_id_counter;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
28
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
29 unsigned int in_iteration:1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
30 unsigned int handshaked:1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
31 };
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
32
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
33 struct client_dict_iterate_context {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
34 struct dict_iterate_context ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
35
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
36 pool_t pool;
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3858
diff changeset
37 bool failed;
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
38 };
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
39
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
40 struct client_dict_transaction_context {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
41 struct dict_transaction_context ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
42
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
43 unsigned int id;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
44 unsigned int connect_counter;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
45
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3858
diff changeset
46 bool failed;
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
47 };
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
48
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
49 static int client_dict_connect(struct client_dict *dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
50 static void client_dict_disconnect(struct client_dict *dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
51
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
52 const char *dict_client_escape(const char *src)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
53 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
54 const char *p;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
55 string_t *dest;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
56
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
57 /* first do a quick lookup to see if there's anything to escape.
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
58 probably not. */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
59 for (p = src; *p != '\0'; p++) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
60 if (*p == '\t' || *p == '\n' || *p == '\001')
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
61 break;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
62 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
63
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
64 if (*p == '\0')
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
65 return src;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
66
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
67 dest = t_str_new(256);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
68 str_append_n(dest, src, p - src);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
69
3858
2e5c34fe9634 Small (compiling) fixes
Timo Sirainen <tss@iki.fi>
parents: 3852
diff changeset
70 for (; *p != '\0'; p++) {
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
71 switch (*p) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
72 case '\t':
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
73 str_append_c(dest, '\001');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
74 str_append_c(dest, 't');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
75 break;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
76 case '\n':
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
77 str_append_c(dest, '\001');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
78 str_append_c(dest, 'n');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
79 break;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
80 case '\001':
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
81 str_append_c(dest, '\001');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
82 str_append_c(dest, '1');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
83 break;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
84 default:
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
85 str_append_c(dest, *p);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
86 break;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
87 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
88 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
89 return str_c(dest);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
90 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
91
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
92 const char *dict_client_unescape(const char *src)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
93 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
94 const char *p;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
95 string_t *dest;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
96
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
97 /* first do a quick lookup to see if there's anything to unescape.
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
98 probably not. */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
99 for (p = src; *p != '\0'; p++) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
100 if (*p == '\001')
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
101 break;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
102 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
103
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
104 if (*p == '\0')
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
105 return src;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
106
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
107 dest = t_str_new(256);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
108 str_append_n(dest, src, p - src);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
109 for (; *p != '\0'; p++) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
110 if (*p != '\001')
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
111 str_append_c(dest, *p);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
112 else if (p[1] != '\0') {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
113 p++;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
114 switch (*p) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
115 case '1':
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
116 str_append_c(dest, '\001');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
117 break;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
118 case 't':
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
119 str_append_c(dest, '\t');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
120 break;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
121 case 'n':
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
122 str_append_c(dest, '\n');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
123 break;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
124 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
125 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
126 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
127 return str_c(dest);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
128 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
129
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
130 static int client_dict_send_query(struct client_dict *dict, const char *query)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
131 {
4368
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
132 if (dict->output == NULL) {
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
133 /* not connected currently */
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
134 if (client_dict_connect(dict) < 0)
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
135 return -1;
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
136 }
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
137
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
138 if (o_stream_send_str(dict->output, query) < 0 ||
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
139 o_stream_flush(dict->output) < 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
140 /* Send failed */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
141 if (!dict->handshaked) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
142 /* we're trying to send hello, don't try to reconnect */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
143 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
144 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
145
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
146 /* Reconnect and try again. */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
147 client_dict_disconnect(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
148 if (client_dict_connect(dict) < 0)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
149 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
150
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
151 if (o_stream_send_str(dict->output, query) < 0 ||
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
152 o_stream_flush(dict->output) < 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
153 i_error("write(%s) failed: %m", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
154 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
155 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
156 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
157 return 0;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
158 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
159
4368
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
160 static int
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
161 client_dict_send_transaction_query(struct client_dict_transaction_context *ctx,
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
162 const char *query)
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
163 {
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
164 struct client_dict *dict = (struct client_dict *)ctx->ctx.dict;
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
165
4385
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
166 if (ctx->connect_counter != dict->connect_counter || ctx->failed)
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
167 return -1;
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
168
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
169 if (dict->output == NULL) {
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
170 /* not connected currently */
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
171 if (client_dict_connect(dict) < 0)
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
172 return -1;
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
173 }
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
174
4368
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
175 if (o_stream_send_str(dict->output, query) < 0 ||
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
176 o_stream_flush(dict->output) < 0) {
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
177 /* Send failed. Our transactions have died, so don't even try
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
178 to re-send the command */
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
179 ctx->failed = TRUE;
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
180 client_dict_disconnect(dict);
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
181 return -1;
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
182 }
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
183 return 0;
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
184 }
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
185
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
186 static char *client_dict_read_line(struct client_dict *dict)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
187 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
188 char *line;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
189 int ret;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
190
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
191 line = NULL;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
192 while ((ret = i_stream_read(dict->input)) > 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
193 line = i_stream_next_line(dict->input);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
194 if (line != NULL)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
195 return line;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
196 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
197
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
198 i_error("read(%s) failed: %m", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
199 return NULL;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
200 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
201
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
202 static int client_dict_connect(struct client_dict *dict)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
203 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
204 const char *query;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
205
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
206 i_assert(dict->fd == -1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
207
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
208 dict->fd = net_connect_unix(dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
209 if (dict->fd == -1) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
210 i_error("net_connect_unix(%s) failed: %m", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
211 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
212 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
213
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
214 /* Dictionary lookups are blocking */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
215 net_set_nonblock(dict->fd, FALSE);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
216
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
217 dict->input = i_stream_create_file(dict->fd, default_pool,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
218 (size_t)-1, FALSE);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
219 dict->output = o_stream_create_file(dict->fd, default_pool,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
220 4096, FALSE);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
221 dict->transaction_id_counter = 0;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
222
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
223 t_push();
3852
72606d5256b8 Fixes to dict proxy.
Timo Sirainen <tss@iki.fi>
parents: 3793
diff changeset
224 query = t_strdup_printf("%c%u\t%u\t%s\t%s\n", DICT_PROTOCOL_CMD_HELLO,
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
225 DICT_CLIENT_PROTOCOL_MAJOR_VERSION,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
226 DICT_CLIENT_PROTOCOL_MINOR_VERSION,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
227 dict->username, dict->uri);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
228 if (client_dict_send_query(dict, query) < 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
229 client_dict_disconnect(dict);
4367
763401b5b344 t_pop() calls were missing from some error handling paths
Timo Sirainen <tss@iki.fi>
parents: 4070
diff changeset
230 t_pop();
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
231 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
232 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
233 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
234
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
235 dict->handshaked = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
236 return 0;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
237 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
238
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
239 static void client_dict_disconnect(struct client_dict *dict)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
240 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
241 dict->connect_counter++;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
242 dict->handshaked = FALSE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
243
3879
928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
244 if (dict->input != NULL)
4070
71b8faa84ec6 Added i_stream_destroy() and o_stream_destroy() and used them instead of
Timo Sirainen <tss@iki.fi>
parents: 3990
diff changeset
245 i_stream_destroy(&dict->input);
3879
928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
246 if (dict->output != NULL)
4070
71b8faa84ec6 Added i_stream_destroy() and o_stream_destroy() and used them instead of
Timo Sirainen <tss@iki.fi>
parents: 3990
diff changeset
247 o_stream_destroy(&dict->output);
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
248
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
249 if (dict->fd != -1) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
250 if (close(dict->fd) < 0)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
251 i_error("close(%s) failed: %m", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
252 dict->fd = -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
253 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
254 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
255
3967
6fabe878c46d Dictionary takes now a username parameter, which is used for private
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
256 static struct dict *client_dict_init(struct dict *dict_class, const char *uri,
6fabe878c46d Dictionary takes now a username parameter, which is used for private
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
257 const char *username)
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
258 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
259 struct client_dict *dict;
3967
6fabe878c46d Dictionary takes now a username parameter, which is used for private
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
260 const char *dest_uri;
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
261 pool_t pool;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
262
3967
6fabe878c46d Dictionary takes now a username parameter, which is used for private
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
263 /* uri = [<path>] ":" <uri> */
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
264 dest_uri = strchr(uri, ':');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
265 if (dest_uri == NULL) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
266 i_error("dict-client: Invalid URI: %s", uri);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
267 return NULL;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
268 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
269
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
270 pool = pool_alloconly_create("client dict", 1024);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
271 dict = p_new(pool, struct client_dict, 1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
272 dict->pool = pool;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
273 dict->dict = *dict_class;
3967
6fabe878c46d Dictionary takes now a username parameter, which is used for private
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
274 dict->username = p_strdup(pool, username);
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
275
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
276 dict->fd = -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
277
3967
6fabe878c46d Dictionary takes now a username parameter, which is used for private
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
278 if (*uri != ':') {
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
279 /* path given */
3967
6fabe878c46d Dictionary takes now a username parameter, which is used for private
Timo Sirainen <tss@iki.fi>
parents: 3879
diff changeset
280 dict->path = p_strdup_until(pool, uri, dest_uri);
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
281 } else {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
282 dict->path = DEFAULT_DICT_SERVER_SOCKET_PATH;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
283 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
284 dict->uri = p_strdup(pool, dest_uri + 1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
285
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
286 (void)client_dict_connect(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
287 return &dict->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
288 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
289
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
290 static void client_dict_deinit(struct dict *_dict)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
291 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
292 struct client_dict *dict = (struct client_dict *)_dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
293
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
294 client_dict_disconnect(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
295 pool_unref(dict->pool);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
296 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
297
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
298 static int client_dict_lookup(struct dict *_dict, pool_t pool,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
299 const char *key, const char **value_r)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
300 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
301 struct client_dict *dict = (struct client_dict *)_dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
302 const char *line;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
303
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
304 if (dict->fd == -1)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
305 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
306
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
307 t_push();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
308 line = t_strdup_printf("%c%s\n", DICT_PROTOCOL_CMD_LOOKUP,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
309 dict_client_escape(key));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
310 if (client_dict_send_query(dict, line) < 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
311 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
312 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
313 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
314 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
315
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
316 /* read reply */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
317 line = client_dict_read_line(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
318 if (line == NULL)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
319 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
320
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
321 if (*line == DICT_PROTOCOL_REPLY_OK) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
322 *value_r = p_strdup(pool, dict_client_unescape(line + 1));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
323 return 1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
324 } else {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
325 *value_r = NULL;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
326 return *line == DICT_PROTOCOL_REPLY_NOTFOUND ? 0 : -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
327 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
328 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
329
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
330 static struct dict_iterate_context *
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3858
diff changeset
331 client_dict_iterate_init(struct dict *_dict, const char *path, bool recurse)
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
332 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
333 struct client_dict *dict = (struct client_dict *)_dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
334 struct client_dict_iterate_context *ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
335 const char *query;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
336
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
337 if (dict->in_iteration)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
338 i_panic("dict-client: Only one iteration supported");
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
339 dict->in_iteration = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
340
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
341 ctx = i_new(struct client_dict_iterate_context, 1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
342 ctx->ctx.dict = _dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
343 ctx->pool = pool_alloconly_create("client dict iteration", 512);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
344
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
345 t_push();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
346 query = t_strdup_printf("%c%d\t%s\n", DICT_PROTOCOL_CMD_ITERATE,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
347 recurse, dict_client_escape(path));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
348 if (client_dict_send_query(dict, query) < 0)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
349 ctx->failed = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
350 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
351
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
352 return &ctx->ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
353 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
354
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
355 static int client_dict_iterate(struct dict_iterate_context *_ctx,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
356 const char **key_r, const char **value_r)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
357 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
358 struct client_dict_iterate_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
359 (struct client_dict_iterate_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
360 struct client_dict *dict = (struct client_dict *)_ctx->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
361 char *line, *value;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
362
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
363 if (ctx->failed)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
364 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
365
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
366 /* read next reply */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
367 line = client_dict_read_line(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
368 if (line == NULL)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
369 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
370
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
371 if (*line == '\0') {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
372 /* end of iteration */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
373 return 0;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
374 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
375
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
376 /* line contains key \t value */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
377 p_clear(ctx->pool);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
378
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
379 value = strchr(line, '\t');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
380 if (value == NULL) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
381 /* broken protocol */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
382 i_error("dict client (%s) sent broken reply", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
383 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
384 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
385 *value++ = '\0';
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
386
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
387 *key_r = p_strdup(ctx->pool, dict_client_unescape(line));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
388 *value_r = p_strdup(ctx->pool, dict_client_unescape(value));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
389 return 1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
390 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
391
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
392 static void client_dict_iterate_deinit(struct dict_iterate_context *_ctx)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
393 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
394 struct client_dict *dict = (struct client_dict *)_ctx->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
395 struct client_dict_iterate_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
396 (struct client_dict_iterate_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
397
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
398 pool_unref(ctx->pool);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
399 i_free(ctx);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
400 dict->in_iteration = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
401 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
402
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
403 static struct dict_transaction_context *
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
404 client_dict_transaction_init(struct dict *_dict)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
405 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
406 struct client_dict *dict = (struct client_dict *)_dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
407 struct client_dict_transaction_context *ctx;
4368
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
408 const char *query;
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
409
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
410 ctx = i_new(struct client_dict_transaction_context, 1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
411 ctx->ctx.dict = _dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
412 ctx->id = ++dict->transaction_id_counter;
4368
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
413
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
414 t_push();
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
415 query = t_strdup_printf("%c%u\n", DICT_PROTOCOL_CMD_BEGIN, ctx->id);
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
416 if (client_dict_send_query(dict, query) < 0)
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
417 ctx->failed = TRUE;
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
418 else
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
419 ctx->connect_counter = dict->connect_counter;
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
420 t_pop();
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
421
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
422 return &ctx->ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
423 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
424
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
425 static int client_dict_transaction_commit(struct dict_transaction_context *_ctx)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
426 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
427 struct client_dict_transaction_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
428 (struct client_dict_transaction_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
429 struct client_dict *dict = (struct client_dict *)_ctx->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
430 const char *query, *line;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
431 int ret = ctx->failed ? -1 : 0;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
432
4385
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
433 t_push();
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
434 query = t_strdup_printf("%c%u\n", !ctx->failed ?
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
435 DICT_PROTOCOL_CMD_COMMIT :
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
436 DICT_PROTOCOL_CMD_ROLLBACK, ctx->id);
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
437 if (client_dict_send_transaction_query(ctx, query) < 0)
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
438 ret = -1;
4385
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
439 else if (ret == 0) {
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
440 /* read reply */
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
441 line = client_dict_read_line(dict);
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
442 if (line == NULL || *line != DICT_PROTOCOL_REPLY_OK)
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
443 ret = -1;
4385
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
444 }
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
445
4385
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
446 t_pop();
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
447 i_free(ctx);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
448
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
449 return ret;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
450 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
451
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
452 static void
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
453 client_dict_transaction_rollback(struct dict_transaction_context *_ctx)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
454 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
455 struct client_dict_transaction_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
456 (struct client_dict_transaction_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
457 const char *query;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
458
4385
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
459 t_push();
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
460 query = t_strdup_printf("%c%u\n", DICT_PROTOCOL_CMD_ROLLBACK, ctx->id);
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
461 (void)client_dict_send_transaction_query(ctx, query);
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
462 t_pop();
Timo Sirainen <tss@iki.fi>
parents: 4368
diff changeset
463
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
464 i_free(ctx);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
465 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
466
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
467 static void client_dict_set(struct dict_transaction_context *_ctx,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
468 const char *key, const char *value)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
469 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
470 struct client_dict_transaction_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
471 (struct client_dict_transaction_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
472 const char *query;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
473
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
474 t_push();
3990
e2e6919c6c4d LF wasn't sent at the end of all commands.
Timo Sirainen <tss@iki.fi>
parents: 3967
diff changeset
475 query = t_strdup_printf("%c%u\t%s\t%s\n",
e2e6919c6c4d LF wasn't sent at the end of all commands.
Timo Sirainen <tss@iki.fi>
parents: 3967
diff changeset
476 DICT_PROTOCOL_CMD_SET, ctx->id,
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
477 dict_client_escape(key),
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
478 dict_client_escape(value));
4368
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
479 (void)client_dict_send_transaction_query(ctx, query);
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
480 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
481 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
482
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
483 static void client_dict_atomic_inc(struct dict_transaction_context *_ctx,
3990
e2e6919c6c4d LF wasn't sent at the end of all commands.
Timo Sirainen <tss@iki.fi>
parents: 3967
diff changeset
484 const char *key, long long diff)
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
485 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
486 struct client_dict_transaction_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
487 (struct client_dict_transaction_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
488 const char *query;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
489
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
490 t_push();
3990
e2e6919c6c4d LF wasn't sent at the end of all commands.
Timo Sirainen <tss@iki.fi>
parents: 3967
diff changeset
491 query = t_strdup_printf("%c%u\t%s\t%lld\n",
e2e6919c6c4d LF wasn't sent at the end of all commands.
Timo Sirainen <tss@iki.fi>
parents: 3967
diff changeset
492 DICT_PROTOCOL_CMD_ATOMIC_INC,
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
493 ctx->id, dict_client_escape(key), diff);
4368
51a1d0fbbc94 Fixes to dict proxy
Timo Sirainen <tss@iki.fi>
parents: 4367
diff changeset
494 (void)client_dict_send_transaction_query(ctx, query);
3793
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
495 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
496 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
497
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
498 static struct dict client_dict = {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
499 MEMBER(name) "proxy",
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
500
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
501 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
502 client_dict_init,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
503 client_dict_deinit,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
504 client_dict_lookup,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
505 client_dict_iterate_init,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
506 client_dict_iterate,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
507 client_dict_iterate_deinit,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
508 client_dict_transaction_init,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
509 client_dict_transaction_commit,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
510 client_dict_transaction_rollback,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
511 client_dict_set,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
512 client_dict_atomic_inc
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
513 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
514 };
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
515
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
516 void dict_client_register(void)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
517 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
518 dict_class_register(&client_dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
519 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
520
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
521 void dict_client_unregister(void)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
522 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
523 dict_class_unregister(&client_dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
524 }