annotate src/lib-dict/dict-client.c @ 3852:72606d5256b8 HEAD

Fixes to dict proxy.
author Timo Sirainen <tss@iki.fi>
date Wed, 11 Jan 2006 23:48:14 +0200
parents 0b3f3323e460
children 2e5c34fe9634
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;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
37 int failed;
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
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
46 int failed;
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
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
70 for (; *p != '\0'; *p++) {
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 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
132 if (o_stream_send_str(dict->output, query) < 0 ||
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
133 o_stream_flush(dict->output) < 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
134 /* Send failed */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
135 if (!dict->handshaked) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
136 /* we're trying to send hello, don't try to reconnect */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
137 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
138 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
139
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
140 /* Reconnect and try again. */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
141 client_dict_disconnect(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
142 if (client_dict_connect(dict) < 0)
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 if (o_stream_send_str(dict->output, query) < 0 ||
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
146 o_stream_flush(dict->output) < 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
147 i_error("write(%s) failed: %m", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
148 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
149 }
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 return 0;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
152 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
153
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
154 static char *client_dict_read_line(struct client_dict *dict)
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 char *line;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
157 int ret;
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 line = NULL;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
160 while ((ret = i_stream_read(dict->input)) > 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
161 line = i_stream_next_line(dict->input);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
162 if (line != NULL)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
163 return line;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
164 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
165
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
166 i_error("read(%s) failed: %m", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
167 return NULL;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
168 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
169
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
170 static int client_dict_connect(struct client_dict *dict)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
171 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
172 const char *query;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
173
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
174 i_assert(dict->fd == -1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
175
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
176 dict->fd = net_connect_unix(dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
177 if (dict->fd == -1) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
178 i_error("net_connect_unix(%s) failed: %m", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
179 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
180 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
181
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
182 /* Dictionary lookups are blocking */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
183 net_set_nonblock(dict->fd, FALSE);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
184
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
185 dict->input = i_stream_create_file(dict->fd, default_pool,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
186 (size_t)-1, FALSE);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
187 dict->output = o_stream_create_file(dict->fd, default_pool,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
188 4096, FALSE);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
189 dict->transaction_id_counter = 0;
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 t_push();
3852
72606d5256b8 Fixes to dict proxy.
Timo Sirainen <tss@iki.fi>
parents: 3793
diff changeset
192 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
193 DICT_CLIENT_PROTOCOL_MAJOR_VERSION,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
194 DICT_CLIENT_PROTOCOL_MINOR_VERSION,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
195 dict->username, dict->uri);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
196 if (client_dict_send_query(dict, query) < 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
197 client_dict_disconnect(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
198 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
199 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
200 t_pop();
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 dict->handshaked = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
203 return 0;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
204 }
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 static void client_dict_disconnect(struct client_dict *dict)
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->connect_counter++;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
209 dict->handshaked = FALSE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
210
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
211 if (dict->input != NULL) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
212 i_stream_unref(dict->input);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
213 dict->input = NULL;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
214 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
215 if (dict->output != NULL) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
216 o_stream_unref(dict->output);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
217 dict->output = NULL;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
218 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
219
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
220 if (dict->fd != -1) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
221 if (close(dict->fd) < 0)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
222 i_error("close(%s) failed: %m", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
223 dict->fd = -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
224 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
225 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
226
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
227 static struct dict *client_dict_init(struct dict *dict_class, const char *uri)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
228 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
229 struct client_dict *dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
230 const char *path, *dest_uri;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
231 pool_t pool;
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 /* uri = <username> [" " <path>] ":" <uri> */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
234 dest_uri = strchr(uri, ':');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
235 if (dest_uri == NULL) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
236 i_error("dict-client: Invalid URI: %s", uri);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
237 return NULL;
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
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
240 pool = pool_alloconly_create("client dict", 1024);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
241 dict = p_new(pool, struct client_dict, 1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
242 dict->pool = pool;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
243 dict->dict = *dict_class;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
244
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
245 dict->fd = -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
246
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
247 path = strchr(uri, ' ');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
248 if (path != NULL && path < dest_uri) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
249 /* path given */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
250 dict->path = p_strdup_until(pool, path + 1, dest_uri);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
251 dict->username = p_strdup_until(pool, uri, path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
252 } else {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
253 dict->path = DEFAULT_DICT_SERVER_SOCKET_PATH;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
254 dict->username = p_strdup_until(pool, uri, dest_uri);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
255 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
256 dict->uri = p_strdup(pool, dest_uri + 1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
257
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
258 (void)client_dict_connect(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
259 return &dict->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
260 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
261
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
262 static void client_dict_deinit(struct dict *_dict)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
263 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
264 struct client_dict *dict = (struct client_dict *)_dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
265
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
266 client_dict_disconnect(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
267 pool_unref(dict->pool);
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 static int client_dict_lookup(struct dict *_dict, pool_t pool,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
271 const char *key, const char **value_r)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
272 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
273 struct client_dict *dict = (struct client_dict *)_dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
274 const char *line;
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 if (dict->fd == -1)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
277 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
278
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
279 t_push();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
280 line = t_strdup_printf("%c%s\n", DICT_PROTOCOL_CMD_LOOKUP,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
281 dict_client_escape(key));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
282 if (client_dict_send_query(dict, line) < 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
283 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
284 return -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 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
287
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
288 /* read reply */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
289 line = client_dict_read_line(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
290 if (line == NULL)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
291 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
292
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
293 if (*line == DICT_PROTOCOL_REPLY_OK) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
294 *value_r = p_strdup(pool, dict_client_unescape(line + 1));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
295 return 1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
296 } else {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
297 *value_r = NULL;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
298 return *line == DICT_PROTOCOL_REPLY_NOTFOUND ? 0 : -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
299 }
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
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
302 static struct dict_iterate_context *
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
303 client_dict_iterate_init(struct dict *_dict, const char *path, int recurse)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
304 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
305 struct client_dict *dict = (struct client_dict *)_dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
306 struct client_dict_iterate_context *ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
307 const char *query;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
308
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
309 if (dict->in_iteration)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
310 i_panic("dict-client: Only one iteration supported");
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
311 dict->in_iteration = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
312
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
313 ctx = i_new(struct client_dict_iterate_context, 1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
314 ctx->ctx.dict = _dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
315 ctx->pool = pool_alloconly_create("client dict iteration", 512);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
316
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
317 t_push();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
318 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
319 recurse, dict_client_escape(path));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
320 if (client_dict_send_query(dict, query) < 0)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
321 ctx->failed = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
322 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
323
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
324 return &ctx->ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
325 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
326
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
327 static int client_dict_iterate(struct dict_iterate_context *_ctx,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
328 const char **key_r, const char **value_r)
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 struct client_dict_iterate_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
331 (struct client_dict_iterate_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
332 struct client_dict *dict = (struct client_dict *)_ctx->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
333 char *line, *value;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
334
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
335 if (ctx->failed)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
336 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
337
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
338 /* read next reply */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
339 line = client_dict_read_line(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
340 if (line == NULL)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
341 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
342
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
343 if (*line == '\0') {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
344 /* end of iteration */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
345 return 0;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
346 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
347
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
348 /* line contains key \t value */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
349 p_clear(ctx->pool);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
350
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
351 value = strchr(line, '\t');
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
352 if (value == NULL) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
353 /* broken protocol */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
354 i_error("dict client (%s) sent broken reply", dict->path);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
355 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
356 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
357 *value++ = '\0';
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
358
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
359 *key_r = p_strdup(ctx->pool, dict_client_unescape(line));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
360 *value_r = p_strdup(ctx->pool, dict_client_unescape(value));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
361 return 1;
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
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
364 static void client_dict_iterate_deinit(struct dict_iterate_context *_ctx)
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 struct client_dict *dict = (struct client_dict *)_ctx->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
367 struct client_dict_iterate_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
368 (struct client_dict_iterate_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
369
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
370 pool_unref(ctx->pool);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
371 i_free(ctx);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
372 dict->in_iteration = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
373 }
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 static struct dict_transaction_context *
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
376 client_dict_transaction_init(struct dict *_dict)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
377 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
378 struct client_dict *dict = (struct client_dict *)_dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
379 struct client_dict_transaction_context *ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
380
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
381 ctx = i_new(struct client_dict_transaction_context, 1);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
382 ctx->ctx.dict = _dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
383 ctx->id = ++dict->transaction_id_counter;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
384 ctx->connect_counter = dict->connect_counter;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
385 return &ctx->ctx;
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
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
388 static int client_dict_transaction_commit(struct dict_transaction_context *_ctx)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
389 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
390 struct client_dict_transaction_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
391 (struct client_dict_transaction_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
392 struct client_dict *dict = (struct client_dict *)_ctx->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
393 const char *query, *line;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
394 int ret = ctx->failed ? -1 : 0;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
395
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
396 if (ctx->connect_counter != dict->connect_counter)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
397 ret = -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
398 else {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
399 t_push();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
400 query = t_strdup_printf("%c%u", !ctx->failed ?
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
401 DICT_PROTOCOL_CMD_COMMIT :
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
402 DICT_PROTOCOL_CMD_ROLLBACK,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
403 ctx->id);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
404 if (client_dict_send_query(dict, query) < 0)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
405 ret = -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
406 else if (ret == 0) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
407 /* read reply */
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
408 line = client_dict_read_line(dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
409 if (line == NULL)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
410 return -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
411
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
412 if (*line != DICT_PROTOCOL_REPLY_OK)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
413 ret = -1;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
414 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
415
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
416 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
417 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
418 i_free(ctx);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
419
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
420 return ret;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
421 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
422
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
423 static void
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
424 client_dict_transaction_rollback(struct dict_transaction_context *_ctx)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
425 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
426 struct client_dict_transaction_context *ctx =
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 *dict = (struct client_dict *)_ctx->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
429 const char *query;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
430
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
431 if (ctx->connect_counter == dict->connect_counter) {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
432 t_push();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
433 query = t_strdup_printf("%c%u", DICT_PROTOCOL_CMD_ROLLBACK,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
434 ctx->id);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
435 (void)client_dict_send_query(dict, query);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
436 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
437 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
438 i_free(ctx);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
439 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
440
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
441 static void client_dict_set(struct dict_transaction_context *_ctx,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
442 const char *key, const char *value)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
443 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
444 struct client_dict_transaction_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
445 (struct client_dict_transaction_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
446 struct client_dict *dict = (struct client_dict *)_ctx->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
447 const char *query;
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 if (ctx->connect_counter != dict->connect_counter)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
450 return;
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 t_push();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
453 query = t_strdup_printf("%c%u\t%s\t%s", DICT_PROTOCOL_CMD_SET, ctx->id,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
454 dict_client_escape(key),
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
455 dict_client_escape(value));
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
456 if (client_dict_send_query(dict, query) < 0)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
457 ctx->failed = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
458 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
459 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
460
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
461 static void client_dict_atomic_inc(struct dict_transaction_context *_ctx,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
462 const char *key, long long diff)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
463 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
464 struct client_dict_transaction_context *ctx =
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
465 (struct client_dict_transaction_context *)_ctx;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
466 struct client_dict *dict = (struct client_dict *)_ctx->dict;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
467 const char *query;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
468
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
469 if (ctx->connect_counter != dict->connect_counter)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
470 return;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
471
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
472 t_push();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
473 query = t_strdup_printf("%c%u\t%s\t%lld", DICT_PROTOCOL_CMD_ATOMIC_INC,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
474 ctx->id, dict_client_escape(key), diff);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
475 if (client_dict_send_query(dict, query) < 0)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
476 ctx->failed = TRUE;
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
477 t_pop();
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
478 }
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
479
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
480 static struct dict client_dict = {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
481 MEMBER(name) "proxy",
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 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
484 client_dict_init,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
485 client_dict_deinit,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
486 client_dict_lookup,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
487 client_dict_iterate_init,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
488 client_dict_iterate,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
489 client_dict_iterate_deinit,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
490 client_dict_transaction_init,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
491 client_dict_transaction_commit,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
492 client_dict_transaction_rollback,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
493 client_dict_set,
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
494 client_dict_atomic_inc
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
495 }
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 void dict_client_register(void)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
499 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
500 dict_class_register(&client_dict);
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
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
503 void dict_client_unregister(void)
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
504 {
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
505 dict_class_unregister(&client_dict);
0b3f3323e460 Forgot to add
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
506 }