sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:a4e753d0: domain: coheren indentation and whitespacing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a4e753d041ec79d14d861a6cf1eeb6cdc04fccde URL: https://github.com/kamailio/kamailio/commit/a4e753d041ec79d14d861a6cf1eeb6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-25T18:17:56+02:00 domain: coheren indentation and whitespacing - formatted to clang-format specs --- Modified: src/modules/domain/api.c Modified: src/modules/domain/api.h Modified: src/modules/domain/domain.c Modified: src/modules/domain/domain.h Modified: src/modules/domain/domain_mod.c Modified: src/modules/domain/domain_mod.h Modified: src/modules/domain/hash.c Modified: src/modules/domain/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/a4e753d041ec79d14d861a6cf1eeb6c… Patch: https://github.com/kamailio/kamailio/commit/a4e753d041ec79d14d861a6cf1eeb6c…

7 years, 6 months

git:master:77f4cea8: domain: clarifications about string parameters in the docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 77f4cea8df15920f33f0f017c7303d2306aeee83 URL: https://github.com/kamailio/kamailio/commit/77f4cea8df15920f33f0f017c7303d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-25T18:12:36+02:00 domain: clarifications about string parameters in the docs --- Modified: src/modules/domain/doc/domain_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/77f4cea8df15920f33f0f017c7303d2… Patch: https://github.com/kamailio/kamailio/commit/77f4cea8df15920f33f0f017c7303d2… --- diff --git a/src/modules/domain/doc/domain_admin.xml b/src/modules/domain/doc/domain_admin.xml index c0c99bd..561fb92 100644 --- a/src/modules/domain/doc/domain_admin.xml +++ b/src/modules/domain/doc/domain_admin.xml @@ -247,17 +247,18 @@ if (is_uri_host_local()) { </example> </section> <section id="domain.f.is_domain_local"> - <title><function moreinfo="none">is_domain_local(pseudo_variable)</function></title> + <title><function moreinfo="none">is_domain_local(domain)</function></title> <para> This function checks if the domain contained in the - pseudo_variable is local. + parameter is local. The parameter can be a static string or contain + pseduo-variables. </para> <para> This function is a generalized form of the is_from_local() and is_uri_host_local() functions, being able to completely replace them and also extends them by allowing the domain to be taken from any of the above mentioned sources. - The following equivalences exist: + The following equivalences exist: </para> <itemizedlist> <listitem><para> @@ -277,33 +278,37 @@ if (is_uri_host_local()) { ... if (is_domain_local("$rd")) { ... -}; +} +if (is_domain_local("my.domain.com")) { + ... +} if (is_domain_local("$fd")) { ... -}; +} if (is_domain_local("$avp(some_avp_alias)")) { ... -}; +} if (is_domain_local("$avp(i:850)")) { ... -}; +} if (is_domain_local("$avp(s:some_avp)")) { ... -}; +} ... </programlisting> </example> </section> <section id="domain.f.lookup_domain"> - <title><function moreinfo="none">lookup_domain(domain[, prefix])</function></title> - <para> - This function checks if domain given in - domain argument (pseudo variable) is local and, if so, - adds attributes - associated with domain's id (did) to AVPs. If prefix - argument (string) is given, names of attributes are prefixes by - it. In addition to attributes given in domain_attrs - table, AVP did containing did of domain is added. + <title><function moreinfo="none">lookup_domain(domain [, prefix])</function></title> + <para> + This function checks if domain given in domain argument is local and, + if so, adds attributes associated with domain's id (did) to AVPs. + If prefix argument (string) is given, names of attributes are prefixes + by it. In addition to attributes given in domain_attrs table, AVP + named did containing the did of domain is added. + </para> + <para> + Both parameters can contain pseudo-variables. </para> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE,

7 years, 6 months

