- sr-dev - kamailio.org

git:master:272783e7: Merge pull request #1185 from grumvalski/core_rpc_fmt
by GitHub 12 Jul '17

12 Jul '17

Module: kamailio Branch: master Commit: 272783e770c440c7a19ab986c1d757ebe8217905 URL: https://github.com/kamailio/kamailio/commit/272783e770c440c7a19ab986c1d757e… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-12T10:52:25+02:00 Merge pull request #1185 from grumvalski/core_rpc_fmt Adapt some core rpc command to json --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/272783e770c440c7a19ab986c1d757e… Patch: https://github.com/kamailio/kamailio/commit/272783e770c440c7a19ab986c1d757e… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 9d62617bdd..b7e4b020bb 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -876,14 +876,16 @@ static const char* core_aliases_list_doc[] = { static void core_aliases_list(rpc_t* rpc, void* c) { void *hr; + void *hs; void *ha; struct host_alias* a; rpc->add(c, "{", &hr); rpc->struct_add(hr, "s", "myself_callbacks", is_check_self_func_list_set()?"yes":"no"); + rpc->struct_add(hr, "[", "aliases", &hs); for(a=aliases; a; a=a->next) { - rpc->struct_add(hr, "{", "alias", &ha); + rpc->struct_add(hs, "{", "alias", &ha); rpc->struct_add(ha, "sS", "proto", proto2a(a->proto), "address", &a->alias @@ -989,7 +991,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, - {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, + {"core.sockets_list", core_sockets_list, core_sockets_list_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

1 0

