sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:master:03289ce3: registrar: update doc for use_expired_contacts

by Stefan Mititelu

Module: kamailio Branch: master Commit: 03289ce36d12d9397b5d9879e75d56b8baac10fa URL: https://github.com/kamailio/kamailio/commit/03289ce36d12d9397b5d9879e75d56b… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-28T17:12:04+02:00 registrar: update doc for use_expired_contacts --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/03289ce36d12d9397b5d9879e75d56b… Patch: https://github.com/kamailio/kamailio/commit/03289ce36d12d9397b5d9879e75d56b… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 4575bbaf9b..e3140965d4 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1100,6 +1100,46 @@ request_route { </programlisting> </example> </section> + + + <section id="registrar.p.use_expired_contacts"> + <title><varname>use_expired_contacts</varname> (int)</title> + + <para> + Allow/Disallow the usage of the expired contacts. + </para> + + <itemizedlist> + <listitem> + <para> + <emphasis>0</emphasis> Disallow the usage of the expired contacts. + </para> + </listitem> + <listitem> + <para> + <emphasis>1</emphasis> Allow the usage of the expired contacts. + </para> + </listitem> + </itemizedlist> + + <para> + <emphasis> + Default value is 0 (Disallow). + </emphasis> + </para> + + <example> + <title>Set <varname>use_expired_contacts</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("registrar", "use_expired_contacts", 1) +... + +kamcmd cfg.set_now_int registrar use_expired_contacts 1 +kamcmd cfg.set_now_int registrar use_expired_contacts 0 + </programlisting> + </example> + </section> </section>

4 years, 8 months

git:master:252d18a0: registrar: add use_expired_contacts config param

by Stefan Mititelu

Module: kamailio Branch: master Commit: 252d18a032d5c6efbb709b75c0f17cdbd20ac58b URL: https://github.com/kamailio/kamailio/commit/252d18a032d5c6efbb709b75c0f17cd… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-28T17:12:04+02:00 registrar: add use_expired_contacts config param Allow/Disallow the usage of the expired contacts. Useful when some problems happen with new REGISTERs; allow the usage of old REGISTERed contacts. Default value is 0 meaning "disallow the usage of the expired contacts". (no changes to existing behavior) Value can be set dinamically via: kamcmd cfg.set_now_int registrar use_expired_contacts 1 --- Modified: src/modules/registrar/config.c Modified: src/modules/registrar/config.h Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/252d18a032d5c6efbb709b75c0f17cd… Patch: https://github.com/kamailio/kamailio/commit/252d18a032d5c6efbb709b75c0f17cd… --- diff --git a/src/modules/registrar/config.c b/src/modules/registrar/config.c index 937b9ea736..8a08207216 100644 --- a/src/modules/registrar/config.c +++ b/src/modules/registrar/config.c @@ -40,7 +40,8 @@ struct cfg_group_registrar default_registrar_cfg = { 0, /* retry_after */ 0, /* case_sensitive */ Q_UNSPECIFIED, /* default_q */ - 1 /* append_branches */ + 1, /* append_branches */ + 0 /* use_expired_contacts */ }; void *registrar_cfg = &default_registrar_cfg; @@ -68,5 +69,7 @@ cfg_def_t registrar_cfg_def[] = { "The parameter represents default q value for new contacts."}, /* Q_UNSPECIFIED is -1 */ {"append_branches", CFG_VAR_INT , 0, 0, 0, 0, "If set to 1(default), lookup will put all contacts found in msg structure"}, + {"use_expired_contacts",CFG_VAR_INT , 0, 0, 0, 0, + "Toggles using expired contacts as if they were active."}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/registrar/config.h b/src/modules/registrar/config.h index a6d1076ec1..43f5606bc2 100644 --- a/src/modules/registrar/config.h +++ b/src/modules/registrar/config.h @@ -36,6 +36,7 @@ struct cfg_group_registrar { unsigned int case_sensitive; qvalue_t default_q; unsigned int append_branches; + unsigned int use_expired_contacts; }; extern struct cfg_group_registrar default_registrar_cfg; diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 97dd635b38..81f9b7afd9 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -304,7 +304,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) ret = -1; /* look first for an un-expired and suported contact */ while (ptr) { - if(VALID_CONTACT(ptr,act_time)) { + if(VALID_CONTACT(ptr,act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts)) { if(allowed_method(_m,ptr)) { /* match on instance, if pub-gruu */ if(inst.len>0) { @@ -346,7 +346,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) aor = *ptr->aor; /* test if not expired and contact with suported method */ if(ptr) { - if(!(VALID_CONTACT(ptr,act_time))) { + if(!(VALID_CONTACT(ptr,act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts))) { goto done; } else if(!allowed_method(_m,ptr)) { ret=-2; @@ -485,7 +485,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) if (!cfg_get(registrar, registrar_cfg, append_branches)) goto done; for( ; ptr ; ptr = ptr->next ) { - if (VALID_CONTACT(ptr, act_time) && allowed_method(_m, ptr) + if ((VALID_CONTACT(ptr, act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts)) && allowed_method(_m, ptr) && reg_lookup_filter_match(ptr)) { path_dst.len = 0; if(ptr->path.s && ptr->path.len) { @@ -847,7 +847,7 @@ int registered4(struct sip_msg* _m, udomain_t* _d, str* _uri, int match_flag, get_act_time(); for (ptr = r->contacts; ptr; ptr = ptr->next) { - if(!VALID_CONTACT(ptr, act_time)) continue; + if(!(VALID_CONTACT(ptr, act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts))) continue; if (match_callid.s && /* optionally enforce tighter matching w/ Call-ID */ match_callid.len > 0 && (match_callid.len != ptr->callid.len || diff --git a/src/modules/registrar/registrar.c b/src/modules/registrar/registrar.c index 7f1aa78bd7..11ebbdc8b9 100644 --- a/src/modules/registrar/registrar.c +++ b/src/modules/registrar/registrar.c @@ -248,6 +248,7 @@ static param_export_t params[] = { {"event_callback", PARAM_STR, &reg_event_callback }, {"lookup_filter_mode", INT_PARAM, &reg_lookup_filter_mode }, {"min_expires_mode", PARAM_INT, &reg_min_expires_mode }, + {"use_expired_contacts", INT_PARAM, &default_registrar_cfg.use_expired_contacts }, {0, 0, 0} };

