sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

by Juha Heinanen

LCR module load_gws() call can currently filter matching gateways based on regular expression match of From URI. I was thinking to add as an alternative to the regular expression match a match based on mt_match() of mtree module. That would require that mtree module provides an API function corresponding to mt_match() script function. Does such an API function sound like a feasible thing to implement or does there already exist better ways to achieve the same? -- Juha

7 years, 6 months

git:5.0:9abd1e00: rabbitmq: don't create reply-to queue on publish

by Sebastian Damm

Module: kamailio Branch: 5.0 Commit: 9abd1e002e0b3f7a884093e7e76efc8afdd54a17 URL: https://github.com/kamailio/kamailio/commit/9abd1e002e0b3f7a884093e7e76efc8… Author: Sebastian Damm <damm(a)sipgate.de> Committer: Sebastian Damm <damm(a)sipgate.de> Date: 2017-05-12T15:34:39+02:00 rabbitmq: don't create reply-to queue on publish When using the rabbitmq_publish function, there is no need to create a reply to queue, because it will never be read. And since there is never a real consumer, so the queue will never be deleted. This will eventually cloak up the RabbitMQ server with millions of generic reply queues. This bug has been fixed in master already, so this is basically a backport. --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/9abd1e002e0b3f7a884093e7e76efc8… Patch: https://github.com/kamailio/kamailio/commit/9abd1e002e0b3f7a884093e7e76efc8… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 4cd69c9..05fa750 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -175,7 +175,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou int reconnect_attempts = 0; int log_ret; str exchange, routingkey, messagebody, contenttype; - amqp_bytes_t reply_to_queue; // sanity checks if (get_str_fparam(&exchange, msg, (fparam_t*)in_exchange) < 0) { @@ -231,44 +230,13 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou return RABBITMQ_ERR_CHANNEL; } - // alloc queue - amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1, amqp_empty_table); - if (log_on_amqp_error(amqp_get_rpc_reply(conn), "amqp_queue_declare()") != AMQP_RESPONSE_NORMAL) { - LM_ERR("FAIL: amqp_queue_declare()\n"); - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - return RABBITMQ_ERR_QUEUE; - } - - // alloc bytes - reply_to_queue = amqp_bytes_malloc_dup(r->queue); - LM_DBG("%.*s\n", (int)reply_to_queue.len, (char*)reply_to_queue.bytes); - if (reply_to_queue.bytes == NULL) { - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); - LM_ERR("Out of memory while copying queue name"); - return -1; - } - // alloc properties amqp_basic_properties_t props; props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG | AMQP_BASIC_DELIVERY_MODE_FLAG | - AMQP_BASIC_REPLY_TO_FLAG | AMQP_BASIC_CORRELATION_ID_FLAG; props.content_type = amqp_cstring_bytes(contenttype.s); props.delivery_mode = 2; /* persistent delivery mode */ - props.reply_to = amqp_bytes_malloc_dup(reply_to_queue); - if (props.reply_to.bytes == NULL) { - // debug - LM_ERR("Out of memory while copying queue name"); - - // cleanup - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); - - // error - return -1; - } props.correlation_id = amqp_cstring_bytes("1"); // publish @@ -285,7 +253,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou // cleanup amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); // error return RABBITMQ_ERR_PUBLISH; @@ -295,8 +262,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou LM_DBG("SUCCESS: amqp_basic_publish()\n"); // cleanup - amqp_bytes_free(props.reply_to); - amqp_bytes_free(reply_to_queue); amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); // success

7 years, 6 months

git:5.0:63f6416b: Merge pull request #1128 from SipSeb/5.0

by GitHub