git:master:f4fa77ac: domain: added section ids for parameters and functions in docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f4fa77ac0611b0dd96b992210ec1901145b1397c URL: https://github.com/kamailio/kamailio/commit/f4fa77ac0611b0dd96b992210ec1901… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-25T18:07:19+02:00 domain: added section ids for parameters and functions in docs --- Modified: src/modules/domain/doc/domain_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f4fa77ac0611b0dd96b992210ec1901… Patch: https://github.com/kamailio/kamailio/commit/f4fa77ac0611b0dd96b992210ec1901… --- diff --git a/src/modules/domain/doc/domain_admin.xml b/src/modules/domain/doc/domain_admin.xml index 7892b5c..c0c99bd 100644 --- a/src/modules/domain/doc/domain_admin.xml +++ b/src/modules/domain/doc/domain_admin.xml @@ -51,7 +51,7 @@ <section> <title>Parameters</title> - <section> + <section id="domain.p.db_url"> <title><varname>db_url</varname> (string)</title> <para> This is <acronym>URL</acronym> of the database to be used. @@ -67,7 +67,7 @@ modparam("domain", "db_url", "mysql://ser:pass@db_host/ser") </programlisting> </example> </section> - <section> + <section id="domain.p.domain_table"> <title><varname>domain_table</varname> (string)</title> <para> Name of table containing names of local domains that the proxy is @@ -83,7 +83,7 @@ modparam("domain", "domain_table", "new_name") </programlisting> </example> </section> - <section> + <section id="domain.p.domain_attrs_table"> <title><varname>domain_attrs_table</varname> (string)</title> <para> Name of table containing attributes of local domains. @@ -98,7 +98,7 @@ modparam("domain", "domain_attrs_table", "local_domain_attributes") </programlisting> </example> </section> - <section> + <section id="domain.p.did_col"> <title><varname>did_col</varname> (string)</title> <para> Name of column containing domain id (did) of domain in domain @@ -116,7 +116,7 @@ modparam("domain", "did_col", "domain_did") </programlisting> </example> </section> - <section> + <section id="domain.p.domain_col"> <title><varname>domain_col</varname> (string)</title> <para> Name of column containing domain name in domain table. @@ -131,7 +131,7 @@ modparam("domain", "domain_col", "domain_name") </programlisting> </example> </section> - <section> + <section id="domain.p.name_col"> <title><varname>name_col</varname> (string)</title> <para> Name of column containing attribute name in domain_attrs table. @@ -146,7 +146,7 @@ modparam("domain", "name_col", "attr_name") </programlisting> </example> </section> - <section> + <section id="domain.p.type_col"> <title><varname>type_col</varname> (string)</title> <para> Name of column containing attribute type in domain_attrs table. @@ -162,7 +162,7 @@ modparam("domain", "type_col", "attr_type") </programlisting> </example> </section> - <section> + <section id="domain.p.value_col"> <title><varname>value_col</varname> (string)</title> <para> Name of column containing attribute value in domain_attrs table. @@ -177,7 +177,7 @@ modparam("domain", "value_col", "attr_value") </programlisting> </example> </section> - <section> + <section id="domain.p.register_myself"> <title><varname>register_myself</varname> (integer)</title> <para> Register the list of domains to match 'myself' check: @@ -199,7 +199,7 @@ modparam("domain", "register_myself", 1) </section> <section> <title>Functions</title> - <section> + <section id="domain.f.is_from_local"> <title><function moreinfo="none">is_from_local()</function></title> <para> Checks based on domain table if host part of From header uri is @@ -220,7 +220,7 @@ if (is_from_local()) { </programlisting> </example> </section> - <section> + <section id="domain.f.is_uri_host_local"> <title><function moreinfo="none">is_uri_host_local()</function></title> <para> If called from route or failure route block, checks @@ -246,7 +246,7 @@ if (is_uri_host_local()) { </programlisting> </example> </section> - <section> + <section id="domain.f.is_domain_local"> <title><function moreinfo="none">is_domain_local(pseudo_variable)</function></title> <para> This function checks if the domain contained in the @@ -294,7 +294,7 @@ if (is_domain_local("$avp(s:some_avp)")) { </programlisting> </example> </section> - <section> + <section id="domain.f.lookup_domain"> <title><function moreinfo="none">lookup_domain(domain[, prefix])</function></title> <para> This function checks if domain given in

7 years, 6 months

git:master:9dd7e97a: domain: use core fixup helper functions for string parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9dd7e97a743b3f78bed9f7a2d6eb7af6f816dc80 URL: https://github.com/kamailio/kamailio/commit/9dd7e97a743b3f78bed9f7a2d6eb7af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-25T18:02:25+02:00 domain: use core fixup helper functions for string parameters - simplifies getting the values and it is more flexible allowing static strings as well --- Modified: src/modules/domain/domain.c Modified: src/modules/domain/domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9dd7e97a743b3f78bed9f7a2d6eb7af… Patch: https://github.com/kamailio/kamailio/commit/9dd7e97a743b3f78bed9f7a2d6eb7af…

7 years, 6 months

