sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
210 discussions

git:master: modules/presence: fix crash in main/ attendant process when using presence module in library mode
by Jason Penton 23 Jan '14

23 Jan '14

Module: sip-router Branch: master Commit: 20302744b22858e0e215e74e2a6656677881bb4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2030274… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Jan 23 17:25:04 2014 +0200 modules/presence: fix crash in main/attendant process when using presence module in library mode --- modules/presence/presence.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/presence/presence.c b/modules/presence/presence.c index 067a1e1..75e5da8 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -415,6 +415,11 @@ static int child_init(int rank) if (rank==PROC_INIT || rank==PROC_TCP_MAIN) return 0; + pid = my_pid(); + + if(library_mode) + return 0; + if (rank == PROC_MAIN) { int i; @@ -438,11 +443,6 @@ static int child_init(int rank) return 0; } - pid = my_pid(); - - if(library_mode) - return 0; - if (pa_dbf.init==0) { LM_CRIT("child_init: database not bound\n");

1 0

git:master: modules/rls: changed default hash size from 512 to 9 to avoid overflow
by Richard Good 23 Jan '14

23 Jan '14

Module: sip-router Branch: master Commit: 48bb4b562d7d7ec20b45dbe555836bb8969b988d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48bb4b5… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Jan 23 17:21:04 2014 +0200 modules/rls: changed default hash size from 512 to 9 to avoid overflow --- modules/rls/rls.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rls/rls.c b/modules/rls/rls.c index 08dedcf..453b43e 100644 --- a/modules/rls/rls.c +++ b/modules/rls/rls.c @@ -89,7 +89,7 @@ int *rls_notifier_id = NULL; str db_url = str_init(DEFAULT_DB_URL); str xcap_db_url = str_init(""); str rlpres_db_url = str_init(""); -int hash_size = 512; +int hash_size = 9; shtable_t rls_table; contains_event_t pres_contains_event; search_event_t pres_search_event;

1 0

RLS module default hash size
by Richard Good 23 Jan '14

23 Jan '14

Hi I am re-using the pres shtable pattern from the RLS module. I've found that the default size of the hash size is 512 when I think it should be 9 (2^9=512) (rls.c line 92 in master) If you do not set the hash size from the config file the code will bit shift 512 and you will get an overflow. Am I correct? Regards Richard. This email is subject to the disclaimer of Smile Communications at http://www.smilecoms.com/disclaimer

2 1

git:master: memcached: add new parameter 'stringify', patch from Federico Cabiddu
by Henning Westerholt 23 Jan '14

23 Jan '14

Module: sip-router Branch: master Commit: b9b83d251810f70545c72c2207b2864460572872 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9b83d2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Thu Jan 23 13:14:02 2014 +0100 memcached: add new parameter 'stringify', patch from Federico Cabiddu * add a new parameter 'stringify' to the memcached module to force the module to evaluate all returned values as strings. This is useful if other parts of the memcached infrastructure are not able to set the correct value flags * patch from Federico Cabiddu, federico dot cabiddu at gmail dot com * add documentation for the new parameter --- modules/memcached/README | 19 +++++++++++++++++++ modules/memcached/doc/memcached_admin.xml | 24 ++++++++++++++++++++++++ modules/memcached/mcd_var.c | 8 ++++---- modules/memcached/memcached.c | 21 ++++++++++++--------- modules/memcached/memcached.h | 2 ++ 5 files changed, 61 insertions(+), 13 deletions(-) diff --git a/modules/memcached/README b/modules/memcached/README index 37e1d06..6abdfbc 100644 --- a/modules/memcached/README +++ b/modules/memcached/README @@ -27,6 +27,7 @@ Henning Westerholt 4.3. mode (integer) 4.4. timeout (integer) 4.5. memory (integer) + 4.6. stringify (integer) 5. @@ -43,6 +44,7 @@ Henning Westerholt 1.7. Set mode parameter 1.8. Set timeout parameter 1.9. Set memory parameter + 1.10. Set stringify parameter Chapter 1. Admin Guide @@ -66,6 +68,7 @@ Chapter 1. Admin Guide 4.3. mode (integer) 4.4. timeout (integer) 4.5. memory (integer) + 4.6. stringify (integer) 5. @@ -179,6 +182,7 @@ xlog("stored value is $mct(test)"); # will return <null> 4.3. mode (integer) 4.4. timeout (integer) 4.5. memory (integer) + 4.6. stringify (integer) 4.1. servers (str) @@ -258,6 +262,21 @@ modparam("memcached", "timeout", 10000) modparam("memcached", "memory", 1) ... +4.6. stringify (integer) + + The string mode for the memcached module. By default the module checks + the flags for each returned value from the memcached library to decide + to evaluate it as string or numerical value. If you need + interoperability with existing applications that are not able to set + this flag, you can force the module to evaluate all values as strings. + + Default value is “0” (don't force string values). + + Example 1.10. Set stringify parameter +... +modparam("memcached", "stringify", 1) +... + 5.1. Exported pseudo-variables 5.1. Exported pseudo-variables diff --git a/modules/memcached/doc/memcached_admin.xml b/modules/memcached/doc/memcached_admin.xml index 15ff6f5..f0ddd3f 100644 --- a/modules/memcached/doc/memcached_admin.xml +++ b/modules/memcached/doc/memcached_admin.xml @@ -267,6 +267,30 @@ modparam("memcached", "memory", 1) </programlisting> </example> </section> + <section id="memcached.p.stringify"> + <title><varname>stringify</varname> (integer)</title> + <para> + The string mode for the memcached module. By default the module + checks the flags for each returned value from the memcached library + to decide to evaluate it as string or numerical value. If you need + interoperability with existing applications that are not able to + set this flag, you can force the module to evaluate all values as + strings. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (don't force string values). + </emphasis> + </para> + <example> + <title>Set <varname>stringify</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("memcached", "stringify", 1) +... + </programlisting> + </example> + </section> </section> <section> <section> diff --git a/modules/memcached/mcd_var.c b/modules/memcached/mcd_var.c index a5bdf25..849a668 100644 --- a/modules/memcached/mcd_var.c +++ b/modules/memcached/mcd_var.c @@ -45,12 +45,12 @@ static inline int pv_mcd_key_expiry_split_str(str *data, str *key, unsigned int str str_exp; str_exp.s = NULL; str_exp.len = 0; - + if (data == NULL || data->s == NULL || data->len <= 0) { LM_ERR("invalid parameters\n"); return -1; } - + p = data->s; key->s = p; key->len = 0; @@ -208,7 +208,7 @@ int pv_get_mcd_value(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { trim_len(res_str.len, res_str.s, res_str); - if(return_flags&VAR_VAL_STR) { + if(return_flags&VAR_VAL_STR || mcd_stringify) { res->rs.s = pv_get_buffer(); res->rs.len = pv_get_buffer_size(); if(res_str.len>=res->rs.len) { @@ -314,7 +314,7 @@ static int pv_mcd_atomic_helper(struct sip_msg* msg, pv_param_t *param, int op, char *return_value; uint32_t return_flags; memcached_return rc; - + if (!(val->flags&PV_VAL_INT)) { LM_ERR("invalid value %.*s for atomic operation, strings not allowed\n", val->rs.len, val->rs.s); diff --git a/modules/memcached/memcached.c b/modules/memcached/memcached.c index 0815d63..b3199d9 100644 --- a/modules/memcached/memcached.c +++ b/modules/memcached/memcached.c @@ -46,6 +46,8 @@ unsigned int mcd_mode = 0; unsigned int mcd_timeout = 5000; /*! Internal or system memory manager, default is system */ unsigned int mcd_memory = 0; +/*! stringify all values retrieved from memcached, default false */ +unsigned int mcd_stringify = 0; /*! memcached handle */ struct memcached_st *memcached_h; /*! memcached server list */ @@ -77,11 +79,12 @@ static pv_export_t mod_pvs[] = { * Exported parameters */ static param_export_t params[] = { - {"servers", STR_PARAM, &mcd_srv_str }, - {"expire", INT_PARAM, &mcd_expire }, - {"timeout", INT_PARAM, &mcd_timeout }, - {"mode", INT_PARAM, &mcd_mode }, - {"memory", INT_PARAM, &mcd_memory }, + {"servers", STR_PARAM, &mcd_srv_str }, + {"expire", INT_PARAM, &mcd_expire }, + {"timeout", INT_PARAM, &mcd_timeout }, + {"mode", INT_PARAM, &mcd_mode }, + {"memory", INT_PARAM, &mcd_memory }, + {"stringify", INT_PARAM, &mcd_stringify }, {0, 0, 0} }; @@ -239,7 +242,7 @@ static int mod_init(void) { port = "11211"; len = strlen(mcd_srv_str) ; } - + server = pkg_malloc(len); if (server == NULL) { PKG_MEM_ERROR; @@ -280,7 +283,7 @@ static int mod_init(void) { } servers = memcached_server_list_append(servers, server, atoi(port), &rc); - + if (memcached_behavior_set(memcached_h, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, mcd_timeout) != MEMCACHED_SUCCESS) { LM_ERR("could not set server connection timeout\n"); return -1; @@ -298,7 +301,7 @@ static int mod_init(void) { /** \todo FIXME logic to handle connection errors on startup memcached_server_cursor(memcached_h, (const memcached_server_fn*) &mcd_check_connection, NULL, 1); */ - + LM_INFO("libmemcached version is %s\n", memcached_lib_version()); return 0; } @@ -310,7 +313,7 @@ static int mod_init(void) { static void mod_destroy(void) { if (servers != NULL) memcached_server_list_free(servers); - + /* Crash on shutdown with internal memory manager, even if we disable the mm callbacks */ if (mcd_memory != 1 && memcached_h != NULL) memcached_free(memcached_h); diff --git a/modules/memcached/memcached.h b/modules/memcached/memcached.h index 407d39f..cd35f5d 100644 --- a/modules/memcached/memcached.h +++ b/modules/memcached/memcached.h @@ -38,6 +38,8 @@ extern unsigned int mcd_mode; extern unsigned int mcd_timeout; /*! Internal or system memory manager */ extern unsigned int mcd_memory; +/*! stringify all values retrieved from memcached */ +extern unsigned int mcd_stringify; /*! memcached handle */ extern struct memcached_st* memcached_h; /*! memcached server list */

1 0

git:master: memcached: fix doc section IDs, copy and paste error from dmq
by Henning Westerholt 23 Jan '14

23 Jan '14

Module: sip-router Branch: master Commit: f9ab76f6a82776d9ec48daedbc6880b0b21e552d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9ab76f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Thu Jan 23 13:06:47 2014 +0100 memcached: fix doc section IDs, copy and paste error from dmq --- modules/memcached/doc/memcached_admin.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/memcached/doc/memcached_admin.xml b/modules/memcached/doc/memcached_admin.xml index d00fd83..15ff6f5 100644 --- a/modules/memcached/doc/memcached_admin.xml +++ b/modules/memcached/doc/memcached_admin.xml @@ -146,7 +146,7 @@ xlog("stored value is $mct(test)"); # will return <null> </section> <section> <title>Parameters</title> - <section id="dmq.p.servers"> + <section id="memcached.p.servers"> <title><varname>servers</varname> (str)</title> <para> The servers to connect to. At the moment only one server is supported. @@ -167,7 +167,7 @@ modparam("memcached", "servers", "localhost:11211") </programlisting> </example> </section> - <section id="dmq.p.expire"> + <section id="memcached.p.expire"> <title><varname>expire</varname> (integer)</title> <para> The default expire value of entries in memcached in seconds. The maximal @@ -199,7 +199,7 @@ modparam("memcached", "expire", 10800) </programlisting> </example> </section> - <section id="dmq.p.mode"> + <section id="memcached.p.mode"> <title><varname>mode</varname> (integer)</title> <para> The used storage mode for the memcached module for write access @@ -222,7 +222,7 @@ modparam("memcached", "mode", 0) </programlisting> </example> </section> - <section id="dmq.p.timeout"> + <section id="memcached.p.timeout"> <title><varname>timeout</varname> (integer)</title> <para> The timeout for the memcache servers access in milliseconds. @@ -241,7 +241,7 @@ modparam("memcached", "timeout", 10000) </programlisting> </example> </section> - <section id="dmq.p.memory"> + <section id="memcached.p.memory"> <title><varname>memory</varname> (integer)</title> <para> The memory mode for the memcached client library. The library can

1 0

Presence module in library mode
by Richard Good 23 Jan '14

23 Jan '14

Hi I am using the presence module in library mode and have found that even when in this mode the presence notifier process (default is number of presence notifier processes is 1) is forked in the child init process. I think if you are in library mode you should break out before this process(es) is forked. I've attached a patch - if everyone is OK I will commit this to master. Regards Richard. This email is subject to the disclaimer of Smile Communications at http://www.smilecoms.com/disclaimer

1 0

git:master: cnxcc: formated some examples not to exceed boundaries of blocks in html output
by Daniel-Constantin Mierla 22 Jan '14

22 Jan '14

Module: sip-router Branch: master Commit: cd007447bdd3fc4caa2d8eec3cec8a7b16422c10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd00744… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 22 23:27:19 2014 +0100 cnxcc: formated some examples not to exceed boundaries of blocks in html output --- modules/cnxcc/doc/cnxcc_admin.xml | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/cnxcc/doc/cnxcc_admin.xml b/modules/cnxcc/doc/cnxcc_admin.xml index ec52dfc..6716e84 100644 --- a/modules/cnxcc/doc/cnxcc_admin.xml +++ b/modules/cnxcc/doc/cnxcc_admin.xml @@ -144,7 +144,8 @@ $var(cps) = "2.00"; # cost per second $var(initial_p) = "030"; # intial pulse $var(final_p) = "006"; # final pulse -cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(cps)", "$var(initial_p)", "$var(final_p)"); +cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(cps)", + "$var(initial_p)", "$var(final_p)"); ... </programlisting> </example> @@ -274,17 +275,17 @@ $var(max_chan) = 2; $var(retcode) = cnxcc_set_max_channels("$var(customer)", "$var(max_chan)"); if ($var(retcode) == -1) { - xlog("Error setting up credit control"); - return; + xlog("Error setting up credit control"); + return; } if ($var(retcode) < -1) { - xlog("Too many channels for customer"); - sl_send_reply(403, "Forbidden"); + xlog("Too many channels for customer"); + sl_send_reply(403, "Forbidden"); - if (!cnxcc_terminate_all("$var(customer)")) { - xlog("Error terminating customer's calls"); - } + if (!cnxcc_terminate_all("$var(customer)")) { + xlog("Error terminating customer's calls"); + } exit; } @@ -324,7 +325,7 @@ if ($var(retcode) < -1) { $var(customer) = "john-doe-123-basic"; if (!cnxcc_terminate_all("$var(customer)")) { - xlog("Error terminating customer's calls"); + xlog("Error terminating customer's calls"); } ... </programlisting> @@ -399,9 +400,9 @@ if (!cnxcc_terminate_all("$var(customer)")) { ... event_route[cnxcc:call-shutdown] { - xlog("L_INFO", "[$ci]: call killed"); + xlog("L_INFO", "[$ci]: call killed"); - # perform some kind of notification, database update, email sending, etc. + # perform some kind of notification, database update, email sending, etc. } ... </programlisting> @@ -438,7 +439,7 @@ route[CNXCC] "$var(cost_per_sec)", "$var(i_pulse)", "$var(f_pulse)")) { - xlog("Error setting up credit control"); + xlog("Error setting up credit control"); } } @@ -446,7 +447,6 @@ event_route[cnxcc:call-shutdown] { xlog("L_INFO", "[$ci]: call killed"); - } ... </programlisting>

1 0

[tracker] Comment added: carrierroute not loading with kamailio 4.0.x
by sip-router 21 Jan '14

21 Jan '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#353 - carrierroute not loading with kamailio 4.0.x User who did this - Pete Ashdown (pashdown) ---------- This is sort of a deal breaker for me. Could be alleviated by the debs for 4.1.x being created. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=353#comment1277 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:4.1: dispatcher: readme regenerated with new sameple config and sections content
by Daniel-Constantin Mierla 21 Jan '14

21 Jan '14

Module: sip-router Branch: 4.1 Commit: ac7d551b29c2ce8e5ba3c668a1dcd8c5abfddfbe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac7d551… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 21 10:24:41 2014 +0100 dispatcher: readme regenerated with new sameple config and sections content --- modules/dispatcher/README | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/dispatcher/README b/modules/dispatcher/README index edd9801..2357883 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -223,7 +223,7 @@ Chapter 1. Admin Guide message attributes. The module can be used as a stateless load balancer, it does not depend - on any call state tracing module. It requires the TM module if you + on any call state tracking module. It requires the TM module if you enable auto-discovery of active/inactive gateways. It is very lightweight, therefore suitable for handling heavy SIP @@ -702,7 +702,14 @@ Note 4.1. ds_select_dst(set, alg) The method selects a destination from addresses set. It returns true if - a new destination is set. + a new destination is set. The selected address is set to dst_uri field + (aka the outbound proxy address or the $du variable), not being visible + in the SIP request. + + If the bit 2 in 'flags' parameter is set, the rest of the addresses + from the destination set is stored in AVP list. You can use + 'ds_next_dst()' to use next address in order to achieve serial forking + to all possible destinations. Meaning of the parameters is as follows: * set - the id of the set from where to pick up destination address. @@ -1081,6 +1088,9 @@ r,opt) # - define WITH_DEBUG # +#!ifndef DBURL +#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" +#!endif ####### Global Parameters ######### @@ -1168,8 +1178,7 @@ modparam("tm", "fr_timer", 2000) modparam("tm", "fr_inv_timer", 40000) # ----- dispatcher params ----- -modparam("dispatcher", "db_url", - "mysql://openser:openserro@localhost/openser") +modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "flags", 2) modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") @@ -1228,8 +1237,6 @@ route { # dispatch destinations route(DISPATCH); - - route(RELAY); } @@ -1317,7 +1324,8 @@ route[DISPATCH] { } xlog("L_DBG", "--- SCRIPT: going to <$ru> via <$du>\n"); t_on_failure("RTF_DISPATCH"); - return; + route(RELAY); + exit; } # Sample failure route

