sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

[kamailio] kamctl: fixing mysql creation errors (#134)

by Victor Seva

Fix #133 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/134 -- Commit Summary -- * kamctl: fix defaults acc_cdrs introduced by 045e2f56e2 * kamctl: msilo removed BLOB/TEXT defaults -- File Changes -- M utils/kamctl/mysql/acc-create.sql (6) M utils/kamctl/mysql/msilo-create.sql (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/134.patch https://github.com/kamailio/kamailio/pull/134.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/134

9 years, 7 months

[kamailio] kamctl create with mysql (#133)

by Victor Seva

git version: d6472f226e71739cc2d1c71197def5aaba9113b4 ``` root@981a657db3dd:/code/utils/kamctl# TEST=true DBENGINE=MYSQL DBHOST=mysql PW=secretpw ./kamdbctl create INFO: test server charset INFO: creating database kamailio ... INFO: granting privileges to database kamailio ... INFO: creating standard tables into kamailio ... ERROR 1067 (42000) at line 16: Invalid default value for 'start_time' ERROR: Creating core tables failed at acc! ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/133

9 years, 7 months

usrloc and db only mode

by Daniel-Constantin Mierla

Hello, following some discussions on github issues, mailing list and irc recently, I am opening a topic and see if we can get something to accommodate the needs out there at the best for everyone. These are more in the context with the increase of sizes for deployments, but also having the option to use a no-sql, some internal bits of usrloc may need tunings. The points to be considered: 1) discovering what is the server that wrote the record 2) efficiently getting the records that require nat keepalive The two are sometime related, but not necessary always. Victor Seva on irc channel was saying that is planning to propose a patch for 1), relying on socket value in the location table. The use case presented was many servers saving and looking up the records in the same table, but fetch only the records written by current instance for sending keepalives. It makes sense not send keepalives from all instances, for load as well and bandwidth considerations. This could work relying on local socket, but I am not sure how efficient will be when listening on many sockets (different ips, but also different ports or protocols - ipv4/6, tcp, tls, udp -- all add sockets). On 2), it's being for a while on my list to review, as the module uses custom sql queries (or even functions) to be able to match the the records for sending keepalives -- it does matching with bitwise operations to see if flags for nat are set. That doesn't work with no-sql databases (including db_text, db_mongodb and I expect db_cassandra). Even for sql, that kind of query is not efficient, especially when dealing with a large amount of records. The solutions that came in my mind for now: - for 1) -- add the server_id as a new column in the location table. It was pointed to be that ser location had it. This will turn a query matching on many socket-representation strings to one expression done on an integer. The value for server_id can be set via the core parameter with the same name. - for 2) -- add a new column 'keepalive' to be set internally by the module to 1 if any of the flags for sending keepalive was set. Then the query to fetch it will just use a match on it, rather that bitwise operations in the match expression. Furthermore, this can be set to a different value when enabling the keepalive partitioning (ie., sending keepalives from different timer processes, each doing for a part of natted users) - right now, for the db only mode, the selection is done by column id % (number of keepalive processes). Opinions, improvements, other proposals? Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

9 years, 7 months

git:master:db0628ef: modules/dialog_ng: only delete dlg iff all dlg_outs have completed

by jaybeepee

Module: kamailio Branch: master Commit: db0628effa6898a5c1376c2719e54be201b195bb URL: https://github.com/kamailio/kamailio/commit/db0628effa6898a5c1376c2719e54be… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-21T16:32:04+02:00 modules/dialog_ng: only delete dlg iff all dlg_outs have completed --- Modified: modules/dialog_ng/dlg_handlers.c Modified: modules/dialog_ng/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/db0628effa6898a5c1376c2719e54be… Patch: https://github.com/kamailio/kamailio/commit/db0628effa6898a5c1376c2719e54be…

9 years, 7 months

persist changes in sdp_info_t

by Cockhootec Yahrabee

Hi guys, I am trying to change some fields in sdp_info_t structure. I am getting this structure by casting sip_msg_t->body to sdp_info_t structure. I am just wondering if there is need to somehow "persist" my changes done in sessions streams (sdp_stream_cell_t structure) to sip_info_t->raw_sdp so the changed values will be sent back to UA? I am just not really sure how this works so I am asking the community. I just want to find out if I am doing something wrong or there is not possible to change message's SDP through these structures. Thanks in advance

9 years, 7 months

git:master:d6472f22: pv: simplified access to $branch by avoiding temporary storage of fields in str

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d6472f226e71739cc2d1c71197def5aaba9113b4 URL: https://github.com/kamailio/kamailio/commit/d6472f226e71739cc2d1c71197def5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-20T22:40:45+02:00 pv: simplified access to $branch by avoiding temporary storage of fields in str --- Modified: modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/d6472f226e71739cc2d1c71197def5a… Patch: https://github.com/kamailio/kamailio/commit/d6472f226e71739cc2d1c71197def5a… --- diff --git a/modules/pv/pv_branch.c b/modules/pv/pv_branch.c index c88d89d..24e22a6 100644 --- a/modules/pv/pv_branch.c +++ b/modules/pv/pv_branch.c @@ -32,14 +32,7 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, { int idx = 0; int idxf = 0; - str uri; - str duri; - int lq = 0; - str path; - unsigned int fl = 0; - struct socket_info* fsocket = NULL; - str ruid; - str location_ua; + branch_t *br; /* get the index */ if(pv_get_spec_index(msg, param, &idx, &idxf)!=0) @@ -48,10 +41,10 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } - uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket, &ruid, 0, &location_ua); + br = get_sip_branch(idx); /* branch(count) doesn't need a valid branch, everything else does */ - if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) + if(br->len == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) { LM_ERR("error accessing branch [%d]\n", idx); return pv_get_null(msg, param, res); @@ -60,36 +53,36 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, switch(param->pvn.u.isname.name.n) { case 1: /* dst uri */ - if(duri.len==0) + if(br->dst_uri_len==0) return pv_get_null(msg, param, res); - return pv_get_strval(msg, param, res, &duri); + return pv_get_strlval(msg, param, res, br->dst_uri, br->dst_uri_len); case 2: /* path */ - if(path.len==0) + if(br->path_len==0) return pv_get_null(msg, param, res); - return pv_get_strval(msg, param, res, &path); + return pv_get_strlval(msg, param, res, br->path, br->path_len); case 3: /* Q */ - if(lq == Q_UNSPECIFIED) + if(br->q == Q_UNSPECIFIED) return pv_get_null(msg, param, res); - return pv_get_sintval(msg, param, res, lq); + return pv_get_sintval(msg, param, res, br->q); case 4: /* send socket */ - if(fsocket!=0) - return pv_get_strval(msg, param, res, &fsocket->sock_str); + if(br->force_send_socket!=0) + return pv_get_strval(msg, param, res, &br->force_send_socket->sock_str); return pv_get_null(msg, param, res); case 5: /* count */ return pv_get_uintval(msg, param, res, nr_branches); case 6: /* flags */ - return pv_get_uintval(msg, param, res, fl); + return pv_get_uintval(msg, param, res, br->flags); case 7: /* ruid */ - if(ruid.len==0) + if(br->ruid_len==0) return pv_get_null(msg, param, res); - return pv_get_strval(msg, param, res, &ruid); + return pv_get_strlval(msg, param, res, br->ruid, br->ruid_len); case 8: /* location_ua */ - if(location_ua.len==0) + if(br->location_ua_len==0) return pv_get_null(msg, param, res); - return pv_get_strval(msg, param, res, &location_ua); + return pv_get_strlval(msg, param, res, br->location_ua, br->location_ua_len); default: /* 0 - uri */ - return pv_get_strval(msg, param, res, &uri); + return pv_get_strlval(msg, param, res, br->uri, br->len); } return 0;

9 years, 7 months

git:master:bca93fd8: core: helper function for pvs to return values based on pairs (char*, len)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bca93fd8f6f8a5d3d8872e387585945329fe8205 URL: https://github.com/kamailio/kamailio/commit/bca93fd8f6f8a5d3d8872e387585945… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-20T22:40:02+02:00 core: helper function for pvs to return values based on pairs (char*, len) --- Modified: pvapi.c Modified: pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/bca93fd8f6f8a5d3d8872e387585945… Patch: https://github.com/kamailio/kamailio/commit/bca93fd8f6f8a5d3d8872e387585945… --- diff --git a/pvapi.c b/pvapi.c index ccf9814..d60aebc 100644 --- a/pvapi.c +++ b/pvapi.c @@ -539,6 +539,21 @@ int pv_get_strzval(struct sip_msg *msg, pv_param_t *param, } /** + * convert char* with len to pv_value_t + */ +int pv_get_strlval(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, char *sval, int slen) +{ + if(res==NULL) + return -1; + + res->rs.s = sval; + res->rs.len = slen; + res->flags = PV_VAL_STR; + return 0; +} + +/** * convert str-int to pv_value_t (type is str) */ int pv_get_strintval(struct sip_msg *msg, pv_param_t *param, diff --git a/pvar.h b/pvar.h index da13806..3bdfe17 100644 --- a/pvar.h +++ b/pvar.h @@ -219,6 +219,8 @@ int pv_get_strval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, str *sval); int pv_get_strzval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, char *sval); +int pv_get_strlval(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res, char *sval, int slen); int pv_get_strintval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, str *sval, int ival); int pv_get_intstrval(struct sip_msg *msg, pv_param_t *param,

9 years, 7 months

git:master:efa9b09e: doc: documentation for xavp_params_explode()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: efa9b09e79cdedd8c7e4ec67f22d2802f85dcaea URL: https://github.com/kamailio/kamailio/commit/efa9b09e79cdedd8c7e4ec67f22d280… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-19T21:36:57+02:00 doc: documentation for xavp_params_explode() --- Modified: modules/pv/README Modified: modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/efa9b09e79cdedd8c7e4ec67f22d280… Patch: https://github.com/kamailio/kamailio/commit/efa9b09e79cdedd8c7e4ec67f22d280… --- diff --git a/modules/pv/README b/modules/pv/README index fafee35..bcd2eab 100644 --- a/modules/pv/README +++ b/modules/pv/README @@ -41,6 +41,7 @@ Daniel-Constantin Mierla 4.3. is_int(pvar) 4.4. typeof(pvar, vtype) 4.5. not_empty(pvar) + 4.6. xavp_params_explode(sparams, xname) 5. MI Commands @@ -62,8 +63,9 @@ Daniel-Constantin Mierla 1.6. is_int() usage 1.7. typeof() usage 1.8. not_empty() usage - 1.9. shv_set usage - 1.10. shv_get usage + 1.9. xavp_params_explode usage + 1.10. shv_set usage + 1.11. shv_get usage Chapter 1. Admin Guide @@ -88,6 +90,7 @@ Chapter 1. Admin Guide 4.3. is_int(pvar) 4.4. typeof(pvar, vtype) 4.5. not_empty(pvar) + 4.6. xavp_params_explode(sparams, xname) 5. MI Commands @@ -187,6 +190,7 @@ modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") 4.3. is_int(pvar) 4.4. typeof(pvar, vtype) 4.5. not_empty(pvar) + 4.6. xavp_params_explode(sparams, xname) 4.1. pv_isset(pvar) @@ -262,6 +266,27 @@ if (not_empty("$var(foo)")) { } ... +4.6. xavp_params_explode(sparams, xname) + + Convert a parameters string in xavp atributes. + + The first parameter has to be a string in the format of SIP header + parameters (name1=value1;...;nameN=valueN). The second parameter is the + name of the root xavp to hold the pairs (nameX,valueX). + + The values are stored as string type. + + Function can be used from ANY ROUTE. + + Example 1.9. xavp_params_explode usage +... +xavp_params_explode("a=b;c=d;e=d", "x"); +# results in: +# $xavp(x=>a) = "b"; +# $xavp(x=>c) = "d"; +# $xavp(x=>e) = "f"; +... + 5. MI Commands 5.1. shv_set @@ -285,7 +310,7 @@ if (not_empty("$var(foo)")) { _value_ _empty_line_ - Example 1.9. shv_set usage + Example 1.10. shv_set usage ... $ kamctl fifo shv_set debug int 0 ... @@ -303,7 +328,7 @@ $ kamctl fifo shv_set debug int 0 _name_ _empty_line_ - Example 1.10. shv_get usage + Example 1.11. shv_get usage ... $ kamctl fifo shv_get debug $ kamctl fifo shv_get diff --git a/modules/pv/doc/pv_admin.xml b/modules/pv/doc/pv_admin.xml index 739ccbb..a92d549 100644 --- a/modules/pv/doc/pv_admin.xml +++ b/modules/pv/doc/pv_admin.xml @@ -266,6 +266,37 @@ if (not_empty("$var(foo)")) { </programlisting> </example> </section> + <section id="pv.f.xavp_params_explode"> + <title> + <function moreinfo="none">xavp_params_explode(sparams, xname)</function> + </title> + <para> + Convert a parameters string in xavp atributes. + </para> + <para> + The first parameter has to be a string in the format of SIP header + parameters (name1=value1;...;nameN=valueN). The second parameter + is the name of the root xavp to hold the pairs (nameX,valueX). + </para> + <para> + The values are stored as string type. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_params_explode</function> usage</title> + <programlisting format="linespecific"> +... +xavp_params_explode("a=b;c=d;e=d", "x"); +# results in: +# $xavp(x=>a) = "b"; +# $xavp(x=>c) = "d"; +# $xavp(x=>e) = "f"; +... + </programlisting> + </example> + </section> </section> <section>

9 years, 7 months

ASYNC module - CPU load

by Olle E. Johansson

Good morning! In one installation where Kamailio runs in a VMware virtual machine we use Async in a registrar. There's no traffic - only one SIP device registred - but the CPU load goes up. If we change the workers to 1 CPU load goes down, if we set it to 8 CPU load average quickly goes up to 3. If we add a second CPU, nothing changes. Again, with no traffic. The CPU load is directly related to number of workers, but not if they are used or not. My conclusion is that something in the Async module is causing CPU load regardless of traffic - primarily depending on the number of workers. I don't think that's the correct behaviour ;-) Kamailio 4.2.0 Cheers, /O

9 years, 7 months

git:master:6030a225: Makefile: don't create run_dir on install-utils

by Victor Seva

Module: kamailio Branch: master Commit: 6030a2256f29350021fc94fdcb41a2b8155ba715 URL: https://github.com/kamailio/kamailio/commit/6030a2256f29350021fc94fdcb41a2b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-20T12:33:06+02:00 Makefile: don't create run_dir on install-utils --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/6030a2256f29350021fc94fdcb41a2b… Patch: https://github.com/kamailio/kamailio/commit/6030a2256f29350021fc94fdcb41a2b… --- diff --git a/Makefile b/Makefile index 8cacc7a..31fe195 100644 --- a/Makefile +++ b/Makefile @@ -795,7 +795,7 @@ install-every-module-doc: $(foreach mods,$(modules_dirs),install-$(mods)-doc) install-every-module-man: $(foreach mods,$(modules_dirs),install-$(mods)-man) -install-utils: utils $(bin_prefix)/$(bin_dir) $(run_prefix)/$(run_dir) +install-utils: utils $(bin_prefix)/$(bin_dir) @for r in $(C_INSTALL_BIN) "" ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \

9 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015