4 years, 8 months

[kamailio/kamailio] registrar: add use_expired_contacts config param (#2234)

by Stefan Mititelu

#### 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  Allow/Disallow the usage of the expired contacts. Useful when some problems happen with new REGISTERs; allow the usage of old REGISTERed contacts. Default value is 0 meaning "disallow the usage of the expired contacts". (no changes to existing behavior) Value can be set dinamically via: kamcmd cfg.set_now_int registrar use_expired_contacts 1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2234 -- Commit Summary -- * registrar: add use_expired_contacts config param * registrar: update doc for use_expired_contacts -- File Changes -- M src/modules/registrar/config.c (5) M src/modules/registrar/config.h (1) M src/modules/registrar/doc/registrar_admin.xml (40) M src/modules/registrar/lookup.c (8) M src/modules/registrar/registrar.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2234.patch https://github.com/kamailio/kamailio/pull/2234.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/2234

4 years, 8 months

[kamailio/kamailio] Fedora 32/Rawhide build error: modules/sms: multiple definition of 'queued_msgs', 'use_contact', 'sms_report_type' (#2236)

by Anthony Messina

Similar to #2235. After this one, I can try to collect them up rather than reporting an issue for each module--it's only that the build is killed, so I only see the first one that errors out. I'll see what I can do about that. ``` make[2]: Entering directory '/builddir/build/BUILD/kamailio-5.3.2/src/modules/sms' gcc -shared -Wl,-O2 -Wl,-E -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions libsms_getsms.o libsms_putsms.o libsms_modem.o sms_funcs.o sms.o sms_report.o libsms_charset.o -o sms.so make[2]: Leaving directory '/builddir/build/BUILD/kamailio-5.3.2/src/modules/sms' /usr/bin/ld: sms.o:(.bss+0x40): multiple definition of `queued_msgs'; sms_funcs.o:(.bss+0x11a0): first defined here /usr/bin/ld: sms.o:(.bss+0x48): multiple definition of `use_contact'; sms_funcs.o:(.bss+0x11a8): first defined here /usr/bin/ld: sms.o:(.bss+0x4c): multiple definition of `sms_report_type'; libsms_modem.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status make[2]: *** [../../Makefile.rules:191: sms.so] Error 1 make[1]: *** [Makefile:511: modules] Error 1 make: *** [Makefile:34: every-module] Error 2 ``` -- 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/2236

4 years, 8 months

uac_replace_from rare behaviour

by David Escartin

Hello all we just noticed an issue using this function when we call it with 2 params (display and uri) and the SIP INVITE comes with a From uri like sip:anonymous@anonymous.invalid; tag=13133439191609, without <> delimiters, then doing the uac replace in the ACK we have 2(14923) DEBUG: uac [replace.c:922]: replace_callback(): DOWNSTREAM direction detected - replacing uri with the new uri 2(14923) DEBUG: uac [replace.c:943]: replace_callback(): Replace [ sip:anonymous@anonymous.invalid] with ["14254350027" sip:14254350027@1.1.18.171] 2(14923) DEBUG: uac [replace.c:980]: replace_callback(): inserting display ["14254350027"] And this is the From header replaced From: sip:14254350027@1.1.18.171"14254350027" <>;tag=13133439191609 But if the call comes with a From header like <sip:anonymous@anonymous.invalid>; tag=13133439191609 Then this is the From header replaced 2(19741) DEBUG: uac [replace.c:922]: replace_callback(): DOWNSTREAM direction detected - replacing uri with the new uri 2(19741) DEBUG: uac [replace.c:943]: replace_callback(): Replace [ sip:1241342@1.1.18.171:5074] with ["14254350027" sip:14254350027@1.1.18.171] 2(19741) DEBUG: uac [replace.c:980]: replace_callback(): inserting display ["14254350027"] From: "14254350027" <sip:14254350027@1.1.18.171>;tag=13133439191609 Were you aware of this kind of behaviour? If possible we will look for a patch for this. thanks a lot and regards david

4 years, 8 months

[kamailio/kamailio] Kamailio SDP Error 5.1.8 (#1983)

by nicoonline

Hello, I got this message under some circumstances (the number called) Jun 12 15:15:01 proxy1 /usr/sbin/kamailio[16096]: ERROR: <core> [core/parser/sdp/sdp.c:228]: set_sdp_payload_fmtp(): Invalid payload location What means "Payload location" ? SDP Debug from the callee: Jun 12 15:15:01 proxy1 /usr/sbin/kamailio[16096]: DEBUG: sdpops [sdpops_mod.c:1626]: sdp_get_helper(): Found SDP v=0#015#012o=- 5793 1 IN IP4 192.168.50.50#015#012s=-#015#012t=0 0#015#012m=audio 24734 RTP/AVP 8 101#015#012c=IN IP4 217.112.190.117#015#012a=rtpmap:101 telephone-event/8000#015#012a=fmtp:18 annexa=yes#015#012a=fmtp:101 0-15#015#012a=ptime:30#015#012a=silenceSupp:off - - - -#015#012a=sendrecv#015#012 SDP Debug called pbx: Jun 12 15:15:01 proxy1 /usr/sbin/kamailio[16097]: DEBUG: sdpops [sdpops_mod.c:1626]: sdp_get_helper(): Found SDP v=0#015#012o=root 1673681431 1673681431 IN IP4 217.112.180.5#015#012s=Asterisk PBX 11.25.1#015#012c=IN IP4 217.112.180.5#015#012t=0 0#015#012m=audio 10884 RTP/AVP 8 101#015#012a=rtpmap:8 PCMA/8000#015#012a=rtpmap:101 telephone-event/8000#015#012a=fmtp:101 0-16#015#012a=ptime:20#015#012a=sendrecv#015#012 -- 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/1983

4 years, 8 months

git:5.3:48a630a1: app_python3: declare global vars extern in header file

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 48a630a11b954fe8da5edac7f3cf5b582407416b URL: https://github.com/kamailio/kamailio/commit/48a630a11b954fe8da5edac7f3cf5b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:21:11+01:00 app_python3: declare global vars extern in header file (cherry picked from commit a771d9abd9ce97228efa7a0dfc9c4d89690e9b38) --- Modified: src/modules/app_python3/app_python3_mod.c Modified: src/modules/app_python3/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/48a630a11b954fe8da5edac7f3cf5b5… Patch: https://github.com/kamailio/kamailio/commit/48a630a11b954fe8da5edac7f3cf5b5… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 92ce10e04f..502a6d540b 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -53,6 +53,7 @@ static int child_init(int rank); static void mod_destroy(void); PyObject *_sr_apy_handler_obj = NULL; +PyObject *format_exc_obj = NULL; char *dname = NULL, *bname = NULL; diff --git a/src/modules/app_python3/python_support.h b/src/modules/app_python3/python_support.h index 97c4e72e3e..8859f9a32a 100644 --- a/src/modules/app_python3/python_support.h +++ b/src/modules/app_python3/python_support.h @@ -25,7 +25,7 @@ #include <Python.h> #include <stdarg.h> -PyObject *format_exc_obj; +extern PyObject *format_exc_obj; void python_handle_exception(const char *, ...);

4 years, 8 months

git:5.3:e934227b: app_python: declare global vars extern in header file

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: e934227bf3d7c082a4cd3125f32a002bda3dd8c4 URL: https://github.com/kamailio/kamailio/commit/e934227bf3d7c082a4cd3125f32a002… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:20:59+01:00 app_python: declare global vars extern in header file (cherry picked from commit 9cc9576c025c541264a3679618bb2be8d108a9f6) --- Modified: src/modules/app_python/app_python_mod.c Modified: src/modules/app_python/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/e934227bf3d7c082a4cd3125f32a002… Patch: https://github.com/kamailio/kamailio/commit/e934227bf3d7c082a4cd3125f32a002… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index e901c91412..ee832feb3d 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -54,6 +54,8 @@ static void mod_destroy(void); PyObject *_sr_apy_handler_obj = NULL; +PyObject *format_exc_obj = NULL; + char *dname = NULL, *bname = NULL; int _apy_process_rank = 0; diff --git a/src/modules/app_python/python_support.h b/src/modules/app_python/python_support.h index 4d25564119..2a97d16ed8 100644 --- a/src/modules/app_python/python_support.h +++ b/src/modules/app_python/python_support.h @@ -25,7 +25,7 @@ #include <Python.h> #include <stdarg.h> -PyObject *format_exc_obj; +extern PyObject *format_exc_obj; void python_handle_exception(const char *, ...);

4 years, 8 months

git:5.3:dd7e19b1: siputils: proper param type for kemi contact ops exports

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: dd7e19b1a383bc52e0a9fcf22f183e79474508b3 URL: https://github.com/kamailio/kamailio/commit/dd7e19b1a383bc52e0a9fcf22f183e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:20:40+01:00 siputils: proper param type for kemi contact ops exports (cherry picked from commit 92c6f04a3faa917a227fb5d3b8918c981a1b1d96) --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/dd7e19b1a383bc52e0a9fcf22f183e7… Patch: https://github.com/kamailio/kamailio/commit/dd7e19b1a383bc52e0a9fcf22f183e7… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index e9593da3b4..c2da159088 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -553,12 +553,12 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { }, { str_init("siputils"), str_init("decode_contact"), SR_KEMIP_INT, ki_decode_contact, - { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siputils"), str_init("decode_contact_header"), SR_KEMIP_INT, ki_decode_contact_header, - { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

4 years, 8 months

git:5.3:87e2fcb0: pua_reginfo: extern declaration of global vars in header file

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 87e2fcb0289e148f53719fca6f029e03c62a2c72 URL: https://github.com/kamailio/kamailio/commit/87e2fcb0289e148f53719fca6f029e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:20:19+01:00 pua_reginfo: extern declaration of global vars in header file (cherry picked from commit 7afe5b9837d38cd77f75c3028c9134673c95404e) --- Modified: src/modules/pua_reginfo/pua_reginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/87e2fcb0289e148f53719fca6f029e0… Patch: https://github.com/kamailio/kamailio/commit/87e2fcb0289e148f53719fca6f029e0… --- diff --git a/src/modules/pua_reginfo/pua_reginfo.h b/src/modules/pua_reginfo/pua_reginfo.h index a15b7e47a8..133191541b 100644 --- a/src/modules/pua_reginfo/pua_reginfo.h +++ b/src/modules/pua_reginfo/pua_reginfo.h @@ -16,8 +16,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,9 +27,9 @@ #include "../pua/pua_bind.h" #include "../usrloc/usrloc.h" -str default_domain; -str outbound_proxy; -str server_address; +extern str default_domain; +extern str outbound_proxy; +extern str server_address; extern usrloc_api_t ul; /*!< Structure containing pointers to usrloc functions*/ extern pua_api_t pua; /*!< Structure containing pointers to PUA functions*/

4 years, 8 months

← Newer
1
...
33
34
35
36
37
38
39
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020