1 0

git:4.1: dispatcher: more details on how destination select functions work
by Daniel-Constantin Mierla 21 Jan '14

21 Jan '14

Module: sip-router Branch: 4.1 Commit: 7a21f21d2e5d48fa83454a4ed2fa4a9671f9d015 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a21f21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 21 10:13:51 2014 +0100 dispatcher: more details on how destination select functions work (cherry picked from commit f210c266311498393b93d66b41e8c08d89cbc731) --- modules/dispatcher/doc/dispatcher_admin.xml | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index d375fd0..75debec 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -24,7 +24,7 @@ </para> <para> The module can be used as a stateless load balancer, it does not - depend on any call state tracing module. It requires the TM module if + depend on any call state tracking module. It requires the TM module if you enable auto-discovery of active/inactive gateways. </para> <para> @@ -741,7 +741,15 @@ modparam("dispatcher", "force_dst", 1) </title> <para> The method selects a destination from addresses set. It returns true if - a new destination is set. + a new destination is set. The selected address is set to dst_uri field + (aka the outbound proxy address or the $du variable), not being visible + in the SIP request. + </para> + <para> + If the bit 2 in 'flags' parameter is set, the rest of the addresses from + the destination set is stored in AVP list. You can use 'ds_next_dst()' + to use next address in order to achieve serial forking to all possible + destinations. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -875,7 +883,7 @@ ds_select_dst("1", "$var(a)"); <function moreinfo="none">ds_select_domain(set, alg)</function> </title> <para> - The method selects a destination from addresses set and rewrites the + The method selects a destination from addresses set and rewrites the host and port from R-URI. The parameters have same meaning as for ds_select_dst(). </para>

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2014