sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:master:49f8582b: rabbitmq: add 'url' new module parameter

by Stefan Mititelu

Module: kamailio Branch: master Commit: 49f8582baab1df23cbbd7038f4f9e2da2f917bf5 URL: https://github.com/kamailio/kamailio/commit/49f8582baab1df23cbbd7038f4f9e2d… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Committer: Stefan Mititelu <stefan.mititelu(a)onem.com> Date: 2017-03-08T17:59:17+02:00 rabbitmq: add 'url' new module parameter If set to something else than the default value, it will overwrite the values of all individual connection parameters. Updated doc and README. --- Modified: src/modules/rabbitmq/README Modified: src/modules/rabbitmq/doc/rabbitmq_admin.xml Modified: src/modules/rabbitmq/rabbitmq.c Modified: src/modules/rabbitmq/rabbitmq.h --- Diff: https://github.com/kamailio/kamailio/commit/49f8582baab1df23cbbd7038f4f9e2d… Patch: https://github.com/kamailio/kamailio/commit/49f8582baab1df23cbbd7038f4f9e2d…

7 years, 8 months

[rabbitmq] connection parameters cleanup

by Mititelu Stefan

Hello, I'm thinking of adding a new rabbitmq parameter to define the amqp connection url e,g, modparam("rabbitmq", "url", "amqp://kamailio:kamailio@localhost:5672/%2Fkamailio"). This obsoletes the current user/password/host/vhost/port parameters. While doing this, I'm thinking of removing those obsolete parameters. Is it ok to do this removal(and simplify the code) or should I keep them while adding the new url parameter (and override the values of obsolete parameters only when url is set)? Thank you, Stefan

7 years, 8 months

git:master:a0fa8cd6: rabbitmq: replace anonymous reply-to queue with 'kamailio-uuid'

by Stefan Mititelu

Module: kamailio Branch: master Commit: a0fa8cd663f8fb14b1126aa7e26f96ed16813cd9 URL: https://github.com/kamailio/kamailio/commit/a0fa8cd663f8fb14b1126aa7e26f96e… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Committer: Stefan Mititelu <stefan.mititelu(a)onem.com> Date: 2017-03-08T13:56:21+02:00 rabbitmq: replace anonymous reply-to queue with 'kamailio-uuid' In order to better identify reply-to queues, when direct reply-to is not used. Also rabbitmq is known to be slower, working with anonymous queues. --- Modified: src/modules/rabbitmq/Makefile Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/a0fa8cd663f8fb14b1126aa7e26f96e… Patch: https://github.com/kamailio/kamailio/commit/a0fa8cd663f8fb14b1126aa7e26f96e… --- diff --git a/src/modules/rabbitmq/Makefile b/src/modules/rabbitmq/Makefile index 6980506..b9a839b 100644 --- a/src/modules/rabbitmq/Makefile +++ b/src/modules/rabbitmq/Makefile @@ -7,8 +7,8 @@ LIBS= ifeq ($(CROSS_COMPILE),) RMQ_BUILDER=$(shell \ - if pkg-config --exists librabbitmq; then \ - echo 'pkg-config librabbitmq'; \ + if pkg-config --exists librabbitmq && pkg-config --exists uuid; then \ + echo 'pkg-config librabbitmq uuid'; \ fi) endif @@ -17,7 +17,7 @@ ifneq ($(RMQ_BUILDER),) LIBS += $(shell $(RMQ_BUILDER) --libs) else DEFS+=-I$(LOCALBASE)/include - LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lrabbitmq + LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lrabbitmq -luuid endif DEFS+=-DKAMAILIO_MOD_INTERFACE diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index af7cb98..ad6c62b 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -48,6 +48,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <uuid/uuid.h> #include <stdint.h> #include <amqp_tcp_socket.h> @@ -289,6 +290,10 @@ static int rabbitmq_publish_consume(struct sip_msg* msg, char* in_exchange, char amqp_queue_declare_ok_t *reply_to; + uuid_t uuid; + char uuid_buffer[40]; + char reply_to_buffer[64]; + // sanity checks if (get_str_fparam(&exchange, msg, (fparam_t*)in_exchange) < 0) { LM_ERR("failed to get exchange\n"); @@ -347,7 +352,13 @@ static int rabbitmq_publish_consume(struct sip_msg* msg, char* in_exchange, char if (direct_reply_to == 1) { reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes("amq.rabbitmq.reply-to"), 0, 0, 0, 1, amqp_empty_table); } else { - reply_to = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1, amqp_empty_table); + uuid_generate_random(uuid); + uuid_unparse(uuid, uuid_buffer); + + strcpy(reply_to_buffer, "kamailio-"); + strcat(reply_to_buffer, uuid_buffer); + + reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes(reply_to_buffer), 0, 0, 0, 1, amqp_empty_table); } if (log_on_amqp_error(amqp_get_rpc_reply(conn), "amqp_queue_declare()") != AMQP_RESPONSE_NORMAL) {

7 years, 8 months

git:master:679febf1: websocket: proper parameters for rpc response building of ws dump

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 679febf10e325ddbb90d6070b5599478fb858d75 URL: https://github.com/kamailio/kamailio/commit/679febf10e325ddbb90d6070b559947… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-08T12:31:26+01:00 websocket: proper parameters for rpc response building of ws dump - reported by GH #1022 --- Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/679febf10e325ddbb90d6070b559947… Patch: https://github.com/kamailio/kamailio/commit/679febf10e325ddbb90d6070b559947… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 900847b..8b0dc84 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -623,7 +623,7 @@ void ws_rpc_dump(rpc_t* rpc, void* ctx) return; } if(rpc->struct_add(th, "[{", - "connections", "info", &ih, &dh)<0) + "connections", &ih, "info", &dh)<0) { rpc->fault(ctx, 500, "Internal error connections structure"); return; @@ -703,8 +703,8 @@ void ws_rpc_dump(rpc_t* rpc, void* ctx) WSCONN_UNLOCK; if(rpc->struct_add(dh, "ds", - "wscounter", "truncated", - connections, (truncated==1)?"yes":"no")<0) + "wscounter", connections, + "truncated", (truncated==1)?"yes":"no")<0) { rpc->fault(ctx, 500, "Internal error adding info structure"); return;

