sr-dev July 2018

sr-dev@lists.kamailio.org

17 participants
229 discussions

git:master:4e2290fa: blst: removed unused parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4e2290facad0768daa636df387e438d4ff931588 URL: https://github.com/kamailio/kamailio/commit/4e2290facad0768daa636df387e438d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-04T08:34:06+02:00 blst: removed unused parameter --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/4e2290facad0768daa636df387e438d… Patch: https://github.com/kamailio/kamailio/commit/4e2290facad0768daa636df387e438d… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index e3c5226b91..5fd654feba 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -399,7 +399,7 @@ static int ki_blst_rpl_set_ignore(sip_msg_t* msg, int mask) /** * */ -static int ki_blst_rpl_set_ignore_all(sip_msg_t* msg, int mask) +static int ki_blst_rpl_set_ignore_all(sip_msg_t* msg) { return ki_blst_rpl_set_ignore(msg, 0xff); }

5 years, 9 months

[kamailio/kamailio] Enhancement on phonenum module: add CountryCode (string) (#1576)

by Joel Serrano

Currently you have the following information available when using `phonenum_match(num, pvc)` from the `phonenum` module: * number - phone number that is matched * valid - 1 if the matched number has a valid result; 0 otherwise * normalized - normalized phone number * cctel - country code for phone number * ltype - local network type * ndesc - phone number description * error - error string if phone number matching fails. It would be useful to have access also to the `cc` information. Right now, `cctel` outputs the country code (digits) for the number. Example: +34123456789 --> cctel = 34 The enhancement would be to add the country code (string) for the number (maybe in the `cc` position?): +34123456789 --> cc = ES Having a look at the phonenum module code (`cphonenumber.cpp`), I understand (with my very little idea of C) that country code (string) information is in fact used to get the country code (digits). So I think it would be only a matter of returning one more key:value: https://github.com/kamailio/kamailio/blob/master/src/modules/phonenum/cphon… ``` string regionCode; _phoneUtil.GetRegionCodeForNumber(parsedNumber, &regionCode); res->cctel = _phoneUtil.GetCountryCodeForRegion(regionCode); ``` Something like (pseudocode, this obviously doesn't work but gives the idea): ``` string regionCode; _phoneUtil.GetRegionCodeForNumber(parsedNumber, &regionCode); res->cctel = _phoneUtil.GetCountryCodeForRegion(regionCode); res->cc = regionCode; ``` So then later in kamailio you can do for example: ```xlog("L_INFO", "Call from $phn(src=>cc) to $phn(dst=>cc)\n");``` I have also seen that a function to provide this info exists in the module level, but I haven't seen it used anywhere else but the declaration: https://github.com/kamailio/kamailio/blob/master/src/modules/phonenum/cphon… This feels like a really easy change and I tried to do it myself, but I didn't manage to get through the complete path from "getting the info" to "making it available in the pvc" so here I am asking for help. Thanks! -- 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/1576

5 years, 9 months

git:master:f5ef3919: blst: more functions exported to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f5ef3919b42541ac6daa1c3ea2ed7c1707f4dd01 URL: https://github.com/kamailio/kamailio/commit/f5ef3919b42541ac6daa1c3ea2ed7c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-03T15:59:48+02:00 blst: more functions exported to kemi framework --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/f5ef3919b42541ac6daa1c3ea2ed7c1… Patch: https://github.com/kamailio/kamailio/commit/f5ef3919b42541ac6daa1c3ea2ed7c1…

5 years, 9 months

git:master:b87b6523: modules: readme files regenerated - benchmark ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b87b65237401420328b2afccdec69f45f1ada826 URL: https://github.com/kamailio/kamailio/commit/b87b65237401420328b2afccdec69f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-03T15:01:37+02:00 modules: readme files regenerated - benchmark ... [skip ci] --- Modified: src/modules/benchmark/README --- Diff: https://github.com/kamailio/kamailio/commit/b87b65237401420328b2afccdec69f4… Patch: https://github.com/kamailio/kamailio/commit/b87b65237401420328b2afccdec69f4… --- diff --git a/src/modules/benchmark/README b/src/modules/benchmark/README index c69987a9af..425324d110 100644 --- a/src/modules/benchmark/README +++ b/src/modules/benchmark/README @@ -52,6 +52,8 @@ Bastian Friedrich 6.2. benchmark.enable_timer 6.3. benchmark.granularity 6.4. benchmark.loglevel + 6.5. benchmark.timer_list + 6.6. benchmark.timer_name_list 7. Example of usage @@ -74,7 +76,9 @@ Bastian Friedrich 1.5. bm_start_timer usage 1.6. bm_log_timer usage 1.7. Enabling a timer - 1.8. benchmark usage + 1.8. List all timers + 1.9. List one timer + 1.10. benchmark usage 2.1. Using the benchmark module's API from another module Chapter 1. Admin Guide @@ -109,6 +113,8 @@ Chapter 1. Admin Guide 6.2. benchmark.enable_timer 6.3. benchmark.granularity 6.4. benchmark.loglevel + 6.5. benchmark.timer_list + 6.6. benchmark.timer_name_list 7. Example of usage @@ -276,6 +282,8 @@ bm_log_timer("test"); 6.2. benchmark.enable_timer 6.3. benchmark.granularity 6.4. benchmark.loglevel + 6.5. benchmark.timer_list + 6.6. benchmark.timer_name_list 6.1. benchmark.enable_global @@ -300,11 +308,80 @@ kamcmd benchmark.enable_timer test 1 Modifies the module log level. See "loglevel" variable. +6.5. benchmark.timer_list + + List data for all timers (Last complete period and global data) + Displays info close to the one output in the log by using a RPC + structure. period_sum, period_min and period_media show data for last + granularity period already completed. + + Example 1.8. List all timers +... +kamcmd benchmark.timer_list +{ + name: test + state: enabled + id: 0 + granularity: 2 + period_sum: 69 + period_min: 22 + period_max: 47 + period_media: 34.500000 + calls: 4 + sum: 217 + global_min: 22 + global_max: 88 + global_media: 54.250000 +} +{ + name: test2 + state: enabled + id: 1 + granularity: 2 + period_sum: 122 + period_min: 25 + period_max: 97 + period_media: 61.000000 + calls: 4 + sum: 349 + global_min: 25 + global_max: 151 + global_media: 87.250000 +} +... + +6.6. benchmark.timer_name_list + + List data for one timer based on its name (Last complete period and + global data) It displays info close to the one output in the log by + using a RPC structure. period_sum, period_min and period_media show + data for last granularity period already completed. + + Example 1.9. List one timer +... +kamcmd benchmark.timer_name_list test +{ + name: test + state: enabled + id: 0 + granularity: 2 + period_sum: 69 + period_min: 22 + period_max: 47 + period_media: 34.500000 + calls: 4 + sum: 217 + global_min: 22 + global_max: 88 + global_media: 54.250000 +} +... + 7. Example of usage Measure the duration of user location lookup. - Example 1.8. benchmark usage + Example 1.10. benchmark usage ... bm_start_timer("usrloc-lookup"); lookup("location");

5 years, 9 months

[kamailio/kamailio] str_hash: Option to allocate hash in shm (#1535)

by Alfonso Pinto

Added an allocator function to allocate the hash in shared memory. Added also locking stuff   #### 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  Added a new allocator function to str_hash.h. This new function allows to allocate the hash table in shared memory. Changes to struct str_hash_table: - Added a gen_lock_set_t (locks) to hold the lock set - Added an int (locks_no) to hold the number of locks - Added an indicator (memory) to know if the table was allocated in private memory (p) or shared memory(s) Changes to struct str_hash_head: - Added an int(lock_idx) that hold the index of the lock when the head is locked. Changes to struct str_hash_entry: - Added a pointer to the head the entry belongs to. This allows to unlock the head when needed. Added functions to lock and unlock the head when needed. Modified functions str_hash_add and str_hash_get to lock the head when needed Added function str_hash_destroy to remove the hash table and all its contents from memory. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1535 -- Commit Summary -- * str_hash: Option to allocate hash in shm -- File Changes -- M src/core/str_hash.h (100) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1535.patch https://github.com/kamailio/kamailio/pull/1535.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/1535

5 years, 9 months

[kamailio/kamailio] Bench branch pull (#1580)

by vhernando

#### 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  Added two RPC functions to benchmark module: timer_list and timer_name_list timer_list shows info for every timer (last complete period and global data) timer_name_list shows same info as timer_list but for a timer selected by its name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1580 -- Commit Summary -- * benchmark: RPC commands timer_list and timer_name_list * benchmark: documentation for RPC functions timer_list and timer_name_list -- File Changes -- M src/modules/benchmark/benchmark.c (185) M src/modules/benchmark/benchmark.h (3) M src/modules/benchmark/doc/benchmark_admin.xml (80) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1580.patch https://github.com/kamailio/kamailio/pull/1580.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/1580

5 years, 9 months

git:master:4ccbb45e: Merge pull request #1580 from kamailio/bench_branch_pull

by GitHub

Module: kamailio Branch: master Commit: 4ccbb45ecfe5d691ee2a423ffa21f1586ae0cf1b URL: https://github.com/kamailio/kamailio/commit/4ccbb45ecfe5d691ee2a423ffa21f15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-07-03T14:51:18+02:00 Merge pull request #1580 from kamailio/bench_branch_pull Bench branch pull --- Modified: src/modules/benchmark/benchmark.c Modified: src/modules/benchmark/benchmark.h Modified: src/modules/benchmark/doc/benchmark_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ccbb45ecfe5d691ee2a423ffa21f15… Patch: https://github.com/kamailio/kamailio/commit/4ccbb45ecfe5d691ee2a423ffa21f15…

5 years, 9 months

git:master:71d1c721: benchmark: documentation for RPC functions timer_list and timer_name_list

by Vicente Hernando

Module: kamailio Branch: master Commit: 71d1c721321d523553ac4975e6c2df95cc56a197 URL: https://github.com/kamailio/kamailio/commit/71d1c721321d523553ac4975e6c2df9… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-07-02T12:33:43+02:00 benchmark: documentation for RPC functions timer_list and timer_name_list --- Modified: src/modules/benchmark/doc/benchmark_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/71d1c721321d523553ac4975e6c2df9… Patch: https://github.com/kamailio/kamailio/commit/71d1c721321d523553ac4975e6c2df9… --- diff --git a/src/modules/benchmark/doc/benchmark_admin.xml b/src/modules/benchmark/doc/benchmark_admin.xml index d01bbc81ee..10f94b2b5c 100644 --- a/src/modules/benchmark/doc/benchmark_admin.xml +++ b/src/modules/benchmark/doc/benchmark_admin.xml @@ -332,6 +332,86 @@ bm_log_timer("test"); Modifies the module log level. See "loglevel" variable. </para> </section> + <section id="benchmark.rpc.timer_list"> + <title><function moreinfo="none">benchmark.timer_list</function></title> + <para> + List data for all timers (Last complete period and global data) + Displays info close to the one output in the log by using a RPC structure. + period_sum, period_min and period_media show data for last granularity + period already completed. + </para> + <example> + <title>List all timers</title> + <programlisting format="linespecific"> +... +&kamcmd; benchmark.timer_list +{ + name: test + state: enabled + id: 0 + granularity: 2 + period_sum: 69 + period_min: 22 + period_max: 47 + period_media: 34.500000 + calls: 4 + sum: 217 + global_min: 22 + global_max: 88 + global_media: 54.250000 +} +{ + name: test2 + state: enabled + id: 1 + granularity: 2 + period_sum: 122 + period_min: 25 + period_max: 97 + period_media: 61.000000 + calls: 4 + sum: 349 + global_min: 25 + global_max: 151 + global_media: 87.250000 +} +... +</programlisting> + </example> + </section> + <section id="benchmark.rpc.timer_name_list"> + <title><function moreinfo="none">benchmark.timer_name_list</function></title> + <para> + List data for one timer based on its name (Last complete period and global data) + It displays info close to the one output in the log by using a RPC structure. + period_sum, period_min and period_media show data for last granularity + period already completed. + </para> + <example> + <title>List one timer</title> + <programlisting format="linespecific"> +... +&kamcmd; benchmark.timer_name_list test +{ + name: test + state: enabled + id: 0 + granularity: 2 + period_sum: 69 + period_min: 22 + period_max: 47 + period_media: 34.500000 + calls: 4 + sum: 217 + global_min: 22 + global_max: 88 + global_media: 54.250000 +} +... +</programlisting> + </example> + </section> + </section> <section>

5 years, 9 months

git:master:91e84d94: benchmark: RPC commands timer_list and timer_name_list

by Vicente Hernando

Module: kamailio Branch: master Commit: 91e84d94cb267bf6f16e97b535433fee19a184a6 URL: https://github.com/kamailio/kamailio/commit/91e84d94cb267bf6f16e97b535433fe… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-07-02T11:17:22+02:00 benchmark: RPC commands timer_list and timer_name_list --- Modified: src/modules/benchmark/benchmark.c Modified: src/modules/benchmark/benchmark.h --- Diff: https://github.com/kamailio/kamailio/commit/91e84d94cb267bf6f16e97b535433fe… Patch: https://github.com/kamailio/kamailio/commit/91e84d94cb267bf6f16e97b535433fe…

5 years, 9 months

git:master:a8d4ca29: topos: detect first direction for dlg requests before linking contact

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a8d4ca293dba19b4b44110e9e7f5be71ce3c090b URL: https://github.com/kamailio/kamailio/commit/a8d4ca293dba19b4b44110e9e7f5be7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-03T09:50:46+02:00 topos: detect first direction for dlg requests before linking contact - related to GH #1571 --- 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/a8d4ca293dba19b4b44110e9e7f5be7… Patch: https://github.com/kamailio/kamailio/commit/a8d4ca293dba19b4b44110e9e7f5be7… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 0027a08203..41cb7ef416 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -936,7 +936,7 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) memset(&mtsd, 0, sizeof(tps_data_t)); memset(&btsd, 0, sizeof(tps_data_t)); memset(&stsd, 0, sizeof(tps_data_t)); - ptsd = &mtsd; + ptsd = NULL; if(tps_pack_message(msg, &mtsd)<0) { LM_ERR("failed to extract and pack the headers\n"); @@ -956,14 +956,6 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) tps_storage_lock_get(&lkey); - if(tps_storage_load_branch(msg, &mtsd, &btsd, 0)!=0) { - if(tps_storage_record(msg, ptsd, dialog)<0) { - goto error; - } - } else { - ptsd = &btsd; - } - if(dialog!=0) { if(tps_storage_load_dialog(msg, &mtsd, &stsd)==0) { ptsd = &stsd; @@ -975,6 +967,16 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) mtsd.direction = direction; } + if(tps_storage_load_branch(msg, &mtsd, &btsd, 0)!=0) { + if(tps_storage_record(msg, &mtsd, dialog, direction)<0) { + goto error; + } + } else { + if(ptsd==NULL) ptsd = &btsd; + } + + if(ptsd==NULL) ptsd = &mtsd; + /* local generated requests */ if(local) { /* ACK and CANCEL go downstream */ diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 5e0e87b249..08bf15ec8a 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -360,7 +360,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) } } - LM_DBG("downstream: %s acontact: [%.*s] bcontact: [%.*s]\n", + LM_DBG("downstream: %s - acontact: [%.*s] - bcontact: [%.*s]\n", (dir==TPS_DIR_DOWNSTREAM)?"yes":"no", td->a_contact.len, (td->a_contact.len>0)?td->a_contact.s:"", td->b_contact.len, (td->b_contact.len>0)?td->b_contact.s:""); @@ -374,7 +374,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) /** * */ -int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) +int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog, int dir) { int ret = -1; /* error if dialog == 0 */ str suid; @@ -399,7 +399,7 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) ret = tps_storage_fill_contact(msg, td, &suid, TPS_DIR_UPSTREAM); if(ret<0) goto error; - ret = tps_storage_link_msg(msg, td, TPS_DIR_DOWNSTREAM); + ret = tps_storage_link_msg(msg, td, dir); if(ret<0) goto error; if(dialog==0) { if(td->as_contact.len <= 0 && td->bs_contact.len <= 0) { diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index c10c3f2699..fc69ccca4c 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -87,7 +87,7 @@ int tps_storage_branch_find(sip_msg_t *msg, tps_data_t *td); int tps_storage_branch_save(sip_msg_t *msg, tps_data_t *td); int tps_storage_branch_rm(sip_msg_t *msg, tps_data_t *td); -int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog); +int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog, int dir); int tps_storage_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, uint32_t mode); int tps_storage_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd,

5 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2018