git:master:0b39960c: diversion: fixed name of cfg wrapper function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0b39960c4b7575e5705306acff5e261207149ddb URL: https://github.com/kamailio/kamailio/commit/0b39960c4b7575e5705306acff5e261… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-25T17:40:13+02:00 diversion: fixed name of cfg wrapper function --- Modified: src/modules/diversion/diversion.c --- Diff: https://github.com/kamailio/kamailio/commit/0b39960c4b7575e5705306acff5e261… Patch: https://github.com/kamailio/kamailio/commit/0b39960c4b7575e5705306acff5e261… --- diff --git a/src/modules/diversion/diversion.c b/src/modules/diversion/diversion.c index 9c89fb7..37fef3d 100644 --- a/src/modules/diversion/diversion.c +++ b/src/modules/diversion/diversion.c @@ -167,7 +167,7 @@ int add_diversion_uri(sip_msg_t* msg, str* reason, str* uri) return 1; } -int add_diversion(struct sip_msg* msg, char* r, char* u) +int w_add_diversion(struct sip_msg* msg, char* r, char* u) { str div_hf; char *at;

7 years, 6 months

git:master:e442da4b: diversion: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e442da4b3403c2f778a53532c51a3dcb806dbf82 URL: https://github.com/kamailio/kamailio/commit/e442da4b3403c2f778a53532c51a3dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-25T16:34:57+02:00 diversion: exported functions to kemi framework --- Modified: src/modules/diversion/diversion.c --- Diff: https://github.com/kamailio/kamailio/commit/e442da4b3403c2f778a53532c51a3dc… Patch: https://github.com/kamailio/kamailio/commit/e442da4b3403c2f778a53532c51a3dc…

7 years, 6 months

git:master:2fe556a1: core: kemi - handle the case when a module is reloaded with different flags

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2fe556a1e2c43d33106f121c05b857d4f1f7b380 URL: https://github.com/kamailio/kamailio/commit/2fe556a1e2c43d33106f121c05b857d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-25T15:36:48+02:00 core: kemi - handle the case when a module is reloaded with different flags - avoid having same module exported twice --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe556a1e2c43d33106f121c05b857d… Patch: https://github.com/kamailio/kamailio/commit/2fe556a1e2c43d33106f121c05b857d… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 28468de..145cb9a 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -791,10 +791,20 @@ int sr_kemi_modules_add(sr_kemi_t *klist) _sr_kemi_modules[_sr_kemi_modules_size].kexp = _sr_kemi_hdr; _sr_kemi_modules_size++; } - LM_DBG("adding module: %.*s\n", klist[0].mname.len, klist[0].mname.s); - _sr_kemi_modules[_sr_kemi_modules_size].mname = klist[0].mname; - _sr_kemi_modules[_sr_kemi_modules_size].kexp = klist; - _sr_kemi_modules_size++; + if((_sr_kemi_modules_size>1) + && (_sr_kemi_modules[_sr_kemi_modules_size-1].mname.len + ==klist[0].mname.len) + && (strncmp(_sr_kemi_modules[_sr_kemi_modules_size-1].mname.s, + klist[0].mname.s, klist[0].mname.len)==0)) { + /* handle re-open of the module */ + LM_DBG("updating module: %.*s\n", klist[0].mname.len, klist[0].mname.s); + _sr_kemi_modules[_sr_kemi_modules_size-1].kexp = klist; + } else { + LM_DBG("adding module: %.*s\n", klist[0].mname.len, klist[0].mname.s); + _sr_kemi_modules[_sr_kemi_modules_size].mname = klist[0].mname; + _sr_kemi_modules[_sr_kemi_modules_size].kexp = klist; + _sr_kemi_modules_size++; + } return 0; }

7 years, 6 months

