sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
280 discussions

[kamailio/kamailio] topos: don't insert contact header for 4xx replies (PR #3158)

by Victor Seva

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally #### Description Topos is adding Contact header to the 407 reply ![image](https://user-images.githubusercontent.com/63080/174794224-b9a6f9d9-f496-4be0-b903-489bd8a4a261.png) ![image](https://user-images.githubusercontent.com/63080/174794351-14000f4c-185c-48b9-adde-476ba6744c30.png) Related to https://github.com/kamailio/kamailio/pull/3149 even with https://github.com/kamailio/kamailio/commit/414c7dd608584df18f871b42e05f401… applied You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3158 -- Commit Summary -- * topos: don't insert contact header for 4xx replies -- File Changes -- M src/modules/topos/tps_msg.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3158.patch https://github.com/kamailio/kamailio/pull/3158.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3158 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3158(a)github.com>

1 year, 11 months

git:master:f49f14a8: topos: don't insert contact header for 4xx replies

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f49f14a87606314e98a253ee29b1624ae814dccf URL: https://github.com/kamailio/kamailio/commit/f49f14a87606314e98a253ee29b1624… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-22T21:45:35+02:00 topos: don't insert contact header for 4xx replies unless original msg has contact --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/f49f14a87606314e98a253ee29b1624… Patch: https://github.com/kamailio/kamailio/commit/f49f14a87606314e98a253ee29b1624… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 6f5633119d..798885df56 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1167,6 +1167,11 @@ int tps_response_sent(sip_msg_t *msg) && msg->contact==NULL) { contact_keep = 1; } + if(contact_keep==0 && msg->first_line.u.reply.statuscode>=400 + && msg->first_line.u.reply.statuscode<500 + && msg->contact==NULL) { + contact_keep = 1; + } if(contact_keep==0) { tps_remove_headers(msg, HDR_CONTACT_T); if(direction==TPS_DIR_DOWNSTREAM) {

1 year, 11 months

git:5.6:315781e5: core: fix freeaddrinfo coredump

by Victor Seva

Module: kamailio Branch: 5.6 Commit: 315781e547e359354b6deaf53355a029fdb3e869 URL: https://github.com/kamailio/kamailio/commit/315781e547e359354b6deaf53355a02… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-22T12:47:18+02:00 core: fix freeaddrinfo coredump > #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 > #1 0x00007fbb5e515537 in __GI_abort () at abort.c:79 > #2 0x00007fbb5e56e768 in __libc_message (action=action@entry=do_abort, fmt=fmt@entry=0x7fbb5e67ce2d "%s\n") at ../sysdeps/posix/libc_fatal.c:155 > #3 0x00007fbb5e575a5a in malloc_printerr (str=str@entry=0x7fbb5e67b05a "free(): invalid pointer") at malloc.c:5347 > #4 0x00007fbb5e576c14 in _int_free (av=<optimized out>, p=<optimized out>, have_lock=0) at malloc.c:4173 > #5 0x00007fbb5e5d8da0 in __GI_freeaddrinfo (ai=ai@entry=0x7fbb5e83ba10) at ../sysdeps/posix/getaddrinfo.c:2520 > #6 0x000055ba099dcd0b in log_init () at core/dprint.c:482 > #7 0x000055ba09970d7a in main (argc=10, argv=0x7ffde85a1788) at main.c:2055 (cherry picked from commit 71502d2bb733340db310bf4e0c47e4b194f49113) --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/315781e547e359354b6deaf53355a02… Patch: https://github.com/kamailio/kamailio/commit/315781e547e359354b6deaf53355a02… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 9b01dc8af9a..f4780bb4d47 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -459,7 +459,8 @@ static str log_prefix_str = STR_NULL; void log_init(void) { - struct addrinfo hints, *info; + struct addrinfo hints; + struct addrinfo *info = NULL; int gai_result; char hostname[1024];

1 year, 11 months

git:master:71502d2b: core: fix freeaddrinfo coredump

by Victor Seva