Module: kamailio Branch: 5.0 Commit: 63f6416b4c26530ab52201aa487beae2375eb11d URL: https://github.com/kamailio/kamailio/commit/63f6416b4c26530ab52201aa487beae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-12T16:06:04+02:00 Merge pull request #1128 from SipSeb/5.0 rabbitmq: don't create reply-to queue on publish --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/63f6416b4c26530ab52201aa487beae… Patch: https://github.com/kamailio/kamailio/commit/63f6416b4c26530ab52201aa487beae… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 4cd69c9..05fa750 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -175,7 +175,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou int reconnect_attempts = 0; int log_ret; str exchange, routingkey, messagebody, contenttype; - amqp_bytes_t reply_to_queue; // sanity checks if (get_str_fparam(&exchange, msg, (fparam_t*)in_exchange) < 0) { @@ -231,44 +230,13 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou return RABBITMQ_ERR_CHANNEL; } - // alloc queue - amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1, amqp_empty_table); - if (log_on_amqp_error(amqp_get_rpc_reply(conn), "amqp_queue_declare()") != AMQP_RESPONSE_NORMAL) { - LM_ERR("FAIL: amqp_queue_declare()\n"); - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - return RABBITMQ_ERR_QUEUE; - } - - // alloc bytes - reply_to_queue = amqp_bytes_malloc_dup(r->queue); - LM_DBG("%.*s\n", (int)reply_to_queue.len, (char*)reply_to_queue.bytes); - if (reply_to_queue.bytes == NULL) { - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); - LM_ERR("Out of memory while copying queue name"); - return -1; - } - // alloc properties amqp_basic_properties_t props; props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG | AMQP_BASIC_DELIVERY_MODE_FLAG | - AMQP_BASIC_REPLY_TO_FLAG | AMQP_BASIC_CORRELATION_ID_FLAG; props.content_type = amqp_cstring_bytes(contenttype.s); props.delivery_mode = 2; /* persistent delivery mode */ - props.reply_to = amqp_bytes_malloc_dup(reply_to_queue); - if (props.reply_to.bytes == NULL) { - // debug - LM_ERR("Out of memory while copying queue name"); - - // cleanup - amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); - - // error - return -1; - } props.correlation_id = amqp_cstring_bytes("1"); // publish @@ -285,7 +253,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou // cleanup amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); - amqp_bytes_free(reply_to_queue); // error return RABBITMQ_ERR_PUBLISH; @@ -295,8 +262,6 @@ static int rabbitmq_publish(struct sip_msg* msg, char* in_exchange, char* in_rou LM_DBG("SUCCESS: amqp_basic_publish()\n"); // cleanup - amqp_bytes_free(props.reply_to); - amqp_bytes_free(reply_to_queue); amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS); // success

7 years, 6 months

[kamailio/kamailio] rabbitmq: don't create reply-to queue on publish (#1128)

by Sebastian Damm

When using the rabbitmq_publish function, there is no need to create a reply-to queue, because it will never be read. And since there is never a real consumer, the queue will never be deleted. This will eventually cloak up the RabbitMQ server with millions of generic reply queues. This bug has been fixed in master already, so this is basically a backport. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1128 -- Commit Summary -- * rabbitmq: don't create reply-to queue on publish -- File Changes -- M src/modules/rabbitmq/rabbitmq.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1128.patch https://github.com/kamailio/kamailio/pull/1128.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/1128

7 years, 6 months