[kamailio/kamailio] "shm_mem_size" does not work if it was set in config file (#950)

by Maxim Malygin

### Description Config file has parameter "shm_mem_size" (or "shm" or "shm_mem") which allows to set shared memory size (in Mb) via configuration file. This parameter worked well in 3.1.5. Now it does not work (4.4.2). Shared memory size is always 64Mb (default value). The only way to set another size is to use "-m" command line option. #### Reproduction - Set shm_mem_size=512 in configuration file - Start kamailio and check size of shared memory using "kamcmd core.shmmem" - Expected result: total size of shared memory should be 512 Mb (in bytes) - Actual result: 64Mb ### Possible Solutions A workaround is to use "-m" command line option to send shared memeory size. ### Additional Information version: kamailio 4.4.3 (x86_64/linux) 5a2195 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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: 5a2195 compiled on 13:41:22 Sep 27 2016 with gcc 4.4.7 OS: CentOS 6.8 (kernel 2.6.32-642.4.2.el6.x86_64) -- 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/950

7 years, 6 months

git:master:5ee474ca: misc/examples: flags defines stored in a table

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5ee474cae20b5a8f73fece3bc393f6fcd91d3821 URL: https://github.com/kamailio/kamailio/commit/5ee474cae20b5a8f73fece3bc393f6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-25T11:22:29+02:00 misc/examples: flags defines stored in a table --- Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/5ee474cae20b5a8f73fece3bc393f6f… Patch: https://github.com/kamailio/kamailio/commit/5ee474cae20b5a8f73fece3bc393f6f… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index d39c348..e3c82f9 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -205,9 +205,9 @@ function ksr_route_registrar() { if (KSR.pv.get("$rm")!="REGISTER") { return; } if (KSR.isflagset(FLAGS.FLT_NATS)) { - KSR.setbflag(FLB_NATB); + KSR.setbflag(FLAGS.FLB_NATB); // do SIP NAT pinging - KSR.setbflag(FLB_NATSIPPING); + KSR.setbflag(FLAGS.FLB_NATSIPPING); } if (KSR.registrar.save("location", 0)<0) { KSR.sl.sl_reply_error(); @@ -295,11 +295,11 @@ function ksr_route_natmanage() if (KSR.siputils.is_request()>0) { if (KSR.siputils.has_totag()>0) { if (KSR.rr.check_route_param("nat=yes")>0) { - KSR.setbflag(FLB_NATB); + KSR.setbflag(FLAGS.FLB_NATB); } } } - if (! (KSR.isflagset(FLAGS.FLT_NATS) || KSR.isbflagset(FLB_NATB))) { + if (! (KSR.isflagset(FLAGS.FLT_NATS) || KSR.isbflagset(FLAGS.FLB_NATB))) { return; } @@ -313,7 +313,7 @@ function ksr_route_natmanage() } } if (KSR.siputils.is_reply()>0) { - if (KSR.isbflagset(FLB_NATB)) { + if (KSR.isbflagset(FLAGS.FLB_NATB)) { KSR.nathelper.set_contact_alias(); } }

7 years, 6 months

git:master:62cf6970: misc/examples: fixed flags names for sqlang example

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 62cf697022b30f53c36e11c9e9ea9def3bf9fbb6 URL: https://github.com/kamailio/kamailio/commit/62cf697022b30f53c36e11c9e9ea9de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-25T11:17:21+02:00 misc/examples: fixed flags names for sqlang example --- Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/62cf697022b30f53c36e11c9e9ea9de… Patch: https://github.com/kamailio/kamailio/commit/62cf697022b30f53c36e11c9e9ea9de… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index 3b0c4d3..d39c348 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -60,7 +60,7 @@ function ksr_request_route() // account only INVITEs if (METHOD=="INVITE") { - KSR.setflag(FLAGS.FLT__ACC); // do accounting + KSR.setflag(FLAGS.FLT_ACC); // do accounting } // dispatch requests to foreign domains @@ -172,8 +172,8 @@ function ksr_route_withindlg() if (KSR.rr.loose_route()>0) { ksr_route_dlguri(); if (METHOD=="BYE") { - KSR.setflag(FLAGS.FLT__ACC); // do accounting ... - KSR.setflag(FLAGS.FLT__ACCFAILED); // ... even if the transaction fails + KSR.setflag(FLAGS.FLT_ACC); // do accounting ... + KSR.setflag(FLAGS.FLT_ACCFAILED); // ... even if the transaction fails } else if (METHOD=="ACK") { // ACK is forwarded statelessy ksr_route_natmanage(); @@ -204,7 +204,7 @@ function ksr_route_withindlg() function ksr_route_registrar() { if (KSR.pv.get("$rm")!="REGISTER") { return; } - if (KSR.isflagset(FLAGS.FLT__NATS)) { + if (KSR.isflagset(FLAGS.FLT_NATS)) { KSR.setbflag(FLB_NATB); // do SIP NAT pinging KSR.setbflag(FLB_NATSIPPING); @@ -232,7 +232,7 @@ function ksr_route_location() // when routing via usrloc, log the missed calls also if (KSR.pv.get("$rm")=="INVITE") { - KSR.setflag(FLAGS.FLT__ACCMISSED); + KSR.setflag(FLAGS.FLT_ACCMISSED); } ksr_route_relay(); @@ -284,7 +284,7 @@ function ksr_route_natdetect() } else if (KSR.siputils.is_first_hop()>0) { KSR.nathelper.set_contact_alias(); } - KSR.setflag(FLAGS.FLT__NATS); + KSR.setflag(FLAGS.FLT_NATS); } return; } @@ -299,7 +299,7 @@ function ksr_route_natmanage() } } } - if (! (KSR.isflagset(FLAGS.FLT__NATS) || KSR.isbflagset(FLB_NATB))) { + if (! (KSR.isflagset(FLAGS.FLT_NATS) || KSR.isbflagset(FLB_NATB))) { return; }

7 years, 6 months

← Newer
1
...
12
13
14
15
16
17
18
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017