[sr-dev] git:master:62d7c838: db_redis: Fix removal of correct queued command

Module: kamailio Branch: master Commit: 62d7c838b5bcef04c3445b9eb9c6d73402f2b02f URL: https://github.com/kamailio/kamailio/commit/62d7c838b5bcef04c3445b9eb9c6d73… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-02-27T17:55:48+01:00 db_redis: Fix removal of correct queued command When calling db_redis_get_reply, remove oldest queued command instead of newest. --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/62d7c838b5bcef04c3445b9eb9c6d73… Patch: https://github.com/kamailio/kamailio/commit/62d7c838b5bcef04c3445b9eb9c6d73… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index c0a6c383d1..564350316b 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -98,28 +98,6 @@ static redis_key_t* db_redis_shift_query(km_redis_con_t *con) { return query; } -static redis_key_t* db_redis_pop_query(km_redis_con_t *con) { - redis_command_t **current; - redis_command_t *prev; - redis_key_t *query; - - current = &con->command_queue; - if (!*current) - return NULL; - - do { - query = (*current)->query; - prev = *current; - *current = (*current)->next; - } while (*current); - - prev->next = NULL; - pkg_free(*current); - *current = NULL; - - return query; -} - int db_redis_connect(km_redis_con_t *con) { struct timeval tv; redisReply *reply; @@ -388,8 +366,8 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { con->append_counter--; } } else { - LM_DBG("get_reply successful, popping query\n"); - query = db_redis_pop_query(con); + LM_DBG("get_reply successful, removing query\n"); + query = db_redis_shift_query(con); db_redis_key_free(&query); con->append_counter--; }