7 years, 8 months

git:master:6bd32088: db_mongodb: re-init iterator for bson covert search failure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6bd32088de1d7ae816643aea4a60c70911e46b5e URL: https://github.com/kamailio/kamailio/commit/6bd32088de1d7ae816643aea4a60c70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-07T23:25:27+01:00 db_mongodb: re-init iterator for bson covert search failure --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/6bd32088de1d7ae816643aea4a60c70… Patch: https://github.com/kamailio/kamailio/commit/6bd32088de1d7ae816643aea4a60c70… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 759b1c6..048d71c 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -529,9 +529,15 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, LM_DBG("looking for field[%d] named: %s\n", col, colname); if(mgres->colsdoc) { if(!bson_iter_find(&riter, colname)) { - LM_ERR("field [%s] not found in result iterator\n", + if (!bson_iter_init (&riter, _rdoc)) { + LM_ERR("failed to initialize result iterator\n"); + return -3; + } + if(!bson_iter_find(&riter, colname)) { + LM_ERR("field [%s] not found in result iterator\n", colname); - return -4; + return -4; + } } piter = &riter; } else {

7 years, 8 months

git:4.4:2e85e0b5: core: initialize dns cache used memory

by Federico Cabiddu

Module: kamailio Branch: 4.4 Commit: 2e85e0b58170e490cf3544eb22d250bb94823474 URL: https://github.com/kamailio/kamailio/commit/2e85e0b58170e490cf3544eb22d250b… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-03-07T19:58:20+01:00 core: initialize dns cache used memory (cherry picked from commit d3710d365272566656dede08463386a1effeef5e) --- Modified: dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/2e85e0b58170e490cf3544eb22d250b… Patch: https://github.com/kamailio/kamailio/commit/2e85e0b58170e490cf3544eb22d250b… --- diff --git a/dns_cache.c b/dns_cache.c index c4b910d..4273d2f 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -347,6 +347,9 @@ int init_dns_cache() ret=E_OUT_OF_MEM; goto error; } + + *dns_cache_mem_used=0; + #ifdef DNS_LU_LST dns_last_used_lst=shm_malloc(sizeof(*dns_last_used_lst)); if (dns_last_used_lst==0){

7 years, 8 months

git:5.0:64d0737d: core: initialize dns cache used memory

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: 64d0737d4dd20461c9a4053077d8ced2a7f7aaa1 URL: https://github.com/kamailio/kamailio/commit/64d0737d4dd20461c9a4053077d8ced… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-03-07T19:57:34+01:00 core: initialize dns cache used memory (cherry picked from commit d3710d365272566656dede08463386a1effeef5e) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/64d0737d4dd20461c9a4053077d8ced… Patch: https://github.com/kamailio/kamailio/commit/64d0737d4dd20461c9a4053077d8ced… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index c4b910d..4273d2f 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -347,6 +347,9 @@ int init_dns_cache() ret=E_OUT_OF_MEM; goto error; } + + *dns_cache_mem_used=0; + #ifdef DNS_LU_LST dns_last_used_lst=shm_malloc(sizeof(*dns_last_used_lst)); if (dns_last_used_lst==0){

7 years, 8 months

git:master:d3710d36: core: initialize dns cache used memory

by Victor Seva

Module: kamailio Branch: master Commit: d3710d365272566656dede08463386a1effeef5e URL: https://github.com/kamailio/kamailio/commit/d3710d365272566656dede08463386a… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-03-07T19:43:41+01:00 core: initialize dns cache used memory --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/d3710d365272566656dede08463386a… Patch: https://github.com/kamailio/kamailio/commit/d3710d365272566656dede08463386a… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index c4b910d..4273d2f 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -347,6 +347,9 @@ int init_dns_cache() ret=E_OUT_OF_MEM; goto error; } + + *dns_cache_mem_used=0; + #ifdef DNS_LU_LST dns_last_used_lst=shm_malloc(sizeof(*dns_last_used_lst)); if (dns_last_used_lst==0){

7 years, 8 months

[kamailio/kamailio] core: initialize dns cache used memory (#1023)

by Federico Cabiddu

Without the initialization the used memory counter can have random values thus breaking the dns cache. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1023 -- Commit Summary -- * core: initialize dns cache used memory -- File Changes -- M src/core/dns_cache.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1023.patch https://github.com/kamailio/kamailio/pull/1023.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1023

7 years, 8 months

git:master:1ad9eb9d: rabbitmq: Add direct_reply_to parameter

by Stefan Mititelu

Module: kamailio Branch: master Commit: 1ad9eb9deeb8736648036d56f5874223f6009c45 URL: https://github.com/kamailio/kamailio/commit/1ad9eb9deeb8736648036d56f587422… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Committer: Stefan Mititelu <stefan.mititelu(a)onem.com> Date: 2017-03-07T17:14:28+02:00 rabbitmq: Add direct_reply_to parameter --- Modified: src/modules/rabbitmq/README Modified: src/modules/rabbitmq/doc/rabbitmq_admin.xml Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/1ad9eb9deeb8736648036d56f587422… Patch: https://github.com/kamailio/kamailio/commit/1ad9eb9deeb8736648036d56f587422…

7 years, 8 months

← Newer
1
...
19
20
21
22
23
24
25
26
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2017