[kamailio/kamailio] Adapt some core rpc command to json (#1185)
by Federico Cabiddu 12 Jul '17

12 Jul '17

Recently playing with jsonrpcs I found an issue with core.sockets_list and core.aliases_list commands called via jsonrpc_dispatch. The problem for the first is that the socket's list is that the JSON produced is like { "jsonrpc": "2.0", "result": { "socket": { "proto": "udp", "address": "XX.XX.XX.XX", "ipaddress": "XX.XX.XX.XX", "port": "5060", "mcast": "no", "mhomed": "no" }, "socket": { "proto": "udp", "address": "XX.XX.XX.XX", "ipaddress": "XX.XX.XX.XX", "port": "5060", "mcast": "no", "mhomed": "no" }, .... }, "id": 1 } While this is a valid JSON document, the fact that the "socket" key is defined several time in the same object makes many parsers not to properly parse it and only keep the last value. Solution for this is to set the RET_ARRAY flag for the rpc command core.sockets_list reply so that the jsonrpcs module will create an array for the sockets instead on an object. Similar issue for the aliases list returned by the core.aliases_list command: in this case the proposed solution is to add an "aliases" array to the rpc reply. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1185 -- Commit Summary -- * core: set RET_ARRAY flag for core.sockets_list command * core: return aliases list as an array in core.aliases_list -- File Changes -- M src/core/core_cmd.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1185.patch https://github.com/kamailio/kamailio/pull/1185.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/1185

2 2

git:master:38f51406: core: set RET_ARRAY flag for core.sockets_list command
by grumvalski 12 Jul '17

12 Jul '17

Module: kamailio Branch: master Commit: 38f514064a326f759e0e88adeffd03b32b35d6c0 URL: https://github.com/kamailio/kamailio/commit/38f514064a326f759e0e88adeffd03b… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-07-12T09:04:13+02:00 core: set RET_ARRAY flag for core.sockets_list command --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/38f514064a326f759e0e88adeffd03b… Patch: https://github.com/kamailio/kamailio/commit/38f514064a326f759e0e88adeffd03b… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 9d62617bdd..fadabf5a7f 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -989,7 +989,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, - {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, + {"core.sockets_list", core_sockets_list, core_sockets_list_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

1 0

git:master:76911ea0: modules: readme files regenerated - cplc ... [skip ci]
by Kamailio Dev 12 Jul '17

12 Jul '17

Module: kamailio Branch: master Commit: 76911ea023f2a1b261015aa8569380e7f286be2e URL: https://github.com/kamailio/kamailio/commit/76911ea023f2a1b261015aa8569380e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-12T10:46:34+02:00 modules: readme files regenerated - cplc ... [skip ci] --- Modified: src/modules/cplc/README --- Diff: https://github.com/kamailio/kamailio/commit/76911ea023f2a1b261015aa8569380e… Patch: https://github.com/kamailio/kamailio/commit/76911ea023f2a1b261015aa8569380e… --- diff --git a/src/modules/cplc/README b/src/modules/cplc/README index 58d17ec8e9..903fa0fc86 100644 --- a/src/modules/cplc/README +++ b/src/modules/cplc/README @@ -32,7 +32,7 @@ Bogdan-Andrei Iancu 3.7. cpl_dtd_file (string) 3.8. log_dir (string) 3.9. proxy_recurse (int) - 3.10. proxy_route (int) + 3.10. proxy_route (string) 3.11. case_sensitive (int) 3.12. realm_prefix (string) 3.13. timer_avp (string) @@ -99,7 +99,7 @@ Chapter 1. Admin Guide 3.7. cpl_dtd_file (string) 3.8. log_dir (string) 3.9. proxy_recurse (int) - 3.10. proxy_route (int) + 3.10. proxy_route (string) 3.11. case_sensitive (int) 3.12. realm_prefix (string) 3.13. timer_avp (string) @@ -168,7 +168,7 @@ Chapter 1. Admin Guide 3.7. cpl_dtd_file (string) 3.8. log_dir (string) 3.9. proxy_recurse (int) - 3.10. proxy_route (int) + 3.10. proxy_route (string) 3.11. case_sensitive (int) 3.12. realm_prefix (string) 3.13. timer_avp (string) @@ -293,17 +293,17 @@ modparam("cpl-c","log_dir","/var/log/kamailio/cpl") modparam("cpl-c","proxy_recurse",2) ... -3.10. proxy_route (int) +3.10. proxy_route (string) Before doing proxy (forward), a script route can be executed. All modifications made by that route will be reflected only for the current branch. - Default value of this parameter is 0 (none). + Default value of this parameter is NULL (none). Example 1.10. Set proxy_route parameter ... -modparam("cpl-c","proxy_route",1) +modparam("cpl-c","proxy_route","1") ... 3.11. case_sensitive (int)

1 0

git:master:027871f7: cplc: use route names to set proxy_route modparam
by Daniel-Constantin Mierla 12 Jul '17

12 Jul '17

Module: kamailio Branch: master Commit: 027871f7a91cf288d36029a4f339801e8b620d10 URL: https://github.com/kamailio/kamailio/commit/027871f7a91cf288d36029a4f339801… Author: Oriol Capsada <ocapsada(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-12T10:42:48+02:00 cplc: use route names to set proxy_route modparam - Changed proxy_route modparam type to string. The route to be executed needs to be defined by name as the current id definition led to some unpredictable behavior. --- Modified: src/modules/cplc/cplc.c Modified: src/modules/cplc/doc/cplc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/027871f7a91cf288d36029a4f339801… Patch: https://github.com/kamailio/kamailio/commit/027871f7a91cf288d36029a4f339801… --- diff --git a/src/modules/cplc/cplc.c b/src/modules/cplc/cplc.c index 5a2b8972dc..cb47ffc4e0 100644 --- a/src/modules/cplc/cplc.c +++ b/src/modules/cplc/cplc.c @@ -62,6 +62,7 @@ static str db_table = str_init("cpl"); /* database table */ static char *dtd_file = 0; /* name of the DTD file for CPL parser */ static char *lookup_domain = 0; static str timer_avp = STR_NULL; /* name of variable timer AVP */ +static str proxy_route = STR_NULL; struct cpl_enviroment cpl_env = { @@ -132,7 +133,7 @@ static param_export_t params[] = { {"db_table", PARAM_STR, &db_table }, {"cpl_dtd_file", PARAM_STRING, &dtd_file }, {"proxy_recurse", INT_PARAM, &cpl_env.proxy_recurse }, - {"proxy_route", INT_PARAM, &cpl_env.proxy_route }, + {"proxy_route", PARAM_STR, &proxy_route }, {"log_dir", PARAM_STRING, &cpl_env.log_dir }, {"case_sensitive", INT_PARAM, &cpl_env.case_sensitive }, {"realm_prefix", PARAM_STR, &cpl_env.realm_prefix }, @@ -232,6 +233,14 @@ static int cpl_init(void) goto error; } + if (proxy_route.len>0) { + cpl_env.proxy_route=route_lookup(&main_rt, proxy_route.s); + if (cpl_env.proxy_route==-1) { + LM_CRIT("route <%s> defined in proxy_route does not exist\n",proxy_route.s); + goto error; + } + } + /* fix the timer_avp name */ if (timer_avp.s && timer_avp.len > 0) { if (pv_parse_spec(&timer_avp, &avp_spec)==0 diff --git a/src/modules/cplc/doc/cplc_admin.xml b/src/modules/cplc/doc/cplc_admin.xml index ac832a1e5f..9d7ed7749e 100644 --- a/src/modules/cplc/doc/cplc_admin.xml +++ b/src/modules/cplc/doc/cplc_admin.xml @@ -280,7 +280,7 @@ modparam("cpl-c","proxy_recurse",2) </example> </section> <section> - <title><varname>proxy_route</varname> (int)</title> + <title><varname>proxy_route</varname> (string)</title> <para> Before doing proxy (forward), a script route can be executed. All modifications made by that route will be reflected only for @@ -288,14 +288,14 @@ modparam("cpl-c","proxy_recurse",2) </para> <para> <emphasis> - Default value of this parameter is 0 (none). + Default value of this parameter is NULL (none). </emphasis> </para> <example> <title>Set <varname>proxy_route</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("cpl-c","proxy_route",1) +modparam("cpl-c","proxy_route","1") ... </programlisting> </example>

1 0

[kamailio/kamailio] cplc: use route names to set proxy_route modparam (#1184)
by Oriol Capsada 12 Jul '17

12 Jul '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description After allowing routes identification using names, the integer value defined in the parameter is not triggering the route referred by the name, but to the mapped id for one of the routes defined in the script. The proxy_route modparam type has been changed from integer to string in order to define the route to be executed by its name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1184 -- Commit Summary -- * cplc: use route names to set proxy_route modparam -- File Changes -- M src/modules/cplc/cplc.c (11) M src/modules/cplc/doc/cplc_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1184.patch https://github.com/kamailio/kamailio/pull/1184.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/1184

2 2

git:5.0:a5d70bd4: xmlrpc: add <value> tag to array elements
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: 5.0 Commit: a5d70bd4babae5242004f089932fa1bfb14493a3 URL: https://github.com/kamailio/kamailio/commit/a5d70bd4babae5242004f089932fa1b… Author: Alberto Sartori <alberto.sartori(a)athonet.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T15:18:27+02:00 xmlrpc: add <value> tag to array elements - add call to `add_xmlrpc_reply(reply, &value_prefix)` to `rpc_array_add` function - add call to `add_xmlrpc_reply(reply, &value_suffix)` to `rpc_array_add` function (cherry picked from commit cfc6e364b4a9be95e2e7e48b1a8e5a86324b35f3) --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/a5d70bd4babae5242004f089932fa1b… Patch: https://github.com/kamailio/kamailio/commit/a5d70bd4babae5242004f089932fa1b… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 128f64753f..b671102a9a 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -1804,6 +1804,7 @@ static int rpc_array_add(struct rpc_struct* s, char* fmt, ...) va_start(ap, fmt); while(*fmt) { + if (add_xmlrpc_reply(reply, &value_prefix) < 0) goto err; if (*fmt == '{' || *fmt == '[') { void_ptr = va_arg(ap, void**); p = new_rpcstruct(0, 0, s->reply, (*fmt=='[')?RET_ARRAY:0); @@ -1821,6 +1822,7 @@ static int rpc_array_add(struct rpc_struct* s, char* fmt, ...) } else { if (print_value(reply, reply, *fmt, &ap) < 0) goto err; } + if (add_xmlrpc_reply(reply, &value_suffix) < 0) goto err; fmt++; }

1 0

git:master:5f83e703: Merge pull request #1183 from athonet-open/xmlrpc-array-value
by GitHub 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: 5f83e703422dadd39b6ba55ee9f6f798ee692755 URL: https://github.com/kamailio/kamailio/commit/5f83e703422dadd39b6ba55ee9f6f79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-11T15:17:21+02:00 Merge pull request #1183 from athonet-open/xmlrpc-array-value xmlrpc: add <value> tag to array elements --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/5f83e703422dadd39b6ba55ee9f6f79… Patch: https://github.com/kamailio/kamailio/commit/5f83e703422dadd39b6ba55ee9f6f79… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 3f1ff4798e..ef1535cc88 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -1805,6 +1805,7 @@ static int rpc_array_add(struct rpc_struct* s, char* fmt, ...) va_start(ap, fmt); while(*fmt) { + if (add_xmlrpc_reply(reply, &value_prefix) < 0) goto err; if (*fmt == '{' || *fmt == '[') { void_ptr = va_arg(ap, void**); p = new_rpcstruct(0, 0, s->reply, (*fmt=='[')?RET_ARRAY:0); @@ -1822,6 +1823,7 @@ static int rpc_array_add(struct rpc_struct* s, char* fmt, ...) } else { if (print_value(reply, reply, *fmt, &ap) < 0) goto err; } + if (add_xmlrpc_reply(reply, &value_suffix) < 0) goto err; fmt++; }

1 0

[kamailio/kamailio] xmlrpc: add <value> tag to array elements (#1183)
by Alberto Sartori 11 Jul '17

11 Jul '17

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  See spec http://xmlrpc.scripting.com/spec.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1183 -- Commit Summary -- * xmlrpc: add <value> tag to array elements -- File Changes -- M src/modules/xmlrpc/xmlrpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1183.patch https://github.com/kamailio/kamailio/pull/1183.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/1183

2 2

git:master:cfc6e364: xmlrpc: add <value> tag to array elements
by Alberto Sartori 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: cfc6e364b4a9be95e2e7e48b1a8e5a86324b35f3 URL: https://github.com/kamailio/kamailio/commit/cfc6e364b4a9be95e2e7e48b1a8e5a8… Author: Alberto Sartori <alberto.sartori(a)athonet.com> Committer: Alberto Sartori <alberto.sartori(a)athonet.com> Date: 2017-07-11T14:18:32+02:00 xmlrpc: add <value> tag to array elements - add call to `add_xmlrpc_reply(reply, &value_prefix)` to `rpc_array_add` function - add call to `add_xmlrpc_reply(reply, &value_suffix)` to `rpc_array_add` function --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/cfc6e364b4a9be95e2e7e48b1a8e5a8… Patch: https://github.com/kamailio/kamailio/commit/cfc6e364b4a9be95e2e7e48b1a8e5a8… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 3f1ff4798e..ef1535cc88 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -1805,6 +1805,7 @@ static int rpc_array_add(struct rpc_struct* s, char* fmt, ...) va_start(ap, fmt); while(*fmt) { + if (add_xmlrpc_reply(reply, &value_prefix) < 0) goto err; if (*fmt == '{' || *fmt == '[') { void_ptr = va_arg(ap, void**); p = new_rpcstruct(0, 0, s->reply, (*fmt=='[')?RET_ARRAY:0); @@ -1822,6 +1823,7 @@ static int rpc_array_add(struct rpc_struct* s, char* fmt, ...) } else { if (print_value(reply, reply, *fmt, &ap) < 0) goto err; } + if (add_xmlrpc_reply(reply, &value_suffix) < 0) goto err; fmt++; }

1 0

git:master:cec4393d: topos: added functions to update branch fields in storage
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: cec4393d55ee8a8d5c71efba2a31b25aec8540d6 URL: https://github.com/kamailio/kamailio/commit/cec4393d55ee8a8d5c71efba2a31b25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T15:11:54+02:00 topos: added functions to update branch fields in storage --- Modified: src/modules/topos/api.h Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/cec4393d55ee8a8d5c71efba2a31b25… Patch: https://github.com/kamailio/kamailio/commit/cec4393d55ee8a8d5c71efba2a31b25…

1 0

git:master:68a8dc88: topos_redis: implementation for update branch storage function
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: 68a8dc88cbef9b08d3c1d06ca867494a36bdf527 URL: https://github.com/kamailio/kamailio/commit/68a8dc88cbef9b08d3c1d06ca867494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T15:11:54+02:00 topos_redis: implementation for update branch storage function --- Modified: src/modules/topos_redis/topos_redis_mod.c Modified: src/modules/topos_redis/topos_redis_storage.c Modified: src/modules/topos_redis/topos_redis_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/68a8dc88cbef9b08d3c1d06ca867494… Patch: https://github.com/kamailio/kamailio/commit/68a8dc88cbef9b08d3c1d06ca867494…

1 0

ocs module
by Anabham Manusha 11 Jul '17

11 Jul '17

I am trying to understand OCS module. In kamailio.cfg file you are using hss_db database file, original hss_db database from FHOSS doesnt have variable like rate_plan_id or payment_methods etc. How can we get modified hss_db file, or can you provide the same for our testing.

2 1

git:master:0db25fd8: ims_ocs: Added example database schema
by Carsten Bock 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: 0db25fd898d6b2d2929c09df55eb8a1f30412ff7 URL: https://github.com/kamailio/kamailio/commit/0db25fd898d6b2d2929c09df55eb8a1… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-07-11T14:38:53+02:00 ims_ocs: Added example database schema --- Added: src/modules/ims_ocs/examples/full/hss_db.sql --- Diff: https://github.com/kamailio/kamailio/commit/0db25fd898d6b2d2929c09df55eb8a1… Patch: https://github.com/kamailio/kamailio/commit/0db25fd898d6b2d2929c09df55eb8a1…

1 0

git:master:b8e9d269: lib/srdb1: make (setid, url) unique key instead of primary
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: b8e9d2697a13c2cdb367aabf4966d6fa09a1319f URL: https://github.com/kamailio/kamailio/commit/b8e9d2697a13c2cdb367aabf4966d6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T12:35:27+02:00 lib/srdb1: make (setid,url) unique key instead of primary - conflicts with autoincrement in mysql --- Modified: src/lib/srdb1/schema/rtpengine.xml --- Diff: https://github.com/kamailio/kamailio/commit/b8e9d2697a13c2cdb367aabf4966d6f… Patch: https://github.com/kamailio/kamailio/commit/b8e9d2697a13c2cdb367aabf4966d6f… --- diff --git a/src/lib/srdb1/schema/rtpengine.xml b/src/lib/srdb1/schema/rtpengine.xml index 02ba2afcac..64444606aa 100644 --- a/src/lib/srdb1/schema/rtpengine.xml +++ b/src/lib/srdb1/schema/rtpengine.xml @@ -37,7 +37,7 @@ <column id="setid"> <name>setid</name> <type>unsigned int</type> - <size>10</size> + <size>10</size> <description>RTPEngine instance set ID</description> <default>0</default> <natural/> @@ -80,7 +80,7 @@ <name>rtpengine_nodes</name> <colref linkend="setid"/> <colref linkend="url"/> - <primary/> + <unique/> </index> </table>

1 0

git:master:de953dfb: kamctl: refreshed db creation scripts for sql databases
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: de953dfb93cfc3a14295f4167af01e522444b066 URL: https://github.com/kamailio/kamailio/commit/de953dfb93cfc3a14295f4167af01e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T12:36:07+02:00 kamctl: refreshed db creation scripts for sql databases --- Modified: utils/kamctl/db_sqlite/rtpengine-create.sql Modified: utils/kamctl/mysql/rtpengine-create.sql Modified: utils/kamctl/oracle/rtpengine-create.sql Modified: utils/kamctl/postgres/rtpengine-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/de953dfb93cfc3a14295f4167af01e5… Patch: https://github.com/kamailio/kamailio/commit/de953dfb93cfc3a14295f4167af01e5… --- diff --git a/utils/kamctl/db_sqlite/rtpengine-create.sql b/utils/kamctl/db_sqlite/rtpengine-create.sql index 43fc12dd4f..1af1a9a4b5 100644 --- a/utils/kamctl/db_sqlite/rtpengine-create.sql +++ b/utils/kamctl/db_sqlite/rtpengine-create.sql @@ -5,7 +5,7 @@ CREATE TABLE rtpengine ( weight INTEGER DEFAULT 1 NOT NULL, disabled INTEGER DEFAULT 0 NOT NULL, stamp TIMESTAMP WITHOUT TIME ZONE DEFAULT '1900-01-01 00:00:01' NOT NULL, - CONSTRAINT rtpengine_rtpengine_nodes PRIMARY KEY (setid, url) + CONSTRAINT rtpengine_rtpengine_nodes UNIQUE (setid, url) ); INSERT INTO version (table_name, table_version) values ('rtpengine','1'); diff --git a/utils/kamctl/mysql/rtpengine-create.sql b/utils/kamctl/mysql/rtpengine-create.sql index 29dbf12683..a0c7dd6386 100644 --- a/utils/kamctl/mysql/rtpengine-create.sql +++ b/utils/kamctl/mysql/rtpengine-create.sql @@ -5,7 +5,7 @@ CREATE TABLE `rtpengine` ( `weight` INT(10) UNSIGNED DEFAULT 1 NOT NULL, `disabled` INT(1) DEFAULT 0 NOT NULL, `stamp` DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL, - CONSTRAINT rtpengine_nodes PRIMARY KEY (`setid`, `url`) + CONSTRAINT rtpengine_nodes UNIQUE (`setid`, `url`) ); INSERT INTO version (table_name, table_version) values ('rtpengine','1'); diff --git a/utils/kamctl/oracle/rtpengine-create.sql b/utils/kamctl/oracle/rtpengine-create.sql index 12626739bc..0392580244 100644 --- a/utils/kamctl/oracle/rtpengine-create.sql +++ b/utils/kamctl/oracle/rtpengine-create.sql @@ -5,7 +5,7 @@ CREATE TABLE rtpengine ( weight NUMBER(10) DEFAULT 1 NOT NULL, disabled NUMBER(10) DEFAULT 0 NOT NULL, stamp DATE DEFAULT '1900-01-01 00:00:01', - CONSTRAINT rtpengine_rtpengine_nodes PRIMARY KEY (setid, url) + CONSTRAINT rtpengine_rtpengine_nodes UNIQUE (setid, url) ); CREATE OR REPLACE TRIGGER rtpengine_tr diff --git a/utils/kamctl/postgres/rtpengine-create.sql b/utils/kamctl/postgres/rtpengine-create.sql index c0f0ec22cb..a6536e551d 100644 --- a/utils/kamctl/postgres/rtpengine-create.sql +++ b/utils/kamctl/postgres/rtpengine-create.sql @@ -5,7 +5,7 @@ CREATE TABLE rtpengine ( weight INTEGER DEFAULT 1 NOT NULL, disabled INTEGER DEFAULT 0 NOT NULL, stamp TIMESTAMP WITHOUT TIME ZONE DEFAULT '1900-01-01 00:00:01' NOT NULL, - CONSTRAINT rtpengine_rtpengine_nodes PRIMARY KEY (setid, url) + CONSTRAINT rtpengine_rtpengine_nodes UNIQUE (setid, url) ); INSERT INTO version (table_name, table_version) values ('rtpengine','1');

1 0

git:master:50e79b69: kamctl: regenerated db creation scripts
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: 50e79b69418967cdb4598a2b69f064885520ec2a URL: https://github.com/kamailio/kamailio/commit/50e79b69418967cdb4598a2b69f0648… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T12:28:32+02:00 kamctl: regenerated db creation scripts --- Modified: utils/kamctl/db_berkeley/kamailio/rtpengine Modified: utils/kamctl/db_sqlite/rtpengine-create.sql Modified: utils/kamctl/dbtext/kamailio/rtpengine Modified: utils/kamctl/mongodb/kamailio/rtpengine.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/rtpengine-create.sql Modified: utils/kamctl/oracle/rtpengine-create.sql Modified: utils/kamctl/postgres/rtpengine-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/rtpengine-mod Modified: utils/kamctl/xhttp_pi/rtpengine-table --- Diff: https://github.com/kamailio/kamailio/commit/50e79b69418967cdb4598a2b69f0648… Patch: https://github.com/kamailio/kamailio/commit/50e79b69418967cdb4598a2b69f0648…

1 0

git:master:9c74b35b: lib/srdb1: added autoincrement id column for rtpengine
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: 9c74b35b06465c9dde23971e342846491fa41c2c URL: https://github.com/kamailio/kamailio/commit/9c74b35b06465c9dde23971e3428464… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T12:28:03+02:00 lib/srdb1: added autoincrement id column for rtpengine --- Modified: src/lib/srdb1/schema/rtpengine.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c74b35b06465c9dde23971e3428464… Patch: https://github.com/kamailio/kamailio/commit/9c74b35b06465c9dde23971e3428464… --- diff --git a/src/lib/srdb1/schema/rtpengine.xml b/src/lib/srdb1/schema/rtpengine.xml index 7b8f295057..02ba2afcac 100644 --- a/src/lib/srdb1/schema/rtpengine.xml +++ b/src/lib/srdb1/schema/rtpengine.xml @@ -24,6 +24,16 @@ </db:para> </description> + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> + <column id="setid"> <name>setid</name> <type>unsigned int</type>

1 0

git:master:09ce8050: textops: remove hf with regex functions exported to kemi framework
by Daniel-Constantin Mierla 11 Jul '17

11 Jul '17

Module: kamailio Branch: master Commit: 09ce80506410b8ef648adb8919492de6f6dad7f5 URL: https://github.com/kamailio/kamailio/commit/09ce80506410b8ef648adb8919492de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-11T09:04:39+02:00 textops: remove hf with regex functions exported to kemi framework --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/09ce80506410b8ef648adb8919492de… Patch: https://github.com/kamailio/kamailio/commit/09ce80506410b8ef648adb8919492de… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cd32f0074a..5048fbae5d 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1098,7 +1098,25 @@ static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) return remove_hf_re(msg, (regex_t*)key); } -static int remove_hf_exp_re(sip_msg_t* msg, regex_t *mre, regex_t *sre) +static int ki_remove_hf_re(sip_msg_t *msg, str *ematch) +{ + regex_t mre; + int ret; + + memset(&mre, 0, sizeof(regex_t)); + if (regcomp(&mre, ematch->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)!=0) { + LM_ERR("failed to compile regex: %.*s\n", ematch->len, ematch->s); + return -1; + } + + ret = remove_hf_re(msg, &mre); + + regfree(&mre); + + return ret; +} + +static int remove_hf_exp(sip_msg_t* msg, regex_t *mre, regex_t *sre) { struct hdr_field *hf; struct lump* l; @@ -1143,7 +1161,33 @@ static int remove_hf_exp_re(sip_msg_t* msg, regex_t *mre, regex_t *sre) static int remove_hf_exp_f(struct sip_msg* msg, char* ematch, char* eskip) { - return remove_hf_exp_re(msg, (regex_t*)ematch, (regex_t*)eskip); + return remove_hf_exp(msg, (regex_t*)ematch, (regex_t*)eskip); +} + +static int ki_remove_hf_exp(sip_msg_t *msg, str *ematch, str *eskip) +{ + regex_t mre; + regex_t sre; + int ret; + + memset(&mre, 0, sizeof(regex_t)); + memset(&sre, 0, sizeof(regex_t)); + if (regcomp(&mre, ematch->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)!=0) { + LM_ERR("failed to compile regex: %.*s\n", ematch->len, ematch->s); + return -1; + } + if (regcomp(&sre, eskip->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)!=0) { + LM_ERR("failed to compile regex: %.*s\n", eskip->len, eskip->s); + regfree(&mre); + return -1; + } + + ret = remove_hf_exp(msg, &mre, &sre); + + regfree(&mre); + regfree(&sre); + + return ret; } static int is_present_hf_helper_f(struct sip_msg* msg, gparam_t* gp) @@ -3490,6 +3534,16 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("remove_hf_re"), + SR_KEMIP_INT, ki_remove_hf_re, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textops"), str_init("remove_hf_exp"), + SR_KEMIP_INT, ki_remove_hf_exp, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:507533e3: modules: readme files regenerated - cfg_rpc ... [skip ci]
by Kamailio Dev 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 507533e3c332a225248c8a23a5bf509946709c1b URL: https://github.com/kamailio/kamailio/commit/507533e3c332a225248c8a23a5bf509… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-10T19:31:21+02:00 modules: readme files regenerated - cfg_rpc ... [skip ci] --- Modified: src/modules/cfg_rpc/README --- Diff: https://github.com/kamailio/kamailio/commit/507533e3c332a225248c8a23a5bf509… Patch: https://github.com/kamailio/kamailio/commit/507533e3c332a225248c8a23a5bf509…

1 0

git:master:ac30274f: Merge pull request #1181 from hdikme/master
by GitHub 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: ac30274feaccd0a1715aee13daafc364cf73de7c URL: https://github.com/kamailio/kamailio/commit/ac30274feaccd0a1715aee13daafc36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-10T19:23:56+02:00 Merge pull request #1181 from hdikme/master configuration reset function (cfg.reset) --- Modified: src/core/cfg/cfg_ctx.c Modified: src/core/cfg/cfg_ctx.h Modified: src/modules/cfg_rpc/cfg_rpc.c Modified: src/modules/cfg_rpc/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/ac30274feaccd0a1715aee13daafc36… Patch: https://github.com/kamailio/kamailio/commit/ac30274feaccd0a1715aee13daafc36…

1 0

git:master:89334293: core: cfg_get_default_value_by_name function has been implemented
by Huseyin Dikme 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 89334293299f817d4ac2774ae60611839a031c73 URL: https://github.com/kamailio/kamailio/commit/89334293299f817d4ac2774ae606118… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2017-07-04T14:40:12+02:00 core: cfg_get_default_value_by_name function has been implemented - As cfg_get_by_name function uses handle to reach variable values, this function will use instead orig_handle in order to reach the initial values when the config group was registered. Read-only variables will not be returned since cfg_reset function uses this function in order to set back the default values, and this cannot be implemented on read-only variables. --- Modified: src/core/cfg/cfg_ctx.c Modified: src/core/cfg/cfg_ctx.h --- Diff: https://github.com/kamailio/kamailio/commit/89334293299f817d4ac2774ae606118… Patch: https://github.com/kamailio/kamailio/commit/89334293299f817d4ac2774ae606118… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index 87ccda81c4..4c07996950 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -1359,6 +1359,74 @@ int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str return 0; } +/* retrieves the default value of a variable + * Return value: + * 0 - success + * -1 - error + * 1 - variable exists, but it is not readable + */ +int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, + void **val, unsigned int *val_type) +{ + cfg_group_t *group; + cfg_mapping_t *var; + void *p; + static str s; /* we need the value even + after the function returns */ + cfg_group_inst_t *group_inst; + + /* verify the context even if we do not need it now + to make sure that a cfg driver has called the function + (very very weak security) */ + if (!ctx) { + LOG(L_ERR, "ERROR: cfg_get_by_name(): context is undefined\n"); + return -1; + } + + /* look-up the group and the variable */ + if (cfg_lookup_var(group_name, var_name, &group, &var)) + return -1; + else + { + if(var->def->type & CFG_READONLY) /* if variables exist then prevents resetting the read-only ones */ + return -1; + } + + if (var->def->on_change_cb) { + /* The variable cannot be retrieved, because the fixup + function may have changed it, and it is better to return + an error than an incorrect value */ + return 1; + } + + /* use the module's orig_handle to access the default registered value of the variable for any group*/ + p = (group->orig_handle) + var->offset; + + switch (CFG_VAR_TYPE(var)) { + case CFG_VAR_INT: + *val = (void *)(long)*(int *)p; + break; + + case CFG_VAR_STRING: + *val = (void *)*(char **)p; + break; + + case CFG_VAR_STR: + memcpy(&s, p, sizeof(str)); + *val = (void *)&s; + break; + + case CFG_VAR_POINTER: + *val = *(void **)p; + break; + + } + *val_type = CFG_VAR_TYPE(var); + + return 0; +} + + /* returns the description of a variable */ int cfg_help(cfg_ctx_t *ctx, str *group_name, str *var_name, char **ch, unsigned int *input_type) diff --git a/src/core/cfg/cfg_ctx.h b/src/core/cfg/cfg_ctx.h index 9401daed77..2ecae7deaf 100644 --- a/src/core/cfg/cfg_ctx.h +++ b/src/core/cfg/cfg_ctx.h @@ -119,6 +119,9 @@ int cfg_rollback(cfg_ctx_t *ctx); int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, void **val, unsigned int *val_type); +int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, + void **val, unsigned int *val_type); + /*! \brief returns the description of a variable */ int cfg_help(cfg_ctx_t *ctx, str *group_name, str *var_name, char **ch, unsigned int *input_type);

1 0

git:master:245a28b6: cfg_rpc: configuration reset function has been implemented
by Huseyin Dikme 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 245a28b666c027f3d697c92863fd54a837ff4d62 URL: https://github.com/kamailio/kamailio/commit/245a28b666c027f3d697c92863fd54a… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2017-07-04T14:41:37+02:00 cfg_rpc: configuration reset function has been implemented - rpc_reset function enables to reset all the variables of a certain group to their initial values. e.g.: kamcmd cfg.reset core. Above given example will reset all variables of the configuration group "core". --- Modified: src/modules/cfg_rpc/cfg_rpc.c Modified: src/modules/cfg_rpc/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/245a28b666c027f3d697c92863fd54a… Patch: https://github.com/kamailio/kamailio/commit/245a28b666c027f3d697c92863fd54a… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index b694d06088..06e775c5c1 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -355,6 +355,61 @@ static void rpc_get(rpc_t* rpc, void* c) } } +static const char* rpc_reset_doc[2] = { + "Reset all the values of a configuration group and commit the change immediately", + 0 +}; + +static void rpc_reset(rpc_t* rpc, void* c) +{ + void *h; + str gname, var; + cfg_def_t *def; + void *val; + int i, ret; + str group; + char *ch; + unsigned int *group_id; + unsigned int val_type; + unsigned int input_type; + + if (rpc->scan(c, "S", &group) < 1) + return; + + if (get_group_id(&group, &group_id)) { + rpc->fault(c, 400, "Wrong group syntax. Use either \"group\", or \"group[id]\""); + return; + } + + cfg_get_group_init(&h); + while(cfg_get_group_next(&h, &gname, &def)) + if (((gname.len == group.len) && (memcmp(gname.s, group.s, group.len) == 0))) + { + for (i=0; def[i].name; i++){ + + var.s = def[i].name; + var.len = (int)strlen(def[i].name); + ret = cfg_get_default_value_by_name(ctx, &gname, group_id, &var, + &val, &val_type); + + if (ret != 0) + continue; + + if (cfg_help(ctx, &group, &var, + &ch, &input_type) + ) { + rpc->fault(c, 400, "Failed to get the variable description"); + return; + } + + if (input_type == CFG_INPUT_INT) + cfg_set_now_int(ctx, &gname, group_id, &var, val); + else if (input_type == CFG_INPUT_STRING) + cfg_set_now_string(ctx, &gname, group_id, &var, val); + } + } +} + static const char* rpc_help_doc[2] = { "Print the description of a configuration variable", @@ -546,6 +601,7 @@ static rpc_export_t rpc_calls[] = { {"cfg.commit", rpc_commit, rpc_commit_doc, 0}, {"cfg.rollback", rpc_rollback, rpc_rollback_doc, 0}, {"cfg.get", rpc_get, rpc_get_doc, 0}, + {"cfg.reset", rpc_reset, rpc_reset_doc, 0}, {"cfg.help", rpc_help, rpc_help_doc, 0}, {"cfg.list", rpc_list, rpc_list_doc, 0}, {"cfg.diff", rpc_diff, rpc_diff_doc, 0}, diff --git a/src/modules/cfg_rpc/doc/rpc.xml b/src/modules/cfg_rpc/doc/rpc.xml index 9810762c50..9298247d83 100644 --- a/src/modules/cfg_rpc/doc/rpc.xml +++ b/src/modules/cfg_rpc/doc/rpc.xml @@ -88,6 +88,22 @@ # &kamcmd; cfg.sets voicemail srv_ip "1.2.3.4" ... </programlisting> + </example> + </section> + <section id="cfg_rpc.rpc.reset"> + <title>cfg.reset</title> + <para> + <emphasis>cfg.reset</emphasis> - Reset the variable values of + a configuration group. The function accepts only one parameter: + group name. + </para> + <example> + <title>Use <varname>cfg.reset</varname> RPC command</title> + <programlisting format="linespecific"> +... +# &sercmd; cfg.reset core +... +</programlisting> </example> </section> <section id="cfg_rpc.rpc.set_now_string">

1 0

[kamailio/kamailio] configuration reset function (cfg.reset) (#1181)
by hdikme 10 Jul '17

10 Jul '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  kamcmd cfg.reset "group_name", cfg.reset has been created in order to reset all the variables of the referred group to be set to their initial values (default). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1181 -- Commit Summary -- * core: cfg_get_default_value_by_name function has been implemented * cfg_rpc: configuration reset function has been implemented -- File Changes -- M src/core/cfg/cfg_ctx.c (68) M src/core/cfg/cfg_ctx.h (3) M src/modules/cfg_rpc/cfg_rpc.c (56) M src/modules/cfg_rpc/doc/rpc.xml (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1181.patch https://github.com/kamailio/kamailio/pull/1181.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/1181

2 2

subst() textops bug?
by Cléviton Mendes de Araújo 10 Jul '17

10 Jul '17

I try replace info PAI header by using subst() function in route block as below: route[3] { ... $var(fromU) = 22227777; ... subst('/^P-Asserted-Identity:(.*)sip:[^@]*@([a-zA-Z0-9.:]+)( .*)$/P-Asserted-Identity:\1sip:$var(fromU)@\2\3/ig'); ... ... forward(); exit; } but when I read ngrep command output I catch P-Asserted-Identity header as below: +++++++++++++++++++++++++++++++++++++++++++++++ before route[3] processing: INVITE sip:99992222@15.113.132.21:5060 SIP/2.0. ... P-Asserted-Identity: "Display Name 7777" <sip:7777@101.14.101.245>. ... +++++++++++++++++++++++++++++++++++++++++++++++ after route[3] processing: INVITE sip:99992222@15.113.132.21:5060 SIP/2.0. ... P-Asserted-Identity: "Display Name 7777" <sip:22227777@101.14.101.245>.P-Asserted-Identity: "Display Name 7777" <sip:7777@101.14.101.245>. ... +++++++++++++++++++++++++++++++++++++++++++++++ Is it normal or bug behaviors? Regards CMA

1 0

git:master:cd17ca91: xlog: free vars in case of errors in fixup functions
by Daniel-Constantin Mierla 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: cd17ca9113031b979fe403255388105ecee0fe73 URL: https://github.com/kamailio/kamailio/commit/cd17ca9113031b979fe403255388105… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-10T17:08:33+02:00 xlog: free vars in case of errors in fixup functions --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/cd17ca9113031b979fe403255388105… Patch: https://github.com/kamailio/kamailio/commit/cd17ca9113031b979fe403255388105… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index e62b432299..1368aa75ff 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*! @@ -116,7 +116,7 @@ static void destroy(void); static int xlog_log_colors_param(modparam_t type, void *val); int pv_parse_color_name(pv_spec_p sp, str *in); -static int pv_get_color(struct sip_msg *msg, pv_param_t *param, +static int pv_get_color(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); typedef struct _xl_level @@ -233,7 +233,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, /* if facility is not explicitely defined use the xlog default facility */ if (facility==NOFACILITY) { facility = xlog_facility; - } + } if(line>0) if(long_format==1) @@ -282,7 +282,7 @@ static int xlog_2_helper(struct sip_msg* msg, char* lev, char* frm, int mode, in xlp = (xl_level_p)lev; if(xlp->type==1) { - if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 + if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 || value.flags&PV_VAL_NULL || !(value.flags&PV_VAL_INT)) { LM_ERR("invalid log level value [%d]\n", value.flags); @@ -354,7 +354,7 @@ static int xlog_3_helper(struct sip_msg* msg, char* fac, char* lev, char* frm, i xlp = (xl_level_p)lev; if(xlp->type==1) { - if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 + if(pv_get_spec_value(msg, &xlp->v.sp, &value)!=0 || value.flags&PV_VAL_NULL || !(value.flags&PV_VAL_INT)) { LM_ERR("invalid log level value [%d]\n", value.flags); @@ -511,6 +511,7 @@ static int xdbg_fixup_helper(void** param, int param_no, int mode) if(pv_parse_format(&s, &xm->m)<0) { LM_ERR("wrong format[%s]\n", (char*)(*param)); + pkg_free(xm); return E_UNSPEC; } *param = (void*)xm; @@ -521,7 +522,7 @@ static int xlog_fixup_helper(void** param, int param_no, int mode) { xl_level_p xlp; str s; - + if(param_no==1) { s.s = (char*)(*param); @@ -545,6 +546,7 @@ static int xlog_fixup_helper(void** param, int param_no, int mode) if(pv_parse_spec(&s, &xlp->v.sp)==NULL) { LM_ERR("invalid level param\n"); + pkg_free(xlp); return E_UNSPEC; } } else { @@ -561,10 +563,10 @@ static int xlog_fixup_helper(void** param, int param_no, int mode) case 'D': xlp->v.level = L_DBG; break; default: LM_ERR("unknown log level\n"); + pkg_free(xlp); return E_UNSPEC; } } - pkg_free(*param); *param = (void*)xlp; return 0; } @@ -696,7 +698,7 @@ int pv_parse_color_name(pv_spec_p sp, str *in) LM_ERR("color name must have two chars\n"); return -1; } - + /* foreground */ switch(in->s[0]) { @@ -708,10 +710,10 @@ int pv_parse_color_name(pv_spec_p sp, str *in) case 'B': case 'P': case 'C': case 'W': break; - default: + default: goto error; } - + /* background */ switch(in->s[1]) { @@ -719,11 +721,11 @@ int pv_parse_color_name(pv_spec_p sp, str *in) case 's': case 'r': case 'g': case 'y': case 'b': case 'p': case 'c': case 'w': - break; - default: + break; + default: goto error; } - + sp->pvp.pvn.type = PV_NAME_INTSTR; sp->pvp.pvn.u.isname.type = AVP_NAME_STR; sp->pvp.pvn.u.isname.name.s = *in; @@ -813,7 +815,7 @@ static int xlog_log_colors_param(modparam_t type, void *val) pit->name.len, pit->name.s); goto error; } - + if(pit->body.len!=2) { LM_ERR("invalid color spec for level %.*s (%.*s)\n", pit->name.len, pit->name.s,

1 0

deb nightly-builds not being built
by Victor Seva 10 Jul '17

10 Jul '17

We are having some issues with our building infrastructure so packages are not being built. We are working on it, please be patient. Cheers, Victor

2 3

git:master:23ee80c8: evapi: close server socket if fnctl() fails
by Daniel-Constantin Mierla 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 23ee80c8d71b9bac63ebe6117620cffc8900c2a9 URL: https://github.com/kamailio/kamailio/commit/23ee80c8d71b9bac63ebe6117620cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-10T11:28:10+02:00 evapi: close server socket if fnctl() fails --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/23ee80c8d71b9bac63ebe6117620cff… Patch: https://github.com/kamailio/kamailio/commit/23ee80c8d71b9bac63ebe6117620cff… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index aa07a8eb4b..04eab30e50 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -623,10 +623,12 @@ int evapi_run_dispatcher(char *laddr, int lport) fflags = fcntl(evapi_srv_sock, F_GETFL); if(fflags<0) { LM_ERR("failed to get the srv socket flags\n"); + close(evapi_srv_sock); return -1; } if (fcntl(evapi_srv_sock, F_SETFL, fflags | O_NONBLOCK)<0) { LM_ERR("failed to set srv socket flags\n"); + close(evapi_srv_sock); return -1; }

1 0

git:master:b5af70a2: tm: several checks for return codes for better error handling
by Daniel-Constantin Mierla 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: b5af70a2b464cae1058ec53bb8dbea5ca07e6d4e URL: https://github.com/kamailio/kamailio/commit/b5af70a2b464cae1058ec53bb8dbea5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-10T11:28:10+02:00 tm: several checks for return codes for better error handling --- Modified: src/modules/tm/t_fifo.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_serial.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/b5af70a2b464cae1058ec53bb8dbea5… Patch: https://github.com/kamailio/kamailio/commit/b5af70a2b464cae1058ec53bb8dbea5…

1 0

TOPOS: Minor issue
by Carsten Bock 10 Jul '17

10 Jul '17

Hi, i've noticed the following detail with the TOPOS module: I wanted to use topos with a database backend. I accidentally misconfigured my Kamailio by setting a database url and the storage type to "redis" without loading the topos_redis module, e.g.: modparam("topos", "db_url", DB_URL) [...] a few lines below.... so I missed that line: modparam("topos", "storage", "redis") This resulted in the DB-Connection not being initialized and in a crash without proper error message. While I can circumvent the crash by a safety check (which I just added), I wonder if it would be nicer, if Kamailio would not start at all in this case of misconfiguration? Just a thought..... Thanks, Carsten -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Millerntorplatz 1 20359 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 5247593-40 Fax +49 40 5247593-99 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

2 1

git:master:95fd884f: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 95fd884f3096ef5e72f98c3cb89939b75ee7232e URL: https://github.com/kamailio/kamailio/commit/95fd884f3096ef5e72f98c3cb89939b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-10T10:01:37+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/95fd884f3096ef5e72f98c3cb89939b… Patch: https://github.com/kamailio/kamailio/commit/95fd884f3096ef5e72f98c3cb89939b…

1 0

git:master:05b31ddb: topos: Safety check for database storage
by Carsten Bock 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 05b31ddbfad71cae5c4cab24b57b1d606c74a7c8 URL: https://github.com/kamailio/kamailio/commit/05b31ddbfad71cae5c4cab24b57b1d6… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-07-10T09:57:20+02:00 topos: Safety check for database storage --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/05b31ddbfad71cae5c4cab24b57b1d6… Patch: https://github.com/kamailio/kamailio/commit/05b31ddbfad71cae5c4cab24b57b1d6… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 814593880e..9e2285dda9 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -448,6 +448,11 @@ int tps_db_insert_dialog(tps_data_t *td) db_val_t db_vals[TPS_NR_KEYS]; int nr_keys; + if (_tps_db_handle == NULL) { + LM_ERR("No database handle - misconfiguration?\n"); + goto error; + } + memset(db_keys, 0, TPS_NR_KEYS*sizeof(db_key_t)); memset(db_vals, 0, TPS_NR_KEYS*sizeof(db_val_t)); nr_keys = 0; @@ -583,6 +588,11 @@ int tps_db_clean_dialogs(void) db_op_t db_ops[2]; int nr_keys; + if (_tps_db_handle == NULL) { + LM_ERR("No database handle - misconfiguration?\n"); + return -1; + } + nr_keys = 0; LM_DBG("cleaning expired dialog records\n"); @@ -629,6 +639,11 @@ int tps_db_insert_branch(tps_data_t *td) db_val_t db_vals[TPS_NR_KEYS]; int nr_keys; + if (_tps_db_handle == NULL) { + LM_ERR("No database handle - misconfiguration?\n"); + goto error; + } + memset(db_keys, 0, TPS_NR_KEYS*sizeof(db_key_t)); memset(db_vals, 0, TPS_NR_KEYS*sizeof(db_val_t)); nr_keys = 0; @@ -730,6 +745,11 @@ int tps_db_clean_branches(void) db_op_t db_ops[2]; int nr_keys; + if (_tps_db_handle == NULL) { + LM_ERR("No database handle - misconfiguration?\n"); + return -1; + } + nr_keys = 0; LM_DBG("cleaning expired branch records\n");

1 0

git:master:3868a27b: topos: Add missing doc for storage parameter
by Carsten Bock 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 3868a27b7358c9a98ed2c240deb41e9ce524b8f5 URL: https://github.com/kamailio/kamailio/commit/3868a27b7358c9a98ed2c240deb41e9… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-07-10T09:56:07+02:00 topos: Add missing doc for storage parameter --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3868a27b7358c9a98ed2c240deb41e9… Patch: https://github.com/kamailio/kamailio/commit/3868a27b7358c9a98ed2c240deb41e9… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index b465713985..77de4b8cbd 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -68,6 +68,37 @@ </section> <section> <title>Parameters</title> + <section id="topos.p.storage"> + <title><varname>storage</varname> (str)</title> + <para> + Type of storage, valid types are: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>db</emphasis> - Database Backend + </para> + </listitem> + <listitem> + <para> + <emphasis>redis</emphasis> - Redis Backend + </para> + </listitem> + </itemizedlist> + <para> + <emphasis> + Default value is <quote>db</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>storage</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "storage", "redis") +... +</programlisting> + </example> + </section> <section id="topos.p.db_url"> <title><varname>db_url</varname> (str)</title> <para>

1 0

git:master:56f6efc1: topos_redis: Fix Typo in error-message
by Carsten Bock 10 Jul '17

10 Jul '17

Module: kamailio Branch: master Commit: 56f6efc176b0c2a1a69754c55a50b1a5661f7b95 URL: https://github.com/kamailio/kamailio/commit/56f6efc176b0c2a1a69754c55a50b1a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-07-10T09:54:08+02:00 topos_redis: Fix Typo in error-message --- Modified: src/modules/topos_redis/topos_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56f6efc176b0c2a1a69754c55a50b1a… Patch: https://github.com/kamailio/kamailio/commit/56f6efc176b0c2a1a69754c55a50b1a… --- diff --git a/src/modules/topos_redis/topos_redis_mod.c b/src/modules/topos_redis/topos_redis_mod.c index 0fdef7882c..08b7ceda45 100644 --- a/src/modules/topos_redis/topos_redis_mod.c +++ b/src/modules/topos_redis/topos_redis_mod.c @@ -101,7 +101,7 @@ static int mod_init(void) _tps_storage_api.end_dialog = tps_redis_end_dialog; if(_tps_api.set_storage_api(&_tps_storage_api)<0) { - LM_ERR("failed to set topos storae api\n"); + LM_ERR("failed to set topos storage api\n"); return -1; } return 0;

1 0

git:master:c0125e04: evapi: handle return code for fcntl
by Daniel-Constantin Mierla 09 Jul '17

09 Jul '17

Module: kamailio Branch: master Commit: c0125e049f1c34afe7411f763f9f57c7a00109a8 URL: https://github.com/kamailio/kamailio/commit/c0125e049f1c34afe7411f763f9f57c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-09T10:21:20+02:00 evapi: handle return code for fcntl --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c0125e049f1c34afe7411f763f9f57c… Patch: https://github.com/kamailio/kamailio/commit/c0125e049f1c34afe7411f763f9f57c… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 5429d6913b..aa07a8eb4b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -591,6 +591,7 @@ int evapi_run_dispatcher(char *laddr, int lport) struct ev_io io_server; struct ev_io io_notify; int yes_true = 1; + int fflags = 0; LM_DBG("starting dispatcher processing\n"); @@ -619,7 +620,15 @@ int evapi_run_dispatcher(char *laddr, int lport) return -1; } /* set non-blocking flag */ - fcntl(evapi_srv_sock, F_SETFL, fcntl(evapi_srv_sock, F_GETFL) | O_NONBLOCK); + fflags = fcntl(evapi_srv_sock, F_GETFL); + if(fflags<0) { + LM_ERR("failed to get the srv socket flags\n"); + return -1; + } + if (fcntl(evapi_srv_sock, F_SETFL, fflags | O_NONBLOCK)<0) { + LM_ERR("failed to set srv socket flags\n"); + return -1; + } bzero(&evapi_srv_addr, sizeof(evapi_srv_addr)); evapi_srv_addr.sin_family = h->h_addrtype;

1 0

git:master:bf9d697c: async: free var in case of fixup error
by Daniel-Constantin Mierla 09 Jul '17

09 Jul '17

Module: kamailio Branch: master Commit: bf9d697c31ad2c7614aa37997c4772df8e8d25a7 URL: https://github.com/kamailio/kamailio/commit/bf9d697c31ad2c7614aa37997c4772d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-09T10:01:17+02:00 async: free var in case of fixup error --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bf9d697c31ad2c7614aa37997c4772d… Patch: https://github.com/kamailio/kamailio/commit/bf9d697c31ad2c7614aa37997c4772d… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index c781753042..90588f1d12 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -194,8 +194,10 @@ static int fixup_async_sleep(void **param, int param_no) } memset(ap, 0, sizeof(async_param_t)); ap->u.paction = get_action_from_param(param, param_no); - if(fixup_igp_null(param, param_no) < 0) + if(fixup_igp_null(param, param_no) < 0) { + pkg_free(ap); return -1; + } ap->pinterval = (gparam_t *)(*param); *param = (void *)ap; return 0;

1 0

git:master:3cbae684: usrloc: rpc flush to return error in case of failure
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: 3cbae6841c80de89fc7c72b73c1695e3788c1819 URL: https://github.com/kamailio/kamailio/commit/3cbae6841c80de89fc7c72b73c1695e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 usrloc: rpc flush to return error in case of failure --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/3cbae6841c80de89fc7c72b73c1695e… Patch: https://github.com/kamailio/kamailio/commit/3cbae6841c80de89fc7c72b73c1695e… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 35f78e95e2..bace4885e1 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -545,7 +545,9 @@ static const char* ul_rpc_rm_contact_doc[2] = { static void ul_rpc_flush(rpc_t* rpc, void* ctx) { - synchronize_all_udomains(0, 1); + if(synchronize_all_udomains(0, 1) != 0) { + rpc->fault(ctx, 500, "Operation failed"); + } return; }

1 0

git:master:070057a5: auth_db: small reorder to do the check before accessing the fields
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: 070057a5d66e2f5dd4bcf90d96f8f8ceeca3a433 URL: https://github.com/kamailio/kamailio/commit/070057a5d66e2f5dd4bcf90d96f8f8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 auth_db: small reorder to do the check before accessing the fields --- Modified: src/modules/auth_db/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/070057a5d66e2f5dd4bcf90d96f8f8c… Patch: https://github.com/kamailio/kamailio/commit/070057a5d66e2f5dd4bcf90d96f8f8c… --- diff --git a/src/modules/auth_db/authorize.c b/src/modules/auth_db/authorize.c index b291cf8f56..4de0956cac 100644 --- a/src/modules/auth_db/authorize.c +++ b/src/modules/auth_db/authorize.c @@ -91,7 +91,8 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int fl return -1; } - if (auth_dbf.query(auth_db_handle, keys, 0, vals, col, n, nc, 0, &res) < 0) { + if (auth_dbf.query(auth_db_handle, keys, 0, vals, col, n, nc, 0, &res) < 0 + || res==NULL) { LM_ERR("failed to query database\n"); pkg_free(col); if(res) @@ -100,8 +101,7 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int fl } pkg_free(col); if (RES_ROW_N(res) == 0) { - if(res) - auth_dbf.free_result(auth_db_handle, res); + auth_dbf.free_result(auth_db_handle, res); LM_DBG("no result for user \'%.*s%s%.*s\' in [%.*s]\n", user->len, user->s, (n==2)?"@":"", (n==2)?domain->len:0, (n==2)?domain->s:"", @@ -114,8 +114,7 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int fl } for (cred=credentials, n=0; cred; cred=cred->next, n++) { if (db_val2pv_spec(msg, &RES_ROWS(res)[0].values[n], cred->spec) != 0) { - if(res) - auth_dbf.free_result(auth_db_handle, res); + auth_dbf.free_result(auth_db_handle, res); LM_ERR("Failed to convert value for column %.*s\n", RES_NAMES(res)[n]->len, RES_NAMES(res)[n]->s); return -3; @@ -542,11 +541,16 @@ int w_auth_check(sip_msg_t *_m, char* _realm, char* _table, char *_flags) str stable; int iflags; + if(_m==NULL) { + LM_ERR("invalid msg parameter\n"); + return AUTH_ERROR; + } + if ((_m->REQ_METHOD == METHOD_ACK) || (_m->REQ_METHOD == METHOD_CANCEL)) { return AUTH_OK; } - if(_m==NULL || _realm==NULL || _table==NULL || _flags==NULL) { + if(_realm==NULL || _table==NULL || _flags==NULL) { LM_ERR("invalid parameters\n"); return AUTH_ERROR; }

1 0

git:master:b28e2943: registrar: free var in case of pv name error
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: b28e2943b8d171628f81057a352507b2a56b91a4 URL: https://github.com/kamailio/kamailio/commit/b28e2943b8d171628f81057a352507b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 registrar: free var in case of pv name error --- Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/b28e2943b8d171628f81057a352507b… Patch: https://github.com/kamailio/kamailio/commit/b28e2943b8d171628f81057a352507b… --- diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index 35bdd74e78..ad82262a04 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -288,8 +288,8 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) { str pn; str pa; - regpv_name_t *rp; - regpv_profile_t *rpp; + regpv_name_t *rp = NULL; + regpv_profile_t *rpp = NULL; if(sp==NULL || in==NULL || in->len<=0) return -1; @@ -414,6 +414,7 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) return 0; error: + if(rp) pkg_free(rp); LM_ERR("unknown contact attr name in %.*s\n", in->len, in->s); return -1; }

1 0

git:master:5530fe31: lib: dtrie - removed duplicate check for same value
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: 5530fe31fe89a4dfe9e17cbe56c0cd83cb8f45ab URL: https://github.com/kamailio/kamailio/commit/5530fe31fe89a4dfe9e17cbe56c0cd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 lib: dtrie - removed duplicate check for same value --- Modified: src/lib/trie/dtrie.c --- Diff: https://github.com/kamailio/kamailio/commit/5530fe31fe89a4dfe9e17cbe56c0cd8… Patch: https://github.com/kamailio/kamailio/commit/5530fe31fe89a4dfe9e17cbe56c0cd8… --- diff --git a/src/lib/trie/dtrie.c b/src/lib/trie/dtrie.c index 3ec65074af..ab3682e2a1 100644 --- a/src/lib/trie/dtrie.c +++ b/src/lib/trie/dtrie.c @@ -100,7 +100,8 @@ void dtrie_delete(struct dtrie_node_t *root, struct dtrie_node_t *node, } -void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload, const unsigned int branches) +void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload, + const unsigned int branches) { if ((root!=NULL) && (*root!=NULL)) { dtrie_delete(*root, *root, delete_payload, branches); @@ -119,13 +120,13 @@ void dtrie_clear(struct dtrie_node_t *root, dt_delete_func_t delete_payload, } -int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned int numberlen, +int dtrie_insert(struct dtrie_node_t *root, const char *number, + const unsigned int numberlen, void *data, const unsigned int branches) { struct dtrie_node_t *node = root; unsigned char digit, i=0; - if (node == NULL) return -1; if (root == NULL) return -1; if (number == NULL) return -1; @@ -151,7 +152,9 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i return -1; } - LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); + LM_DBG("allocate %lu bytes for node at %p\n", + (long unsigned)sizeof(struct dtrie_node_t), + node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); @@ -174,7 +177,8 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i } -unsigned int dtrie_size(const struct dtrie_node_t *root, const unsigned int branches) +unsigned int dtrie_size(const struct dtrie_node_t *root, + const unsigned int branches) { unsigned int i, sum = 0; @@ -188,7 +192,8 @@ unsigned int dtrie_size(const struct dtrie_node_t *root, const unsigned int bran } -unsigned int dtrie_loaded_nodes(const struct dtrie_node_t *root, const unsigned int branches) +unsigned int dtrie_loaded_nodes(const struct dtrie_node_t *root, + const unsigned int branches) { unsigned int i, sum = 0; @@ -204,7 +209,8 @@ unsigned int dtrie_loaded_nodes(const struct dtrie_node_t *root, const unsigned } -unsigned int dtrie_leaves(const struct dtrie_node_t *root, const unsigned int branches) +unsigned int dtrie_leaves(const struct dtrie_node_t *root, + const unsigned int branches) { unsigned int i, sum = 0, leaf = 1; @@ -222,13 +228,13 @@ unsigned int dtrie_leaves(const struct dtrie_node_t *root, const unsigned int br void **dtrie_longest_match(struct dtrie_node_t *root, const char *number, - const unsigned int numberlen, int *nmatchptr, const unsigned int branches) + const unsigned int numberlen, int *nmatchptr, + const unsigned int branches) { struct dtrie_node_t *node = root; unsigned char digit, i = 0; void **ret = NULL; - if (node == NULL) return NULL; if (root == NULL) return NULL; if (number == NULL) return NULL;

1 0

git:master:f401938a: acc: free parameter in acc fixup in case of error
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: f401938a4f5a5b6eb1089b2c85372a69f07ce777 URL: https://github.com/kamailio/kamailio/commit/f401938a4f5a5b6eb1089b2c85372a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 acc: free parameter in acc fixup in case of error --- Modified: src/modules/acc/acc_logic.c Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f401938a4f5a5b6eb1089b2c85372a6… Patch: https://github.com/kamailio/kamailio/commit/f401938a4f5a5b6eb1089b2c85372a6… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index 02de9f4cf3..bb3b05b5cb 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -391,26 +391,26 @@ static inline int should_acc_reply(struct sip_msg *req, struct sip_msg *rpl, { unsigned int i; - /* negative transactions reported otherwise only if explicitly + /* negative transactions reported otherwise only if explicitly * demanded */ if (code >= 300) { - if (!is_failed_acc_on(req)) return 0; - i = 0; - while (failed_filter[i] != 0) { - if (failed_filter[i] == code) return 0; - i++; - } - return 1; + if (!is_failed_acc_on(req)) return 0; + i = 0; + while (failed_filter[i] != 0) { + if (failed_filter[i] == code) return 0; + i++; + } + return 1; } if ( !is_acc_on(req) ) - return 0; - + return 0; + if ( code<200 && !(early_media && parse_headers(rpl,HDR_CONTENTLENGTH_F, 0) == 0 && rpl->content_length && get_content_length(rpl) > 0)) - return 0; + return 0; return 1; /* seed is through, we will account this reply */ } @@ -424,8 +424,10 @@ static inline void acc_onreply_in(struct cell *t, struct sip_msg *req, /* don't parse replies in which we are not interested */ /* missed calls enabled ? */ if ( (reply && reply!=FAKED_REPLY) && (should_acc_reply(req,reply,code) - || (is_invite(t) && code>=300 && is_mc_on(req))) ) { - parse_headers(reply, HDR_TO_F, 0 ); + || (is_invite(t) && code>=300 && is_mc_on(req))) ) { + if(parse_headers(reply, HDR_TO_F, 0)<0) { + LM_ERR("failed to parse headers\n"); + } } } @@ -463,7 +465,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, /* we report on missed calls when the first * forwarding attempt fails; we do not wish to - * report on every attempt; so we clear the flags; + * report on every attempt; so we clear the flags; */ if (is_log_mc_on(req)) { @@ -684,4 +686,4 @@ static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ) } else if (type&TMCB_RESPONSE_IN) { acc_onreply_in( t, ps->req, ps->rpl, ps->code); } -} \ No newline at end of file +} diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 6665446843..f0582b2315 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -313,16 +313,17 @@ static int acc_fixup(void** param, int param_no) if (strchr(p,PV_MARKER)!=NULL) { /* is a variable $xxxxx */ if (pv_parse_format(&accp->reason, &accp->elem)<0) { - LM_ERR("bad param 1; " - "parse format error [%.*s]\n", accp->reason.len, accp->reason.s); + LM_ERR("bad param 1 - parse format error [%.*s]\n", + accp->reason.len, accp->reason.s); + pkg_free(accp); return E_UNSPEC; } } else { if(acc_parse_code(p,accp)<0) { - LM_ERR("bad param 1;" - "parse code error\n"); + LM_ERR("bad param 1 - parse code error\n"); + pkg_free(accp); return E_UNSPEC; } } @@ -810,4 +811,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_acc_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:f632b879: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: f632b879272e6db24d83f0c0881d8708a7aecfc7 URL: https://github.com/kamailio/kamailio/commit/f632b879272e6db24d83f0c0881d870… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-07T14:16:23+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/f632b879272e6db24d83f0c0881d870… Patch: https://github.com/kamailio/kamailio/commit/f632b879272e6db24d83f0c0881d870…

1 0

git:master:c593d749: textops: documentation for remove_hf_exp(...)
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: c593d7492ddb957a862dd31b5ce9e09fdf54a8e5 URL: https://github.com/kamailio/kamailio/commit/c593d7492ddb957a862dd31b5ce9e09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T14:10:04+02:00 textops: documentation for remove_hf_exp(...) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c593d7492ddb957a862dd31b5ce9e09… Patch: https://github.com/kamailio/kamailio/commit/c593d7492ddb957a862dd31b5ce9e09… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 539697fced..68b3676703 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -32,11 +32,11 @@ processing in &kamailio; script. </para> <para> - Search ignores folded lines. For example, + Search ignores folded lines. For example, search(<quote>(From|f):.*@foo.bar</quote>) doesn't match the following From header field: <programlisting format="linespecific"> -From: medabeda +From: medabeda <sip:medameda@foo.bar>;tag=1234 </programlisting> </para> @@ -1154,8 +1154,7 @@ remove_hf("m") </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>remove_hf_re</function> usage</title> @@ -1170,6 +1169,48 @@ if(remove_hf_re("^P-")) </example> </section> + <section id="textops.f.remove_hf_exp"> + <title> + <function moreinfo="none">remove_hf_exp(expmatch, expskip)</function> + </title> + <para> + Remove from message all headers with name matching regular + expression <quote>expmatch</quote>, but not matching regular + expression <quote>expskip</quote>. + </para> + <para> + Returns true if at least one header is found and removed. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>expmatch</emphasis> - regular expression to match + the header name to be removed. + </para> + </listitem> + <listitem> + <para><emphasis>expskip</emphasis> - regular expression to match + the header name to be skipped from removal. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>remove_hf_exp</function> usage</title> + <programlisting format="linespecific"> +... +if(remove_hf_exp("^P-", "^P-Keep-")) +{ + # All headers starting with "P-" removed, + # except the ones starting with "P-Keep-" +} +... +</programlisting> + </example> + </section> + <section id="textops.f.has_body"> <title> <function moreinfo="none">has_body()</function>, @@ -1177,7 +1218,7 @@ if(remove_hf_re("^P-")) </title> <para> The function returns <emphasis>true</emphasis> if the SIP message - has a body attached. The checked includes also the + has a body attached. The checked includes also the <quote>Content-Length</quote> header presence and value. </para> <para> @@ -1187,7 +1228,7 @@ if(remove_hf_re("^P-")) <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> - <para><emphasis>mime</emphasis> - mime to be checked against the + <para><emphasis>mime</emphasis> - mime to be checked against the <quote>Content-Type</quote> header. If not present or 0, this check will be disabled. </para>

1 0

git:master:d7972d83: textops: new function remove_hf_exp(match, skip)
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: d7972d83b3f12f64d4f70d8e6eacb88ec34648f1 URL: https://github.com/kamailio/kamailio/commit/d7972d83b3f12f64d4f70d8e6eacb88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T14:03:52+02:00 textops: new function remove_hf_exp(match, skip) - remove header fields that do not match regex ''skip', but match regex 'match' --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/d7972d83b3f12f64d4f70d8e6eacb88… Patch: https://github.com/kamailio/kamailio/commit/d7972d83b3f12f64d4f70d8e6eacb88… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cd116a8fe9..cd32f0074a 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -129,6 +129,7 @@ static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ); static int cmp_istr_f(struct sip_msg *msg, char *str1, char *str2 ); static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ); static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo); +static int remove_hf_exp_f(sip_msg_t* msg, char* ematch, char* eskip); static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int is_audio_on_hold_f(struct sip_msg *msg, char *str1, char *str2 ); static int fixup_substre(void**, int); @@ -207,6 +208,9 @@ static cmd_export_t cmds[]={ {"remove_hf_re", (cmd_function)remove_hf_re_f, 1, fixup_regexp_null, fixup_free_regexp_null, ANY_ROUTE}, + {"remove_hf_exp", (cmd_function)remove_hf_exp_f, 1, + fixup_regexp_regexp, fixup_free_regexp_regexp, + ANY_ROUTE}, {"is_present_hf", (cmd_function)is_present_hf_f, 1, hname_fixup, free_hname_fixup, ANY_ROUTE}, @@ -1052,16 +1056,14 @@ int remove_hf_f(struct sip_msg* msg, char* str_hf, char* foo) return cnt==0 ? -1 : 1; } -static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) +static int remove_hf_re(sip_msg_t* msg, regex_t *re) { struct hdr_field *hf; struct lump* l; int cnt; - regex_t *re; char c; regmatch_t pmatch; - re = (regex_t*)key; cnt=0; /* we need to be sure we have seen all HFs */ @@ -1091,6 +1093,59 @@ static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) return cnt==0 ? -1 : 1; } +static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) +{ + return remove_hf_re(msg, (regex_t*)key); +} + +static int remove_hf_exp_re(sip_msg_t* msg, regex_t *mre, regex_t *sre) +{ + struct hdr_field *hf; + struct lump* l; + int cnt; + char c; + regmatch_t pmatch; + + cnt=0; + + /* we need to be sure we have seen all HFs */ + if(parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_ERR("error while parsing message headers\n"); + return -1; + } + + for (hf=msg->headers; hf; hf=hf->next) + { + c = hf->name.s[hf->name.len]; + hf->name.s[hf->name.len] = '\0'; + if (regexec(sre, hf->name.s, 1, &pmatch, 0)==0) + { + hf->name.s[hf->name.len] = c; + continue; + } + if (regexec(mre, hf->name.s, 1, &pmatch, 0)!=0) + { + hf->name.s[hf->name.len] = c; + continue; + } + hf->name.s[hf->name.len] = c; + l=del_lump(msg, hf->name.s-msg->buf, hf->len, 0); + if (l==0) + { + LM_ERR("cannot remove header\n"); + return -1; + } + cnt++; + } + + return cnt==0 ? -1 : 1; +} + +static int remove_hf_exp_f(struct sip_msg* msg, char* ematch, char* eskip) +{ + return remove_hf_exp_re(msg, (regex_t*)ematch, (regex_t*)eskip); +} + static int is_present_hf_helper_f(struct sip_msg* msg, gparam_t* gp) { struct hdr_field *hf;

1 0

git:master:85136705: core: fixup helper function for two regex parameters
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 851367053d6b4d64161a50fa7408d0dd750922d5 URL: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T14:03:29+02:00 core: fixup helper function for two regex parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0d… Patch: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0d… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 4fd0fa4ca7..d817b75565 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -207,7 +207,7 @@ struct regex_fixup { int fixup_regexp_null(void** param, int param_no) { struct regex_fixup* re; - + if (param_no != 1) return E_UNSPEC; if ((re=pkg_malloc(sizeof(*re))) ==0) { @@ -226,11 +226,15 @@ int fixup_regexp_null(void** param, int param_no) return E_UNSPEC; } +int fixup_regexp_regexp(void** param, int param_no) +{ + return fixup_regexp_null(param, 1); +} int fixup_free_regexp_null(void** param, int param_no) { struct regex_fixup* re; - + if (param_no != 1) return E_UNSPEC; if (*param) { @@ -242,6 +246,11 @@ int fixup_free_regexp_null(void** param, int param_no) return 0; } +int fixup_free_regexp_regexp(void** param, int param_no) +{ + return fixup_free_regexp_null(param, 1); +} + /* fixup_pvar_*() has to be written "by hand", since it needs to save the original pointer (the fixup users expects a pointer to the pv_spec_t in *param and hence the original value @@ -638,4 +647,4 @@ int fixup_free_spve_pvar(void** param, int param_no) if(param_no==2) return fixup_free_pvar_null(param, 1); return E_UNSPEC; -} \ No newline at end of file +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a8388ee84d..835342ab86 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any @@ -36,7 +36,7 @@ /** * generic parameter that holds a string, an int, a pseudo-variable * or a ser select, avp, or subst. - * + * * Note: used only for compatibility with existing kamailio code, * please use fparam_t directly in the future. * @@ -86,13 +86,8 @@ int fixup_uint_uint(void** param, int param_no); int fixup_regexp_null(void** param, int param_no); int fixup_free_regexp_null(void** param, int param_no); -#if 0 -int fixup_regexp_none(void** param, int param_no); -int fixup_free_regexp_none(void** param, int param_no); -/* not implemened yet */ -int fixup_regexpNL_null(void** param, int param_no); -int fixup_regexpNL_none(void** param, int param_no); -#endif +int fixup_regexp_regexp(void** param, int param_no); +int fixup_free_regexp_regexp(void** param, int param_no); int fixup_pvar_null(void **param, int param_no); int fixup_free_pvar_null(void** param, int param_no);

1 0

git:master:4220c41f: dispatcher: try to add sip: scheme to dst uri, if initial parse fails
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 4220c41f9a443d275cf94e1db3a33fbd3ca14d1b URL: https://github.com/kamailio/kamailio/commit/4220c41f9a443d275cf94e1db3a33fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T13:33:16+02:00 dispatcher: try to add sip: scheme to dst uri, if initial parse fails - operation done when records are loaded from database or file --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/4220c41f9a443d275cf94e1db3a33fb… Patch: https://github.com/kamailio/kamailio/commit/4220c41f9a443d275cf94e1db3a33fb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index bea737f4bc..67f706388c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -282,20 +282,43 @@ int ds_set_attrs(ds_dest_t *dest, str *attrs) /** * */ -ds_dest_t *pack_dest(str uri, int flags, int priority, str *attrs) +ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) { ds_dest_t *dp = NULL; /* For DNS-Lookups */ static char hn[256]; + char ub[512]; struct hostent *he; struct sip_uri puri; str host; int port, proto; char c = 0; + str uri; + uri = iuri; /* check uri */ - if(parse_uri(uri.s, uri.len, &puri) != 0 || puri.host.len > 254) { - LM_ERR("bad uri [%.*s]\n", uri.len, uri.s); + if(parse_uri(uri.s, uri.len, &puri) != 0) { + if(iuri.len>4 && strncmp(iuri.s, "sip:", 4)!=0 && iuri.len<500) { + strncpy(ub, "sip:", 4); + strncpy(ub+4, iuri.s, iuri.len); + ub[iuri.len+4] = '\0'; + uri.s = ub; + uri.len = iuri.len+4; + if(parse_uri(uri.s, uri.len, &puri) != 0) { + LM_ERR("bad uri [%.*s]\n", iuri.len, iuri.s); + goto err; + } else { + LM_INFO("uri without sip scheme - fixing it: %.*s\n", + iuri.len, iuri.s); + } + } else { + LM_ERR("bad uri [%.*s]\n", iuri.len, iuri.s); + goto err; + } + } + + if(puri.host.len > 254) { + LM_ERR("hostname in uri is too long [%.*s]\n", uri.len, uri.s); goto err; }

1 0

git:master:86e34946: pv: free var in case pkg alloc failure
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 86e349463c7d573e9a5e68bd3984ecc95808adb4 URL: https://github.com/kamailio/kamailio/commit/86e349463c7d573e9a5e68bd3984ecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:53:38+02:00 pv: free var in case pkg alloc failure --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/86e349463c7d573e9a5e68bd3984ecc… Patch: https://github.com/kamailio/kamailio/commit/86e349463c7d573e9a5e68bd3984ecc… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index d1e638512c..1245cef7f5 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -66,6 +66,7 @@ script_var_t* add_var(str *name, int vtype) if(it->name.s==0) { + pkg_free(it); LM_ERR("out of pkg mem!\n"); return 0; }

1 0

git:master:72b4cc24: textops: fixed whitespacing and few malloc size adjustmets for safety
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 72b4cc243d48cf4ee2302afd45c7ef1a290b7d16 URL: https://github.com/kamailio/kamailio/commit/72b4cc243d48cf4ee2302afd45c7ef1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:31:37+02:00 textops: fixed whitespacing and few malloc size adjustmets for safety --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/72b4cc243d48cf4ee2302afd45c7ef1… Patch: https://github.com/kamailio/kamailio/commit/72b4cc243d48cf4ee2302afd45c7ef1…

1 0

git:master:080bffeb: jsonrpcs: safety vars init and release checks
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 080bffeb53181131f8fb8fab0ddcb771bbdd37dc URL: https://github.com/kamailio/kamailio/commit/080bffeb53181131f8fb8fab0ddcb77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:48:53+02:00 jsonrpcs: safety vars init and release checks --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/080bffeb53181131f8fb8fab0ddcb77… Patch: https://github.com/kamailio/kamailio/commit/080bffeb53181131f8fb8fab0ddcb77… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 7e0502964b..cd99ad8a01 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -756,6 +756,7 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) while(*fmt) { mname.s = va_arg(ap, char*); mname.len = (mname.s?strlen(mname.s):0); + if(mname.s==NULL) mname.s = ""; if (*fmt == '{' || *fmt == '[') { void_ptr = va_arg(ap, void**); diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index fbc9f8f5e6..c61fa6da28 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -388,9 +388,9 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, return 0; err_both: - close(socks->tx_sock); + if(socks->tx_sock>=0) close(socks->tx_sock); err_rx: - close(socks->rx_sock); + if(socks->rx_sock>=0) close(socks->rx_sock); return -1; } @@ -528,7 +528,7 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, { int n; unsigned int optlen = sizeof(int); - int optval; + int optval = 0; if(len == 0 || tolen ==0) return -1; @@ -536,7 +536,9 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, /*LM_DBG("destination address length is %i\n", tolen);*/ n=sendto(fd, buf, len, 0, to, tolen); if(n!=len) { - getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (int*)&optval, &optlen); + if(getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (int*)&optval, &optlen)==-1) { + LM_ERR("getsockopt failed\n"); + } LM_ERR("failed to send the response - ret: %d, len: %d (%d)," " err: %d - %s)\n", n, len, optval, errno, strerror(errno));

1 0

git:master:7987122d: textopsx: free in case of error inside sel_hf_value_name()
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 7987122d25003dd4b5f0ce47caf3e5c9811917b3 URL: https://github.com/kamailio/kamailio/commit/7987122d25003dd4b5f0ce47caf3e5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T09:29:41+02:00 textopsx: free in case of error inside sel_hf_value_name() --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7987122d25003dd4b5f0ce47caf3e5c… Patch: https://github.com/kamailio/kamailio/commit/7987122d25003dd4b5f0ce47caf3e5c… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 7f99a394f4..d7a948c8ea 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -370,7 +370,10 @@ static int keep_hf_helper(sip_msg_t *msg, regex_t *re) struct lump *l; /* we need to be sure we have seen all HFs */ - parse_headers(msg, HDR_EOH_F, 0); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("Error while parsing message\n"); + return -1; + } for(hf = msg->headers; hf; hf = hf->next) { switch(hf->type) { case HDR_FROM_T: @@ -1723,8 +1726,10 @@ static int sel_hf_value_name(str *res, select_t *s, struct sip_msg *msg) hname->hname = s->params[1].v.s; parse_hname2(buf, buf + i, &hdr); - if(hdr.type == HDR_ERROR_T) + if(hdr.type == HDR_ERROR_T) { + pkg_free(hname); return E_CFG; + } hname->htype = hdr.type; s->params[1].v.p = hname;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev