sr-dev May 2018

sr-dev@lists.kamailio.org

22 participants
214 discussions

git:master:896c5e1c: Module: htable:: event_callback_mode to int
by surendratiwari3 04 May '18

04 May '18

Module: kamailio Branch: master Commit: 896c5e1c76e6836bedaf66f9b832020a0d70c04b URL: https://github.com/kamailio/kamailio/commit/896c5e1c76e6836bedaf66f9b832020… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Committer: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-05-04T09:33:36+05:30 Module: htable:: event_callback_mode to int --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/896c5e1c76e6836bedaf66f9b832020… Patch: https://github.com/kamailio/kamailio/commit/896c5e1c76e6836bedaf66f9b832020… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 58b847edbf..3d7cc3e93f 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -146,7 +146,7 @@ static param_export_t params[]={ {"enable_dmq", INT_PARAM, &ht_enable_dmq}, {"timer_procs", PARAM_INT, &ht_timer_procs}, {"event_callback", PARAM_STR, &ht_event_callback}, - {"event_callback_mode", PARAM_STR, &ht_event_callback_mode}, + {"event_callback_mode", PARAM_INT, &ht_event_callback_mode}, {0,0,0} };

1 0

[kamailio/kamailio] Module: htable:: event_callback_mode to int (#1522)
by Surendra Tiwari 04 May '18

04 May '18

#### 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 - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1522 -- Commit Summary -- * Module: htable:: event_callback_mode to int -- File Changes -- M src/modules/htable/htable.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1522.patch https://github.com/kamailio/kamailio/pull/1522.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/1522

2 1

[kamailio/kamailio] I_perform_user_authorization_request(): no int value param passed (#1099)
by riccardovarotto 04 May '18

04 May '18

### Description Using I-CSCF Kamailio module with 5.0.1 version we got the error: "I_perform_user_authorization_request(): no int value param passed" Same configuration file works well on 5.0.0 version  ### Troubleshooting #### Reproduction  #### Debugging Data 1(26715) ERROR: *** cfgtrace:request_route=[register] c=[/etc/KAMAILIO_ASTERISK_CFG/IMS_5/icscf/./kamailio.cfg] l=374 a=26 n=I_perform_user_authorization_request 1(26715) ERROR: <core> [core/sr_module.c:1766]: get_int_fparam(): Unexpected param type: 1280329042 1(26715) ERROR: ims_icscf [registration.c:78]: I_perform_user_authorization_request(): no int value param passed 1(26715) ERROR: *** cfgtrace:request_route=[register] c=[/etc/KAMAILIO_ASTERISK_CFG/IMS_5/icscf/./kamailio.cfg] l=375 a=26 n=send_reply [log_ko.gz](https://github.com/kamailio/kamailio/files/961675/log_ko.gz) [kamailio.cfg.txt](https://github.com/kamailio/kamailio/files/961677/kamaili…  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1099

5 11

[kamailio/kamailio] Module: Htable:: event_callback_mode to int (#1521)
by Surendra Tiwari 04 May '18

04 May '18

#### 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 - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1521 -- Commit Summary -- * Merge pull request #2 from kamailio/master * Modules: htable:: event_callback_mode to int -- File Changes -- M src/modules/htable/htable.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1521.patch https://github.com/kamailio/kamailio/pull/1521.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/1521

1 1

git:master:4bfcbc1f: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 03 May '18

03 May '18

Module: kamailio Branch: master Commit: 4bfcbc1fd8bb412382a2271ae465dc799cf6f50f URL: https://github.com/kamailio/kamailio/commit/4bfcbc1fd8bb412382a2271ae465dc7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-03T21:31:27+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/4bfcbc1fd8bb412382a2271ae465dc7… Patch: https://github.com/kamailio/kamailio/commit/4bfcbc1fd8bb412382a2271ae465dc7…

1 0

git:master:e72a4190: htable: docs for event_callback_mode parameter
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: e72a41906da417cedb81ef8216c3c084fbb4902d URL: https://github.com/kamailio/kamailio/commit/e72a41906da417cedb81ef8216c3c08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T21:19:59+02:00 htable: docs for event_callback_mode parameter --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e72a41906da417cedb81ef8216c3c08… Patch: https://github.com/kamailio/kamailio/commit/e72a41906da417cedb81ef8216c3c08… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index d10a5ff2c8..00f7a6eb41 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -701,6 +701,30 @@ function ksr_htable_event(evname) return 1; end ... +</programlisting> + </example> + </section> + <section id="htable.p.event_callback_mode"> + <title><varname>event_callback_mode</varname> (int)</title> + <para> + Control when event_route[htable:init] is executed: 0 - after all + modules were initialized; 1 - in first worker process. + </para> + <para> + Set it to 1 if used in a KEMI script or when needing to use database + (e.g., via sqlops) inside event_route[htable:init]. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>event_callback_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("htable", "event_callback_mode", 1) +... </programlisting> </example> </section>

1 0

git:master:1b8ab845: htable: added parameter event_callback_mode
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: 1b8ab8458806106a51de26afd06be5e3a15188b0 URL: https://github.com/kamailio/kamailio/commit/1b8ab8458806106a51de26afd06be5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T21:10:12+02:00 htable: added parameter event_callback_mode - control when event_route[htable:init] is executed: 0 - after all modules were initialized; 1 - in first worker process; (default 0) - fixes use with kemi framework by using value 1, because after module initialization the kemi framework is not ready, being set up per child process - reported by GH #1519 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/1b8ab8458806106a51de26afd06be5e… Patch: https://github.com/kamailio/kamailio/commit/1b8ab8458806106a51de26afd06be5e… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index d14f914896..58b847edbf 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -53,6 +53,7 @@ int ht_timer_interval = 20; int ht_db_expires_flag = 0; int ht_enable_dmq = 0; int ht_timer_procs = 0; +static int ht_event_callback_mode = 0; str ht_event_callback = STR_NULL; @@ -131,20 +132,21 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {"htable", PARAM_STRING|USE_FUNC_PARAM, (void*)ht_param}, - {"db_url", PARAM_STR, &ht_db_url}, - {"key_name_column", PARAM_STR, &ht_db_name_column}, - {"key_type_column", PARAM_STR, &ht_db_ktype_column}, - {"value_type_column", PARAM_STR, &ht_db_vtype_column}, - {"key_value_column", PARAM_STR, &ht_db_value_column}, - {"expires_column", PARAM_STR, &ht_db_expires_column}, - {"array_size_suffix", PARAM_STR, &ht_array_size_suffix}, - {"fetch_rows", INT_PARAM, &ht_fetch_rows}, - {"timer_interval", INT_PARAM, &ht_timer_interval}, - {"db_expires", INT_PARAM, &ht_db_expires_flag}, - {"enable_dmq", INT_PARAM, &ht_enable_dmq}, - {"timer_procs", PARAM_INT, &ht_timer_procs}, - {"event_callback", PARAM_STR, &ht_event_callback}, + {"htable", PARAM_STRING|USE_FUNC_PARAM, (void*)ht_param}, + {"db_url", PARAM_STR, &ht_db_url}, + {"key_name_column", PARAM_STR, &ht_db_name_column}, + {"key_type_column", PARAM_STR, &ht_db_ktype_column}, + {"value_type_column", PARAM_STR, &ht_db_vtype_column}, + {"key_value_column", PARAM_STR, &ht_db_value_column}, + {"expires_column", PARAM_STR, &ht_db_expires_column}, + {"array_size_suffix", PARAM_STR, &ht_array_size_suffix}, + {"fetch_rows", INT_PARAM, &ht_fetch_rows}, + {"timer_interval", INT_PARAM, &ht_timer_interval}, + {"db_expires", INT_PARAM, &ht_db_expires_flag}, + {"enable_dmq", INT_PARAM, &ht_enable_dmq}, + {"timer_procs", PARAM_INT, &ht_timer_procs}, + {"event_callback", PARAM_STR, &ht_event_callback}, + {"event_callback_mode", PARAM_STR, &ht_event_callback_mode}, {0,0,0} }; @@ -219,7 +221,9 @@ static int mod_init(void) return 0; } - +/** + * + */ static int child_init(int rank) { struct sip_msg *fmsg; @@ -243,9 +247,11 @@ static int child_init(int rank) } } - if (rank!=PROC_INIT) + if (ht_event_callback_mode==0 && rank!=PROC_INIT) return 0; + if (ht_event_callback_mode==1 && rank!=PROC_SIPINIT) + return 0; rt = -1; if(ht_event_callback.s==NULL || ht_event_callback.len<=0) {

1 0

git:master:6285b5eb: core: dns - print index and remove per record type printing added previously
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: 6285b5ebe02d39bf77baa8f29d16de246dc1ad77 URL: https://github.com/kamailio/kamailio/commit/6285b5ebe02d39bf77baa8f29d16de2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T20:47:37+02:00 core: dns - print index and remove per record type printing added previously - type is already printed at the top of the structure --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/6285b5ebe02d39bf77baa8f29d16de2… Patch: https://github.com/kamailio/kamailio/commit/6285b5ebe02d39bf77baa8f29d16de2… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 0c53ebd50d..bff6ecfb97 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3804,6 +3804,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ticks_t now; str s; int i; + int n; now=get_ticks_raw(); expires = (s_ticks_t)(e->expire-now)<0?-1: TICKS_TO_S(e->expire-now); @@ -3824,16 +3825,12 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) TICKS_TO_S(now-e->last_used)); rpc->rpl_printf(ctx, "%snegative entry: %s", SPACE_FORMAT, (e->ent_flags & DNS_FLAG_BAD_NAME) ? "yes" : "no"); - + n = 0; for (rr=e->rr_lst; rr; rr=rr->next) { + rpc->rpl_printf(ctx, "%srr idx: %d", SPACE_FORMAT, n++); switch(e->type) { case T_A: case T_AAAA: - if(e->type==T_A) { - rpc->rpl_printf(ctx, "%srr type: a", SPACE_FORMAT); - } else { - rpc->rpl_printf(ctx, "%srr type: aaaa", SPACE_FORMAT); - } if (dns_rr2ip(e->type, rr, &ip)==0){ rpc->rpl_printf(ctx, "%srr ip: %s", SPACE_FORMAT, ip_addr2a(&ip) ); @@ -3843,7 +3840,6 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_SRV: - rpc->rpl_printf(ctx, "%srr type: srv", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct srv_rdata*)(rr->rdata))->name); rpc->rpl_printf(ctx, "%srr port: %d", SPACE_FORMAT, @@ -3854,7 +3850,6 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ((struct srv_rdata*)(rr->rdata))->weight); break; case T_NAPTR: - rpc->rpl_printf(ctx, "%srr type: naptr", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr order: %d", SPACE_FORMAT, ((struct naptr_rdata*)(rr->rdata))->order); rpc->rpl_printf(ctx, "%srr preference: %d", SPACE_FORMAT, @@ -3877,12 +3872,10 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) SPACE_FORMAT, s.len, s.s); break; case T_CNAME: - rpc->rpl_printf(ctx, "%srr type: cname", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct cname_rdata*)(rr->rdata))->name); break; case T_TXT: - rpc->rpl_printf(ctx, "%srr type: txt", SPACE_FORMAT); for (i=0; i<((struct txt_rdata*)(rr->rdata))->cstr_no; i++){ rpc->rpl_printf(ctx, "%stxt[%d]: %s", SPACE_FORMAT, i, @@ -3890,7 +3883,6 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_EBL: - rpc->rpl_printf(ctx, "%srr type: ebl", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr position: %d", SPACE_FORMAT, ((struct ebl_rdata*)(rr->rdata))->position); rpc->rpl_printf(ctx, "%srr separator: %s", SPACE_FORMAT, @@ -3899,7 +3891,6 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ((struct ebl_rdata*)(rr->rdata))->apex); break; case T_PTR: - rpc->rpl_printf(ctx, "%srr type: ptr", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct ptr_rdata*)(rr->rdata))->ptrdname); break;

1 0

git:master:b72e0b69: core: print rr type for rpc dns.view
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: b72e0b6984e87b42f0a578a6b220a28a80e67737 URL: https://github.com/kamailio/kamailio/commit/b72e0b6984e87b42f0a578a6b220a28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T14:39:10+02:00 core: print rr type for rpc dns.view --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/b72e0b6984e87b42f0a578a6b220a28… Patch: https://github.com/kamailio/kamailio/commit/b72e0b6984e87b42f0a578a6b220a28… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index b8d8c5e438..0c53ebd50d 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3829,6 +3829,11 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) switch(e->type) { case T_A: case T_AAAA: + if(e->type==T_A) { + rpc->rpl_printf(ctx, "%srr type: a", SPACE_FORMAT); + } else { + rpc->rpl_printf(ctx, "%srr type: aaaa", SPACE_FORMAT); + } if (dns_rr2ip(e->type, rr, &ip)==0){ rpc->rpl_printf(ctx, "%srr ip: %s", SPACE_FORMAT, ip_addr2a(&ip) ); @@ -3838,6 +3843,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_SRV: + rpc->rpl_printf(ctx, "%srr type: srv", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct srv_rdata*)(rr->rdata))->name); rpc->rpl_printf(ctx, "%srr port: %d", SPACE_FORMAT, @@ -3848,6 +3854,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ((struct srv_rdata*)(rr->rdata))->weight); break; case T_NAPTR: + rpc->rpl_printf(ctx, "%srr type: naptr", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr order: %d", SPACE_FORMAT, ((struct naptr_rdata*)(rr->rdata))->order); rpc->rpl_printf(ctx, "%srr preference: %d", SPACE_FORMAT, @@ -3870,10 +3877,12 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) SPACE_FORMAT, s.len, s.s); break; case T_CNAME: + rpc->rpl_printf(ctx, "%srr type: cname", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct cname_rdata*)(rr->rdata))->name); break; case T_TXT: + rpc->rpl_printf(ctx, "%srr type: txt", SPACE_FORMAT); for (i=0; i<((struct txt_rdata*)(rr->rdata))->cstr_no; i++){ rpc->rpl_printf(ctx, "%stxt[%d]: %s", SPACE_FORMAT, i, @@ -3881,6 +3890,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_EBL: + rpc->rpl_printf(ctx, "%srr type: ebl", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr position: %d", SPACE_FORMAT, ((struct ebl_rdata*)(rr->rdata))->position); rpc->rpl_printf(ctx, "%srr separator: %s", SPACE_FORMAT, @@ -3889,6 +3899,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ((struct ebl_rdata*)(rr->rdata))->apex); break; case T_PTR: + rpc->rpl_printf(ctx, "%srr type: ptr", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct ptr_rdata*)(rr->rdata))->ptrdname); break;

1 0

git:master:b4ad3105: kamailio.cfg: small sample for number normalization on pstw gw routing
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: b4ad3105e11559bfe502523f60b085ea720a06a5 URL: https://github.com/kamailio/kamailio/commit/b4ad3105e11559bfe502523f60b085e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T09:50:57+02:00 kamailio.cfg: small sample for number normalization on pstw gw routing --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b4ad3105e11559bfe502523f60b085e… Patch: https://github.com/kamailio/kamailio/commit/b4ad3105e11559bfe502523f60b085e… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index b55e06b0cc..13bef88de1 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -854,6 +854,13 @@ route[PSTN] { exit; } + # normalize target number for pstn gateway + # - convert leading 00 to + + if (starts_with("$rU", "00")) { + strip(2); + prefix("+"); + } + if (strempty($sel(cfg_get.pstn.gw_port))) { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); } else {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2018