Module: kamailio Branch: master Commit: 71502d2bb733340db310bf4e0c47e4b194f49113 URL: https://github.com/kamailio/kamailio/commit/71502d2bb733340db310bf4e0c47e4b… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-22T12:45:14+02:00 core: fix freeaddrinfo coredump > #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 > #1 0x00007fbb5e515537 in __GI_abort () at abort.c:79 > #2 0x00007fbb5e56e768 in __libc_message (action=action@entry=do_abort, fmt=fmt@entry=0x7fbb5e67ce2d "%s\n") at ../sysdeps/posix/libc_fatal.c:155 > #3 0x00007fbb5e575a5a in malloc_printerr (str=str@entry=0x7fbb5e67b05a "free(): invalid pointer") at malloc.c:5347 > #4 0x00007fbb5e576c14 in _int_free (av=<optimized out>, p=<optimized out>, have_lock=0) at malloc.c:4173 > #5 0x00007fbb5e5d8da0 in __GI_freeaddrinfo (ai=ai@entry=0x7fbb5e83ba10) at ../sysdeps/posix/getaddrinfo.c:2520 > #6 0x000055ba099dcd0b in log_init () at core/dprint.c:482 > #7 0x000055ba09970d7a in main (argc=10, argv=0x7ffde85a1788) at main.c:2055 --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/71502d2bb733340db310bf4e0c47e4b… Patch: https://github.com/kamailio/kamailio/commit/71502d2bb733340db310bf4e0c47e4b… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 9b01dc8af9..f4780bb4d4 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -459,7 +459,8 @@ static str log_prefix_str = STR_NULL; void log_init(void) { - struct addrinfo hints, *info; + struct addrinfo hints; + struct addrinfo *info = NULL; int gai_result; char hostname[1024];

1 year, 11 months

