Mercurial > dovecot > core-2.2
changeset 21400:dc86507721f9
dict-client: Support multiple values for lookups
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Thu, 12 Jan 2017 20:35:12 +0200 |
| parents | 6e6f1296708d |
| children | c22acf3af571 |
| files | src/dict/dict-commands.c src/lib-dict/dict-client.c src/lib-dict/dict-client.h |
| diffstat | 3 files changed, 35 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dict/dict-commands.c Thu Jan 12 20:22:38 2017 +0200 +++ b/src/dict/dict-commands.c Thu Jan 12 20:35:12 2017 +0200 @@ -159,14 +159,38 @@ } static void +cmd_lookup_write_reply(struct dict_connection_cmd *cmd, + const char *const *values, string_t *str) +{ + string_t *tmp; + + i_assert(values[0] != NULL); + + if (cmd->conn->minor_version < DICT_CLIENT_PROTOCOL_VERSION_MIN_MULTI_OK || + values[1] == NULL) { + str_append_c(str, DICT_PROTOCOL_REPLY_OK); + str_append_tabescaped(str, values[0]); + return; + } + /* the results get double-tabescaped so they end up becoming a single + parameter */ + tmp = t_str_new(128); + for (unsigned int i = 0; values[i] != NULL; i++) { + str_append_c(tmp, '\t'); + str_append_tabescaped(tmp, values[i]); + } + str_append_c(str, DICT_PROTOCOL_REPLY_MULTI_OK); + str_append_tabescaped(str, str_c(tmp) + 1); +} + +static void cmd_lookup_callback(const struct dict_lookup_result *result, void *context) { struct dict_connection_cmd *cmd = context; string_t *str = t_str_new(128); if (result->ret > 0) { - str_append_c(str, DICT_PROTOCOL_REPLY_OK); - str_append_tabescaped(str, result->value); + cmd_lookup_write_reply(cmd, result->values, str); } else if (result->ret == 0) { str_append_c(str, DICT_PROTOCOL_REPLY_NOTFOUND); } else {
--- a/src/lib-dict/dict-client.c Thu Jan 12 20:22:38 2017 +0200 +++ b/src/lib-dict/dict-client.c Thu Jan 12 20:35:12 2017 +0200 @@ -939,6 +939,11 @@ result.values = values; result.ret = 1; break; + case DICT_PROTOCOL_REPLY_MULTI_OK: + result.values = t_strsplit_tabescaped(value); + result.value = result.values[0]; + result.ret = 1; + break; case DICT_PROTOCOL_REPLY_NOTFOUND: result.ret = 0; break;
--- a/src/lib-dict/dict-client.h Thu Jan 12 20:22:38 2017 +0200 +++ b/src/lib-dict/dict-client.h Thu Jan 12 20:35:12 2017 +0200 @@ -6,7 +6,9 @@ #define DEFAULT_DICT_SERVER_SOCKET_FNAME "dict" #define DICT_CLIENT_PROTOCOL_MAJOR_VERSION 2 -#define DICT_CLIENT_PROTOCOL_MINOR_VERSION 1 +#define DICT_CLIENT_PROTOCOL_MINOR_VERSION 2 + +#define DICT_CLIENT_PROTOCOL_VERSION_MIN_MULTI_OK 2 #define DICT_CLIENT_MAX_LINE_LENGTH (64*1024) @@ -33,6 +35,7 @@ DICT_PROTOCOL_REPLY_ERROR = -1, DICT_PROTOCOL_REPLY_OK = 'O', /* <value> */ + DICT_PROTOCOL_REPLY_MULTI_OK = 'M', /* protocol v2.2+ */ DICT_PROTOCOL_REPLY_NOTFOUND = 'N', DICT_PROTOCOL_REPLY_FAIL = 'F', DICT_PROTOCOL_REPLY_WRITE_UNCERTAIN = 'W',