sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:master:26d25b1c: nathelper: docs - added missing xml tags for the new nat test option

by Daniel-Constantin Mierla

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/kamailio/commit/26d25b1c9e3654642f9f85c02492297… Patch: https://github.com/kamailio/kamailio/commit/26d25b1c9e3654642f9f85c02492297… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 71b8e92479..b5a5b08167 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -666,6 +666,7 @@ 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> + <listitem><para> <emphasis>256</emphasis> - Test if the SDP connection address is different from source IP address. It will work also with multiple connection address lines.

4 years, 7 months

[kamailio/kamailio] nathelper: test sdp c line and sip source ip address is matched. (#2045)

by Yasin CANER

#### 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

4 years, 7 months

git:master:9a5db075: modules: readme files regenerated - nathelper ... [skip ci]

by Kamailio Dev

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/9a5db07510feb5fab0bdd2b7d67446f… Patch: https://github.com/kamailio/kamailio/commit/9a5db07510feb5fab0bdd2b7d67446f…

4 years, 7 months

git:master:9094ee5b: nathelper: also return -1 in case of SDP parsing errors for sdp_1918 check, simplify code

by Henning Westerholt

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/commit/9094ee5b1780b3be1b89b54cb8cc32c… Patch: https://github.com/kamailio/kamailio/commit/9094ee5b1780b3be1b89b54cb8cc32c… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 6baaa64528..4426b93478 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1388,16 +1388,13 @@ static int sdp_1918(struct sip_msg *msg) { str *ip; int pf; - int ret; int sdp_session_num, sdp_stream_num; sdp_session_cell_t *sdp_session; sdp_stream_cell_t *sdp_stream; - ret = parse_sdp(msg); - if(ret != 0) { - if(ret < 0) - LM_ERR("Unable to parse sdp\n"); - return 0; + if(parse_sdp(msg) < 0) { + LM_ERR("Unable to parse sdp body\n"); + return -1; } sdp_session_num = 0; @@ -1462,7 +1459,7 @@ static int nat_uac_test(struct sip_msg *msg, int tests) /* * test for occurrences of RFC1918 addresses in SDP body */ - if((tests & NAT_UAC_TEST_S_1918) && sdp_1918(msg)) + if((tests & NAT_UAC_TEST_S_1918) && (sdp_1918(msg) > 0)) return 1; /* * test for occurrences of RFC1918 addresses top Via

4 years, 7 months

git:master:ce3bfaa8: nathelper: extend nat_uac_test() to test for mismatch between connection and source IP (GH #2045)

by Henning Westerholt

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 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; }

4 years, 7 months

[kamailio/kamailio] Module:phonenum: Issue in fetching resid param fixed (#2054)

by balajeesv

#### 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

4 years, 7 months

git:master:56f86535: phonenum: proper access to the str type param resid

by Daniel-Constantin Mierla

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/56f86535e0ae3fcf8fa2d0b565c7ab6… Patch: https://github.com/kamailio/kamailio/commit/56f86535e0ae3fcf8fa2d0b565c7ab6… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index 6c9e0b1d1b..ea49e73a86 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -112,8 +112,7 @@ static int phonenum_resid_param(modparam_t type, void* val) { str rname; - rname.s = (char*)val; - rname.len = strlen(rname.s); + rname = *((str*)val); if(sr_phonenum_add_resid(&rname) < 0) { LM_ERR("failed to register result container with id: %.*s\n", rname.len, rname.s);

4 years, 7 months

[kamailio/kamailio] dialog database varchar(128) too short for IPv6 (#2053)

by Anthony Messina

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

4 years, 7 months

git:master:5518bbaa: modules: readme files regenerated - uac ... [skip ci]

by Kamailio Dev

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… Patch: https://github.com/kamailio/kamailio/commit/5518bbaa8c27ca0fbfa173e1f7101da…

4 years, 7 months

git:master:56e53ed0: uac: docs - fixed missing ending tag

by Daniel-Constantin Mierla

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… Patch: https://github.com/kamailio/kamailio/commit/56e53ed0ce594a1df30b5a5dcb5b455… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index e6211d398b..1a48b5663e 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1314,7 +1314,7 @@ event_route[uac:reply] { ... </programlisting> </example> - + </section> </section> <section>

4 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019