[kamailio/kamailio] topos: remove contact header for CANCEL, BYE, PRACK REQUESTS (PR #3149)

by Mvondo Eric

#### 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  According to RFC 3261 & 3262 CANCEL , PRACK and BYE requests and their associated responses (most of them) must not have contact header You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3149 -- Commit Summary -- * topos: remove contact header for CANCEL,BYE,PRACK REQUESTS -- File Changes -- M src/modules/topos/tps_msg.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3149.patch https://github.com/kamailio/kamailio/pull/3149.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3149 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3149(a)github.com>

1 year, 11 months

git:master:322562a3: modules: readme files regenerated - topos ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 322562a354887dec18e7df2d90a328fe32fc122e URL: https://github.com/kamailio/kamailio/commit/322562a354887dec18e7df2d90a328f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-21T09:01:17+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/322562a354887dec18e7df2d90a328f… Patch: https://github.com/kamailio/kamailio/commit/322562a354887dec18e7df2d90a328f… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index ef7c0e9634..4c6c4532ad 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -49,6 +49,7 @@ Frederic Gaisnon 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) + 3.19. methods_nocontact (str) 4. Functions @@ -81,11 +82,12 @@ Frederic Gaisnon 1.16. Set xavu_field_contact_host parameter 1.17. Set rr_update parameter 1.18. Set context parameter - 1.19. tps_set_context usage - 1.20. Usage of event_route[topos:msg-outgoing] - 1.21. Usage of event_route[topos:msg-sending] - 1.22. Usage of event_route[topos:msg-incoming] - 1.23. Usage of event_route[topos:msg-receoving] + 1.19. Set methods_nocontact parameter + 1.20. tps_set_context usage + 1.21. Usage of event_route[topos:msg-outgoing] + 1.22. Usage of event_route[topos:msg-sending] + 1.23. Usage of event_route[topos:msg-incoming] + 1.24. Usage of event_route[topos:msg-receoving] Chapter 1. Admin Guide @@ -117,6 +119,7 @@ Chapter 1. Admin Guide 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) + 3.19. methods_nocontact (str) 4. Functions @@ -187,6 +190,7 @@ Chapter 1. Admin Guide 3.16. xavu_field_contact_host (str) 3.17. rr_update (int) 3.18. context (str) + 3.19. methods_nocontact (str) 3.1. storage (str) @@ -471,6 +475,17 @@ modparam("topos", "rr_update", 1) modparam("topos", "context", "srvone") ... +3.19. methods_nocontact (str) + + List of SIP methods to skip adding Contact header for. + + Default value is “BYE,CANCEL,PRACK”. + + Example 1.19. Set methods_nocontact parameter +... +modparam("topos", "methods_nocontact", "CANCEL,PRACK") +... + 4. Functions 4.1. tps_set_context(ctx) @@ -482,7 +497,7 @@ modparam("topos", "context", "srvone") This function can be used from ANY_ROUTE. - Example 1.19. tps_set_context usage + Example 1.20. tps_set_context usage ... request_route { ... @@ -510,7 +525,7 @@ request_route { reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.20. Usage of event_route[topos:msg-outgoing] + Example 1.21. Usage of event_route[topos:msg-outgoing] ... event_route[topos:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -529,7 +544,7 @@ event_route[topos:msg-outgoing] { $sndto(proto) point to the destination. The SIP message is the one to be sent out. - Example 1.21. Usage of event_route[topos:msg-sending] + Example 1.22. Usage of event_route[topos:msg-sending] ... event_route[topos:msg-sending] { if(is_request() and $fU=="alice") { @@ -549,7 +564,7 @@ event_route[topos:msg-sending] { internally generated one at startup, to avoid reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.22. Usage of event_route[topos:msg-incoming] + Example 1.23. Usage of event_route[topos:msg-incoming] ... event_route[topos:msg-incoming] { if($si=="10.1.1.10") { @@ -567,7 +582,7 @@ event_route[topos:msg-incoming] { Inside the event route the variables $si, $sp and $proto point to the source address. The SIP message is the one to be sent out. - Example 1.23. Usage of event_route[topos:msg-receoving] + Example 1.24. Usage of event_route[topos:msg-receoving] ... event_route[topos:msg-receiving] { if(is_request() and $fU=="alice") {

1 year, 11 months

git:master:1ba5080e: topos: docs for methods_nocontact parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1ba5080ee484b5785ae17d38e7108be9d505924a URL: https://github.com/kamailio/kamailio/commit/1ba5080ee484b5785ae17d38e7108be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-21T08:57:06+02:00 topos: docs for methods_nocontact parameter --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1ba5080ee484b5785ae17d38e7108be… Patch: https://github.com/kamailio/kamailio/commit/1ba5080ee484b5785ae17d38e7108be… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index dee94df414c..1fb1d1f9606 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -522,6 +522,25 @@ modparam("topos", "rr_update", 1) ... modparam("topos", "context", "srvone") ... +</programlisting> + </example> + </section> + <section id="topos.p.methods_nocontact"> + <title><varname>methods_nocontact</varname> (str)</title> + <para> + List of SIP methods to skip adding Contact header for. + </para> + <para> + <emphasis> + Default value is <quote>BYE,CANCEL,PRACK</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>methods_nocontact</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "methods_nocontact", "CANCEL,PRACK") +... </programlisting> </example> </section>

1 year, 11 months

git:master:ab714eb3: topos: added methods_nocontact parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ab714eb386060df994875cfd1c8cf2b61fe7fa8f URL: https://github.com/kamailio/kamailio/commit/ab714eb386060df994875cfd1c8cf2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-21T08:57:06+02:00 topos: added methods_nocontact parameter - specify the list of methods to skip adding contact header for --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/ab714eb386060df994875cfd1c8cf2b… Patch: https://github.com/kamailio/kamailio/commit/ab714eb386060df994875cfd1c8cf2b… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 498cc8defe..0c78f3ee38 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -50,6 +50,7 @@ #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_to.h" #include "../../core/parser/parse_from.h" +#include "../../core/parser/parse_methods.h" #include "../../core/timer_proc.h" #include "../../core/fmsg.h" #include "../../core/onsend.h" @@ -84,6 +85,8 @@ str _tps_storage = str_init("db"); extern int _tps_branch_expire; extern int _tps_dialog_expire; +extern unsigned int _tps_methods_nocontact; +str _tps_methods_nocontact_list = str_init(""); int _tps_clean_interval = 60; @@ -165,6 +168,8 @@ static param_export_t params[]={ {"xavu_field_contact_host", PARAM_STR, &_tps_xavu_field_contact_host}, {"rr_update", PARAM_INT, &_tps_rr_update}, {"context", PARAM_STR, &_tps_context_param}, + {"methods_nocontact", PARAM_STR, &_tps_methods_nocontact_list}, + {0,0,0} }; @@ -214,6 +219,12 @@ static int mod_init(void) return -1; } + if(_tps_methods_nocontact_list.len>0) { + if(parse_methods(&_tps_methods_nocontact_list, &_tps_methods_nocontact)<0) { + LM_ERR("failed to parse methods_nocontact parameter\n"); + return -1; + } + } if(_tps_storage.len==2 && strncmp(_tps_storage.s, "db", 2)==0) { /* Find a database module */ if (db_bind_mod(&_tps_db_url, &_tpsdbf)) { diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index c01dde7b3f..6f5633119d 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -46,8 +46,6 @@ #include "tps_msg.h" #include "tps_storage.h" -#define TPS_METHODS_NOCONTACT (METHOD_CANCEL|METHOD_BYE|METHOD_PRACK) - extern int _tps_param_mask_callid; extern int _tps_contact_mode; extern str _tps_cparam_name; @@ -59,6 +57,8 @@ extern str _tps_context_value; str _sr_hname_xbranch = str_init("P-SR-XBranch"); str _sr_hname_xuuid = str_init("P-SR-XUID"); +unsigned int _tps_methods_nocontact = METHOD_CANCEL|METHOD_BYE|METHOD_PRACK; + /** * */ @@ -584,7 +584,7 @@ int tps_reinsert_contact(sip_msg_t *msg, tps_data_t *ptsd, str *hbody) { str hname = str_init("Contact"); - if (get_cseq(msg)->method_id & TPS_METHODS_NOCONTACT) { + if (get_cseq(msg)->method_id & _tps_methods_nocontact) { return 0; }

1 year, 11 months

git:master:414c7dd6: topos: skip adding contact header for BYE, CANCEL, PRACK

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 414c7dd608584df18f871b42e05f401e21ba775d URL: https://github.com/kamailio/kamailio/commit/414c7dd608584df18f871b42e05f401… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-21T08:57:05+02:00 topos: skip adding contact header for BYE, CANCEL, PRACK - GH #3149 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/414c7dd608584df18f871b42e05f401… Patch: https://github.com/kamailio/kamailio/commit/414c7dd608584df18f871b42e05f401… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 83d5f5fddff..c01dde7b3f1 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -46,6 +46,8 @@ #include "tps_msg.h" #include "tps_storage.h" +#define TPS_METHODS_NOCONTACT (METHOD_CANCEL|METHOD_BYE|METHOD_PRACK) + extern int _tps_param_mask_callid; extern int _tps_contact_mode; extern str _tps_cparam_name; @@ -582,6 +584,10 @@ int tps_reinsert_contact(sip_msg_t *msg, tps_data_t *ptsd, str *hbody) { str hname = str_init("Contact"); + if (get_cseq(msg)->method_id & TPS_METHODS_NOCONTACT) { + return 0; + } + if(tps_add_headers(msg, &hname, hbody, 0)<0) { return -1; }

1 year, 11 months

[kamailio/kamailio] ppcfg: add values to log to better tell the problem (PR #3151)

by Seven Du

#### 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/3151 -- Commit Summary -- * ppcfg: add values to log to better tell the problem -- File Changes -- M src/core/ppcfg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3151.patch https://github.com/kamailio/kamailio/pull/3151.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3151 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3151(a)github.com>

1 year, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022