[kamailio/kamailio] [kamcmd] kamcmd domain.dump reply too big (#1127)

by denyspozniak

Hello! I keep into DB (kamailio.domain_attrs) around 25 domains and I can't get them via kamcmd: ``` #kamcmd domain.dump ERROR: reply too big ``` ``` # kamailio -v version: kamailio 5.1.0-dev2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` -- 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/issues/1127

7 years, 6 months

git:master:b02793fe: modules: readme files regenerated - sl ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b02793fe9dab9159d6fdc404fd1293cdad1bef45 URL: https://github.com/kamailio/kamailio/commit/b02793fe9dab9159d6fdc404fd1293c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-11T17:46:40+02:00 modules: readme files regenerated - sl ... [skip ci] --- Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/b02793fe9dab9159d6fdc404fd1293c… Patch: https://github.com/kamailio/kamailio/commit/b02793fe9dab9159d6fdc404fd1293c… --- diff --git a/src/modules/sl/README b/src/modules/sl/README index 520a9e0..64b10eb 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -1,4 +1,4 @@ -The SL Module - Statless request handling +The SL Module - Stateless request handling Bogdan Iancu

7 years, 6 months

git:master:c75e7cf6: modules/sl: documentation typo fix [skip ci]

by Mikko Lehto

Module: kamailio Branch: master Commit: c75e7cf65907cf137be23a11ac2930a80381ea3f URL: https://github.com/kamailio/kamailio/commit/c75e7cf65907cf137be23a11ac2930a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-05-11T18:39:45+03:00 modules/sl: documentation typo fix [skip ci] --- Modified: src/modules/sl/doc/sl.xml --- Diff: https://github.com/kamailio/kamailio/commit/c75e7cf65907cf137be23a11ac2930a… Patch: https://github.com/kamailio/kamailio/commit/c75e7cf65907cf137be23a11ac2930a… --- diff --git a/src/modules/sl/doc/sl.xml b/src/modules/sl/doc/sl.xml index d77f4db..c5f96e8 100644 --- a/src/modules/sl/doc/sl.xml +++ b/src/modules/sl/doc/sl.xml @@ -4,7 +4,7 @@ <book id="sl" xmlns:xi="http://www.w3.org/2001/XInclude"> <bookinfo> - <title>The SL Module - Statless request handling</title> + <title>The SL Module - Stateless request handling</title> <authorgroup> <author> <firstname>Bogdan</firstname>

7 years, 6 months

git:5.0:40d26eae: xhttp_rpc: fix rpc_struct_printf

by Ovidiu Sas

Module: kamailio Branch: 5.0 Commit: 40d26eae8c678e7623478b5b624e401e9bb94434 URL: https://github.com/kamailio/kamailio/commit/40d26eae8c678e7623478b5b624e401… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-05-10T13:03:29-04:00 xhttp_rpc: fix rpc_struct_printf (cherry picked from commit 8f87e7c4c3ba925a20bd0ab69e1fc885a559d262) --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/40d26eae8c678e7623478b5b624e401… Patch: https://github.com/kamailio/kamailio/commit/40d26eae8c678e7623478b5b624e401… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 7e50035..6e27409 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -562,7 +562,7 @@ static int rpc_struct_add(struct rpc_data_struct* rpc_s, char* fmt, ...) } -static int rpc_struct_scan(void* s, char* fmt, ...) +static int rpc_struct_scan(struct rpc_data_struct* rpc_s, char* fmt, ...) { LM_ERR("Not implemented\n"); return -1; @@ -571,10 +571,34 @@ static int rpc_struct_scan(void* s, char* fmt, ...) /** Create a new member from formatting string and add it to a structure. */ -static int rpc_struct_printf(void* s, char* member_name, char* fmt, ...) +static int rpc_struct_printf(struct rpc_data_struct* rpc_s, char* member_name, char* fmt, ...) { - LM_ERR("Not implemented\n"); - return -1; + va_list ap; + char buf[PRINT_VALUE_BUF_LEN]; + int len; + str _name,_body; + rpc_ctx_t *ctx = rpc_s->ctx; + + if (!ctx) { + LM_ERR("Invalid context\n"); + return -1; + } + + va_start(ap, fmt); + len=vsnprintf(buf, PRINT_VALUE_BUF_LEN, fmt, ap); + va_end(ap); + if ((len<0) || (len>PRINT_VALUE_BUF_LEN)){ + LM_ERR("buffer size exceeded [%d]\n", PRINT_VALUE_BUF_LEN); + return -1; + } + + _name.s = member_name; + _name.len = strlen(member_name); + _body.s = buf; + _body.len = len; + if (0!=xhttp_rpc_build_content(ctx, &_body, &_name)) return -1; + + return 0; }

7 years, 6 months

git:master:8f87e7c4: xhttp_rpc: fix rpc_struct_printf

by Ovidiu Sas

Module: kamailio Branch: master Commit: 8f87e7c4c3ba925a20bd0ab69e1fc885a559d262 URL: https://github.com/kamailio/kamailio/commit/8f87e7c4c3ba925a20bd0ab69e1fc88… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-05-10T13:00:57-04:00 xhttp_rpc: fix rpc_struct_printf --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8f87e7c4c3ba925a20bd0ab69e1fc88… Patch: https://github.com/kamailio/kamailio/commit/8f87e7c4c3ba925a20bd0ab69e1fc88… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 7e50035..6e27409 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -562,7 +562,7 @@ static int rpc_struct_add(struct rpc_data_struct* rpc_s, char* fmt, ...) } -static int rpc_struct_scan(void* s, char* fmt, ...) +static int rpc_struct_scan(struct rpc_data_struct* rpc_s, char* fmt, ...) { LM_ERR("Not implemented\n"); return -1; @@ -571,10 +571,34 @@ static int rpc_struct_scan(void* s, char* fmt, ...) /** Create a new member from formatting string and add it to a structure. */ -static int rpc_struct_printf(void* s, char* member_name, char* fmt, ...) +static int rpc_struct_printf(struct rpc_data_struct* rpc_s, char* member_name, char* fmt, ...) { - LM_ERR("Not implemented\n"); - return -1; + va_list ap; + char buf[PRINT_VALUE_BUF_LEN]; + int len; + str _name,_body; + rpc_ctx_t *ctx = rpc_s->ctx; + + if (!ctx) { + LM_ERR("Invalid context\n"); + return -1; + } + + va_start(ap, fmt); + len=vsnprintf(buf, PRINT_VALUE_BUF_LEN, fmt, ap); + va_end(ap); + if ((len<0) || (len>PRINT_VALUE_BUF_LEN)){ + LM_ERR("buffer size exceeded [%d]\n", PRINT_VALUE_BUF_LEN); + return -1; + } + + _name.s = member_name; + _name.len = strlen(member_name); + _body.s = buf; + _body.len = len; + if (0!=xhttp_rpc_build_content(ctx, &_body, &_name)) return -1; + + return 0; }

7 years, 6 months

Live streaming from Kamailio World Conference 2017

by Daniel-Constantin Mierla

Hello, if you haven't noticed from other social networking channels, there is a live stream from Kamailio World 2017, thanks to Pascom team: - http://live.pascom.net/ Enjoy! Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - May 22-24 (USA) - www.asipto.com Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

7 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017