- sr-dev - kamailio.org

[kamailio/kamailio] jsonrpcs: fix double free crash (#1839)
by Federico Cabiddu 04 Sep '19

04 Sep '19

#### 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 … [View More]

5 9

Planning the next major release - v5.3.0
by Daniel-Constantin Mierla 04 Sep '19

04 Sep '19

Hello, it's about the time to set the milestones to the next major release - v5.3.0. There are 6 new modules and many other enhancements to existing components in git master branch, also during the last irc devel meeting it was proposed to freeze after summer holidays. At this moment I would propose Wednesday, September 4, 2019 to freeze the development. Then the release should be about one month later, after testing interval. In case there are people willing a bit more time for development, … [View More]

2 4

git:master:f828ad87: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: f828ad875f2cbb13303e59bb090071e5cc168487 URL: https://github.com/kamailio/kamailio/commit/f828ad875f2cbb13303e59bb090071e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-04T00:31:30+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] module rr: KEMI expose record_route_preset (#2051)
by aalba6675 03 Sep '19

03 Sep '19

#### 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  rr module: expose record_route_preset to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2051 -- Commit Summary -- * module rr: KEMI expose record_route_preset -- File Changes -- M src/modules/rr/rr_mod.c (36) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2051.patch https://github.com/kamailio/kamailio/pull/2051.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/2051 [View Less]

2 2

git:master:c556067b: Merge pull request #2051 from aalba6675/kemi-rr-preset
by GitHub 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: c556067bc3c0d99b7e81ee0bd1a97c1b416617d3 URL: https://github.com/kamailio/kamailio/commit/c556067bc3c0d99b7e81ee0bd1a97c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-09-04T00:21:16+02:00 Merge pull request #2051 from aalba6675/kemi-rr-preset module rr: KEMI expose record_route_preset --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:e1ab977f: module rr: KEMI expose record_route_preset
by A Alba 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: e1ab977fd9a61864376782f2534cc0d932347d78 URL: https://github.com/kamailio/kamailio/commit/e1ab977fd9a61864376782f2534cc0d… Author: A Alba <ascanio.alba7(a)gmail.com> Committer: A Alba <ascanio.alba7(a)gmail.com> Date: 2019-09-02T01:28:48+08:00 module rr: KEMI expose record_route_preset --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e1ab977fd9a61864376782f2534cc0d… Patch: https://github.com/… [View More]

1 0

git:master:26d25b1c: nathelper: docs - added missing xml tags for the new nat test option
by Daniel-Constantin Mierla 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: 26d25b1c9e3654642f9f85c02492297ec1c03e75 URL: https://github.com/kamailio/kamailio/commit/26d25b1c9e3654642f9f85c02492297… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-04T00:19:38+02:00 nathelper: docs - added missing xml tags for the new nat test option --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/… [View More]

1 0

[kamailio/kamailio] nathelper: test sdp c line and sip source ip address is matched. (#2045)
by Yasin CANER 03 Sep '19

03 Sep '19

#### 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  test sdp c line and sip source ip address is matched. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2045 -- Commit Summary -- * nathelper: test sdp c line and sip source ip address is matched * nathelper : flag 256 is added to nathelper documentation -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (72) M src/modules/nathelper/nathelper.c (47) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2045.patch https://github.com/kamailio/kamailio/pull/2045.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/2045 [View Less]

3 19

git:master:9a5db075: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: 9a5db07510feb5fab0bdd2b7d67446f93c55ee0f URL: https://github.com/kamailio/kamailio/commit/9a5db07510feb5fab0bdd2b7d67446f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-03T23:31:47+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:ce3bfaa8: nathelper: extend nat_uac_test() to test for mismatch between connection and source IP (GH #2045)
by Henning Westerholt 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: ce3bfaa843f0efabe49bd7087e89506f3f211669 URL: https://github.com/kamailio/kamailio/commit/ce3bfaa843f0efabe49bd7087e89506… Author: Yasin Caner <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-03T23:14:16+02:00 nathelper: extend nat_uac_test() to test for mismatch between connection and source IP (GH #2045) - extend nat_uac_test function to test for mismatch between connection and source IP - add … [View More]documentation for this new flag 256 to module docs as well - based on pull request GH #2045 with smaller adaptions --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ce3bfaa843f0efabe49bd7087e89506… Patch: https://github.com/kamailio/kamailio/commit/ce3bfaa843f0efabe49bd7087e89506… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index e3c47e2d70..71b8e92479 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -666,6 +666,10 @@ fix_nated_register(); URI port differs from the source port of the request (Warning: this is might be legal or even intended combination in non NATted scenarios) </para></listitem> + <emphasis>256</emphasis> - Test if the SDP connection address is different + from source IP address. It will work also with multiple connection address + lines. + </para></listitem> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 27015b7bd8..6baaa64528 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -100,7 +100,7 @@ MODULE_VERSION #define NAT_UAC_TEST_O_1918 0x20 #define NAT_UAC_TEST_WS 0x40 #define NAT_UAC_TEST_C_PORT 0x80 - +#define NAT_UAC_TEST_SDP_CLINE 0x100 #define DEFAULT_NATPING_STATE 1 @@ -123,6 +123,7 @@ static int fixup_fix_sdp(void **param, int param_no); static int fixup_add_contact_alias(void **param, int param_no); static int add_rcv_param_f(struct sip_msg *, char *, char *); static int nh_sip_reply_received(sip_msg_t *msg); +static int test_sdp_cline(struct sip_msg *msg); static void nh_timer(unsigned int, void *); static int mod_init(void); @@ -1332,6 +1333,54 @@ static int contact_rport(struct sip_msg *msg) } } +/** +* test SDP C line ip address and source IP address match +* if all ip address matches, return 0 +* returns unmatched ip address count +* on parse error, returns -1 +*/ +static int test_sdp_cline(struct sip_msg *msg){ + sdp_session_cell_t* session; + struct ip_addr cline_addr; + int sdp_session_num = 0; + int result = 0; + + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp body\n"); + return -1; + } + + for(;;){ + session = get_sdp_session(msg, sdp_session_num); + if(!session) + break; + + if(!(session->ip_addr.len > 0 && session->ip_addr.s)) + break; + + if(session->pf==AF_INET){ + if(str2ipbuf(&session->ip_addr,&cline_addr)<0){ + LM_ERR("Couldn't get sdp c line IP address\n"); + return -1; + } + }else if(session->pf==AF_INET6){ + if(str2ip6buf(&session->ip_addr, &cline_addr)<0){ + LM_ERR("Couldn't get sdp c line IP address\n"); + return -1; + } + }else{ + LM_ERR("Couldn't get sdp address type\n"); + return -1; + } + + if(ip_addr_cmp(&msg->rcv.src_ip,&cline_addr)){ + result++; + } + sdp_session_num++; + } + + return sdp_session_num - result; +} /* * test for occurrence of RFC1918 IP address in SDP */ @@ -1441,6 +1490,12 @@ static int nat_uac_test(struct sip_msg *msg, int tests) if((tests & NAT_UAC_TEST_C_PORT) && (contact_rport(msg) > 0)) return 1; + /** + * test if sdp c line ip address matches with sip source address + */ + if((tests & NAT_UAC_TEST_SDP_CLINE) && (test_sdp_cline(msg) > 0)) + return 1; + /* no test succeeded */ return -1; } [View Less]

1 0

git:master:9094ee5b: nathelper: also return -1 in case of SDP parsing errors for sdp_1918 check, simplify code
by Henning Westerholt 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: 9094ee5b1780b3be1b89b54cb8cc32cda4e8c04b URL: https://github.com/kamailio/kamailio/commit/9094ee5b1780b3be1b89b54cb8cc32c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-03T23:21:45+02:00 nathelper: also return -1 in case of SDP parsing errors for sdp_1918 check, simplify code --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

[kamailio/kamailio] Module:phonenum: Issue in fetching resid param fixed (#2054)
by balajeesv 03 Sep '19

03 Sep '19

#### 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  Issue in fetching resid param fixed for phonenum module You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2054 -- Commit Summary -- * phonenum_fix -- File Changes -- M src/modules/phonenum/phonenum_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2054.patch https://github.com/kamailio/kamailio/pull/2054.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/2054 [View Less]

2 2

git:master:56f86535: phonenum: proper access to the str type param resid
by Daniel-Constantin Mierla 03 Sep '19

03 Sep '19

Module: kamailio Branch: master Commit: 56f86535e0ae3fcf8fa2d0b565c7ab61351678d0 URL: https://github.com/kamailio/kamailio/commit/56f86535e0ae3fcf8fa2d0b565c7ab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-03T20:03:05+02:00 phonenum: proper access to the str type param resid --- Modified: src/modules/phonenum/phonenum_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] dialog database varchar(128) too short for IPv6 (#2053)
by Anthony Messina 02 Sep '19

02 Sep '19

Related to #2043. When using the database for dialogs, the `caller_contact` and `callee_contact` columns are too short. The following seems to help. ``` ALTER TABLE kamailio.dialog ALTER COLUMN caller_contact TYPE varchar(255); ALTER TABLE kamailio.dialog ALTER COLUMN callee_contact TYPE varchar(255); ``` -- 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/2053

2 3

git:master:5518bbaa: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 5518bbaa8c27ca0fbfa173e1f7101da90b1aee6d URL: https://github.com/kamailio/kamailio/commit/5518bbaa8c27ca0fbfa173e1f7101da… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-02T19:16:50+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/5518bbaa8c27ca0fbfa173e1f7101da… … [View More]

1 0

git:master:56e53ed0: uac: docs - fixed missing ending tag
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 56e53ed0ce594a1df30b5a5dcb5b455e0346957d URL: https://github.com/kamailio/kamailio/commit/56e53ed0ce594a1df30b5a5dcb5b455… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T19:10:31+02:00 uac: docs - fixed missing ending tag --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/56e53ed0ce594a1df30b5a5dcb5b455… … [View More]

1 0

git:master:f99b8731: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: f99b8731a9e91315f75e584f34f15d3c83f086d5 URL: https://github.com/kamailio/kamailio/commit/f99b8731a9e91315f75e584f34f15d3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-02T18:46:48+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/f99b8731a9e91315f75e584f34f15d3… … [View More]

1 0

git:master:3c980e1a: uac: docs - updates about use of auth_ha1 for remote registrations
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 3c980e1a820bd5981b8f68e393a8404131b49bec URL: https://github.com/kamailio/kamailio/commit/3c980e1a820bd5981b8f68e393a8404… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T16:43:59+02:00 uac: docs - updates about use of auth_ha1 for remote registrations - added docs for rpc uac.reg_add command --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https:… [View More]//github.com/kamailio/kamailio/commit/3c980e1a820bd5981b8f68e393a8404… Patch: https://github.com/kamailio/kamailio/commit/3c980e1a820bd5981b8f68e393a8404… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 3ac4cc2a17..e6211d398b 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1278,6 +1278,43 @@ event_route[uac:reply] { </example> </section> + <section id="uac.r.uac.reg_add"> + <para> + Add a new UAC remote registration record. If one with the same + unique id is found, it is deleted. + </para> + <para> + The parameters are: + <itemizedlist> + <listitem><para>l_uuid</para></listitem> + <listitem><para>l_username</para></listitem> + <listitem><para>l_domain</para></listitem> + <listitem><para>r_username</para></listitem> + <listitem><para>r_domain</para></listitem> + <listitem><para>realm</para></listitem> + <listitem><para>auth_username</para></listitem> + <listitem><para>auth_password</para></listitem> + <listitem><para>auth_ha1</para></listitem> + <listitem><para>auth_proxy</para></listitem> + <listitem><para>expires</para></listitem> + <listitem><para>flags</para></listitem> + <listitem><para>reg_delay</para></listitem> + <listitem><para>socket</para></listitem> + </itemizedlist> + </para> + <para> + Use a dot (.) if no value should be set for auth_password or auth_ha1. + </para> + + <example> + <title><function>uac.reg_add</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_add ... +... + </programlisting> + </example> + </section> <section> @@ -1331,8 +1368,14 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>auth_password</emphasis> - authentication password, - e.g.,: xxxxxx + <emphasis>auth_password</emphasis> - authentication password in + clear text, e.g.,: xxxxxx + </para></listitem> + </itemizedlist> + <itemizedlist> + <listitem><para> + <emphasis>auth_ha1</emphasis> - hashed (HA1) authentication password, + it has priority over auth_password. </para></listitem> </itemizedlist> <itemizedlist> [View Less]

1 0

git:master:163f73fe: lib/srdb1: uac_reg schema - updated notes about auth_password and auth_ha1
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 163f73feb1f423270c3ecab7dec30b5d7cee0964 URL: https://github.com/kamailio/kamailio/commit/163f73feb1f423270c3ecab7dec30b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T16:43:09+02:00 lib/srdb1: uac_reg schema - updated notes about auth_password and auth_ha1 --- Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:9b501c49: uac: use auth_ha1 field if set for remote registrations
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 9b501c49450646b47b740c7cc82a6a755f6f10f5 URL: https://github.com/kamailio/kamailio/commit/9b501c49450646b47b740c7cc82a6a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T16:23:31+02:00 uac: use auth_ha1 field if set for remote registrations - has priority over auth_password field --- Modified: src/modules/uac/auth.h Modified: src/modules/uac/auth_alg.c … [View More]

1 0

git:master:b9cfe696: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: b9cfe696db5f7bbcbe6fc8c3ae63b4f9d640e311 URL: https://github.com/kamailio/kamailio/commit/b9cfe696db5f7bbcbe6fc8c3ae63b4f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-02T13:47:22+02:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]b9cfe696db5f7bbcbe6fc8c3ae63b4f… Patch: https://github.com/kamailio/kamailio/commit/b9cfe696db5f7bbcbe6fc8c3ae63b4f… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 842e2cfcc7..ebe872869b 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -26,6 +26,7 @@ Daniel-Constantin Mierla 3. Parameters 3.1. smode (int) + 3.2. resid (str) 4. Functions @@ -37,8 +38,9 @@ Daniel-Constantin Mierla List of Examples 1.1. Set smode parameter - 1.2. phonenum_match usage - 1.3. phonenum_match_cn usage + 1.2. Set resid parameter + 1.3. phonenum_match usage + 1.4. phonenum_match_cn usage Chapter 1. Admin Guide @@ -53,6 +55,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. smode (int) + 3.2. resid (str) 4. Functions @@ -95,10 +98,11 @@ Chapter 1. Admin Guide 3. Parameters 3.1. smode (int) + 3.2. resid (str) 3.1. smode (int) - Phone number search mode. + Phone number search mode (not in use yet). Default value is “0”. @@ -107,6 +111,23 @@ Chapter 1. Admin Guide modparam("phonenum", "smode", 0) ... +3.2. resid (str) + + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native Kamailio.cfg file, + registration is done when parsing config and finding variables. + + Default value is “” (empty). + + Example 1.2. Set resid parameter +... +modparam("phonenum", "resid", "src") +... +if(phonenum_match("1-484-555-8888", "src")) { + ... +} +... + 4. Functions 4.1. phonenum_match(num, pvc) @@ -115,14 +136,14 @@ modparam("phonenum", "smode", 0) 4.1. phonenum_match(num, pvc) Match num against the libphonenumber and set the attributes inside the - pvc container. The function has to be called before accessing a key - via: $phn(pvc=>key). + pvc result container. The function has to be called before accessing a + key via: $phn(pvc=>key). The parameters can be static strings or strings with variables. It can be used from ANY_ROUTE. - Example 1.2. phonenum_match usage + Example 1.3. phonenum_match usage ... if(phonenum_match("1-484-555-8888", "src")) { if($phn(src=>valid)==1) { @@ -144,7 +165,7 @@ if(phonenum_match("1-484-555-8888", "src")) { It can be used from ANY_ROUTE. - Example 1.3. phonenum_match_cn usage + Example 1.4. phonenum_match_cn usage ... if(phonenum_match_cn("1-484-555-8888", "US", "src")) { if($phn(src=>valid)==1) { [View Less]

1 0

git:master:67412b4b: phonenum: new param resid to register result container ids
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: 67412b4b2b377cca179de2ebe109bd56fb8a63b9 URL: https://github.com/kamailio/kamailio/commit/67412b4b2b377cca179de2ebe109bd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T13:41:03+02:00 phonenum: new param resid to register result container ids - allow use in KEMI scripting by pre-registering container result id via modparam --- Modified: src/modules/… [View More]phonenum/phonenum_mod.c Modified: src/modules/phonenum/phonenum_pv.c Modified: src/modules/phonenum/phonenum_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/67412b4b2b377cca179de2ebe109bd5… Patch: https://github.com/kamailio/kamailio/commit/67412b4b2b377cca179de2ebe109bd5… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index eaaa43c1aa..6c9e0b1d1b 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -47,6 +47,8 @@ static int w_phonenum_match_cn(struct sip_msg *msg, char *str1, char *str2, char *str3); static int phonenum_match(sip_msg_t *msg, str *tomatch, str *pvclass); +static int phonenum_resid_param(modparam_t type, void* val); + /* clang-format off */ static pv_export_t mod_pvs[] = { { {"phn", sizeof("phn")-1}, PVT_OTHER, pv_get_phonenum, 0, @@ -64,6 +66,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"smode", PARAM_INT, &phonenum_smode}, + {"resid", PARAM_STR|PARAM_USE_FUNC, &phonenum_resid_param}, {0, 0, 0} }; @@ -102,6 +105,22 @@ static void mod_destroy(void) phonenum_destroy_pv(); } +/** + * + */ +static int phonenum_resid_param(modparam_t type, void* val) +{ + str rname; + + rname.s = (char*)val; + rname.len = strlen(rname.s); + if(sr_phonenum_add_resid(&rname) < 0) { + LM_ERR("failed to register result container with id: %.*s\n", + rname.len, rname.s); + return -1; + } + return 0; +} static int phonenum_match(sip_msg_t *msg, str *tomatch, str *pvclass) { diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index a34382239a..6115d9daad 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -111,6 +111,13 @@ sr_phonenum_item_t *sr_phonenum_add_item(str *name) return it; } +int sr_phonenum_add_resid(str *rname) +{ + if(sr_phonenum_add_item(rname)==NULL) { + return -1; + } + return 0; +} int pv_parse_phonenum_name(pv_spec_p sp, str *in) { diff --git a/src/modules/phonenum/phonenum_pv.h b/src/modules/phonenum/phonenum_pv.h index b56d6f47dd..938bbac297 100644 --- a/src/modules/phonenum/phonenum_pv.h +++ b/src/modules/phonenum/phonenum_pv.h @@ -34,6 +34,7 @@ int phonenum_init_pv(int smode); void phonenum_destroy_pv(void); void phonenum_pv_reset(str *pvclass); int phonenum_update_pv(str *tomatch, str *cncode, str *pvclass); +int sr_phonenum_add_resid(str *rname); #endif [View Less]

1 0

git:master:d2bac426: phonenum: docs for resid parameter
by Daniel-Constantin Mierla 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: d2bac426192c074368bf78014e0d1d0ca97f3274 URL: https://github.com/kamailio/kamailio/commit/d2bac426192c074368bf78014e0d1d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T13:45:16+02:00 phonenum: docs for resid parameter --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] to tags generation (#1164)
by Dmitri Savolainen 02 Sep '19

02 Sep '19

### Description Not shure is this relevant issue. according to rfc3261: > When a tag is generated by a UA for insertion into a request or > response, it MUST be globally unique and cryptographically random > with at least 32 bits of randomness. Kamailio has 16 instead and distribution is not good. I look at tags for 419485 sip flows (different callid) and table below (top keys ordered by count): tag suffix; count for different flows with this suffix ed54 6258 d118 5988 56ce … [View More]

3 4

git:master:e4ae7c7a: tm: improve from-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164)
by Henning Westerholt 02 Sep '19

02 Sep '19

Module: kamailio Branch: master Commit: e4ae7c7a7c7e8696870535e3399c8b9ddf585a06 URL: https://github.com/kamailio/kamailio/commit/e4ae7c7a7c7e8696870535e3399c8b9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-02T09:54:21+02:00 tm: improve from-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164) - improve from-tag generation for uac request to include more randomness (request uri) - … [View More]

1 0

git:master:06e27d36: core: improve to-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164)
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 06e27d3608b7f75003d54dc43b3a067b511f8e7a URL: https://github.com/kamailio/kamailio/commit/06e27d3608b7f75003d54dc43b3a067… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T22:55:59+02:00 core: improve to-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164) - improve to-tag generation to include more randomness (callid body if available) - use the … [View More]recommended size of 32 bit randomness from RFC 3261 - implementation could be further improved by using a cryptographic hash algorithm - related to GH #1164 --- Modified: src/core/crc.h Modified: src/core/tags.h --- Diff: https://github.com/kamailio/kamailio/commit/06e27d3608b7f75003d54dc43b3a067… Patch: https://github.com/kamailio/kamailio/commit/06e27d3608b7f75003d54dc43b3a067… --- diff --git a/src/core/crc.h b/src/core/crc.h index a52348f168..24ba1d0e15 100644 --- a/src/core/crc.h +++ b/src/core/crc.h @@ -5,6 +5,7 @@ #include "str.h" #define CRC16_LEN 4 +#define CRC32_LEN 8 extern unsigned long int crc_32_tab[]; extern unsigned short int ccitt_tab[]; diff --git a/src/core/tags.h b/src/core/tags.h index ddfdaae411..fff879cfab 100644 --- a/src/core/tags.h +++ b/src/core/tags.h @@ -36,10 +36,10 @@ #include "str.h" #include "socket_info.h" -#define TOTAG_VALUE_LEN (MD5_LEN+CRC16_LEN+1) +#define TOTAG_VALUE_LEN (MD5_LEN+CRC32_LEN+1) /*! generate variable part of to-tag for a request; - * it will have length of CRC16_LEN, sufficiently + * it will have length of CRC32_LEN, sufficiently * long buffer must be passed to the function */ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) { @@ -50,9 +50,23 @@ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) if (msg->via1==0) return; /* no via, bad message */ suffix_source[0]=msg->via1->host; suffix_source[1]=msg->via1->port_str; - if (msg->via1->branch) - suffix_source[ss_nr++]=msg->via1->branch->value; + if (msg->via1->branch) { + suffix_source[2]=msg->via1->branch->value; + } else { + suffix_source[2].s = NULL; + suffix_source[2].len = 0; + } crcitt_string_array( tag_suffix, suffix_source, ss_nr ); + + suffix_source[0]=msg->via1->port_str; + suffix_source[1]=msg->via1->host; + if (msg->callid) { + suffix_source[2]=msg->callid->body; + } else { + suffix_source[2].s = NULL; + suffix_source[2].len = 0; + } + crcitt_string_array( tag_suffix+4, suffix_source, ss_nr ); } static void inline init_tags( char *tag, char **suffix, [View Less]

1 0

git:master:a2e5e6e2: seas: remove a code block related to tag generation which was commented out since 2006
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: a2e5e6e267b15cad23bca8be15bca06383865ed7 URL: https://github.com/kamailio/kamailio/commit/a2e5e6e267b15cad23bca8be15bca06… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T22:55:59+02:00 seas: remove a code block related to tag generation which was commented out since 2006 --- Modified: src/modules/seas/seas_action.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:bc96f46f: CONTRIBUTING.md: removed garbage bullet from commit mesage details
by Daniel-Constantin Mierla 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: bc96f46f8a9f0beefffe281398671d216c839f20 URL: https://github.com/kamailio/kamailio/commit/bc96f46f8a9f0beefffe281398671d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-01T19:24:17+02:00 CONTRIBUTING.md: removed garbage bullet from commit mesage details --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:059b8426: lost: a few bug fixes reported from source code analyzer
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 059b8426397f2802ea51db44861387386f7109e5 URL: https://github.com/kamailio/kamailio/commit/059b8426397f2802ea51db448613873… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:04:07+02:00 lost: a few bug fixes reported from source code analyzer --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/059b8426397f2802ea51db448613873… … [View More]

2 1

5.3 add rr record_route_preset to KEMI?
by Anthony Alba 01 Sep '19

01 Sep '19

Hi Daniel and Kamailio developers, Could you consider adding record_route_preset to KEMI in 5.3? If you like I can do the PR. Hope it is not too late. Regards Anthony Alba

2 1

git:master:0e74c602: rtp_media_server: use portable kamailio rand() wrapper instead of direct library call
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 0e74c602c0822393bc6032574f834e2a9030cc7b URL: https://github.com/kamailio/kamailio/commit/0e74c602c0822393bc6032574f834e2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:14:05+02:00 rtp_media_server: use portable kamailio rand() wrapper instead of direct library call --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:e98a4ee5: nathelper: use portable kamailio rand() wrapper instead of direct library call
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: e98a4ee55253302144053704c26089f440d5d7ff URL: https://github.com/kamailio/kamailio/commit/e98a4ee55253302144053704c26089f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:17:38+02:00 nathelper: use portable kamailio rand() wrapper instead of direct library call --- Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:6cc563b1: lost: use portable kamailio rand() wrapper instead of direct library call
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 6cc563b1b73bfa07911d3e6e3f35d744eb952fbf URL: https://github.com/kamailio/kamailio/commit/6cc563b1b73bfa07911d3e6e3f35d74… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:08:05+02:00 lost: use portable kamailio rand() wrapper instead of direct library call --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:06a17dbf: lib: add a comment that HA1 hash value is currently not used from uacreg module
by Henning Westerholt 01 Sep '19

01 Sep '19

Module: kamailio Branch: master Commit: 06a17dbf23d2b1d3cc1c7be69e7fb99825a534ee URL: https://github.com/kamailio/kamailio/commit/06a17dbf23d2b1d3cc1c7be69e7fb99… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T17:04:07+02:00 lib: add a comment that HA1 hash value is currently not used from uacreg module --- Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:8aeca29b: pkg/docker: updated submodule [skip ci]
by Sergey Safarov 31 Aug '19

31 Aug '19

Module: kamailio Branch: master Commit: 8aeca29b0666a6c6fbca7e7488677aad1a45e44e URL: https://github.com/kamailio/kamailio/commit/8aeca29b0666a6c6fbca7e7488677aa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-08-31T13:05:32+03:00 pkg/docker: updated submodule [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/8aeca29b0666a6c6fbca7e7488677aa… Patch: https://github.com/kamailio/… [View More]

1 0

git:master:8f98a04c: pkg/kamailio/obs: packaged kemix, lost and xhttp_prom modules
by Sergey Safarov 31 Aug '19

31 Aug '19

Module: kamailio Branch: master Commit: 8f98a04c0f9392db6a74289a184d06da11545ab0 URL: https://github.com/kamailio/kamailio/commit/8f98a04c0f9392db6a74289a184d06d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-08-31T13:03:20+03:00 pkg/kamailio/obs: packaged kemix, lost and xhttp_prom modules --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]8f98a04c0f9392db6a74289a184d06d… Patch: https://github.com/kamailio/kamailio/commit/8f98a04c0f9392db6a74289a184d06d… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8fd4254eb7..9dec32a876 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1425,7 +1425,9 @@ fi %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc %doc %{_docdir}/kamailio/modules/README.ipops +%doc %{_docdir}/kamailio/modules/README.kemix %doc %{_docdir}/kamailio/modules/README.kex +%doc %{_docdir}/kamailio/modules/README.lost %doc %{_docdir}/kamailio/modules/README.malloc_test %doc %{_docdir}/kamailio/modules/README.mangler %doc %{_docdir}/kamailio/modules/README.matrix @@ -1492,6 +1494,7 @@ fi %doc %{_docdir}/kamailio/modules/README.userblacklist %doc %{_docdir}/kamailio/modules/README.usrloc %doc %{_docdir}/kamailio/modules/README.xhttp +%doc %{_docdir}/kamailio/modules/README.xhttp_prom %doc %{_docdir}/kamailio/modules/README.xhttp_rpc %doc %{_docdir}/kamailio/modules/README.xlog %doc %{_docdir}/kamailio/modules/README.xprint @@ -1576,7 +1579,9 @@ fi %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so %{_libdir}/kamailio/modules/ipops.so +%{_libdir}/kamailio/modules/kemix.so %{_libdir}/kamailio/modules/kex.so +%{_libdir}/kamailio/modules/lost.so %{_libdir}/kamailio/modules/malloc_test.so %{_libdir}/kamailio/modules/mangler.so %{_libdir}/kamailio/modules/matrix.so @@ -1643,6 +1648,7 @@ fi %{_libdir}/kamailio/modules/userblacklist.so %{_libdir}/kamailio/modules/usrloc.so %{_libdir}/kamailio/modules/xhttp.so +%{_libdir}/kamailio/modules/xhttp_prom.so %{_libdir}/kamailio/modules/xhttp_rpc.so %{_libdir}/kamailio/modules/xlog.so %{_libdir}/kamailio/modules/xprint.so @@ -1875,7 +1881,9 @@ fi %files lua %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.app_lua +%doc %{_docdir}/kamailio/modules/README.app_lua_sr %{_libdir}/kamailio/modules/app_lua.so +%{_libdir}/kamailio/modules/app_lua_sr.so %endif @@ -2217,6 +2225,8 @@ fi %changelog +* Sat Aug 31 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-dev7 + - Packaged kemix, lost and xhttp_prom modules * Sat Mar 30 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 - Added support of openSUSE:Leap:15.0, openSUSE:Leap:15.1 and Fedora 30 dists * Thu Feb 21 2019 Sergey Safarov <s.safarov(a)gmail.com> 5.3.0-0 [View Less]

1 0

Info: Upgrading kamcli to work with Python3
by Daniel-Constantin Mierla 30 Aug '19

30 Aug '19

Hello, with the perspective that Python2 is going to be removed from the major Linux distributes starting with the beginning of next year, the work to upgrade kamcli to run with Python3 has been started. >From now on, master branch of kamcli is expected to work only with Python3: * https://github.com/kamailio/kamcli There is still work to be done to upgrade all the code, but any use of it should be done with Python3 and eventual issues to be filed on bug tracker. Of course, pull … [View More]

1 0

git:master:72a4d665: tm: void the return for sr_kemi_route() to prevent analyzer warnings
by Daniel-Constantin Mierla 30 Aug '19

30 Aug '19

Module: kamailio Branch: master Commit: 72a4d665607d3c38278a744d3af3588ed54d2a05 URL: https://github.com/kamailio/kamailio/commit/72a4d665607d3c38278a744d3af3588… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-30T09:09:33+02:00 tm: void the return for sr_kemi_route() to prevent analyzer warnings --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:932bbdb1: sl: void the return for sr_kemi_route() to prevent analyzer warnings
by Daniel-Constantin Mierla 30 Aug '19

30 Aug '19

Module: kamailio Branch: master Commit: 932bbdb19f48808fe6f40849e4798124ef4da127 URL: https://github.com/kamailio/kamailio/commit/932bbdb19f48808fe6f40849e479812… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-30T09:04:43+02:00 sl: void the return for sr_kemi_route() to prevent analyzer warnings --- Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] tls_domain subdomain matching broken (#2049)
by Laszlo 29 Aug '19

29 Aug '19

Concerns the following code: https://github.com/kamailio/kamailio/blob/master/src/modules/tls/tls_domain… Let's say `sname = sip.example.com` and `p->server_name = example.com`. ``` dotpos = sname->len - p->server_name.len; > dotpos = len("sip.example.com") - len("example.com") > dotpos = 15 - 11 = 4 if (sname->s[dotpos] == '.') > if ("sip.example.com"[4] == '.') ``` `sip.example.com"[4]` is "e", not "." so the if clause will always fail and subdomains will never be … [View More]

2 2

git:master:16beec2b: tls: proper dot position for matching subdomains
by Daniel-Constantin Mierla 29 Aug '19

29 Aug '19

Module: kamailio Branch: master Commit: 16beec2b7660d416a05f069695b4ce18e8b4e795 URL: https://github.com/kamailio/kamailio/commit/16beec2b7660d416a05f069695b4ce1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-29T18:51:17+02:00 tls: proper dot position for matching subdomains - reported by GH #2049 --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:152801ea: sl: docs - set section ids in expected format
by Daniel-Constantin Mierla 29 Aug '19

29 Aug '19

Module: kamailio Branch: master Commit: 152801eaef0d95a6cee027391b809bfe2289ef3d URL: https://github.com/kamailio/kamailio/commit/152801eaef0d95a6cee027391b809bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-29T14:36:00+02:00 sl: docs - set section ids in expected format --- Modified: pkg/docker Modified: src/modules/sl/doc/sl_functions.xml Modified: src/modules/sl/doc/sl_params.xml --- Diff: … [View More]https://github.com/kamailio/kamailio/commit/152801eaef0d95a6cee027391b809bf… Patch: https://github.com/kamailio/kamailio/commit/152801eaef0d95a6cee027391b809bf… --- diff --git a/pkg/docker b/pkg/docker index 424756ff7a..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 424756ff7aca572466a99059f76d44ce57e01646 +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 diff --git a/src/modules/sl/doc/sl_functions.xml b/src/modules/sl/doc/sl_functions.xml index bdef94866e..1bb12b76c4 100644 --- a/src/modules/sl/doc/sl_functions.xml +++ b/src/modules/sl/doc/sl_functions.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <section id="sl.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>Functions</title> - <section id="sl_send_reply"> + <section id="sl.f.sl_send_reply"> <title> <function>sl_send_reply(code, reason)</function> </title> @@ -49,14 +49,14 @@ sl_send_reply("404", "Not found"); </programlisting> </example> </section> - - <section id="send_reply"> + + <section id="sl.f.send_reply"> <title> <function moreinfo="none">send_reply(code, reason)</function> </title> <para> - For the current request, a reply is sent back having the given code - and text reason. The reply is sent stateful or stateless, depending of + For the current request, a reply is sent back having the given code + and text reason. The reply is sent stateful or stateless, depending of the <acronym>TM</acronym> module: if a transaction exists for the current request, then the reply is sent statefully, otherwise stateless. </para> @@ -88,7 +88,7 @@ send_reply("403", "Invalid user - $fU"); </example> </section> - <section id="sl_reply_error"> + <section id="sl.f.sl_reply_error"> <title> <function>sl_reply_error()</function> </title> @@ -107,7 +107,7 @@ sl_reply_error(); </example> </section> - <section id="sl_forward_reply"> + <section id="sl.f.sl_forward_reply"> <title> <function moreinfo="none">sl_forward_reply([ code, [ reason ] ])</function> </title> diff --git a/src/modules/sl/doc/sl_params.xml b/src/modules/sl/doc/sl_params.xml index 6c22e26a90..a6db7657da 100644 --- a/src/modules/sl/doc/sl_params.xml +++ b/src/modules/sl/doc/sl_params.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <section id="sl.parameters" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>Parameters</title> - <section id="default_code"> + <section id="sl.p.default_code"> <title><varname>default_code</varname> (int)</title> <para> Default reply status code. @@ -24,7 +24,7 @@ modparam("sl", "default_code", 505) </example> </section> - <section id="default_reason"> + <section id="sl.p.default_reason"> <title><varname>default_reason</varname> (str)</title> <para> Default reply reason phrase. @@ -42,7 +42,7 @@ modparam("sl", "default_reason", "Server Error") </example> </section> - <section id="bind_tm"> + <section id="sl.p.bind_tm"> <title><varname>bind_tm</varname> (int)</title> <para> Controls if SL module should attempt to bind to TM module in order @@ -61,7 +61,7 @@ modparam("sl", "bind_tm", 0) # feature disabled </example> </section> - <section id="rich_redirect"> + <section id="sl.p.rich_redirect"> <title><varname>rich_redirect</varname> (int)</title> <para> When sending a 3xx class reply, include additional branch info [View Less]

1 0

[kamailio/kamailio] Phonenum module not initialized with KEMI framework (#1883)
by balajeesv 29 Aug '19

29 Aug '19

### Description phonenum module is not working with KEMI framework, when debugged I found phonenum module functions "pv_parse_phonenum_name" "sr_phonenum_add_item" are not invoked with KEMI framework. With default config file these modules are invoked from config parser.  I am using lua KEMI framework and included phonenum module ### Troubleshooting #### Reproduction 1. Any KEMI Framework 2. Include phonenum module 3. Test to validate phonenum  #### Debugging Data  ``` (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/1883 [View Less]

2 4

git:master:8beae91f: modules: readme files regenerated - sl ... [skip ci]
by Kamailio Dev 28 Aug '19

28 Aug '19

Module: kamailio Branch: master Commit: 8beae91f8a33b16f3ca66de3d0ec7449af63994a URL: https://github.com/kamailio/kamailio/commit/8beae91f8a33b16f3ca66de3d0ec744… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-28T21:02:05+02:00 modules: readme files regenerated - sl ... [skip ci] --- Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/8beae91f8a33b16f3ca66de3d0ec744… … [View More]Patch: https://github.com/kamailio/kamailio/commit/8beae91f8a33b16f3ca66de3d0ec744… --- diff --git a/src/modules/sl/README b/src/modules/sl/README index 2091f2486d..71825ac919 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -22,6 +22,8 @@ Daniel-Constantin Mierla 2.2. default_reason (str) 2.3. bind_tm (int) 2.4. rich_redirect (int) + 2.5. event_callback_fl_ack (str) + 2.6. event_callback_lres_sent (str) 3. Functions @@ -68,10 +70,12 @@ Daniel-Constantin Mierla 1.2. default_reason example 1.3. bind_tm example 1.4. rich_redirect example - 1.5. sl_send_reply usage - 1.6. send_reply usage - 1.7. sl_reply_error usage + 1.5. event_callback_fl_ack example + 1.6. event_callback_lres_sent example + 1.7. sl_send_reply usage 1.8. send_reply usage + 1.9. sl_reply_error usage + 1.10. send_reply usage Chapter 1. Admin Guide @@ -84,6 +88,8 @@ Chapter 1. Admin Guide 2.2. default_reason (str) 2.3. bind_tm (int) 2.4. rich_redirect (int) + 2.5. event_callback_fl_ack (str) + 2.6. event_callback_lres_sent (str) 3. Functions @@ -158,6 +164,8 @@ Chapter 1. Admin Guide 2.2. default_reason (str) 2.3. bind_tm (int) 2.4. rich_redirect (int) + 2.5. event_callback_fl_ack (str) + 2.6. event_callback_lres_sent (str) 2.1. default_code (int) @@ -208,6 +216,32 @@ modparam("sl", "bind_tm", 0) # feature disabled modparam("sl", "rich_redirect", 3) ... +2.5. event_callback_fl_ack (str) + + The name of the KEMI callback function to be executed instead of + event_route[sl:filtered-ack]. This function receives a string + parameter. + + Default value: not set. + + Example 1.5. event_callback_fl_ack example +... +modparam("sl", "event_callback_fl_ack", "ksr_event_sl_filtered_ack") +... + +2.6. event_callback_lres_sent (str) + + The name of the KEMI callback function to be executed instead of + event_route[sl:local-response]. This function receives a string + parameter. + + Default value: not set. + + Example 1.6. event_callback_lres_sent example +... +modparam("sl", "event_callback_lres_sent", "ksr_event_sl_local_response") +... + 3. Functions 3.1. sl_send_reply(code, reason) @@ -236,7 +270,7 @@ modparam("sl", "rich_redirect", 3) * code - Return code. * reason - Reason phrase. - Example 1.5. sl_send_reply usage + Example 1.7. sl_send_reply usage ... sl_send_reply("404", "Not found"); ... @@ -256,7 +290,7 @@ sl_send_reply("404", "Not found"); be used on ONREPLY_ROUTE executed by tm module (upon a t_on_reply() callback). - Example 1.6. send_reply usage + Example 1.8. send_reply usage ... send_reply("404", "Not found"); ... @@ -269,7 +303,7 @@ send_reply("403", "Invalid user - $fU"); error. Usually this function should be used after a script function that returned an error code. - Example 1.7. sl_reply_error usage + Example 1.9. sl_reply_error usage ... sl_reply_error(); ... @@ -287,7 +321,7 @@ sl_reply_error(); This function can be used from ONREPLY_ROUTE. - Example 1.8. send_reply usage + Example 1.10. send_reply usage ... if(status=="408") sl_forward_reply("404", "Not found"); [View Less]

1 0

git:master:cc0b27a2: sl: added kemi callbacks for event routes
by Daniel-Constantin Mierla 28 Aug '19

28 Aug '19

Module: kamailio Branch: master Commit: cc0b27a26081a0716edcea03d86ff63296b1fdab URL: https://github.com/kamailio/kamailio/commit/cc0b27a26081a0716edcea03d86ff63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-28T20:55:39+02:00 sl: added kemi callbacks for event routes - new parameters * event_callback_fl_ack - name of callback function for filtered-ack * event_callback_lres_sent - name of … [View More]callback function for local-response --- Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/cc0b27a26081a0716edcea03d86ff63… Patch: https://github.com/kamailio/kamailio/commit/cc0b27a26081a0716edcea03d86ff63… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 10361b12e1..930a576b78 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -66,6 +66,9 @@ static str default_reason = STR_STATIC_INIT("Internal Server Error"); static int sl_bind_tm = 1; static struct tm_binds tmb; +str _sl_event_callback_fl_ack = STR_NULL; +str _sl_event_callback_lres_sent = STR_NULL; + static int w_sl_send_reply(struct sip_msg* msg, char* str1, char* str2); static int w_send_reply(struct sip_msg* msg, char* str1, char* str2); static int w_sl_reply_error(struct sip_msg* msg, char* str1, char* str2); @@ -117,6 +120,8 @@ static param_export_t params[] = { {"default_reason", PARAM_STR, &default_reason}, {"bind_tm", PARAM_INT, &sl_bind_tm}, {"rich_redirect", PARAM_INT, &sl_rich_redirect}, + {"event_callback_fl_ack", PARAM_STR, &_sl_event_callback_fl_ack}, + {"event_callback_lres_sent", PARAM_STR, &_sl_event_callback_lres_sent}, {0, 0, 0} }; diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 7cdce0cda2..83cf15bb5d 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -37,6 +37,7 @@ #include "../../core/route.h" #include "../../core/receive.h" #include "../../core/onsend.h" +#include "../../core/kemi.h" #include "sl_stats.h" #include "sl_funcs.h" #include "sl.h" @@ -58,6 +59,9 @@ static int _sl_evrt_local_response = -1; /* default disabled */ /* send path and flags in 3xx class reply */ int sl_rich_redirect = 0; +extern str _sl_event_callback_fl_ack; +extern str _sl_event_callback_lres_sent; + /*! * lookup sl event routes */ @@ -131,6 +135,9 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) int backup_rt; struct run_act_ctx ctx; + run_act_ctx_t *bctx; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("sl:local-response"); struct sip_msg pmsg; if (msg->first_line.u.request.method_value==METHOD_ACK) @@ -206,7 +213,8 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) ret = msg_send(&dst, buf.s, buf.len); mhomed=backup_mhomed; - if (unlikely(_sl_evrt_local_response >= 0)) + keng = sr_kemi_eng_get(); + if (_sl_evrt_local_response >= 0 || keng!=NULL) { if (likely(build_sip_msg_from_buf(&pmsg, buf.s, buf.len, inc_msg_no()) == 0)) @@ -279,7 +287,16 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) backup_rt = get_route_type(); set_route_type(LOCAL_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[_sl_evrt_local_response], &pmsg, 0); + + if(_sl_evrt_local_response>=0) { + run_top_route(event_rt.rlist[_sl_evrt_local_response], &pmsg, 0); + } else if (keng!=NULL) { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ctx); + sr_kemi_route(keng, msg, EVENT_ROUTE, + &_sl_event_callback_lres_sent, &evname); + sr_kemi_act_ctx_set(bctx); + } set_route_type(backup_rt); p_onsend=0; @@ -390,6 +407,10 @@ int sl_reply_error(struct sip_msg *msg ) int sl_filter_ACK(struct sip_msg *msg, unsigned int flags, void *bar ) { str *tag_str; + run_act_ctx_t ctx; + run_act_ctx_t *bctx; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("sl:filtered-ack"); if (msg->first_line.u.request.method_value!=METHOD_ACK) goto pass_it; @@ -419,9 +440,17 @@ int sl_filter_ACK(struct sip_msg *msg, unsigned int flags, void *bar ) LM_DBG("SL local ACK found -> dropping it!\n" ); update_sl_filtered_acks(); sl_run_callbacks(SLCB_ACK_FILTERED, msg, 0, 0, 0, 0); + keng = sr_kemi_eng_get(); if(unlikely(_sl_filtered_ack_route>=0)) { run_top_route(event_rt.rlist[_sl_filtered_ack_route], msg, 0); + } else if(keng!=NULL) { + init_run_actions_ctx(&ctx); + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ctx); + sr_kemi_route(keng, msg, EVENT_ROUTE, + &_sl_event_callback_fl_ack, &evname); + sr_kemi_act_ctx_set(bctx); } return 0; } [View Less]

1 0

git:master:f1953708: sl: docs for new params event_callback_fl_ack and event_callback_lres_sent
by Daniel-Constantin Mierla 28 Aug '19

28 Aug '19

Module: kamailio Branch: master Commit: f1953708c37f0abd020cffff44991b47c4cacfdd URL: https://github.com/kamailio/kamailio/commit/f1953708c37f0abd020cffff44991b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-28T20:55:39+02:00 sl: docs for new params event_callback_fl_ack and event_callback_lres_sent --- Modified: src/modules/sl/doc/sl_params.xml --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

controlling presence with new module `pua_json`
by Bill Neely 28 Aug '19

28 Aug '19

Has anyone been successful in using this procedure with Grandstream phone behind NAT? Bill

2 1

[kamailio/kamailio] topos_d and topos_t database varchar(128) too short for IPv6 (#2043)
by Anthony Messina 27 Aug '19

27 Aug '19

With the default `*_contact ` address columns as `varchar(128)`, TOPOS is unable to handle inserting values into the database when using IPv6, which often has contact information hitting or exceeding 256 chars (tested with PostgreSQL). Perhaps these columns can be switched to the `text` type. -- 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/2043

3 7

git:master:b6763b85: kamctl: regenerate database creation scripts after scheme extensions
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: b6763b8527b627b1bec158b3a3a9c0ef8148cb6c URL: https://github.com/kamailio/kamailio/commit/b6763b8527b627b1bec158b3a3a9c0e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T22:00:12+02:00 kamctl: regenerate database creation scripts after scheme extensions --- Modified: utils/kamctl/db_sqlite/avpops-create.sql Modified: utils/kamctl/db_sqlite/carrierroute-create.sql Modified: … [View More]utils/kamctl/db_sqlite/dialog-create.sql Modified: utils/kamctl/db_sqlite/msilo-create.sql Modified: utils/kamctl/db_sqlite/pdt-create.sql Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/db_sqlite/purple-create.sql Modified: utils/kamctl/db_sqlite/registrar-create.sql Modified: utils/kamctl/db_sqlite/rls-create.sql Modified: utils/kamctl/db_sqlite/siptrace-create.sql Modified: utils/kamctl/db_sqlite/speeddial-create.sql Modified: utils/kamctl/db_sqlite/topos-create.sql Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/mysql/avpops-create.sql Modified: utils/kamctl/mysql/carrierroute-create.sql Modified: utils/kamctl/mysql/dialog-create.sql Modified: utils/kamctl/mysql/msilo-create.sql Modified: utils/kamctl/mysql/pdt-create.sql Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/mysql/purple-create.sql Modified: utils/kamctl/mysql/registrar-create.sql Modified: utils/kamctl/mysql/rls-create.sql Modified: utils/kamctl/mysql/siptrace-create.sql Modified: utils/kamctl/mysql/speeddial-create.sql Modified: utils/kamctl/mysql/topos-create.sql Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/avpops-create.sql Modified: utils/kamctl/oracle/carrierroute-create.sql Modified: utils/kamctl/oracle/dialog-create.sql Modified: utils/kamctl/oracle/msilo-create.sql Modified: utils/kamctl/oracle/pdt-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/oracle/purple-create.sql Modified: utils/kamctl/oracle/registrar-create.sql Modified: utils/kamctl/oracle/rls-create.sql Modified: utils/kamctl/oracle/siptrace-create.sql Modified: utils/kamctl/oracle/speeddial-create.sql Modified: utils/kamctl/oracle/topos-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/avpops-create.sql Modified: utils/kamctl/postgres/carrierroute-create.sql Modified: utils/kamctl/postgres/dialog-create.sql Modified: utils/kamctl/postgres/msilo-create.sql Modified: utils/kamctl/postgres/pdt-create.sql Modified: utils/kamctl/postgres/presence-create.sql Modified: utils/kamctl/postgres/purple-create.sql Modified: utils/kamctl/postgres/registrar-create.sql Modified: utils/kamctl/postgres/rls-create.sql Modified: utils/kamctl/postgres/siptrace-create.sql Modified: utils/kamctl/postgres/speeddial-create.sql Modified: utils/kamctl/postgres/topos-create.sql Modified: utils/kamctl/postgres/uac-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/b6763b8527b627b1bec158b3a3a9c0e… Patch: https://github.com/kamailio/kamailio/commit/b6763b8527b627b1bec158b3a3a9c0e… [View Less]

1 0

git:master:5d9109a0: lib: change topos DB scheme for *contact from uri_len to contact_len, 512 (GH #2043)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 5d9109a0b901f3d959ee01a3b234841671a72c9b URL: https://github.com/kamailio/kamailio/commit/5d9109a0b901f3d959ee01a3b234841… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:58:41+02:00 lib: change topos DB scheme for *contact from uri_len to contact_len, 512 (GH #2043) --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml --- Diff: https:… [View More]//github.com/kamailio/kamailio/commit/5d9109a0b901f3d959ee01a3b234841… Patch: https://github.com/kamailio/kamailio/commit/5d9109a0b901f3d959ee01a3b234841… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index 12a235f73b..f0ee77473f 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -84,7 +84,7 @@ <column id="a_contact"> <name>a_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - A side</description> </column> @@ -92,7 +92,7 @@ <column id="b_contact"> <name>b_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - B side</description> </column> @@ -100,7 +100,7 @@ <column id="as_contact"> <name>as_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - server A side</description> </column> @@ -108,7 +108,7 @@ <column id="bs_contact"> <name>bs_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - server B side</description> </column> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index ca7eab9d5f..0fdda01590 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -137,7 +137,7 @@ <column id="a_contact"> <name>a_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - A side</description> </column> @@ -145,7 +145,7 @@ <column id="b_contact"> <name>b_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - B side</description> </column> @@ -153,7 +153,7 @@ <column id="as_contact"> <name>as_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - server A side</description> </column> @@ -161,7 +161,7 @@ <column id="bs_contact"> <name>bs_contact</name> <type>string</type> - <size>&uri_len;</size> + <size>&contact_len;</size> <default/> <description>Contact address - server B side</description> </column> [View Less]

1 0

git:master:f318c29b: lib: use socket_len for location received and topos IP address DB scheme (no change table definitions)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: f318c29bb86208a95a65ed6f00b12647f2c86b6f URL: https://github.com/kamailio/kamailio/commit/f318c29bb86208a95a65ed6f00b1264… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:49:31+02:00 lib: use socket_len for location received and topos IP address DB scheme (no change table definitions) --- Modified: src/lib/srdb1/schema/location.xml Modified: src/lib/srdb1/schema/topos_d.xml … [View More]

1 0

git:master:a222ad2f: lib: change uri_len from 128 to 255 for DB scheme (GH #2043)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: a222ad2f384aeb025de7caa345cfc1e49b45defe URL: https://github.com/kamailio/kamailio/commit/a222ad2f384aeb025de7caa345cfc1e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:56:54+02:00 lib: change uri_len from 128 to 255 for DB scheme (GH #2043) --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:7f205a7b: - lib: use new introduced socket_len in topos and uacreg DB scheme (no actual change in definition)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 7f205a7bee0df7f1966f77250f765e5947fcd4dc URL: https://github.com/kamailio/kamailio/commit/7f205a7bee0df7f1966f77250f765e5… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:41:33+02:00 - lib: use new introduced socket_len in topos and uacreg DB scheme (no actual change in definition) --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml … [View More]Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/7f205a7bee0df7f1966f77250f765e5… Patch: https://github.com/kamailio/kamailio/commit/7f205a7bee0df7f1966f77250f765e5… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index 5b13333d62..e544bdd0db 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -202,7 +202,7 @@ <column id="a_socket"> <name>a_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - A side</description> </column> @@ -210,7 +210,7 @@ <column id="b_socket"> <name>b_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - B side</description> </column> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index c6bc095aeb..ca7eab9d5f 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -209,7 +209,7 @@ <column id="a_socket"> <name>a_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - A side</description> </column> @@ -217,7 +217,7 @@ <column id="b_socket"> <name>b_socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Socket address - B side</description> </column> diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index 985b27f8ec..d6257d0cf4 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -137,7 +137,7 @@ <column id="socket"> <name>socket</name> <type>string</type> - <size>&uri_len;</size> + <size>&socket_len;</size> <default/> <description>Used socket for sending out requests</description> </column> [View Less]

1 0

git:master:c5bd1556: lib: use domain_len for dialog socket in database scheme (no change in table definitions)
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: c5bd15567e56c4798aa15e670550e313bb0bf7c4 URL: https://github.com/kamailio/kamailio/commit/c5bd15567e56c4798aa15e670550e31… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:37:49+02:00 lib: use domain_len for dialog socket in database scheme (no change in table definitions) --- Modified: src/lib/srdb1/schema/dialog.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:ab3ad7ed: lib: add new DB scheme entity 'socket_len' with length 128 to prepare the change of uri_len
by Henning Westerholt 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: ab3ad7ed318f3b76c75c716ad1c0e280bb478262 URL: https://github.com/kamailio/kamailio/commit/ab3ad7ed318f3b76c75c716ad1c0e28… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-27T21:38:14+02:00 lib: add new DB scheme entity 'socket_len' with length 128 to prepare the change of uri_len --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

controlling presence with new module `pua_json`
by Bill Neely 27 Aug '19

27 Aug '19

Has anyone been successful in using this procedure with Grandstream phones behind NAT?

1 0

RFC: about sl and tm local-response event routes
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Hello, just discovered what I consider to be an inconsistency in naming and behaviour for event_route blocks for local-request and local-response and starting a discussion here to see how to move on. The event_route[tm:local-request] is executed before sending there local generated request out (allowing also to change its content, drop, etc...). This event route is quite popular event route used when the local generated requests need to be checked or updates. The event_route[tm:local-… [View More]

4 5

git:master:88350ffb: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 88350ffb64c9655f195bf9e96be9645589094370 URL: https://github.com/kamailio/kamailio/commit/88350ffb64c9655f195bf9e96be9645… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T13:31:45+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/88350ffb64c9655f195bf9e96be9645… … [View More]

1 0

git:master:a2b8e829: tm: new parameter event_callback_lres_sent
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: a2b8e8296f3a56b9ba96f043e3297e4e65d95a58 URL: https://github.com/kamailio/kamailio/commit/a2b8e8296f3a56b9ba96f043e3297e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T13:22:24+02:00 tm: new parameter event_callback_lres_sent - set the name of callback function to be executed in KEMI scripts for event_route[tm:local-response] --- Modified: src/modules/tm/… [View More]t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/a2b8e8296f3a56b9ba96f043e3297e4… Patch: https://github.com/kamailio/kamailio/commit/a2b8e8296f3a56b9ba96f043e3297e4… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 25ece75fa6..350be35bdd 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -98,6 +98,8 @@ static int goto_on_reply=0; int goto_on_sl_reply=0; extern str on_sl_reply_name; +extern str _tm_event_callback_lres_sent; + /* remap 503 response code to 500 */ extern int tm_remap_503_500; /* send path and flags in 3xx class reply */ @@ -454,7 +456,10 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, struct tmcb_params onsend_params; int rt, backup_rt; struct run_act_ctx ctx; + struct run_act_ctx *bctx; struct sip_msg pmsg; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("tm:local-response-sent"); init_cancel_info(&cancel_data); if (!buf) @@ -558,17 +563,20 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, &onsend_params); } - if(_tm_local_response_sent_lookup == 0) { - rt = route_lookup(&event_rt, "tm:local-response"); - _tm_local_response_sent_lookup = 1; - } else { - rt = -1; + if(_tm_event_callback_lres_sent.len>0 + && _tm_event_callback_lres_sent.s!=NULL) { + keng = sr_kemi_eng_get(); + } + rt = -1; + if(likely(keng==NULL)) { + if(_tm_local_response_sent_lookup == 0) { + rt = route_lookup(&event_rt, "tm:local-response"); + _tm_local_response_sent_lookup = 1; + } } - if (unlikely(rt >= 0 && event_rt.rlist[rt] != NULL)) - { + if ((rt >= 0 && event_rt.rlist[rt] != NULL) || (keng != NULL)) { if (likely(build_sip_msg_from_buf(&pmsg, buf, len, - inc_msg_no()) == 0)) - { + inc_msg_no()) == 0)) { struct onsend_info onsnd_info; onsnd_info.to=&(trans->uas.response.dst.to); @@ -580,11 +588,21 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, backup_rt = get_route_type(); set_route_type(LOCAL_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], &pmsg, 0); + if(keng == NULL) { + run_top_route(event_rt.rlist[rt], &pmsg, 0); + } else { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ctx); + sr_kemi_route(keng, &pmsg, EVENT_ROUTE, + &_tm_event_callback_lres_sent, &evname); + sr_kemi_act_ctx_set(bctx); + } set_route_type(backup_rt); p_onsend=0; free_sip_msg(&pmsg); + } else { + LM_ERR("failed to build sip msg structure\n"); } } diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 99e20afcd3..6cbdaf1776 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -218,6 +218,7 @@ str contact_flows_avp = {0, 0}; str ulattrs_xavp_name = {NULL, 0}; str on_sl_reply_name = {NULL, 0}; int tm_remap_503_500 = 1; +str _tm_event_callback_lres_sent = {NULL, 0}; int tm_failure_exec_mode = 0; @@ -469,6 +470,7 @@ static param_export_t params[]={ {"event_callback", PARAM_STR, &tm_event_callback }, {"relay_100", PARAM_INT, &default_tm_cfg.relay_100 }, {"rich_redirect" , PARAM_INT, &tm_rich_redirect }, + {"event_callback_lres_sent", PARAM_STR, &_tm_event_callback_lres_sent }, {0,0,0} }; [View Less]

1 0

git:master:e78d2ffb: tm: docs for event_callback_lres_sent param
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: e78d2ffb2537f4272fd9a796e640edb4e4a75736 URL: https://github.com/kamailio/kamailio/commit/e78d2ffb2537f4272fd9a796e640edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T13:22:24+02:00 tm: docs for event_callback_lres_sent param --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:234f201e: tm: lookup envet route for local-response only once
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 234f201e180289414d6a45b7ecfe696273a54182 URL: https://github.com/kamailio/kamailio/commit/234f201e180289414d6a45b7ecfe696… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T13:22:24+02:00 tm: lookup envet route for local-response only once --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:613fba97: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 613fba9704b497e6181802a7aa68fb3b476d4897 URL: https://github.com/kamailio/kamailio/commit/613fba9704b497e6181802a7aa68fb3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T13:01:47+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/613fba9704b497e6181802a7aa68fb3… … [View More]

1 0

git:master:d3211fdf: tm: event_route[local-response] is actually executed after response is sent
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: d3211fdff1cfb9596a5339eff2184f1a91508bd2 URL: https://github.com/kamailio/kamailio/commit/d3211fdff1cfb9596a5339eff2184f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T12:49:20+02:00 tm: event_route[local-response] is actually executed after response is sent - change back after previous commit - somehow it is incoherent with event_route[local-request] that … [View More]

1 0

git:master:755e15fc: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 755e15fcfc4d36cdeff974a7ab701f3cdd445c78 URL: https://github.com/kamailio/kamailio/commit/755e15fcfc4d36cdeff974a7ab701f3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T09:46:47+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/755e15fcfc4d36cdeff974a7ab701f3… … [View More]

1 0

git:master:18303418: tm: docs - include dockbook entities in event route file
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 18303418756952ce0d850d8994cc485a823d547c URL: https://github.com/kamailio/kamailio/commit/18303418756952ce0d850d8994cc485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T09:37:09+02:00 tm: docs - include dockbook entities in event route file --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:be8ba0da: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: be8ba0dab1ee36ae517cef52c023cd83440f4af9 URL: https://github.com/kamailio/kamailio/commit/be8ba0dab1ee36ae517cef52c023cd8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-27T09:31:51+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/be8ba0dab1ee36ae517cef52c023cd8… … [View More]Patch: https://github.com/kamailio/kamailio/commit/be8ba0dab1ee36ae517cef52c023cd8… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 47598f379e..7f0970a4e3 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -149,7 +149,7 @@ Daniel-Constantin Mierla 6. Event Routes - 6.1. event_route[tm:branch-failure] + 6.1. event_route[tm:branch-failure:id] 6.2. event_route[tm:local-request] 6.3. event_route[tm:local-response] @@ -268,9 +268,9 @@ Daniel-Constantin Mierla 1.93. t_is_retr_async_reply usage 1.94. t_uac_send usage 1.95. t_get_status_code usage - 1.96. event_route[tm:branch-failure] usage - 1.97. event_route[tm:local-request] usage - 1.98. event_route[tm:local-response] usage + 1.96. event_route[tm:branch-failure:id] usage + 1.1. event_route[tm:local-request] usage + 1.2. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -400,7 +400,7 @@ Chapter 1. Admin Guide 6. Event Routes - 6.1. event_route[tm:branch-failure] + 6.1. event_route[tm:branch-failure:id] 6.2. event_route[tm:local-request] 6.3. event_route[tm:local-response] @@ -2964,21 +2964,21 @@ if($var(ts) == 500) { ... } 6. Event Routes - 6.1. event_route[tm:branch-failure] + 6.1. event_route[tm:branch-failure:id] 6.2. event_route[tm:local-request] 6.3. event_route[tm:local-response] -6.1. event_route[tm:branch-failure] +6.1. event_route[tm:branch-failure:id] Named branch failure routes can be defined to run when when a failure response is received. This allows handling failures on individual branches, for example, retrying an alternative outbound flow. - The format of the event_route name is "tm:branch-failure:<name>" and is + The format of the event_route name is "tm:branch-failure:<id>" and is enabled with the t_on_branch_failure function. This event_route uses the BRANCH_FAILURE_ROUTE route type. - Example 1.96. event_route[tm:branch-failure] usage + Example 1.96. event_route[tm:branch-failure:id] usage ... request_route { ... @@ -2993,8 +2993,15 @@ event_route[tm:branch-failure:myroute] { 6.2. event_route[tm:local-request] - Executed after the tm module has sent a local generated, transaction - stateful request. + Executed when the tm module generates a request, in other words, the + request originates from and a transaction is created for it. The source + of the requests can be tm itself or other modules that use tm + internally (e.g., msilo, uac). The event route is executed if it is + defined in the native config file. To execute the equivalent callback + when using KEMI scripting, see the 'event_callback' module parameter. + + The request can still be updated, i.e., changes are possible to R-URI + ($ru), destination URI ($du) or the send socket ($fs). Example 1.97. event_route[tm:local-request] usage ... @@ -3006,8 +3013,8 @@ event_route [tm:local-request] { 6.3. event_route[tm:local-response] - Executed after the tm module has sent a local generated, transaction - stateful response. + Executed when the tm module is about to send a local generated, + transaction stateful response. Example 1.98. event_route[tm:local-response] usage ... [View Less]

1 0

git:5.1:a792b1cf: siptrace: check if trace_to_database is set before checking the db connection
by Federico Cabiddu 27 Aug '19

27 Aug '19

Module: kamailio Branch: 5.1 Commit: a792b1cfd927e1c29385a229d82b96c91b86b9ab URL: https://github.com/kamailio/kamailio/commit/a792b1cfd927e1c29385a229d82b96c… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-08-27T09:28:12+02:00 siptrace: check if trace_to_database is set before checking the db connection (cherry picked from commit afd0c929dc72a975e2ca3c88f307fd8c140a4fda) --- Modified: src/modules/… [View More]

1 0

git:5.2:94b60464: siptrace: check if trace_to_database is set before checking the db connection
by Federico Cabiddu 27 Aug '19

27 Aug '19

Module: kamailio Branch: 5.2 Commit: 94b60464c9ccac49ebae238aa42ae16fb2c5f9ec URL: https://github.com/kamailio/kamailio/commit/94b60464c9ccac49ebae238aa42ae16… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-08-27T09:27:54+02:00 siptrace: check if trace_to_database is set before checking the db connection (cherry picked from commit afd0c929dc72a975e2ca3c88f307fd8c140a4fda) --- Modified: src/modules/… [View More]

1 0

[kamailio/kamailio] siptrace: check if trace_to_database is set before checking the db co… (#2047)
by Federico Cabiddu 27 Aug '19

27 Aug '19

…nnection   #### 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:  - [ X] PR should be backported to stable branches - [ X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Return the proper error code to not stop message processing in reply_route. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2047 -- Commit Summary -- * siptrace: check if trace_to_database is set before checking the db connection -- File Changes -- M src/modules/siptrace/siptrace.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2047.patch https://github.com/kamailio/kamailio/pull/2047.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/2047 [View Less]

2 2

git:master:042971bc: Merge pull request #2047 from kamailio/grumvalski/siptrace_fix
by GitHub 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 042971bcb6bb47ced735f5405fa5534f94d81dce URL: https://github.com/kamailio/kamailio/commit/042971bcb6bb47ced735f5405fa5534… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-27T09:26:48+02:00 Merge pull request #2047 from kamailio/grumvalski/siptrace_fix siptrace: check if trace_to_database is set before checking the db coâ¦ --- Modified: src/modules/siptrace/siptrace.c --- … [View More]

1 0

git:master:afd0c929: siptrace: check if trace_to_database is set before checking the db connection
by Federico Cabiddu 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: afd0c929dc72a975e2ca3c88f307fd8c140a4fda URL: https://github.com/kamailio/kamailio/commit/afd0c929dc72a975e2ca3c88f307fd8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2019-08-26T20:21:13+02:00 siptrace: check if trace_to_database is set before checking the db connection --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:b241fc7e: tm: docs - clarifications about event routes
by Daniel-Constantin Mierla 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: b241fc7e1d20098dd8b0666297303fe7255587e8 URL: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-27T09:17:18+02:00 tm: docs - clarifications about event routes --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]b241fc7e1d20098dd8b0666297303fe… Patch: https://github.com/kamailio/kamailio/commit/b241fc7e1d20098dd8b0666297303fe… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index adda5536ed..b969695c9a 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -10,20 +10,20 @@ <section id="tm.e.branch-failure"> <title> - <function moreinfo="none">event_route[tm:branch-failure]</function> + <function moreinfo="none">event_route[tm:branch-failure:id]</function> </title> <para> Named branch failure routes can be defined to run when when a failure response is received. This allows handling failures on individual branches, for example, retrying an alternative outbound flow. </para> - <para> - The format of the event_route name is "tm:branch-failure:<name>" - and is enabled with the t_on_branch_failure function. - This event_route uses the BRANCH_FAILURE_ROUTE route type. - </para> + <para> + The format of the event_route name is "tm:branch-failure:<id>" + and is enabled with the t_on_branch_failure function. + This event_route uses the BRANCH_FAILURE_ROUTE route type. + </para> <example> - <title><function>event_route[tm:branch-failure]</function> usage</title> + <title><function>event_route[tm:branch-failure:id]</function> usage</title> <programlisting> ... request_route { @@ -44,7 +44,17 @@ event_route[tm:branch-failure:myroute] { <function moreinfo="none">event_route[tm:local-request]</function> </title> <para> - Executed after the tm module has sent a local generated, transaction stateful request. + Executed when the tm module generates a request, in other words, + the request originates from &kamailio; and a transaction is created + for it. The source of the requests can be tm itself or other modules + that use tm internally (e.g., msilo, uac). The event route is executed + if it is defined in the native &kamailio; config file. To execute + the equivalent callback when using KEMI scripting, see the + 'event_callback' module parameter. + </para> + <para> + The request can still be updated, i.e., changes are possible to + R-URI ($ru), destination URI ($du) or the send socket ($fs). </para> <example> <title><function>event_route[tm:local-request]</function> usage</title> @@ -63,7 +73,8 @@ event_route [tm:local-request] { <function moreinfo="none">event_route[tm:local-response]</function> </title> <para> - Executed after the tm module has sent a local generated, transaction stateful response. + Executed when the tm module is about to send a local generated, + transaction stateful response. </para> <example> <title><function>event_route[tm:local-response]</function> usage</title> [View Less]

1 0

[kamailio/kamailio] pkg/kamailio/alpine: packaged MongoDB module (#2000)
by sergey-safarov 27 Aug '19

27 Aug '19

#### 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 - [ x Related to issue #1995 #### Description Packaged MongoDB driver for Alpine dist Need wait utils merged [PR for alpine dist](https://github.com/alpinelinux/aports/… [View More]

2 3

git:master:fa7e915b: pkg/kamailio/alpine: packaged MongoDB module [skip ci]
by sergey-safarov 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: fa7e915b31965709be6549076f70ff6a65817db0 URL: https://github.com/kamailio/kamailio/commit/fa7e915b31965709be6549076f70ff6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: sergey-safarov <s.safarov(a)gmail.com> Date: 2019-08-27T09:44:21+03:00 pkg/kamailio/alpine: packaged MongoDB module [skip ci] --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/fa7e915b31965709be6549076f70ff6… … [View More]

1 0

git:master:6b52ccc6: pkg/docker: updated submodule
by Sergey Safarov 27 Aug '19

27 Aug '19

Module: kamailio Branch: master Commit: 6b52ccc6176da328205dafcde55a34af59f1729e URL: https://github.com/kamailio/kamailio/commit/6b52ccc6176da328205dafcde55a34a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-08-27T09:40:52+03:00 pkg/docker: updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/6b52ccc6176da328205dafcde55a34a… Patch: https://github.com/kamailio/kamailio/… [View More]

1 0

[kamailio/kamailio] rtpengine module set_rtpengine_set(set1, set2) issue (#2039)
by juha-h 26 Aug '19

26 Aug '19

My Kamailio master based test sip proxy has two rtpengine sets: ``` # sip-proxy_ctl rtpengine.show all { url: udp:192.26.134.1:6050 set: 0 index: 0 weight: 1 disabled: 0 recheck_ticks: 0 } { url: udp:192.26.134.40:6050 set: 1 index: 1 weight: 1 disabled: 0 recheck_ticks: 0 } ``` Config calls set_rtpengine_set() with two set argument followed by rtpengine_offer(): ``` set_rtpengine_set("1", "0"); rtpengine_offer("..."); ``` Debug shows that sip proxy sends TWO offer commands to the … [View More]

1 5

[kamailio/kamailio] modules/rtpengine: set_rtpengine_set fix (#2040)
by juha-h 26 Aug '19

26 Aug '19

WIthout this fix, set_rtpengine_set(set1, set2) sets set1 twice and set2 not at all. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2040 -- Commit Summary -- * modules/rtpengine: set_rtpengine_set fix -- File Changes -- M src/modules/rtpengine/rtpengine.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2040.patch https://github.com/kamailio/kamailio/pull/2040.diff -- You are receiving this because … [View More]

3 5

git:master:e4edf538: Merge pull request #2040 from kamailio/set_rtpengine_set
by GitHub 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: e4edf53858c399e5a3e635d04725a8a137523d15 URL: https://github.com/kamailio/kamailio/commit/e4edf53858c399e5a3e635d04725a8a… Author: juha-h <jh(a)tutpro.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-26T21:43:53+03:00 Merge pull request #2040 from kamailio/set_rtpengine_set modules/rtpengine: set_rtpengine_set fix --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:fe6614fe: modules/rtpengine: set_rtpengine_set fix
by Juha Heinanen 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: fe6614feb5f9b062a556de82fd7df6fc12c96471 URL: https://github.com/kamailio/kamailio/commit/fe6614feb5f9b062a556de82fd7df6f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2019-08-23T10:05:33+03:00 modules/rtpengine: set_rtpengine_set fix --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/fe6614feb5f9b062a556de82fd7df6f… Patch: https://github.com/… [View More]

1 0

git:master:78a62e19: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: 78a62e19955ada9d67245031780bad29035b0ef2 URL: https://github.com/kamailio/kamailio/commit/78a62e19955ada9d67245031780bad2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-26T16:02:22+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/78a62e19955ada9d67245031780bad2… … [View More]

1 0

git:master:fa3c97a3: tm: docs - note about kemi for on_sl_reply parameter
by Daniel-Constantin Mierla 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: fa3c97a331b06ea675e830f418771e94375216cc URL: https://github.com/kamailio/kamailio/commit/fa3c97a331b06ea675e830f418771e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-26T15:52:29+02:00 tm: docs - note about kemi for on_sl_reply parameter --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:3f1b5142: tm: lookup on_sl_reply route in mod_init()
by Daniel-Constantin Mierla 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: 3f1b5142c45f979b7847b2878ccf3b130baeae65 URL: https://github.com/kamailio/kamailio/commit/3f1b5142c45f979b7847b2878ccf3b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-26T13:31:29+02:00 tm: lookup on_sl_reply route in mod_init() - moved from fixup during modparam to store the name of the route block --- Modified: src/modules/tm/t_reply.c Modified: src/… [View More]modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/3f1b5142c45f979b7847b2878ccf3b1… Patch: https://github.com/kamailio/kamailio/commit/3f1b5142c45f979b7847b2878ccf3b1… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index f138e9a2e4..1fa7f9dda8 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -96,6 +96,7 @@ static int goto_on_branch_failure=0; static int goto_on_reply=0; /* where to go on receipt of reply without transaction context */ int goto_on_sl_reply=0; +extern str on_sl_reply_name; /* remap 503 response code to 500 */ extern int tm_remap_503_500; diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 370d477109..105bbaf1f2 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -96,7 +96,6 @@ static int fixup_on_branch_failure(void** param, int param_no); static int fixup_on_reply(void** param, int param_no); static int fixup_on_branch(void** param, int param_no); static int fixup_t_reply(void** param, int param_no); -static int fixup_on_sl_reply(modparam_t type, void* val); static int fixup_t_relay_to(void** param, int param_no); static int fixup_t_is_set(void** param, int param_no); @@ -217,7 +216,7 @@ static char *fr_inv_timer_param = 0 /*FR_INV_TIMER_AVP*/; str contacts_avp = {0, 0}; str contact_flows_avp = {0, 0}; str ulattrs_xavp_name = {NULL, 0}; - +str on_sl_reply_name = {NULL, 0}; int tm_remap_503_500 = 1; int tm_failure_exec_mode = 0; @@ -454,7 +453,7 @@ static param_export_t params[]={ {"cancel_b_method", PARAM_INT, &default_tm_cfg.cancel_b_flags}, {"reparse_on_dns_failover", PARAM_INT, &default_tm_cfg.reparse_on_dns_failover}, - {"on_sl_reply", PARAM_STRING|PARAM_USE_FUNC, fixup_on_sl_reply }, + {"on_sl_reply", PARAM_STR, &on_sl_reply_name }, {"contacts_avp", PARAM_STR, &contacts_avp }, {"contact_flows_avp", PARAM_STR, &contact_flows_avp }, {"disable_6xx_block", PARAM_INT, &default_tm_cfg.disable_6xx }, @@ -588,21 +587,6 @@ static int fixup_on_branch(void** param, int param_no) return 0; } -static int fixup_on_sl_reply(modparam_t type, void* val) -{ - if ((type & PARAM_STRING) == 0) { - LM_ERR("not a string parameter\n"); - return -1; - } - - if (fixup_routes(0, &onreply_rt, &val)) - return -1; - - goto_on_sl_reply = (int)(long)val; - return 0; -} - - /* (char *hostname, char *port_nr) ==> (struct proxy_l *, -) */ static int fixup_hostport2proxy(void** param, int param_no) @@ -716,6 +700,13 @@ static int mod_init(void) return -1; } + if(on_sl_reply_name.s!=NULL && on_sl_reply_name.len>0) { + goto_on_sl_reply=route_get(&onreply_rt, on_sl_reply_name.s); + if (goto_on_sl_reply==-1){ + LM_ERR("route get failed for on_sl_reply\n"); + return -1; + } + } if (init_callid() < 0) { LM_CRIT("Error while initializing Call-ID generator\n"); return -1; [View Less]

1 0

git:master:ce661240: tm: execute on_sl_reply callback via kemi
by Daniel-Constantin Mierla 26 Aug '19

26 Aug '19

Module: kamailio Branch: master Commit: ce6612402f122d38878834f7da70ebf75c12b37b URL: https://github.com/kamailio/kamailio/commit/ce6612402f122d38878834f7da70ebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-26T15:49:42+02:00 tm: execute on_sl_reply callback via kemi - the value of the parameter on_sl_reply has to be the kemi function name --- Modified: src/modules/tm/t_reply.c Modified: src/… [View More]modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/ce6612402f122d38878834f7da70ebf… Patch: https://github.com/kamailio/kamailio/commit/ce6612402f122d38878834f7da70ebf… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 1fa7f9dda8..30006ae8a6 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2162,7 +2162,6 @@ enum rps local_reply( struct cell *t, struct sip_msg *p_msg, int branch, */ int reply_received( struct sip_msg *p_msg ) { - int msg_status; int last_uac_status; char *ack; @@ -2192,6 +2191,8 @@ int reply_received( struct sip_msg *p_msg ) struct run_act_ctx ctx; struct run_act_ctx *bctx; sr_kemi_eng_t *keng = NULL; + int ret; + str evname = str_init("on_sl_reply"); /* make sure we know the associated transaction ... */ branch = T_BR_UNDEFINED; @@ -2566,17 +2567,40 @@ int reply_received( struct sip_msg *p_msg ) trans_not_found: /* transaction context was not found */ - if (goto_on_sl_reply) { - /* The script writer has a chance to decide whether to - * forward the reply or not. - * Pre- and post-script callbacks have already - * been execueted by the core. (Miklos) - */ - return run_top_route(onreply_rt.rlist[goto_on_sl_reply], p_msg, 0); - } else { - /* let the core forward the reply */ - return 1; + if(on_sl_reply_name.s!=NULL && on_sl_reply_name.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + if (goto_on_sl_reply) { + /* The script writer has a chance to decide whether to + * forward the reply or not. + * Pre- and post-script callbacks have already + * been execueted by the core. (Miklos) + */ + return run_top_route(onreply_rt.rlist[goto_on_sl_reply], p_msg, 0); + } else { + /* let the core forward the reply */ + return 1; + } + } else { + bctx = sr_kemi_act_ctx_get(); + init_run_actions_ctx(&ctx); + sr_kemi_act_ctx_set(&ctx); + ret = sr_kemi_ctx_route(keng, &ctx, p_msg, EVENT_ROUTE, + &on_sl_reply_name, &evname); + sr_kemi_act_ctx_set(bctx); + if(ret<0) { + LM_ERR("error running on sl reply callback\n"); + return -1; + } + if(unlikely(ctx.run_flags & DROP_R_F)) { + LM_DBG("drop flag set - skip forwarding the reply\n"); + return 0; + } + /* let the core forward the reply */ + return 1; + } } + return 1; } diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 105bbaf1f2..99e20afcd3 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -689,6 +689,8 @@ static int script_init( struct sip_msg *foo, unsigned int flags, void *bar) static int mod_init(void) { + sr_kemi_eng_t *keng = NULL; + DBG( "TM - (sizeof cell=%ld, sip_msg=%ld) initializing...\n", (long)sizeof(struct cell), (long)sizeof(struct sip_msg)); @@ -701,10 +703,13 @@ static int mod_init(void) } if(on_sl_reply_name.s!=NULL && on_sl_reply_name.len>0) { - goto_on_sl_reply=route_get(&onreply_rt, on_sl_reply_name.s); - if (goto_on_sl_reply==-1){ - LM_ERR("route get failed for on_sl_reply\n"); - return -1; + keng = sr_kemi_eng_get(); + if(keng==NULL) { + goto_on_sl_reply=route_get(&onreply_rt, on_sl_reply_name.s); + if (goto_on_sl_reply==-1){ + LM_ERR("route get failed for on_sl_reply\n"); + return -1; + } } } if (init_callid() < 0) { [View Less]

1 0

git:master:b8e725c4: websocket: remove core stats.h #include, remove no-op #defines as well
by Henning Westerholt 25 Aug '19

25 Aug '19

Module: kamailio Branch: master Commit: b8e725c407ce5b0b9580ab0d8bd7a9223b509193 URL: https://github.com/kamailio/kamailio/commit/b8e725c407ce5b0b9580ab0d8bd7a92… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-25T13:27:56+02:00 websocket: remove core stats.h #include, remove no-op #defines as well --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:74dd23ad: tls: remove core stats.h #include, add necessary system #include for open(..)
by Henning Westerholt 25 Aug '19

25 Aug '19

Module: kamailio Branch: master Commit: 74dd23adc125ee2e3e9f31a4d33a9fd687638a21 URL: https://github.com/kamailio/kamailio/commit/74dd23adc125ee2e3e9f31a4d33a9fd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-25T13:26:34+02:00 tls: remove core stats.h #include, add necessary system #include for open(..) --- Modified: src/modules/tls/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:b38fe1b5: core: remove STATS #define, depends on non-existing module, does not compile
by Henning Westerholt 25 Aug '19

25 Aug '19

Module: kamailio Branch: master Commit: b38fe1b5b6061c07a050b329bacd55377bdd45ef URL: https://github.com/kamailio/kamailio/commit/b38fe1b5b6061c07a050b329bacd553… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-25T13:20:17+02:00 core: remove STATS #define, depends on non-existing module, does not compile - remove STATS #define, depends on non-existing snmp module, does not compile - could be used to print e.g. number of … [View More]

1 0

ims_diameter_server and cdp modules modification
by Maryam Baghdadi 25 Aug '19

25 Aug '19

Hello, I used from kamailio with MMTel features as AS in my IMS scenario and I wanted to send UDR diameter request from AS to my HSS. According to my study I should use "diameter_request" or "diameter_request_async" in ims_diameter_server module . but some problem exists in diameter_request function which caused "json" string as input of "diameter_request" ignored and fault happened. I added parse and checking "json" string in diameter_request function in ims_diameter_server.c file : if … [View More]

2 1

git:5.2:b16b9bf4: core: kemi - warning when using an unsupported method flag for is_method_in()
by Daniel-Constantin Mierla 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.2 Commit: b16b9bf49d1b8437673c8913265daf8ee311e51a URL: https://github.com/kamailio/kamailio/commit/b16b9bf49d1b8437673c8913265daf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:23:27+02:00 core: kemi - warning when using an unsupported method flag for is_method_in() (cherry picked from commit 7dc450006743ea160864ce5583a4494fb1033e9e) --- Modified: src/core/kemi.c … [View More]

1 0

git:master:7dc45000: core: kemi - warning when using an unsupported method flag for is_method_in()
by Daniel-Constantin Mierla 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 7dc450006743ea160864ce5583a4494fb1033e9e URL: https://github.com/kamailio/kamailio/commit/7dc450006743ea160864ce5583a4494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:22:16+02:00 core: kemi - warning when using an unsupported method flag for is_method_in() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:b21a75da: core: kemi - fix matching update for is_method_in("U")
by Daniel-Constantin Mierla 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.2 Commit: b21a75dad1575999549f9a84de522dfb8d7fb50f URL: https://github.com/kamailio/kamailio/commit/b21a75dad1575999549f9a84de522df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:11:59+02:00 core: kemi - fix matching update for is_method_in("U") (cherry picked from commit e876770e36c83ce47d1b0f95c14fe269b92a4e70) --- Modified: src/core/kemi.c --- Diff: https://… [View More]

1 0

git:master:e876770e: core: kemi - fix matching update for is_method_in("U")
by Daniel-Constantin Mierla 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: e876770e36c83ce47d1b0f95c14fe269b92a4e70 URL: https://github.com/kamailio/kamailio/commit/e876770e36c83ce47d1b0f95c14fe26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:10:36+02:00 core: kemi - fix matching update for is_method_in("U") --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e876770e36c83ce47d1b0f95c14fe26… … [View More]

1 0

[kamailio/kamailio] Dispatcher probes a maximum of 15 Gateways at a time (#2041)
by duarterocha91 24 Aug '19

24 Aug '19

### Description I have a Kamailio with several Gateways configured. It's Probing is done using Dispatcher module and setting the GW state with value "8". If more than 15 Gw's are set as "8" with a probing frequency of 1min, only 15 GW will be probed each minute. I can't find a configuration for this and have already posted this issue in the sr-users mailing list I'm using Kamailio 5.2.0. Best Regards -- You are receiving this because you are subscribed to this thread. Reply to this email … [View More]

2 4

git:master:c8132a25: uac: small whitespace change in docs
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: c8132a25d412c4fb907b27dc4f4d24a479fc2770 URL: https://github.com/kamailio/kamailio/commit/c8132a25d412c4fb907b27dc4f4d24a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T12:29:57+02:00 uac: small whitespace change in docs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c8132a25d412c4fb907b27dc4f4d24a… Patch: https://… [View More]

1 0

git:master:8c8aaa62: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 8c8aaa62db91c0b4ea25f09b4214947a6b80950b URL: https://github.com/kamailio/kamailio/commit/8c8aaa62db91c0b4ea25f09b4214947… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-24T12:01:42+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/8c8aaa62db91c0b4ea25f09b4214947… … [View More]

1 0

git:master:55740c2b: uac: add functionality to specify a custom socket for each uacreg table entry
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 55740c2b1eb69a19a0a42b4264edcb1b5a9a0aa9 URL: https://github.com/kamailio/kamailio/commit/55740c2b1eb69a19a0a42b4264edcb1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T11:59:08+02:00 uac: add functionality to specify a custom socket for each uacreg table entry - add functionality to specify a custom socket for each uacreg table entry - necessary if you need to REGISTER over … [View More]

1 0

git:master:6fe6b336: modules: readme files regenerated - ims_registrar_scscf ... [skip ci]
by Kamailio Dev 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 6fe6b336acd28d07aa227f9252a4b2cfbb8c2d39 URL: https://github.com/kamailio/kamailio/commit/6fe6b336acd28d07aa227f9252a4b2c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-24T10:47:22+02:00 modules: readme files regenerated - ims_registrar_scscf ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:5244a3ac: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.2 Commit: 5244a3ac50f9766fff9bf4f769eb1d3464d1fc74 URL: https://github.com/kamailio/kamailio/commit/5244a3ac50f9766fff9bf4f769eb1d3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-24T10:47:03+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.1:d7730b1c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.1 Commit: d7730b1c271b7699267fb4ddd9afb2ab3548105c URL: https://github.com/kamailio/kamailio/commit/d7730b1c271b7699267fb4ddd9afb2a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-24T10:46:47+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]d7730b1c271b7699267fb4ddd9afb2a… Patch: https://github.com/kamailio/kamailio/commit/d7730b1c271b7699267fb4ddd9afb2a… --- diff --git a/src/modules/ims_registrar_scscf/README b/src/modules/ims_registrar_scscf/README index 3401e825ef..79dc6846a1 100644 --- a/src/modules/ims_registrar_scscf/README +++ b/src/modules/ims_registrar_scscf/README @@ -1,4 +1,4 @@ -IMS Usrloc PCSCF Module +IMS Registrar SCSCF Module Jason Penton @@ -810,31 +810,31 @@ Chapter 2. Frequently Asked Questions 2.1. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at https://www.kamailio.org/. + Take a look at https://www.kamailio.org/. 2.2. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.kamailio.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.kamailio.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.kamailio.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.kamailio.org>. - If you want to keep the mail private, send it to - <sr-users(a)lists.kamailio.org>. + If you want to keep the mail private, send it to + <sr-users(a)lists.kamailio.org>. 2.3. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - https://github.com/kamailio/kamailio/issues. + Please follow the guidelines provided at: + https://github.com/kamailio/kamailio/issues. [View Less]

1 0

git:5.1:b34c3b97: ims_registrar_scscf : document title is fixed
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.1 Commit: b34c3b97676f06d756da3797bddd1a71464f26fd URL: https://github.com/kamailio/kamailio/commit/b34c3b97676f06d756da3797bddd1a7… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T10:45:04+02:00 ims_registrar_scscf : document title is fixed Document title is fixed (cherry picked from commit 2668110abe7b008470740ffbace1235933b9ba09) --- Modified: src/modules/ims_registrar_scscf/doc/… [View More]

1 0

git:5.2:63cf7598: ims_registrar_scscf : document title is fixed
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: 5.2 Commit: 63cf7598b2ed0bdf8420782a21a39a44094a6f64 URL: https://github.com/kamailio/kamailio/commit/63cf7598b2ed0bdf8420782a21a39a4… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T10:44:57+02:00 ims_registrar_scscf : document title is fixed Document title is fixed (cherry picked from commit 2668110abe7b008470740ffbace1235933b9ba09) --- Modified: src/modules/ims_registrar_scscf/doc/… [View More]

1 0

[kamailio/kamailio] ims_registrar_scscf : document title is fixed (#2042)
by Yasin CANER 24 Aug '19

24 Aug '19

Document title is fixed  <!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls)… [View More]

2 2

git:master:2668110a: ims_registrar_scscf : document title is fixed
by Henning Westerholt 24 Aug '19

24 Aug '19

Module: kamailio Branch: master Commit: 2668110abe7b008470740ffbace1235933b9ba09 URL: https://github.com/kamailio/kamailio/commit/2668110abe7b008470740ffbace1235… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-24T10:36:27+02:00 ims_registrar_scscf : document title is fixed Document title is fixed --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf.xml --- Diff: https://github.com/kamailio/… [View More]

1 0

About STIR/SHAKEN - Caller Identity
by Daniel-Constantin Mierla 23 Aug '19

23 Aug '19

Hello, at couple of events I participated during the past few months, I was asked about support of STIR/SHAKEN (caller identity authentication/verification), which is a hot topic these days at least in USA, aiming to combat "fraudulent" robo-calling. Therefore I thought of share some details with everyone in the community about the state in Kamailio, writing to both devs and users, the information being relevant for everyone. We already have the (related) module named auth_identity, available … [View More]

2 2

[kamailio/kamailio] Module:rtpengine: memory leak is fixed, if no rtpengine in list (#2038)
by Surendra Tiwari 23 Aug '19

23 Aug '19

… reload  <!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is … [View More]

2 3

git:master:7d7670f6: Merge pull request #2038 from surendratiwari3/memory_leak_rtpengine
by GitHub 23 Aug '19

23 Aug '19

Module: kamailio Branch: master Commit: 7d7670f6d19cba5cbb8a3533795d6e271edad8f1 URL: https://github.com/kamailio/kamailio/commit/7d7670f6d19cba5cbb8a3533795d6e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-23T09:46:40+02:00 Merge pull request #2038 from surendratiwari3/memory_leak_rtpengine Module:rtpengine: memory leak is fixed, if no rtpengine in list --- Modified: src/modules/rtpengine/rtpengine_db.c --- … [View More]

1 0

git:master:0e29879e: Module:rtpengine: memory leak is fixed, if no rtpengine in list while reload
by surendra tiwari 23 Aug '19

23 Aug '19

Module: kamailio Branch: master Commit: 0e29879ee950d5a9e9a669c7d5c634416d52f5c9 URL: https://github.com/kamailio/kamailio/commit/0e29879ee950d5a9e9a669c7d5c6344… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: surendra tiwari <surendratiwari3(a)gmail.com> Date: 2019-08-20T13:17:04+05:30 Module:rtpengine: memory leak is fixed, if no rtpengine in list while reload --- Modified: src/modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:92a25673: uac: remove obselete DB definition from source code
by Henning Westerholt 22 Aug '19

22 Aug '19

Module: kamailio Branch: master Commit: 92a25673cb3b16b0d324569c25dc74f14a7c9147 URL: https://github.com/kamailio/kamailio/commit/92a25673cb3b16b0d324569c25dc74f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-22T22:28:11+02:00 uac: remove obselete DB definition from source code --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/92a25673cb3b16b0d324569c25dc74f… Patch: … [View More]

1 0

Failed to catch some reply message with reply_route block
by Salah Ahmed 22 Aug '19

22 Aug '19

Hello, We facing an issue on capturing sip message in Kamailio(Version: 5.2.3). The scenario is very simple. UAC Kamailio UAS |--------INVITE--------->| | | |-------INVITE------->| | |<------100 Trying----| |<-------100 Trying------| | | |<------200 Ok--------| |<-------200 Ok----------| | In this simple … [View More]

2 4

git:5.1:144a4945: dialog: run dlg callbacks also for PRACK requests (as done for "other" requests)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.1 Commit: 144a49451387eee0cc75725af121348596184a7d URL: https://github.com/kamailio/kamailio/commit/144a49451387eee0cc75725af121348… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T22:28:41+02:00 dialog: run dlg callbacks also for PRACK requests (as done for "other" requests) - run dlg callbacks also for PRACK requests (as done for "other" requests) - bugfix for uac module in auto mode with … [View More]

1 0

git:5.2:a5713816: dialog: run dlg callbacks also for PRACK requests (as done for "other" requests)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: a57138162a40390c245236a8ab693e62292d92ce URL: https://github.com/kamailio/kamailio/commit/a57138162a40390c245236a8ab693e6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T22:28:37+02:00 dialog: run dlg callbacks also for PRACK requests (as done for "other" requests) - run dlg callbacks also for PRACK requests (as done for "other" requests) - bugfix for uac module in auto mode with … [View More]

1 0

git:master:4efe19f6: dialog: run dlg callbacks also for PRACK requests (as done for "other" requests)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: 4efe19f64d8bb787d2d620a833f5dd29619fa588 URL: https://github.com/kamailio/kamailio/commit/4efe19f64d8bb787d2d620a833f5dd2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T22:24:30+02:00 dialog: run dlg callbacks also for PRACK requests (as done for "other" requests) - run dlg callbacks also for PRACK requests (as done for "other" requests) - bugfix for uac module in auto mode … [View More]

1 0

git:master:c5208429: build: lost module depends (also via http_client) on curl library, correct group
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: c5208429d1e2b4f4c0d3e7928849a172d8779644 URL: https://github.com/kamailio/kamailio/commit/c5208429d1e2b4f4c0d3e7928849a17… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T21:44:36+02:00 build: lost module depends (also via http_client) on curl library, correct group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:000e778c: topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 000e778cf8838989e316aa71f35f2e0e252c511d URL: https://github.com/kamailio/kamailio/commit/000e778cf8838989e316aa71f35f2e0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T21:12:57+02:00 topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784) - fix regression in PRACK routing (introduced in cfc89db53c, GH #1784) - result set were set to 0 before usage by a … [View More]

1 0

git:5.1:9ebd82b6: topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784)
by Henning Westerholt 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.1 Commit: 9ebd82b66c2967f38e94c58c4fd22d8c2be61479 URL: https://github.com/kamailio/kamailio/commit/9ebd82b66c2967f38e94c58c4fd22d8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T21:13:02+02:00 topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784) - fix regression in PRACK routing (introduced in cfc89db53c, GH #1784) - result set were set to 0 before usage by a … [View More]

1 0

git:master:dc437506: core: tcp - new global parameter tcp_connection_match
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: dc43750644f723494c6821e3298b3580cf49797a URL: https://github.com/kamailio/kamailio/commit/dc43750644f723494c6821e3298b358… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T13:48:48+02:00 core: tcp - new global parameter tcp_connection_match - control how the connection is matched - set it to 1 to force a more strict matching trying to lookup using local port as … [View More]

1 0

[kamailio/kamailio] topoh: PKG memory leak (#2027)
by Whitey 20 Aug '19

20 Aug '19

<!-- Kamailio Project uses GitHub Issues only for bugs in the code or feature requests. Please use this template only for bug reports. If you have questions about using Kamailio or related to its configuration file, ask on sr-users mailing list: * http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users If you have questions about developing extensions to Kamailio or its existing C code, ask on sr-dev mailing list: * http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev … [View More]

3 10

git:master:8d608d1c: tm: set send socket flag when computing the destination and local socket is found
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: 8d608d1c3ed0fe4c69cb02868b746cd0497dd1f5 URL: https://github.com/kamailio/kamailio/commit/8d608d1c3ed0fe4c69cb02868b746cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T12:07:30+02:00 tm: set send socket flag when computing the destination and local socket is found --- Modified: src/modules/tm/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:67f889bc: core: clear branches and expose the function for a new faked msg
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 67f889bcda49ad8f99f619b495e3fa201968ad64 URL: https://github.com/kamailio/kamailio/commit/67f889bcda49ad8f99f619b495e3fa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:23:29+02:00 core: clear branches and expose the function for a new faked msg (cherry picked from commit d7bd8a187546f132547788c47ff9a3947be49957) --- Modified: src/core/fmsg.c Modified: src/… [View More]

1 0

git:5.2:0ded702c: evapi: use a completely new fake message structure for dispatcher handling
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 0ded702ccbb746a26c7172bcbf80dd971ec8b530 URL: https://github.com/kamailio/kamailio/commit/0ded702ccbb746a26c7172bcbf80dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:23:39+02:00 evapi: use a completely new fake message structure for dispatcher handling (cherry picked from commit 769dce2fad66efdbc6cce6951bc60b60bf453a19) --- Modified: src/modules/evapi/… [View More]

1 0

git:5.2:4db7db84: core: function to get a new faked message in a specific structure
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 4db7db8486ecab55e649a4037a1d86cda7633faf URL: https://github.com/kamailio/kamailio/commit/4db7db8486ecab55e649a4037a1d86c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:23:19+02:00 core: function to get a new faked message in a specific structure - refactored the code to be able to fill a sip msg structure with content from the faked request (cherry picked … [View More]from commit 4a904b5fe90253d0d5517cf1a5cdca3695e59ec3) --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/4db7db8486ecab55e649a4037a1d86c… Patch: https://github.com/kamailio/kamailio/commit/4db7db8486ecab55e649a4037a1d86c… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 28d24cd116..1450509f8c 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -30,48 +30,69 @@ #define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <sip:you@kamailio.org>;tag=123\r\nTo: <sip:you@kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) -static char _faked_sip_buf[FAKED_SIP_MSG_LEN+1]; -static struct sip_msg _faked_msg; +static char _faked_sip_buf[BUF_SIZE]; +static int _faked_sip_buf_init = 0; +static sip_msg_t _faked_msg; static unsigned int _faked_msg_no = 0; -int faked_msg_init(void) +static unsigned int faked_msg_get_next_id(void) { - if(_faked_msg_no>0) - return 0; - /* init faked sip msg */ + _faked_msg_no += ((_faked_msg_no+1)==0)?2:1; + return _faked_msg_no; +} + +static void faked_msg_buf_init(void) +{ + if(_faked_sip_buf_init!=0) { + return; + } memcpy(_faked_sip_buf, FAKED_SIP_MSG, FAKED_SIP_MSG_LEN); _faked_sip_buf[FAKED_SIP_MSG_LEN] = '\0'; + _faked_sip_buf_init = 1; +} + +static int faked_msg_init_new(sip_msg_t *fmsg) +{ + faked_msg_buf_init(); - memset(&_faked_msg, 0, sizeof(struct sip_msg)); + /* init faked sip msg */ + memset(fmsg, 0, sizeof(sip_msg_t)); - _faked_msg.buf=_faked_sip_buf; - _faked_msg.len=FAKED_SIP_MSG_LEN; + fmsg->buf=_faked_sip_buf; + fmsg->len=FAKED_SIP_MSG_LEN; - _faked_msg.set_global_address=default_global_address; - _faked_msg.set_global_port=default_global_port; + fmsg->set_global_address=default_global_address; + fmsg->set_global_port=default_global_port; - if (parse_msg(_faked_msg.buf, _faked_msg.len, &_faked_msg)!=0) - { - LM_ERR("parse_msg failed\n"); + if (parse_msg(fmsg->buf, fmsg->len, fmsg)!=0) { + LM_ERR("parse faked msg failed\n"); return -1; } - _faked_msg.rcv.proto = PROTO_UDP; - _faked_msg.rcv.src_port = 5060; - _faked_msg.rcv.src_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.src_ip.af = AF_INET; - _faked_msg.rcv.src_ip.len = 4; - _faked_msg.rcv.dst_port = 5060; - _faked_msg.rcv.dst_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.dst_ip.af = AF_INET; - _faked_msg.rcv.dst_ip.len = 4; + fmsg->rcv.proto = PROTO_UDP; + fmsg->rcv.src_port = 5060; + fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.src_ip.af = AF_INET; + fmsg->rcv.src_ip.len = 4; + fmsg->rcv.dst_port = 5060; + fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.dst_ip.af = AF_INET; + fmsg->rcv.dst_ip.len = 4; return 0; } -static inline sip_msg_t* faked_msg_next_id(int mode) +int faked_msg_init(void) +{ + if(_faked_msg_no>0) { + return 0; + } + return faked_msg_init_new(&_faked_msg); +} + +static inline sip_msg_t* faked_msg_build_next(int mode) { - _faked_msg.id = 1 + _faked_msg_no++; + _faked_msg.id = faked_msg_get_next_id(); _faked_msg.pid = my_pid(); memset(&_faked_msg.tval, 0, sizeof(struct timeval)); if(mode) clear_branches(); @@ -80,12 +101,12 @@ static inline sip_msg_t* faked_msg_next_id(int mode) sip_msg_t* faked_msg_next(void) { - return faked_msg_next_id(0); + return faked_msg_build_next(0); } sip_msg_t* faked_msg_next_clear(void) { - return faked_msg_next_id(1); + return faked_msg_build_next(1); } sip_msg_t* faked_msg_get_next(void) @@ -104,6 +125,18 @@ sip_msg_t* faked_msg_get_next_clear(void) return faked_msg_next_clear(); } +int faked_msg_get_new(sip_msg_t *fmsg) +{ + if(faked_msg_init_new(fmsg)<0) { + return -1; + } + fmsg->id = faked_msg_get_next_id(); + fmsg->pid = my_pid(); + memset(&fmsg->tval, 0, sizeof(struct timeval)); + + return 0; +} + int faked_msg_match(sip_msg_t *tmsg) { return ( tmsg == &_faked_msg ) ? 1 : 0; [View Less]

1 0

git:5.2:9b6d1e9e: corex: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 9b6d1e9ee767e2bf2a31dcf817558566d99f81b2 URL: https://github.com/kamailio/kamailio/commit/9b6d1e9ee767e2bf2a31dcf81755856… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:54+02:00 corex: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit c79dfbeab0bfefaa4dd5cefc41cba3ba157da0ce) --- Modified: src/modules/corex/corex_nio.… [View More]

1 0

git:5.2:9f4c8c37: evapi: free the faked msg clone used for dispatcher event route
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 9f4c8c37f50ce15e52ea64388d7aab46167e78cd URL: https://github.com/kamailio/kamailio/commit/9f4c8c37f50ce15e52ea64388d7aab4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:22:59+02:00 evapi: free the faked msg clone used for dispatcher event route (cherry picked from commit d36a4b00c6becd42cfcec4fc7eb398371e1cc812) --- Modified: src/modules/evapi/… [View More]

1 0

git:5.2:d815945c: gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: d815945cdf85250877c89b3368506d444aa0ff2f URL: https://github.com/kamailio/kamailio/commit/d815945cdf85250877c89b3368506d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:40+02:00 gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit d9a1cbc8f66f9fd0991048e5e1ba1579916a092e) --- Modified: src/modules/gzcompress/… [View More]

1 0

git:5.2:0df6f49f: dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 0df6f49fe7a13ce6c01542a16fdd8932043f5ec9 URL: https://github.com/kamailio/kamailio/commit/0df6f49fe7a13ce6c01542a16fdd893… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:31+02:00 dialog: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit ad8d9628da27a3ab68b005ef52842784af6bda3a) --- Modified: src/modules/dialog/dlg_cseq.… [View More]

1 0

git:5.2:bbac0720: topos: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: bbac07207f55216ece4fad4d1aed2ed578cb0e15 URL: https://github.com/kamailio/kamailio/commit/bbac07207f55216ece4fad4d1aed2ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:22+02:00 topos: free old outbound buffer inside SREV_NET_DATA_OUT callback - GH #2027 (cherry picked from commit 21816a11a56628a9eee17765645fcf03d57929bd) --- Modified: src/modules/… [View More]

1 0

git:5.2:aaeb0ca5: topoh: free old outbound buffer inside th_msg_sent()
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: aaeb0ca500f4cbf98631c58da5289eea30b3dd92 URL: https://github.com/kamailio/kamailio/commit/aaeb0ca500f4cbf98631c58da5289ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:10+02:00 topoh: free old outbound buffer inside th_msg_sent() - GH #2027 (cherry picked from commit 37a1765853294016f43bd633667cd623aaaa2d3e) --- Modified: src/modules/topoh/topoh_mod.c … [View More]

1 0

git:5.2:891bd927: core: forward - clone outbound buffer for SREV_NET_DATA_OUT event
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: 5.2 Commit: 891bd927f3e519bb9fb2f23a65f21f82f2f7e0af URL: https://github.com/kamailio/kamailio/commit/891bd927f3e519bb9fb2f23a65f21f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:43:58+02:00 core: forward - clone outbound buffer for SREV_NET_DATA_OUT event - this event can execute a series of callbacks, leading to leak if only the core function does pkg free - GH #… [View More]

1 0

git:master:18eb1c97: pv: added {s.count, c} transformation
by Daniel-Constantin Mierla 20 Aug '19

20 Aug '19

Module: kamailio Branch: master Commit: 18eb1c973c5d863a562864c2b77b4e1d520f9406 URL: https://github.com/kamailio/kamailio/commit/18eb1c973c5d863a562864c2b77b4e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T11:17:17+02:00 pv: added {s.count,c} transformation - count how many times c appears in the pv value "abababa"{s.count,a} => 4 --- Modified: src/modules/pv/pv_trans.c Modified: src/… [View More]modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/18eb1c973c5d863a562864c2b77b4e1… Patch: https://github.com/kamailio/kamailio/commit/18eb1c973c5d863a562864c2b77b4e1… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 8ab46d328f..ea693bffd4 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1207,6 +1207,42 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s[val->rs.len] = '\0'; break; + case TR_S_COUNT: + if(tp==NULL) + { + LM_ERR("invalid parameters (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + if(!(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + } + if(tp->type==TR_PARAM_STRING) + { + st = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) + { + LM_ERR("cannot get parameter value (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + st = v.rs; + } + LM_DBG("counting [%.*s](%d) in [%.*s](%d)\n", + st.len, st.s, st.len, val->rs.len, val->rs.s, val->rs.len); + j = 0; + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]==st.s[0]) { + j++; + } + } + val->flags = PV_TYPE_INT|PV_VAL_INT|PV_VAL_STR; + val->ri = j; + val->rs.s = int2str(j, &val->rs.len); + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2575,6 +2611,26 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==9 && strncasecmp(name.s, "unbracket", 9)==0) { t->subtype = TR_S_UNBRACKET; goto done; + } else if(name.len==5 && strncasecmp(name.s, "count", 5)==0) { + t->subtype = TR_S_COUNT; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid count transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid count transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index da2cb87624..0b579e4b27 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -42,7 +42,7 @@ enum _tr_s_subtype { TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE, - TR_S_UNBRACKET + TR_S_UNBRACKET, TR_S_COUNT }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, [View Less]

1 0

[kamailio/kamailio] UAC (#2036)
by Antoineb2s 19 Aug '19

19 Aug '19

Hi, I'm trying to register to a SIP provider (v5.2.4), so I added in kamailio.cfg: ... loadmodule "uac.so" ... modparam("rr", "append_fromtag", 1) modparam("uac", "credential", "user:host_provider_ip:password") modparam("uac", "reg_retry_interval", 300) Seems that nothing happens after a service restart. I also tried : `kamcmd uac.reg_dump error: 500 - command uac.reg_dump not found` Is there something I misunderstood ? Thanks in advanced ! -- You are receiving this because you … [View More]

2 2

git:master:4acc8aa7: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 4acc8aa71b50efc0f8ec073d711dda27b928e991 URL: https://github.com/kamailio/kamailio/commit/4acc8aa71b50efc0f8ec073d711dda2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-19T11:47:13+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/4acc8aa71b50efc0f8ec073d711dda2… … [View More]

1 0

git:master:a743a6c7: core: tcp - debug messages when looking up tcp connection
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: a743a6c7d3f7b65a366251dd121011725964d07b URL: https://github.com/kamailio/kamailio/commit/a743a6c7d3f7b65a366251dd1210117… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 core: tcp - debug messages when looking up tcp connection --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:9ff491a8: tm: propagate tcp connection id in outbound branch dst structure
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 9ff491a881f326b5ee6eee4fd40c427f8d83ecf0 URL: https://github.com/kamailio/kamailio/commit/9ff491a881f326b5ee6eee4fd40c427… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 tm: propagate tcp connection id in outbound branch dst structure --- Modified: src/modules/tm/t_funcs.c Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/… [View More]kamailio/kamailio/commit/9ff491a881f326b5ee6eee4fd40c427… Patch: https://github.com/kamailio/kamailio/commit/9ff491a881f326b5ee6eee4fd40c427… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index d814e3d5b2..0e484d9ebf 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -284,8 +284,9 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, e2e ACKs do not establish a transaction and are fwd-ed statelessly */ if ( p_msg->REQ_METHOD==METHOD_ACK) { LM_DBG("forwarding ACK statelessly\n"); + init_dest_info(&dst); + dst.id = p_msg->otcpid; if (proxy==0) { - init_dest_info(&dst); dst.proto=proto; if (get_uri_send_info(GET_NEXT_HOP(p_msg), &host, &port, &dst.proto, &comp)!=0){ @@ -299,7 +300,6 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, * of it */ ret=forward_request(p_msg, &host, port, &dst); } else { - init_dest_info(&dst); dst.proto=get_proto(proto, proxy->proto); proxy2su(&dst.to, proxy); /* dst->send_sock not set, but forward_request will take care diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 213f0df746..33a50d7799 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1596,22 +1596,15 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, struct proxy_l * proxy, int proto) { int branch_ret, lowest_ret; - str current_uri; branch_bm_t added_branches; int first_branch; - int i, q; + int i; struct cell *t_invite; int success_branch; int try_new; int lock_replies; - str dst_uri, path, instance, ruid, location_ua; - struct socket_info* si; flag_t backup_bflags = 0; - flag_t bflags = 0; - - - /* make -Wall happy */ - current_uri.s=0; + branch_data_t obranch; getbflagsval(0, &backup_bflags); @@ -1667,40 +1660,46 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, */ if (ruri_get_forking_state()) { try_new=1; - branch_ret=add_uac( t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), + branch_ret=add_uac(t, p_msg, GET_RURI(p_msg), GET_NEXT_HOP(p_msg), &p_msg->path_vec, proxy, p_msg->force_send_socket, p_msg->fwd_send_flags, proto, (p_msg->dst_uri.len)?0:UAC_SKIP_BR_DST_F, &p_msg->instance, &p_msg->ruid, &p_msg->location_ua); /* test if cancel was received meanwhile */ if (t->flags & T_CANCELED) goto canceled; - if (branch_ret>=0) + if (branch_ret>=0) { added_branches |= 1<<branch_ret; - else + t->uac[branch_ret].request.dst.id = p_msg->otcpid; + } else { lowest_ret=MIN_int(lowest_ret, branch_ret); - } else try_new=0; + } + } else { + try_new=0; + } + memset(&obranch, 0, sizeof(branch_data_t)); init_branch_iterator(); - while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path, - &bflags, &si, &ruid, &instance, &location_ua))) { + while(next_branch_data(&obranch)==1) { try_new++; - setbflagsval(0, bflags); + setbflagsval(0, obranch.flags); - branch_ret=add_uac( t, p_msg, &current_uri, - (dst_uri.len) ? (&dst_uri) : &current_uri, - &path, proxy, si, p_msg->fwd_send_flags, - proto, (dst_uri.len)?0:UAC_SKIP_BR_DST_F, &instance, - &ruid, &location_ua); + branch_ret=add_uac(t, p_msg, &obranch.uri, + (obranch.dst_uri.len>0) ? &obranch.dst_uri : &obranch.uri, + &obranch.path, proxy, obranch.force_socket, p_msg->fwd_send_flags, + proto, (obranch.dst_uri.len>0)?0:UAC_SKIP_BR_DST_F, + &obranch.instance, &obranch.ruid, &obranch.location_ua); /* test if cancel was received meanwhile */ if (t->flags & T_CANCELED) goto canceled; /* pick some of the errors in case things go wrong; * note that picking lowest error is just as good as * any other algorithm which picks any other negative * branch result */ - if (branch_ret>=0) + if (branch_ret>=0) { added_branches |= 1<<branch_ret; - else + t->uac[branch_ret].request.dst.id = obranch.otcpid; + } else { lowest_ret=MIN_int(lowest_ret, branch_ret); + } } /* consume processed branches */ clear_branches(); [View Less]

1 0

git:master:4917283a: core: dset - comment to document return code for getting branch data
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 4917283ae2ed27a852a63cde78e9f8739958ff92 URL: https://github.com/kamailio/kamailio/commit/4917283ae2ed27a852a63cde78e9f87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 core: dset - comment to document return code for getting branch data - differentiate when returning data for valid or invalid branch index --- Modified: src/core/dset.c --- … [View More]

1 0

git:master:a8d3274c: core: dset - function to link branch data in a structure
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: a8d3274c32ba7d7cfb93d0f6d4090a7832db7ff7 URL: https://github.com/kamailio/kamailio/commit/a8d3274c32ba7d7cfb93d0f6d4090a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 core: dset - function to link branch data in a structure - existing functions to retrive branch attributes have too many parameters already --- Modified: src/core/dset.c … [View More]Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/commit/a8d3274c32ba7d7cfb93d0f6d4090a7… Patch: https://github.com/kamailio/kamailio/commit/a8d3274c32ba7d7cfb93d0f6d4090a7… --- diff --git a/src/core/dset.c b/src/core/dset.c index 184ddc9e92..f1b79ba037 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -232,9 +232,9 @@ void set_branch_iterator(int n) * more branches */ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, - str* path, unsigned int *flags, - struct socket_info** force_socket, - str *ruid, str *instance, str *location_ua) + str* path, unsigned int *flags, + struct socket_info** force_socket, + str *ruid, str *instance, str *location_ua) { if (i < nr_branches) { *len = branches[i].len; @@ -302,18 +302,69 @@ char* get_branch(unsigned int i, int* len, qvalue_t* q, str* dst_uri, * 0 is returned if there are no more branches */ char* next_branch(int* len, qvalue_t* q, str* dst_uri, str* path, - unsigned int* flags, struct socket_info** force_socket, - str* ruid, str *instance, str *location_ua) + unsigned int* flags, struct socket_info** force_socket, + str* ruid, str *instance, str *location_ua) { char* ret; - + ret=get_branch(branch_iterator, len, q, dst_uri, path, flags, - force_socket, ruid, instance, location_ua); + force_socket, ruid, instance, location_ua); if (likely(ret)) branch_iterator++; return ret; } +int get_branch_data(unsigned int i, branch_data_t *vbranch) +{ + if(vbranch==NULL) { + return -1; + } + memset(vbranch, 0, sizeof(branch_data_t)); + + if (i < nr_branches) { + vbranch->uri.s = branches[i].uri; + vbranch->uri.len = branches[i].len; + vbranch->q = branches[i].q; + if (branches[i].dst_uri_len > 0) { + vbranch->dst_uri.len = branches[i].dst_uri_len; + vbranch->dst_uri.s = branches[i].dst_uri; + } + if (branches[i].path_len > 0) { + vbranch->path.len = branches[i].path_len; + vbranch->path.s = branches[i].path; + } + vbranch->force_socket = branches[i].force_send_socket; + vbranch->flags = branches[i].flags; + if (branches[i].ruid_len > 0) { + vbranch->ruid.len = branches[i].ruid_len; + vbranch->ruid.s = branches[i].ruid; + } + if (branches[i].instance_len > 0) { + vbranch->instance.len = branches[i].instance_len; + vbranch->instance.s =branches[i].instance; + } + if (branches[i].location_ua_len > 0) { + vbranch->location_ua.len = branches[i].location_ua_len; + vbranch->location_ua.s = branches[i].location_ua; + } + vbranch->otcpid = branches[i].otcpid; + } else { + vbranch->q = Q_UNSPECIFIED; + } + + return 0; +} + +int next_branch_data(branch_data_t *vbranch) +{ + int ret; + ret= get_branch_data(branch_iterator, vbranch); + if (ret < 0) { + return ret; + } + branch_iterator++; + return ret; +} /* * Empty the dset array diff --git a/src/core/dset.h b/src/core/dset.h index ebb4e765bb..9a640da704 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -43,7 +43,7 @@ extern int ruri_is_new; /*! \brief * Structure for storing branch attributes */ -struct branch +typedef struct branch { char uri[MAX_URI_SIZE]; unsigned int len; @@ -79,9 +79,20 @@ struct branch /* Branch flags */ flag_t flags; -}; - -typedef struct branch branch_t; +} branch_t; + +typedef struct branch_data { + str uri; + str dst_uri; + qvalue_t q; + str path; + unsigned int flags; + socket_info_t* force_socket; + str ruid; + str instance; + str location_ua; + int otcpid; +} branch_data_t; /*! \brief * Return pointer to branch[idx] structure @@ -163,6 +174,9 @@ char* get_branch( unsigned int i, int* len, qvalue_t* q, str* dst_uri, struct socket_info** force_socket, str* ruid, str *instance, str *location_ua); +int get_branch_data(unsigned int i, branch_data_t *vbranch); +int next_branch_data(branch_data_t *vbranch); + /*! \brief * Empty the array of branches */ [View Less]

1 0

git:master:878c41b7: lost: docs - note that http_client param query_result has to be set to 0
by Daniel-Constantin Mierla 19 Aug '19

19 Aug '19

Module: kamailio Branch: master Commit: 878c41b7dbd1a716d5a2a9281ab99af585737022 URL: https://github.com/kamailio/kamailio/commit/878c41b7dbd1a716d5a2a9281ab99af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-19T11:37:40+02:00 lost: docs - note that http_client param query_result has to be set to 0 --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:0e4e0a16: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 0e4e0a162aa4fc4e3b8467c68b20fea992012e18 URL: https://github.com/kamailio/kamailio/commit/0e4e0a162aa4fc4e3b8467c68b20fea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-16T23:01:36+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/0e4e0a162aa4fc4e3b8467c68b20fea… … [View More]

1 0

git:master:769dce2f: evapi: use a completely new fake message structure for dispatcher handling
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 769dce2fad66efdbc6cce6951bc60b60bf453a19 URL: https://github.com/kamailio/kamailio/commit/769dce2fad66efdbc6cce6951bc60b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T12:57:33+02:00 evapi: use a completely new fake message structure for dispatcher handling --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:d7bd8a18: core: clear branches and expose the function for a new faked msg
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: d7bd8a187546f132547788c47ff9a3947be49957 URL: https://github.com/kamailio/kamailio/commit/d7bd8a187546f132547788c47ff9a39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T12:56:49+02:00 core: clear branches and expose the function for a new faked msg --- Modified: src/core/fmsg.c Modified: src/core/fmsg.h --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:4a904b5f: core: function to get a new faked message in a specific structure
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 4a904b5fe90253d0d5517cf1a5cdca3695e59ec3 URL: https://github.com/kamailio/kamailio/commit/4a904b5fe90253d0d5517cf1a5cdca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T12:37:58+02:00 core: function to get a new faked message in a specific structure - refactored the code to be able to fill a sip msg structure with content from the faked request --- … [View More]Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/4a904b5fe90253d0d5517cf1a5cdca3… Patch: https://github.com/kamailio/kamailio/commit/4a904b5fe90253d0d5517cf1a5cdca3… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 28d24cd116..1450509f8c 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -30,48 +30,69 @@ #define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <sip:you@kamailio.org>;tag=123\r\nTo: <sip:you@kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) -static char _faked_sip_buf[FAKED_SIP_MSG_LEN+1]; -static struct sip_msg _faked_msg; +static char _faked_sip_buf[BUF_SIZE]; +static int _faked_sip_buf_init = 0; +static sip_msg_t _faked_msg; static unsigned int _faked_msg_no = 0; -int faked_msg_init(void) +static unsigned int faked_msg_get_next_id(void) { - if(_faked_msg_no>0) - return 0; - /* init faked sip msg */ + _faked_msg_no += ((_faked_msg_no+1)==0)?2:1; + return _faked_msg_no; +} + +static void faked_msg_buf_init(void) +{ + if(_faked_sip_buf_init!=0) { + return; + } memcpy(_faked_sip_buf, FAKED_SIP_MSG, FAKED_SIP_MSG_LEN); _faked_sip_buf[FAKED_SIP_MSG_LEN] = '\0'; + _faked_sip_buf_init = 1; +} + +static int faked_msg_init_new(sip_msg_t *fmsg) +{ + faked_msg_buf_init(); - memset(&_faked_msg, 0, sizeof(struct sip_msg)); + /* init faked sip msg */ + memset(fmsg, 0, sizeof(sip_msg_t)); - _faked_msg.buf=_faked_sip_buf; - _faked_msg.len=FAKED_SIP_MSG_LEN; + fmsg->buf=_faked_sip_buf; + fmsg->len=FAKED_SIP_MSG_LEN; - _faked_msg.set_global_address=default_global_address; - _faked_msg.set_global_port=default_global_port; + fmsg->set_global_address=default_global_address; + fmsg->set_global_port=default_global_port; - if (parse_msg(_faked_msg.buf, _faked_msg.len, &_faked_msg)!=0) - { - LM_ERR("parse_msg failed\n"); + if (parse_msg(fmsg->buf, fmsg->len, fmsg)!=0) { + LM_ERR("parse faked msg failed\n"); return -1; } - _faked_msg.rcv.proto = PROTO_UDP; - _faked_msg.rcv.src_port = 5060; - _faked_msg.rcv.src_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.src_ip.af = AF_INET; - _faked_msg.rcv.src_ip.len = 4; - _faked_msg.rcv.dst_port = 5060; - _faked_msg.rcv.dst_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.dst_ip.af = AF_INET; - _faked_msg.rcv.dst_ip.len = 4; + fmsg->rcv.proto = PROTO_UDP; + fmsg->rcv.src_port = 5060; + fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.src_ip.af = AF_INET; + fmsg->rcv.src_ip.len = 4; + fmsg->rcv.dst_port = 5060; + fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.dst_ip.af = AF_INET; + fmsg->rcv.dst_ip.len = 4; return 0; } -static inline sip_msg_t* faked_msg_next_id(int mode) +int faked_msg_init(void) +{ + if(_faked_msg_no>0) { + return 0; + } + return faked_msg_init_new(&_faked_msg); +} + +static inline sip_msg_t* faked_msg_build_next(int mode) { - _faked_msg.id = 1 + _faked_msg_no++; + _faked_msg.id = faked_msg_get_next_id(); _faked_msg.pid = my_pid(); memset(&_faked_msg.tval, 0, sizeof(struct timeval)); if(mode) clear_branches(); @@ -80,12 +101,12 @@ static inline sip_msg_t* faked_msg_next_id(int mode) sip_msg_t* faked_msg_next(void) { - return faked_msg_next_id(0); + return faked_msg_build_next(0); } sip_msg_t* faked_msg_next_clear(void) { - return faked_msg_next_id(1); + return faked_msg_build_next(1); } sip_msg_t* faked_msg_get_next(void) @@ -104,6 +125,18 @@ sip_msg_t* faked_msg_get_next_clear(void) return faked_msg_next_clear(); } +int faked_msg_get_new(sip_msg_t *fmsg) +{ + if(faked_msg_init_new(fmsg)<0) { + return -1; + } + fmsg->id = faked_msg_get_next_id(); + fmsg->pid = my_pid(); + memset(&fmsg->tval, 0, sizeof(struct timeval)); + + return 0; +} + int faked_msg_match(sip_msg_t *tmsg) { return ( tmsg == &_faked_msg ) ? 1 : 0; [View Less]

1 0

git:master:860cf242: registrar: lookup() sets the tcp connection id in sip msg and branch structures
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 860cf242c1d9fb964b8e64acba136af561ffa748 URL: https://github.com/kamailio/kamailio/commit/860cf242c1d9fb964b8e64acba136af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T11:06:42+02:00 registrar: lookup() sets the tcp connection id in sip msg and branch structures --- Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:9115bcda: core: dset - function to push a new branch and return its pointer
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 9115bcdabaa3da04e3e563bb43a04358b33e2c17 URL: https://github.com/kamailio/kamailio/commit/9115bcdabaa3da04e3e563bb43a0435… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T11:05:35+02:00 core: dset - function to push a new branch and return its pointer --- Modified: src/core/dset.c Modified: src/core/dset.h --- Diff: https://github.com/kamailio/kamailio/… [View More]commit/9115bcdabaa3da04e3e563bb43a0435… Patch: https://github.com/kamailio/kamailio/commit/9115bcdabaa3da04e3e563bb43a0435… --- diff --git a/src/core/dset.c b/src/core/dset.c index 1803155206..184ddc9e92 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -328,7 +328,7 @@ void clear_branches(void) -/** Add a new branch to the current transaction. +/** Add a new branch to the current destination set. * @param msg sip message, used for getting the uri if not specified (0). * @param uri uri, can be 0 (in which case the uri is taken from msg) * @param dst_uri destination uri, can be 0. @@ -352,7 +352,7 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, str luri; /* if we have already set up the maximum number - * of branches, don't try new ones + * of branches, don't try new ones */ if (unlikely(nr_branches == sr_dst_max_branches - 1)) { LM_ERR("max nr of branches exceeded\n"); @@ -466,12 +466,40 @@ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, branches[nr_branches].location_ua[0] = '\0'; branches[nr_branches].location_ua_len = 0; } - + nr_branches++; return 1; } +/** Push a new branch to the current destination set. + * @param msg sip message, used for getting the uri if not specified (0). + * @param uri uri, can be 0 (in which case the uri is taken from msg) + * @param dst_uri destination uri, can be 0. + * @param path path vector (passed in a string), can be 0. + * @param q q value. + * @param flags per branch flags. + * @param force_socket socket that should be used when sending. + * @param instance sip instance contact header param value + * @param reg_id reg-id contact header param value + * @param ruid ruid value from usrloc + * @param location_ua location user agent + * + * @return NULL on failure, new branch pointer on success. + */ +branch_t* ksr_push_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, + qvalue_t q, unsigned int flags, + struct socket_info* force_socket, + str* instance, unsigned int reg_id, + str* ruid, str* location_ua) +{ + if(append_branch(msg, uri, dst_uri, path, q, flags, force_socket, + instance, reg_id, ruid, location_ua)<0) { + return NULL; + } + return &branches[nr_branches-1]; +} + /*! \brief * Combines the given elements into a Contact header field * dest = target buffer, will be updated to new position after the printed contact diff --git a/src/core/dset.h b/src/core/dset.h index 96f31978a6..ebb4e765bb 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -94,7 +94,16 @@ branch_t *get_sip_branch(int idx); int drop_sip_branch(int idx); /*! \brief - * Add a new branch to current transaction + * Push a new branch to current destination set + */ +branch_t *ksr_push_branch(sip_msg_t* msg, str* uri, str* dst_uri, str* path, + qvalue_t q, unsigned int flags, + struct socket_info* force_socket, + str* instance, unsigned int reg_id, + str* ruid, str* location_ua); + +/*! \brief + * Add a new branch to current destination set */ int append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, qvalue_t q, unsigned int flags, [View Less]

1 0

git:master:f3b977d3: core: store tcp connection id in sip msg and branch structure
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: f3b977d39ca72e5787a5b97ee2cf154adbe7d0ca URL: https://github.com/kamailio/kamailio/commit/f3b977d39ca72e5787a5b97ee2cf154… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T10:42:43+02:00 core: store tcp connection id in sip msg and branch structure - try to use it to identify outbound connection for stateless forward() --- Modified: src/core/action.c Modified:… [View More] src/core/dset.h Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/f3b977d39ca72e5787a5b97ee2cf154… Patch: https://github.com/kamailio/kamailio/commit/f3b977d39ca72e5787a5b97ee2cf154… --- diff --git a/src/core/action.c b/src/core/action.c index 45581ba312..8211cf00f7 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -383,10 +383,16 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) init_dest_info(&dst); if (a->type==FORWARD_UDP_T) dst.proto=PROTO_UDP; #ifdef USE_TCP - else if (a->type==FORWARD_TCP_T) dst.proto= PROTO_TCP; + else if (a->type==FORWARD_TCP_T) { + dst.proto= PROTO_TCP; + dst.id = msg->otcpid; + } #endif #ifdef USE_TLS - else if (a->type==FORWARD_TLS_T) dst.proto= PROTO_TLS; + else if (a->type==FORWARD_TLS_T) { + dst.proto= PROTO_TLS; + dst.id = msg->otcpid; + } #endif #ifdef USE_SCTP else if (a->type==FORWARD_SCTP_T) dst.proto=PROTO_SCTP; diff --git a/src/core/dset.h b/src/core/dset.h index 65b54c3104..96f31978a6 100644 --- a/src/core/dset.h +++ b/src/core/dset.h @@ -48,7 +48,7 @@ struct branch char uri[MAX_URI_SIZE]; unsigned int len; - /* Real destination of the request */ + /* Real destination of the request */ char dst_uri[MAX_URI_SIZE]; unsigned int dst_uri_len; @@ -74,6 +74,9 @@ struct branch char location_ua[MAX_UA_SIZE + 1]; unsigned int location_ua_len; + /* tcp connection id */ + int otcpid; + /* Branch flags */ flag_t flags; }; diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 5dff970206..827c541086 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -378,6 +378,7 @@ typedef struct sip_msg { unsigned int reg_id; str ruid; str location_ua; + int otcpid; /*!< outbound tcp connection id, if known */ /* structure with fields that are needed for local processing * - not cloned to shm, reset to 0 in the clone */ [View Less]

1 0

git:master:308b7a2f: core: tcp - new core parameter tcp_accept_unique
by Daniel-Constantin Mierla 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 308b7a2f7b6a7c50e05a2c83537f85b95f979c32 URL: https://github.com/kamailio/kamailio/commit/308b7a2f7b6a7c50e05a2c83537f85b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-16T10:11:21+02:00 core: tcp - new core parameter tcp_accept_unique - if set to 1, do an extra check when a new connection is created to be sure the is no overlapping with another connection on … [View More]local ip/port and remote ip/port - recently some tcp/ip router/balancers can do port sharing, but that can create troubles for routing of the requests with the current tcp routing implementation (e.g., using the wrong connection in such group) - default is set to 0 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/308b7a2f7b6a7c50e05a2c83537f85b… Patch: https://github.com/kamailio/kamailio/commit/308b7a2f7b6a7c50e05a2c83537f85b… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index dd1b935d8f..20a8fd94ef 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -375,6 +375,7 @@ MHOMED mhomed DISABLE_TCP "disable_tcp" TCP_CHILDREN "tcp_children" TCP_ACCEPT_ALIASES "tcp_accept_aliases" +TCP_ACCEPT_UNIQUE "tcp_accept_unique" TCP_SEND_TIMEOUT "tcp_send_timeout" TCP_CONNECT_TIMEOUT "tcp_connect_timeout" TCP_CON_LIFETIME "tcp_connection_lifetime" @@ -814,6 +815,8 @@ IMPORTFILE "import_file" <INITIAL>{TCP_CHILDREN} { count(); yylval.strval=yytext; return TCP_CHILDREN; } <INITIAL>{TCP_ACCEPT_ALIASES} { count(); yylval.strval=yytext; return TCP_ACCEPT_ALIASES; } +<INITIAL>{TCP_ACCEPT_UNIQUE} { count(); yylval.strval=yytext; + return TCP_ACCEPT_UNIQUE; } <INITIAL>{TCP_SEND_TIMEOUT} { count(); yylval.strval=yytext; return TCP_SEND_TIMEOUT; } <INITIAL>{TCP_CONNECT_TIMEOUT} { count(); yylval.strval=yytext; diff --git a/src/core/cfg.y b/src/core/cfg.y index 4c7dcd1307..3adff2429b 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -406,6 +406,7 @@ extern char *default_routename; %token MHOMED %token DISABLE_TCP %token TCP_ACCEPT_ALIASES +%token TCP_ACCEPT_UNIQUE %token TCP_CHILDREN %token TCP_CONNECT_TIMEOUT %token TCP_SEND_TIMEOUT @@ -994,6 +995,14 @@ assign_stm: #endif } | TCP_ACCEPT_ALIASES EQUAL error { yyerror("boolean value expected"); } + | TCP_ACCEPT_UNIQUE EQUAL NUMBER { + #ifdef USE_TCP + tcp_accept_unique=$3; + #else + warn("tcp support not compiled in"); + #endif + } + | TCP_ACCEPT_UNIQUE EQUAL error { yyerror("number expected"); } | TCP_CHILDREN EQUAL NUMBER { #ifdef USE_TCP tcp_cfg_children_no=$3; diff --git a/src/core/globals.h b/src/core/globals.h index 3790058075..78a8e5aadc 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -93,6 +93,7 @@ extern int socket_workers; #ifdef USE_TCP extern int tcp_main_pid; extern int tcp_cfg_children_no; +extern int tcp_accept_unique; extern int tcp_children_no; extern int tcp_disable; extern enum poll_types tcp_poll_method; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 54288e908f..7ecaf47eb6 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -158,6 +158,7 @@ enum poll_types tcp_poll_method=0; /* by default choose the best method */ int tcp_main_max_fd_no=0; int tcp_max_connections=DEFAULT_TCP_MAX_CONNECTIONS; int tls_max_connections=DEFAULT_TLS_MAX_CONNECTIONS; +int tcp_accept_unique=0; static union sockaddr_union tcp_source_ipv4_addr; /* saved bind/srv v4 addr. */ static union sockaddr_union* tcp_source_ipv4=0; @@ -1655,6 +1656,24 @@ struct tcp_connection* _tcpconn_find(int id, struct ip_addr* ip, int port, } +/** + * find if a tcp connection exits by id or remote+local address/port + * - return: 1 if found; 0 if not found + */ +int tcpconn_exists(int conn_id, ip_addr_t* peer_ip, int peer_port, + ip_addr_t* local_ip, int local_port) +{ + tcp_connection_t* c; + + TCPCONN_LOCK; + c=_tcpconn_find(conn_id, peer_ip, peer_port, local_ip, local_port); + TCPCONN_UNLOCK; + if (c) { + return 1; + } + return 0; + +} /* _tcpconn_find with locks and timeout * local_addr contains the desired local ip:port. If null any local address @@ -4245,6 +4264,15 @@ static inline int handle_new_connect(struct socket_info* si) /* add socket to list */ tcpconn=tcpconn_new(new_sock, &su, dst_su, si, si->proto, S_CONN_ACCEPT); if (likely(tcpconn)){ + if(tcp_accept_unique) { + if(tcpconn_exists(0, &tcpconn->rcv.dst_ip, tcpconn->rcv.dst_port, + &tcpconn->rcv.src_ip, tcpconn->rcv.src_port)) { + LM_ERR("duplicated connection by local and remote addresses\n"); + _tcpconn_free(tcpconn); + tcp_safe_close(new_sock); + return 1; /* success, because the accept was succesfull */ + } + } tcpconn->flags|=F_CONN_PASSIVE; #ifdef TCP_PASS_NEW_CONNECTION_ON_DATA atomic_set(&tcpconn->refcnt, 1); /* safe, not yet available to the [View Less]

1 0

[kamailio/kamailio] lost: code review, updates to memory managment and error handling (#2034)
by Wolfgang Kampichler 16 Aug '19

16 Aug '19

#### 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/2034 -- Commit Summary -- * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing -- File Changes -- A src/modules/lost/Makefile (23) A src/modules/lost/doc/Makefile (4) A src/modules/lost/doc/lost.xml (36) A src/modules/lost/doc/lost_admin.xml (265) A src/modules/lost/functions.c (590) A src/modules/lost/functions.h (40) A src/modules/lost/lost.c (339) A src/modules/lost/pidf.c (137) A src/modules/lost/pidf.h (50) A src/modules/lost/utilities.c (653) A src/modules/lost/utilities.h (76) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2034.patch https://github.com/kamailio/kamailio/pull/2034.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/2034 [View Less]

3 3

git:master:edd056dd: lost: small spelling fix in docs
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: edd056dd85e2f68fd7877592e7bd2fc5d15b7b64 URL: https://github.com/kamailio/kamailio/commit/edd056dd85e2f68fd7877592e7bd2fc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:16:03+02:00 lost: small spelling fix in docs --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/edd056dd85e2f68fd7877592e7bd2fc… Patch: https://… [View More]

1 0

git:master:4b317d12: build: add new lost module to extra module group
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 4b317d12a3b9786b1d5ba152e9fb1f1189484e02 URL: https://github.com/kamailio/kamailio/commit/4b317d12a3b9786b1d5ba152e9fb1f1… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:15:24+02:00 build: add new lost module to extra module group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/4b317d12a3b9786b1d5ba152e9fb1f1… Patch: https://… [View More]

1 0

git:master:2ab96d98: lost: initial checkin of README file
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 2ab96d985676889f4145f7aecbb7ca21a9048f29 URL: https://github.com/kamailio/kamailio/commit/2ab96d985676889f4145f7aecbb7ca2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:09:52+02:00 lost: initial checkin of README file --- Added: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/2ab96d985676889f4145f7aecbb7ca2… Patch: https://github.com/kamailio/kamailio/commit/2ab96d985676889f4145f7aecbb7ca2…

1 0

[kamailio/kamailio] lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-bas… (#2031)
by Wolfgang Kampichler 16 Aug '19

16 Aug '19

…ed routing - lost_held_query() takes specific id (pvar, P-A-I, or From), assembles a locationRequest (XML), and sends it to an http_client connection, responses are parsed (pidf-lo and location reference are returned) - lost_query() takes pidf-lo (pvar, msg body, or de-referenced), a service urn (pvar, request line) assembles a findService request (XML), and sends it to an http_client connection, responses are parsed (target uri and display name are returned)   #### 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/2031 -- Commit Summary -- * lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing -- File Changes -- A src/modules/lost/Makefile (23) A src/modules/lost/README (238) A src/modules/lost/doc/Makefile (4) A src/modules/lost/doc/lost.xml (36) A src/modules/lost/doc/lost_admin.xml (265) A src/modules/lost/functions.c (551) A src/modules/lost/functions.h (40) A src/modules/lost/lost.c (343) A src/modules/lost/pidf.c (143) A src/modules/lost/pidf.h (53) A src/modules/lost/utilities.c (592) A src/modules/lost/utilities.h (73) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2031.patch https://github.com/kamailio/kamailio/pull/2031.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/2031 [View Less]

3 9

git:master:31866942: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 318669423164b7c96e48861fd49de17d34e957ab URL: https://github.com/kamailio/kamailio/commit/318669423164b7c96e48861fd49de17… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - header comment included --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/… [View More]

1 0

git:master:c655e401: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: c655e401e0a839a73c60217b3feb7be87d183bf5 URL: https://github.com/kamailio/kamailio/commit/c655e401e0a839a73c60217b3feb7be… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - code review, updates to memory managment and error handling --- Modified: src/modules/lost/functions.c … [View More]

1 0

git:master:0f006f09: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: 0f006f092cc56f06a153b3c8f363c2d81e2afb1e URL: https://github.com/kamailio/kamailio/commit/0f006f092cc56f06a153b3c8f363c2d… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - code review, updates to memory managment and error handling --- Removed: src/modules/lost/README --- … [View More]

1 0

git:master:e255aaa5: lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing
by Henning Westerholt 16 Aug '19

16 Aug '19

Module: kamailio Branch: master Commit: e255aaa596d622103628903d08f07a226dacdbd9 URL: https://github.com/kamailio/kamailio/commit/e255aaa596d622103628903d08f07a2… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-16T08:04:03+02:00 lost: adds HELD (RFC6155) and LOST (RFC5222) queries for location-based routing - lost_held_query() takes specific id (pvar, P-A-I, or From), assembles a locationRequest (XML), and sends … [View More]

1 0

git:master:a263f5b6: topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784)
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: a263f5b62c03851a5d8a61f09e69745f90370703 URL: https://github.com/kamailio/kamailio/commit/a263f5b62c03851a5d8a61f09e69745… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T16:25:57+02:00 topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784) - fix regression in PRACK routing (introduced in cfc89db53c, GH #1784) - result set were set to 0 before usage by a … [View More]

1 1

git:master:3cd50f17: topos_redis: a few improvements for debugging output
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: 3cd50f171d4443abe21beba8e5e07081f29747d1 URL: https://github.com/kamailio/kamailio/commit/3cd50f171d4443abe21beba8e5e0708… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T16:23:58+02:00 topos_redis: a few improvements for debugging output --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:6670a3b6: add ims_usrloc_scscf README
by Kamailio Dev 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.2 Commit: 6670a3b6403fb43670042103ce4e087f92fa0c1b URL: https://github.com/kamailio/kamailio/commit/6670a3b6403fb43670042103ce4e087… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-14T19:37:37+02:00 add ims_usrloc_scscf README --- Added: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/6670a3b6403fb43670042103ce4e087… Patch: https://github.com/kamailio/kamailio/commit/6670a3b6403fb43670042103ce4e087…

3 4

git:5.1:988fc2ed: ims_dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.1 Commit: 988fc2edb33215e97e6efb88981f43b3a548f753 URL: https://github.com/kamailio/kamailio/commit/988fc2edb33215e97e6efb88981f43b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:48:33+02:00 ims_dialog: small spelling fix in WARN log messages (cherry picked from commit f25cf7806a84caccf49275be14a5885a9038bdca) --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/… [View More]ims_dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/988fc2edb33215e97e6efb88981f43b… Patch: https://github.com/kamailio/kamailio/commit/988fc2edb33215e97e6efb88981f43b… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index 27b13c8cb5..495aa91c65 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -976,7 +976,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1015,7 +1015,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1051,7 +1051,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, diff --git a/src/modules/ims_dialog/dlg_req_within.c b/src/modules/ims_dialog/dlg_req_within.c index aa960ecdbc..cba9a39130 100644 --- a/src/modules/ims_dialog/dlg_req_within.c +++ b/src/modules/ims_dialog/dlg_req_within.c @@ -190,7 +190,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps) { dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s); [View Less]

1 0

git:5.1:e6b8d218: dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.1 Commit: e6b8d218faed267e2963b1e75dd11b2addef8e8c URL: https://github.com/kamailio/kamailio/commit/e6b8d218faed267e2963b1e75dd11b2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:48:27+02:00 dialog: small spelling fix in WARN log messages (cherry picked from commit 389843c34eed6f39f4631eede6f6ab8b6bade2eb) --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/… [View More]

1 0

git:5.2:5e314acb: ims_dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.2 Commit: 5e314acbe9c66fb868ed4cbff1e57a98fc18fa60 URL: https://github.com/kamailio/kamailio/commit/5e314acbe9c66fb868ed4cbff1e57a9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:48:20+02:00 ims_dialog: small spelling fix in WARN log messages (cherry picked from commit f25cf7806a84caccf49275be14a5885a9038bdca) --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/… [View More]ims_dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/5e314acbe9c66fb868ed4cbff1e57a9… Patch: https://github.com/kamailio/kamailio/commit/5e314acbe9c66fb868ed4cbff1e57a9… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index e9257b2cc1..b0f5b491bb 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -981,7 +981,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1020,7 +1020,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1056,7 +1056,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, diff --git a/src/modules/ims_dialog/dlg_req_within.c b/src/modules/ims_dialog/dlg_req_within.c index aa960ecdbc..cba9a39130 100644 --- a/src/modules/ims_dialog/dlg_req_within.c +++ b/src/modules/ims_dialog/dlg_req_within.c @@ -190,7 +190,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps) { dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s); [View Less]

1 0

git:5.2:9f766cbb: dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: 5.2 Commit: 9f766cbb6d4820e5418594681ae0ebb305204bfd URL: https://github.com/kamailio/kamailio/commit/9f766cbb6d4820e5418594681ae0ebb… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:48:06+02:00 dialog: small spelling fix in WARN log messages (cherry picked from commit 389843c34eed6f39f4631eede6f6ab8b6bade2eb) --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/… [View More]

1 0

git:master:f25cf780: ims_dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: f25cf7806a84caccf49275be14a5885a9038bdca URL: https://github.com/kamailio/kamailio/commit/f25cf7806a84caccf49275be14a5885… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:47:21+02:00 ims_dialog: small spelling fix in WARN log messages --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_req_within.c --- Diff: https://github.com/… [View More]kamailio/kamailio/commit/f25cf7806a84caccf49275be14a5885… Patch: https://github.com/kamailio/kamailio/commit/f25cf7806a84caccf49275be14a5885… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index e9257b2cc1..b0f5b491bb 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -981,7 +981,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1020,7 +1020,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, @@ -1056,7 +1056,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { dlg->from_tag.len, dlg->from_tag.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s' and tags '%.*s' \n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s, diff --git a/src/modules/ims_dialog/dlg_req_within.c b/src/modules/ims_dialog/dlg_req_within.c index aa960ecdbc..cba9a39130 100644 --- a/src/modules/ims_dialog/dlg_req_within.c +++ b/src/modules/ims_dialog/dlg_req_within.c @@ -190,7 +190,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps) { dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s); } else if (ret > 0) { - LM_WARN("inconsitent dlg timer data on dlg %p [%u:%u] " + LM_WARN("inconsistent dlg timer data on dlg %p [%u:%u] " "with clid '%.*s'\n", dlg, dlg->h_entry, dlg->h_id, dlg->callid.len, dlg->callid.s); [View Less]

1 0

git:master:389843c3: dialog: small spelling fix in WARN log messages
by Henning Westerholt 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: 389843c34eed6f39f4631eede6f6ab8b6bade2eb URL: https://github.com/kamailio/kamailio/commit/389843c34eed6f39f4631eede6f6ab8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-15T08:47:21+02:00 dialog: small spelling fix in WARN log messages --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:d36a4b00: evapi: free the faked msg clone used for dispatcher event route
by Daniel-Constantin Mierla 15 Aug '19

15 Aug '19

Module: kamailio Branch: master Commit: d36a4b00c6becd42cfcec4fc7eb398371e1cc812 URL: https://github.com/kamailio/kamailio/commit/d36a4b00c6becd42cfcec4fc7eb3983… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T08:33:49+02:00 evapi: free the faked msg clone used for dispatcher event route --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

Re: [sr-dev] [SR-Users] Question regarding Dispatcher + ds_default_socket() modparam + Call-ID generation
by Henning Westerholt 14 Aug '19

14 Aug '19

Hi Daniel, good tip about the crypto module. It will indeed hide the IP address in the call-id, just tried it: Call-ID: d810d369-aa60-4d79-aee5-9c03d2e66781 I think if we would feed the sruid unique ID (in libs/srutils) into the SHA256 hash (also available there) this it should be secure enough without the crypto dependencies. The sruid is based on a LSFR implementation which is quite fast, and the SHA256 should provide the necessary unpredictability. But as the crypto module approach … [View More]works, it has probably not a really high priority. I can also look a bit into it when I got time. Cheers, Henning Am 14.08.19 um 19:21 schrieb Daniel-Constantin Mierla: Hello, using the ip in call-id is not a good practice imo, I had it in mind to replace it properly everywhere for quite some time -- actually at this moment there is an option that can be activated in the crypto module making the call-id to be generated with libssl unique id generation functions, but I don't recall if the local ip is still appended. This would require libssl, so my goal was to add an alternative to generate a "good-enough" unique id, without external dependencies, to be used as local call-id. Cheers, Daniel On 14.08.19 19:01, Joel Serrano wrote: Hello Henning, No concerns at all!! As you say, the Call-ID can really say whatever... The only concern could/would be in the security topic that you are disclosing potential sensible information about your infrastructure blablabla... but that can be solved just by changing the listen= order so even that wouldn't be a problem.. In reality I was just curious so I thought I'd ask :) Thanks!! Joel. On Wed, Aug 14, 2019 at 9:32 AM Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>> wrote: Hello Joel, funny - I just had this discussion about the same topic some days ago. In the end this is "only" the call-id, the IP should not be used to to routing descisions etc.. Do you have some more concerns about this? I think as well it just uses the first IP. I think at the moment the call-id is generated internally from tm, but this could be of course changed for the module with some coding/extension. Cheers, Henning Am 14.08.19 um 17:12 schrieb Joel Serrano: Hello, Simple doubt regarding dispatcher module when you have the ds_default_socket() modparam set: Say you have 2 kamailio boxes, active + passive, one shared IP via keepalived.... On the actrive node, you have dispatcher.send_ping to 1, and the passive has it set to 0. So far OK, only the active box is sending out probing OPTIONS requests, and it's using as outbound socket the virtual IP out of all the available ones (as defined with ds_default_socket() modparam) I have seen in a capture that the outbound OPTIONS look like: OPTIONS sip:190.14.203.219:5060<http://190.14.203.219:5060> SIP/2.0 Via: SIP/2.0/UDP A.B.C.180;branch=z9hG4bK7abb.6fbaccc1000000000000000000000000.0 To: <sip:190.14.203.219:5060<http://190.14.203.219:5060>> From: <sip:dspinger@my.domain><mailto:sip:dspinger@my.domain>;tag=e2bdd495733c59fd91487a137fccad4e-8a73 CSeq: 10 OPTIONS Call-ID: 2019f8491329c382-31419(a)A.B.C.181 Max-Forwards: 70 Content-Length: 0 A.B.C.180 -> VRRP A.B.C.181 -> Physical IP of the box My doubt is, shouldn't ds_default_socket also update the IP used to generate the Call-ID used in the OPTIONS request? Currently, I believe it's using the first defined listen= IP from config script as I switched the order the listen= are defined and I get the desired result: OPTIONS sip:186.188.220.174:5060<http://186.188.220.174:5060> SIP/2.0 Via: SIP/2.0/UDP A.B.C.180;branch=z9hG4bKc97e.a8d9e1c2000000000000000000000000.0 To: <sip:186.188.220.174:5060<http://186.188.220.174:5060>> From: <sip:dspinger@my.domain><mailto:sip:dspinger@my.domain>;tag=5e2e1773f812f6a7e4085c5d036e29d8-d323 CSeq: 10 OPTIONS Call-ID: 7d9a92c218fc1ba0-32111(a)A.B.C.180 Max-Forwards: 70 Content-Length: 0 Is this expected? Cheers, Joel. _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Daniel-Constantin Mierla -- www.asipto.com<http://www.asipto.com> www.twitter.com/miconda<http://www.twitter.com/miconda> -- www.linkedin.com/in/miconda<http://www.linkedin.com/in/miconda> -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services [View Less]

1 0

git:5.1:f031ae77: add ims_usrloc_scscf README
by Kamailio Dev 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.1 Commit: f031ae7792ab487b6bbcae7c5df3103431441668 URL: https://github.com/kamailio/kamailio/commit/f031ae7792ab487b6bbcae7c5df3103… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-14T19:37:55+02:00 add ims_usrloc_scscf README --- Added: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/f031ae7792ab487b6bbcae7c5df3103… Patch: https://github.com/kamailio/kamailio/commit/f031ae7792ab487b6bbcae7c5df3103…

1 0

[kamailio/kamailio] ims_usrloc_scscf module lacks module documentation (#1644)
by Henning Westerholt 14 Aug '19

14 Aug '19

The ims_usrloc_scscf module lacks module documentation in git master: ~/repositories/kamailio/src/modules/ims_usrloc_scscf> ls -la README doc* ls: cannot access 'README': No such file or directory ls: cannot access 'doc*': No such file or directory The purpose of this module and also its parameters that are exported should be documented in a doc/*.xml files like the other modules. This are the exported parameters from the source code: {"timer_interval", INT_PARAM, &… [View More]

4 6

[kamailio/kamailio] ims_usrloc_scscf : documentation is added (#1835)
by Yasin CANER 14 Aug '19

14 Aug '19

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  ims_usrloc_scscf module documentation is added. removed unnecessary files. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1835 -- Commit Summary -- * ims_registrar_scscf : fixed wrong comment for emergency register * ims_registrar_scscf: removed screensharing log file. * ims_usrloc_scscf: removed NewFile.xml file * ims_usrloc_scscf: doc is added -- File Changes -- M src/modules/ims_registrar_scscf/config.c (4) D src/modules/ims_registrar_scscf/screensharing.log (66) D src/modules/ims_usrloc_scscf/NewFile.xml (9) A src/modules/ims_usrloc_scscf/doc/Makefile (4) A src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf.xml (62) A src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml (340) A src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_faq.xml (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1835.patch https://github.com/kamailio/kamailio/pull/1835.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/1835 [View Less]

3 2

git:5.1:263a078e: ims_usrloc_scscf: doc is added
by Henning Westerholt 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.1 Commit: 263a078e581c11173d89f1114fa8827ee6259c35 URL: https://github.com/kamailio/kamailio/commit/263a078e581c11173d89f1114fa8827… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-14T18:15:12+02:00 ims_usrloc_scscf: doc is added documentation is added for ims_usrloc_scscf (cherry picked from commit 44049e9a9793824a8ef09759813b3cc8b5864103) --- Added: src/modules/ims_usrloc_scscf/doc/… [View More]

1 0

git:5.2:3dc241b4: ims_usrloc_scscf: doc is added
by Henning Westerholt 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: 3dc241b48be634ff444443ef9e0a4c4f4ddf33a6 URL: https://github.com/kamailio/kamailio/commit/3dc241b48be634ff444443ef9e0a4c4… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-14T18:14:03+02:00 ims_usrloc_scscf: doc is added documentation is added for ims_usrloc_scscf (cherry picked from commit 44049e9a9793824a8ef09759813b3cc8b5864103) --- Added: src/modules/ims_usrloc_scscf/doc/… [View More]

1 0

Kamailio v5.2.4 Released
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Hello, Kamailio SIP Server v5.2.4 stable release is out. This is a maintenance release of the latest stable branch, 5.2, that includes fixes since the release of v5.2.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.2.x. Deployments running previous v5.2.x versions are strongly recommended to be upgraded to v5.2.4. For more details about version 5.2.4 (including links and guidelines to download the tarball or … [View More]

1 0

git:5.2:759867b6: ChangeLog: content updated for v5.2.4
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: 759867b67e1031d037378168984b87b2590fb7c5 URL: https://github.com/kamailio/kamailio/commit/759867b67e1031d037378168984b87b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-14T11:35:30+02:00 ChangeLog: content updated for v5.2.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/759867b67e1031d037378168984b87b… Patch: https://github.com/kamailio/kamailio/commit/759867b67e1031d037378168984b87b…

1 0

git:5.2:0c23deea: Makefile.defs: version set to 5.2.4
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: 0c23deeaad6b54236966807172388f4073e54dde URL: https://github.com/kamailio/kamailio/commit/0c23deeaad6b54236966807172388f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-14T11:17:03+02:00 Makefile.defs: version set to 5.2.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0c23deeaad6b54236966807172388f4… Patch: https://… [View More]

1 0

git:5.2:7218d1fd: pkg/kamailio: updated version to 5.2.4 in spec files
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: 7218d1fdad903fabaff224cf2be8212013e35221 URL: https://github.com/kamailio/kamailio/commit/7218d1fdad903fabaff224cf2be8212… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-14T11:13:54+02:00 pkg/kamailio: updated version to 5.2.4 in spec files --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/… [View More]

1 0

[kamailio/kamailio] Kemi sqlops memory leak (#2032)
by Sebastian Damm 14 Aug '19

14 Aug '19

### Description We are running Kamailio 5.1.x in a mixed native/Kemi environment. That means, most of the config is still native Kamailio language, but some newer functions were written in JS and included via `jsdt_run("...");`. In one of those functions, we place an sqlops query. And since introducing this code, Kamailio leaks memory. Slowly, but eventually, the private memory will fill up. ### Troubleshooting #### Reproduction In Kamailio, the code looks like this: ``` if (!jsdt_run("… [View More]ksrIsCallAccountingRequired", "$(var(accentries){s.select,10,|})", "$(var(accentries){s.select,12,|})")) { xlog("L_ERR", "JS Call of ksrIsCallAccountingRequired route failed.\n"); } ``` And our JS code containing sqlops looks like this: ``` extension = '1234567e0'; mastersipid = '1234567'; KSR.sqlops.sql_query( "dbconn", `SELECT username, grp FROM grp WHERE username IN ('${mastersipid}', '${extension}') AND grp = 'ourGroupName'`, user ); ``` For each call, this query is executed once. Depending on the traffic, you can see the private package memory starting to fill up quicker or slower. #### Debugging Data ### Possible Solutions We had a similar problem about two years ago with app_lua and getting entries from a hash table, which we solved by introducing a temporary variable for using in the hash table index instead of strings. We tried doing the same thing in our current setup: ``` KSR.pv.sets("$var(extensionForQuery)", extension); KSR.pv.sets("$var(masterSipidForQuery)", masterSipid); KSR.sqlops.sql_query( "dbconn", "SELECT username, grp FROM grp WHERE username IN ('$var(masterSipidForQuery)', '$var(extensionForQuery)') AND grp = 'ourGroupName'", user ); ``` However, Kamailio doesn't replace the variables in the query string. Although the documentation of the sqlops module says, it supports pseudovars in the query string. We even tried putting the whole query into a variable, but ended up with a sqlops error. ### Additional Information ``` ersion: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.7.2 ``` * **Operating System**: ``` Debian Wheezy (yeah, I know... ) ``` -- 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/2032 [View Less]

3 5

git:master:897f58fd: sqlops: add a limit of maximum 32 result containers
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Module: kamailio Branch: master Commit: 897f58fd48c68d88df7967c1390a23f8b9069a61 URL: https://github.com/kamailio/kamailio/commit/897f58fd48c68d88df7967c1390a23f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-14T09:53:17+02:00 sqlops: add a limit of maximum 32 result containers - prevent use of too much memory by defining too many result containers - related to GH #2032 --- Modified: src/modules/… [View More]sqlops/sql_api.c Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/897f58fd48c68d88df7967c1390a23f… Patch: https://github.com/kamailio/kamailio/commit/897f58fd48c68d88df7967c1390a23f… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 54c123f85e..748d77320e 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -35,6 +35,8 @@ #include "sql_api.h" +#define SQLOPS_RESULT_MAXSIZE 32 + sql_con_t *_sql_con_root = NULL; sql_result_t *_sql_result_root = NULL; @@ -209,17 +211,25 @@ sql_result_t* sql_get_result(str *name) { sql_result_t *sr; unsigned int resid; + int i; resid = core_case_hash(name, 0, 0); sr = _sql_result_root; + i = 0; while(sr) { if(sr->resid==resid && sr->name.len==name->len && strncmp(sr->name.s, name->s, name->len)==0) return sr; + i++; sr = sr->next; } + if(i>SQLOPS_RESULT_MAXSIZE) + { + LM_ERR("too many result containers defined\n"); + return NULL; + } sr = (sql_result_t*)pkg_malloc(sizeof(sql_result_t) + name->len); if(sr==NULL) { @@ -736,7 +746,7 @@ int sqlops_do_query(str *scon, str *squery, str *sres) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } } @@ -764,7 +774,7 @@ int sqlops_get_value(str *sres, int i, int j, sql_val_t **val) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } if(i>=res->nrows) @@ -800,7 +810,7 @@ int sqlops_is_null(str *sres, int i, int j) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } if(i>=res->nrows) @@ -836,7 +846,7 @@ int sqlops_get_column(str *sres, int i, str *col) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } if(i>=res->ncols) @@ -866,7 +876,7 @@ int sqlops_num_columns(str *sres) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } return res->ncols; @@ -890,7 +900,7 @@ int sqlops_num_rows(str *sres) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); goto error; } return res->nrows; @@ -914,7 +924,7 @@ void sqlops_reset_result(str *sres) res = sql_get_result(sres); if(res==NULL) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + LM_ERR("invalid result container [%.*s]\n", sres->len, sres->s); return; } sql_reset_result(res); diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 1b16c06ed7..3943b1b81a 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -205,7 +205,7 @@ int sql_res_param(modparam_t type, void *val) res = sql_get_result(&s); if(res==NULL) { - LM_ERR("invalid result [%s]\n", s.s); + LM_ERR("invalid result container [%s]\n", s.s); goto error; } return 0; @@ -335,7 +335,7 @@ static int fixup_sql_query(void** param, int param_no) res = sql_get_result(&s); if(res==NULL) { - LM_ERR("invalid result [%s]\n", s.s); + LM_ERR("invalid result container [%s]\n", s.s); return E_UNSPEC; } *param = (void*)res; @@ -458,7 +458,7 @@ static int fixup_sql_rfree(void** param, int param_no) res = sql_get_result(&s); if(res==NULL) { - LM_ERR("invalid result [%s]\n", s.s); + LM_ERR("invalid result container [%s]\n", s.s); return E_UNSPEC; } *param = (void*)res; [View Less]

1 0

git:5.2:f4f08a90: pkg/kamailio/deb: version set to 5.2.4 [skip ci]
by Victor Seva 14 Aug '19

14 Aug '19

Module: kamailio Branch: 5.2 Commit: f4f08a901bd798acd237851c7299c6d07083974e URL: https://github.com/kamailio/kamailio/commit/f4f08a901bd798acd237851c7299c6d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-08-14T08:32:33+02:00 pkg/kamailio/deb: version set to 5.2.4 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/… [View More]

1 0

Planning the release of Kamailio v5.2.4
by Daniel-Constantin Mierla 14 Aug '19

14 Aug '19

Hello, I am considering to do soon a new release out of branch 5.2, respectively v5.2.4. I am aiming for August 12 or August 14, a matter of how backporting is finished, given that next week some devs travel to ClueCon. As usual, if you are aware of issues not reported yet on bug tracker or fixes not yet backported to branch 5.2, act during the next days to have enough time to approach them. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 3

git:master:29eb7561: rr: use msg_ctx_id_t for caching of request direction
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 29eb75611987c58a32904f5094055efa33c1c89a URL: https://github.com/kamailio/kamailio/commit/29eb75611987c58a32904f5094055ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T16:38:04+02:00 rr: use msg_ctx_id_t for caching of request direction --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:8d4ba1c5: rr: use msg_ctx_id_t for record route params caching
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 8d4ba1c577601c51903cc4b1bee8012318f70b54 URL: https://github.com/kamailio/kamailio/commit/8d4ba1c577601c51903cc4b1bee8012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T16:38:04+02:00 rr: use msg_ctx_id_t for record route params caching --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]8d4ba1c577601c51903cc4b1bee8012… Patch: https://github.com/kamailio/kamailio/commit/8d4ba1c577601c51903cc4b1bee8012… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index e9138985f3..37fa04f33d 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -57,8 +57,7 @@ #define ROUTE_SUFFIX_LEN (sizeof(ROUTE_SUFFIX)-1) /*! variables used to hook the param part of the local route */ -static unsigned int routed_msg_id = 0; -static int routed_msg_pid = 0; +static msg_ctx_id_t routed_msg_id = {0}; static str routed_params = {0,0}; extern int rr_force_send_socket; @@ -585,8 +584,8 @@ static inline int after_strict(struct sip_msg* _m) uri = rt->nameaddr.uri; /* reset rr handling static vars for safety in error case */ - routed_msg_id = 0; - routed_msg_pid = 0; + routed_msg_id.msgid = 0; + routed_msg_id.pid = 0; routed_params.s = NULL; routed_params.len = 0; @@ -637,8 +636,8 @@ static inline int after_strict(struct sip_msg* _m) /* set the hooks for the param * important note: RURI is already parsed by the above function, so * we just used it without any checking */ - routed_msg_id = _m->id; - routed_msg_pid = _m->pid; + routed_msg_id.msgid = _m->id; + routed_msg_id.pid = _m->pid; routed_params = _m->parsed_uri.params; if (is_strict(&puri.params)) { @@ -794,8 +793,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) uri = rt->nameaddr.uri; /* reset rr handling static vars for safety in error case */ - routed_msg_id = 0; - routed_msg_pid = 0; + routed_msg_id.msgid = 0; + routed_msg_id.pid = 0; if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI (%.*s)\n", @@ -812,8 +811,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) LM_DBG("Topmost route URI: '%.*s' is me\n", uri.len, ZSW(uri.s)); /* set the hooks for the params */ - routed_msg_id = _m->id; - routed_msg_pid = _m->pid; + routed_msg_id.msgid = _m->id; + routed_msg_id.pid = _m->pid; if ((use_ob = process_outbound(_m, puri.user)) < 0) { LM_INFO("failed to process outbound flow-token\n"); @@ -1015,7 +1014,7 @@ int redo_route_params(sip_msg_t *msg) } /* check if the hooked params belong to the same message */ - if (routed_msg_id != msg->id || routed_msg_pid != msg->pid) { + if (routed_msg_id.msgid != msg->id || routed_msg_id.pid != msg->pid) { redo = 1; } if((redo==0) && (routed_params.s==NULL || routed_params.len<=0)) { @@ -1031,8 +1030,8 @@ int redo_route_params(sip_msg_t *msg) uri = rt->nameaddr.uri; /* reset rr handling static vars for safety in error case */ - routed_msg_id = 0; - routed_msg_pid = 0; + routed_msg_id.msgid = 0; + routed_msg_id.pid = 0; if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI (%.*s)\n", @@ -1047,8 +1046,8 @@ int redo_route_params(sip_msg_t *msg) LM_DBG("Topmost route URI: '%.*s' is me\n", uri.len, ZSW(uri.s)); /* set the hooks for the params */ - routed_msg_id = msg->id; - routed_msg_pid = msg->pid; + routed_msg_id.msgid = msg->id; + routed_msg_id.pid = msg->pid; routed_params = puri.params; return 0; } else { [View Less]

1 0

git:master:7dca532c: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 7dca532cf3ab3aed35571134081b3715b6fa75c8 URL: https://github.com/kamailio/kamailio/commit/7dca532cf3ab3aed35571134081b371… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-13T16:16:41+02:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/7dca532cf3ab3aed35571134081b371… … [View More]Patch: https://github.com/kamailio/kamailio/commit/7dca532cf3ab3aed35571134081b371… --- diff --git a/src/modules/rr/README b/src/modules/rr/README index 4fe696ee3a..1b1ef14557 100644 --- a/src/modules/rr/README +++ b/src/modules/rr/README @@ -16,8 +16,6 @@ Edited by Jan Janak -Edited by - Bogdan-Andrei Iancu Copyright © 2003 FhG FOKUS @@ -52,7 +50,7 @@ Bogdan-Andrei Iancu 5. Functions 5.1. loose_route() - 5.2. record_route() and record_route(string) + 5.2. record_route([sparams]) 5.3. remove_record_route() 5.4. record_route_preset(string [,string2]) 5.5. record_route_advertised_address(address) @@ -128,7 +126,7 @@ Chapter 1. Admin Guide 5. Functions 5.1. loose_route() - 5.2. record_route() and record_route(string) + 5.2. record_route([sparams]) 5.3. remove_record_route() 5.4. record_route_preset(string [,string2]) 5.5. record_route_advertised_address(address) @@ -362,7 +360,7 @@ modparam("rr", "ignore_sips", 1) 5. Functions 5.1. loose_route() - 5.2. record_route() and record_route(string) + 5.2. record_route([sparams]) 5.3. remove_record_route() 5.4. record_route_preset(string [,string2]) 5.5. record_route_advertised_address(address) @@ -417,7 +415,7 @@ modparam("rr", "ignore_sips", 1) loose_route(); ... -5.2. record_route() and record_route(string) +5.2. record_route([sparams]) The function adds a new Record-Route header field. The header field will be inserted in the message before any other Record-Route header @@ -432,6 +430,10 @@ loose_route(); generate and add a flow-token as the username part of the Record-Route-URI. + Note: if append From-tag is enabled and the function is used for + requests within dialog, it must be executed after loose_route() in + order to detect properly the direction. + This function can be used from REQUEST_ROUTE, BRANCH_ROUTE and FAILURE_ROUTE. [View Less]

1 0

git:master:6542a638: rr: docs - note about use of record_route() for requests within dialog
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 6542a638bee90afdbfe63b59d9d7f1d23b0406aa URL: https://github.com/kamailio/kamailio/commit/6542a638bee90afdbfe63b59d9d7f1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T16:07:05+02:00 rr: docs - note about use of record_route() for requests within dialog - it has to be used after loose_route() for a proper detection of request direction --- Modified: src/… [View More]

1 0

git:master:8546983d: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 8546983de13bba7ed7a84a88ed91027e4291a1bc URL: https://github.com/kamailio/kamailio/commit/8546983de13bba7ed7a84a88ed91027… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-13T10:16:43+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:0cc64de7: registrar: allow unregister() to be used in any route
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 0cc64de7530fe90cbe3183caa494d9ef9941ee51 URL: https://github.com/kamailio/kamailio/commit/0cc64de7530fe90cbe3183caa494d9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T10:01:35+02:00 registrar: allow unregister() to be used in any route --- Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:23a5b8d9: registrar: updated docs for unregister()
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 23a5b8d9baf40a416401017324ceb01e7d769494 URL: https://github.com/kamailio/kamailio/commit/23a5b8d9baf40a416401017324ceb01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T10:03:32+02:00 registrar: updated docs for unregister() - function is allowed to be used in any route --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.… [View More]

1 0

git:master:8b8b5780: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: 8b8b5780c968079fd57d7b236ebfbfe3c9c76607 URL: https://github.com/kamailio/kamailio/commit/8b8b5780c968079fd57d7b236ebfbfe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-13T09:32:20+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:f9f113d9: http_client: docs for query_maxdatasize parameter
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: f9f113d9b07ea351c75f3d7fed5478074d5575c4 URL: https://github.com/kamailio/kamailio/commit/f9f113d9b07ea351c75f3d7fed54780… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:25:15+02:00 http_client: docs for query_maxdatasize parameter --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:ea4b25c6: http_client: new param query_maxdatasize
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: ea4b25c67c0e4ea072ce1bbc11ae21bc7c9484a3 URL: https://github.com/kamailio/kamailio/commit/ea4b25c67c0e4ea072ce1bbc11ae21b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:20:08+02:00 http_client: new param query_maxdatasize - set the maximum size to be downloaded for http_client_query() result - default: 0 - disabled (unlimited size) --- Modified: src/… [View More]modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/ea4b25c67c0e4ea072ce1bbc11ae21b… Patch: https://github.com/kamailio/kamailio/commit/ea4b25c67c0e4ea072ce1bbc11ae21b… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 05dc827126..bfa42ac527 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -653,7 +653,7 @@ int http_client_query( query_params.timeout = default_connection_timeout; query_params.http_follow_redirect = default_http_follow_redirect; query_params.oneline = default_query_result; - query_params.maxdatasize = 0; + query_params.maxdatasize = default_query_maxdatasize; if(default_useragent.s != NULL && default_useragent.len > 0) { query_params.useragent = default_useragent.s; } diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index fc20b65525..bdc2253b3d 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -104,6 +104,8 @@ unsigned int default_authmethod = * - 0: return full result * - 1: return first line only */ unsigned int default_query_result = 1; +/*!< Default download size for result of query function. 0=disabled (no limit) */ +unsigned int default_query_maxdatasize = 0; str http_client_config_file = STR_NULL; @@ -201,6 +203,7 @@ static param_export_t params[] = { {"authmethod", PARAM_INT, &default_authmethod }, {"keep_connections", PARAM_INT, &default_keep_connections }, {"query_result", PARAM_INT, &default_query_result }, + {"query_maxdatasize", PARAM_INT, &default_query_maxdatasize }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index 7f236dfa7e..a3620bd233 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -63,6 +63,7 @@ extern unsigned int extern unsigned int default_keep_connections; /*!< Keep http connections open for reuse */ extern unsigned int default_query_result; /*!< Default query result mode */ +extern unsigned int default_query_maxdatasize; /*!< Default query result maximum download size */ extern counter_handle_t connections; /* Number of connection definitions */ extern counter_handle_t connok; /* Successful Connection attempts */ [View Less]

1 0

git:master:d93b1861: http_client: docs for query_result parameter
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: d93b1861c6e9be5991040d2da327d2f543d9f9ab URL: https://github.com/kamailio/kamailio/commit/d93b1861c6e9be5991040d2da327d2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:15:43+02:00 http_client: docs for query_result parameter --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]d93b1861c6e9be5991040d2da327d2f… Patch: https://github.com/kamailio/kamailio/commit/d93b1861c6e9be5991040d2da327d2f… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 70bcd2a433..55c65ccc97 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -36,10 +36,10 @@ <para> Like in SIP, the HTTP URL may need encoding to be transported safely over the network. Check the string encoding functions in the Transformation - Cookbook (as used in the http_client_query example below). + Cookbook (as used in the http_client_query() example below). </para> <para> - The function http_client_query allows &kamailio; to issue an HTTP GET + The function http_client_query() allows &kamailio; to issue an HTTP GET request and get access to parts of the reply. This function has been ported from the utils module and now use the same libcurl functions. We recommend using the new functionality provided by @@ -433,6 +433,31 @@ modparam("http_client", "authmethod", 3) <programlisting format="linespecific"> ... modparam("http_client", "keep_connections", 1) +... + </programlisting> + </example> + </section> + <section id="http_client.p.query_result"> + <title><varname>query_result</varname> (int)</title> + <para> + Control what is returned by the http_client_query(...) in the result + variable. + </para> + <para> + Valid values are: + <itemizedlist> + <listitem><para>0 - Return the entire HTTP result body</para></listitem> + <listitem><para>1 - Return the first oine from HTTP result body</para></listitem> + </itemizedlist> + </para> + <para> + Default value: 1 (return first line). + </para> + <example> + <title>Set <varname>query_result</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("http_client", "query_result", 0) ... </programlisting> </example> @@ -796,17 +821,18 @@ http_get_redirect("apiserver", "$var(targeturl)"); </para> <para> If HTTP server returns a class 2xx, 3xx or 4xx reply, - the first line of the reply's body (if any) is + the first line or the entire reply body (if any) is stored in <quote>result</quote> parameter, - which must be a writable pseudo variable. + which must be a writable pseudo variable. See the query_result + parameter for controling what value to be stored in the result + variable. </para> <para> Function returns reply code of HTTP reply or -1 if something went wrong. </para> <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> <para> Note that this function is based on the http_query function in the utils module. [View Less]

1 0

git:master:d07b522b: http_client: new param query_result
by Daniel-Constantin Mierla 13 Aug '19

13 Aug '19

Module: kamailio Branch: master Commit: d07b522b927f26b01a24417e0fb9f64c87fb79fb URL: https://github.com/kamailio/kamailio/commit/d07b522b927f26b01a24417e0fb9f64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-13T09:07:34+02:00 http_client: new param query_result - control if the http_client_query() returns only the first line or the entire result - 0: return the entire result - 1: return the … [View More]first line (default, backward compatible) --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/d07b522b927f26b01a24417e0fb9f64… Patch: https://github.com/kamailio/kamailio/commit/d07b522b927f26b01a24417e0fb9f64… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 695324bf43..05dc827126 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -652,7 +652,7 @@ int http_client_query( query_params.verify_host = default_tls_verify_host; query_params.timeout = default_connection_timeout; query_params.http_follow_redirect = default_http_follow_redirect; - query_params.oneline = 1; + query_params.oneline = default_query_result; query_params.maxdatasize = 0; if(default_useragent.s != NULL && default_useragent.len > 0) { query_params.useragent = default_useragent.s; diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 432d71a6c8..fc20b65525 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -100,6 +100,11 @@ unsigned int default_authmethod = CURLAUTH_BASIC | CURLAUTH_DIGEST; /*!< authentication method - Basic, Digest or both */ +/*!< Default http query result mode + * - 0: return full result + * - 1: return first line only */ +unsigned int default_query_result = 1; + str http_client_config_file = STR_NULL; static curl_version_info_data *curl_info; @@ -195,6 +200,7 @@ static param_export_t params[] = { {"httpcon", PARAM_STRING|USE_FUNC_PARAM, (void*)curl_con_param}, {"authmethod", PARAM_INT, &default_authmethod }, {"keep_connections", PARAM_INT, &default_keep_connections }, + {"query_result", PARAM_INT, &default_query_result }, {0, 0, 0} }; diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index d7bb7658f9..7f236dfa7e 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -62,6 +62,7 @@ extern unsigned int default_authmethod; /*!< authentication method - Basic, Digest or both */ extern unsigned int default_keep_connections; /*!< Keep http connections open for reuse */ +extern unsigned int default_query_result; /*!< Default query result mode */ extern counter_handle_t connections; /* Number of connection definitions */ extern counter_handle_t connok; /* Successful Connection attempts */ [View Less]

1 0

git:master:b3d9da5c: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: b3d9da5c5e80e42e550c4cf56c29aee1ab068c92 URL: https://github.com/kamailio/kamailio/commit/b3d9da5c5e80e42e550c4cf56c29aee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-12T21:01:45+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/b3d9da5c5e80e42e550c4cf56c29aee…… [View More]

1 0

git:5.2:db0ae1e3: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 12 Aug '19

12 Aug '19

Module: kamailio Branch: 5.2 Commit: db0ae1e3dde3331810ba8b154d7e111bf3322583 URL: https://github.com/kamailio/kamailio/commit/db0ae1e3dde3331810ba8b154d7e111… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-12T21:01:32+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/db0ae1e3dde3331810ba8b154d7e111…… [View More]

1 0

git:5.2:6e5cb772: topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024)
by Henning Westerholt 12 Aug '19

12 Aug '19

Module: kamailio Branch: 5.2 Commit: 6e5cb772817a8275c89869c868ce20a2ddb47df9 URL: https://github.com/kamailio/kamailio/commit/6e5cb772817a8275c89869c868ce20a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-12T20:55:26+02:00 topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024) (cherry picked from commit 3ccf5ee691440e806d441f0e58562ddc4137a488) --- Modified: src/modules/topos/doc/… [View More]

1 0

git:master:3ccf5ee6: topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024)
by Henning Westerholt 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 3ccf5ee691440e806d441f0e58562ddc4137a488 URL: https://github.com/kamailio/kamailio/commit/3ccf5ee691440e806d441f0e58562dd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-12T20:54:48+02:00 topos: docs for dialog_expire param limitation for in-dialog requests (GH #2024) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] topos module does not update topos_d timestamp at re-INVITE (#2024)
by Henning Westerholt 12 Aug '19

12 Aug '19

The topos module fails to update the dialog data in the topos_d table after the processing of re-INVITEs. I have setup a call at 11:55, and triggered a re-INVITE at 12:08. The respective topos_d table entry is not updated. This causes the entry to expire after topos dialog_timeout value. I would expect that the timestamp of the call in the topos_d table is updated. Is this assumption correct? If the current behavior is expected, it should documented in the module README. No error messages … [View More]

2 4

git:5.2:c1eaf335: dispatcher: skip inactive destinations for pointing next to be used record
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: 5.2 Commit: c1eaf3353f43d34f164f28a871399ca785c40b4f URL: https://github.com/kamailio/kamailio/commit/c1eaf3353f43d34f164f28a871399ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T20:18:12+02:00 dispatcher: skip inactive destinations for pointing next to be used record (cherry picked from commit 18eeda012a711584239b03d5cfef8b7720f0ef31) --- Modified: src/modules/… [View More]

1 0

git:master:18eeda01: dispatcher: skip inactive destinations for pointing next to be used record
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 18eeda012a711584239b03d5cfef8b7720f0ef31 URL: https://github.com/kamailio/kamailio/commit/18eeda012a711584239b03d5cfef8b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T20:15:17+02:00 dispatcher: skip inactive destinations for pointing next to be used record --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

Re: [sr-dev] [SR-Users] Dispatcher round-robin problems in 5.2
by Henning Westerholt 12 Aug '19

12 Aug '19

Hi Alex, there have been many changes to the modules between 5.1 and 5.2. I just looked a bit to the code of dispatch.c and also the commits. I noticed something in commit 3933a64c464acfb285e - there was a block related to round-robin before which got removed in this refactoring (if I analyzed it correctly): - /* if alg is round-robin then update the shortcut to next to be used */ - if(alg == DS_ALG_ROUNDROBIN) … [View More]- idx->last = (hash + 1) % idx->nr; It could be simple added back, because of the changed logic, though. Cheers, Henning Am 12.08.19 um 17:28 schrieb Alex Balashov: > Hi Daniel, > > Haven’t checked that, no. But all the external system does is issue RPC commands (`dispatcher.set_state`) maybe a few times a day. It’s nothing volatile or overly Byzantine. > > — > Sent from mobile, with due apologies for brevity and errors. > >> On Aug 12, 2019, at 11:24 AM, Daniel-Constantin Mierla <miconda(a)gmail.com> wrote: >> >> Hello, >> >> could you observe similar behavior on other dispatchers that don't use >> an external system tomanage activation and deactivation of the gateways? >> Or you haven't checked such one so far? >> >> Cheers, >> Daniel >> >>> On 12.08.19 15:23, Alex Balashov wrote: >>> Hi, >>> >>> I've got a proxy that does very basic round-robin distribution of calls >>> to an elastic pool of servers, defined in a simple SQLite database with >>> equal priorities. Nothing too complicated, just a vanilla >>> `ds_select_domain("1", "4")`. >>> >>> The only complication is that seldom are most of the gateways enabled. >>> Probing stuff was turned on, but didn't do quite what was desired, so it >>> was replaced with a system that manages activation and deactivation of >>> the gateways externally. Nevertheless, these are the left-over probing >>> settings: >>> >>> modparam("dispatcher", "ds_ping_method", "OPTIONS") >>> modparam("dispatcher", "ds_ping_from", "sip:pinger@domain") >>> modparam("dispatcher", "ds_ping_interval", 15) >>> modparam("dispatcher", "ds_probing_threshold", 256) >>> modparam("dispatcher", "ds_inactive_threshold", 1) >>> modparam("dispatcher", "ds_probing_mode", 0) >>> >>> After an upgrade from 5.1 to 5.2.3 (009f62), the round-robin has become >>> extremely "sticky" and tendentious. That is to say, it directs _almost_ >>> all calls to a single gateway -- the first gateway in the table -- >>> though not 100%. There is also a marked tendency to send lots of >>> consecutive calls to the same gateway, even if it's not the first one, >>> though most of the time it is. >>> >>> Has anyone experienced similar upon upgrading to 5.2? >>> >>> Thanks much! >>> >>> -- Alex >>> >> -- >> Daniel-Constantin Mierla -- www.asipto.com >> www.twitter.com/miconda -- www.linkedin.com/in/miconda >> > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services [View Less]

1 0

[kamailio/kamailio] core: Fix the cfg framework variable input type default (#2022)
by Mancaș George 12 Aug '19

12 Aug '19

#### 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 … [View More]

3 4

git:master:0a161d19: Merge pull request #2022 from mancasg/master
by GitHub 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: 0a161d19707917f690b5823b64d120cccc354c8b URL: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-08-12T11:37:11+02:00 Merge pull request #2022 from mancasg/master core: Fix the cfg framework variable input type default --- Modified: src/core/cfg/cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:c3b2eacb: core: Fix the cfg framework variable input type default
by MancaÈ George 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: c3b2eacbba1097ed3d40cff18ea2d51ebcad1c67 URL: https://github.com/kamailio/kamailio/commit/c3b2eacbba1097ed3d40cff18ea2d51… Author: MancaÈ George <mancas.f.george(a)gmail.com> Committer: MancaÈ George <mancas.f.george(a)gmail.com> Date: 2019-08-01T09:39:28Z core: Fix the cfg framework variable input type default What the affected line of code really wants to achieve is: if an accepted inputs type mask is not specified then default to … [View More]

1 0

git:master:d9a1cbc8: gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback
by Daniel-Constantin Mierla 12 Aug '19

12 Aug '19

Module: kamailio Branch: master Commit: d9a1cbc8f66f9fd0991048e5e1ba1579916a092e URL: https://github.com/kamailio/kamailio/commit/d9a1cbc8f66f9fd0991048e5e1ba157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-12T11:18:21+02:00 gzcompress: free old outbound buffer inside SREV_NET_DATA_OUT callback --- Modified: src/modules/gzcompress/gzcompress_mod.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev