sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

[kamailio/kamailio] tm: check branch uri against current uri when deciding if append a ne… (#702)

by Federico Cabiddu

…w branch This patch allows t_append_branches to cope with sip.instance usage, at least for the case when the contact uri has changed with regards to a previous registration. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/702 -- Commit Summary -- * tm: check branch uri against current uri when deciding if append a new branch -- File Changes -- M modules/tm/t_append_branches.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/702.patch https://github.com/kamailio/kamailio/pull/702.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/702

7 years, 11 months

git:master:0421bf53: pv: return 5061 for port variables (e.g., $dp) when transport is tls

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0421bf53c6ec193238b15907cf4a7c83bbae4401 URL: https://github.com/kamailio/kamailio/commit/0421bf53c6ec193238b15907cf4a7c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-08T10:27:55+02:00 pv: return 5061 for port variables (e.g., $dp) when transport is tls - reported by Colin Morelli, GH #700 --- Modified: modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/0421bf53c6ec193238b15907cf4a7c8… Patch: https://github.com/kamailio/kamailio/commit/0421bf53c6ec193238b15907cf4a7c8… --- diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 6c1ec41..abaa2ec 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -53,6 +53,7 @@ static str str_udp = { "UDP", 3 }; static str str_5060 = { "5060", 4 }; +static str str_5061 = { "5061", 4 }; static str pv_str_1 = { "1", 1 }; static str pv_uri_scheme[] = { { "none", 4 }, @@ -97,6 +98,11 @@ int pv_get_5060(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_strintval(msg, param, res, &str_5060, 5060); } +int pv_get_5061(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + return pv_get_strintval(msg, param, res, &str_5061, 5061); +} + int pv_get_true(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -279,8 +285,13 @@ int pv_get_xuri_attr(struct sip_msg *msg, struct sip_uri *parsed_uri, return pv_get_null(msg, param, res); return pv_get_strval(msg, param, res, &parsed_uri->host); } else if(param->pvn.u.isname.name.n==3) /* port */ { - if(parsed_uri->port.s==NULL) - return pv_get_5060(msg, param, res); + if(parsed_uri->port.s==NULL) { + if(parsed_uri->proto==PROTO_TLS) { + return pv_get_5061(msg, param, res); + } else { + return pv_get_5060(msg, param, res); + } + } return pv_get_strintval(msg, param, res, &parsed_uri->port, (int)parsed_uri->port_no); } else if(param->pvn.u.isname.name.n==4) /* protocol */ { @@ -1140,8 +1151,13 @@ int pv_get_dsturi_attr(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); return pv_get_strval(msg, param, res, &uri.host); } else if(param->pvn.u.isname.name.n==2) /* port */ { - if(uri.port.s==NULL) - return pv_get_5060(msg, param, res); + if(uri.port.s==NULL || uri.port.len<=0) { + if(uri.proto==PROTO_TLS) { + return pv_get_5061(msg, param, res); + } else { + return pv_get_5060(msg, param, res); + } + } return pv_get_strintval(msg, param, res, &uri.port, (int)uri.port_no); } else if(param->pvn.u.isname.name.n==3) /* proto */ { if(uri.transport_val.s==NULL)

7 years, 11 months

git: new commits in branch master

by GitHub

- URL: https://github.com/kamailio/kamailio/commit/8af239f6483d935c981c5a187ebc3b2… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:00-07:00 core: add portable rand() macros - add kam_rand(), kam_srand(), and KAM_RAND_MAX macros - provides consistency on platforms that define RAND_MAX as 32767 - URL: https://github.com/kamailio/kamailio/commit/bcdbcfc57f907ee88a63bef808b4aac… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:23-07:00 ims_charging: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/5836b40f81bf82a11e664ba8ef8ae6d… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:23-07:00 auth: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/c7d133b1d5cfba4110d229fe1780a41… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:24-07:00 carrierroute: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/9b7eaaeaca537b2d0a04421059ba4c4… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:24-07:00 cdp: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/8d538cc8240a99a7c430c7c48a93b9a… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:24-07:00 cfgutils: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/c24c2174b5efb7277c2c3728f784278… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:24-07:00 dialog: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/6d0ad0198c8910291d4ae77da61a214… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:24-07:00 dispatcher: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/4cf4498aad3bff00958938c60f79ff7… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:24-07:00 drouting: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/ecbcf92a5559128b967f919ccb8e6ad… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:24-07:00 ims_auth: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/0b1f07519e82747a7304b9bcb1a185b… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:25-07:00 ims_dialog: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/25cf7d6657b46cd5abb2af996f03fd6… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:25-07:00 ims_registrar_scscf: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/3054a824b6d08ab4869b72ef2707e61… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:25-07:00 iptrtpproxy: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/33820827902fb614843c90774d9aa80… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:25-07:00 lcr: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/8a0ecd99b35e8714b1f8dfc75f9bddf… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:34-07:00 nat_traversal: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/faca6f2bbb654358e98eae37c6e1c2d… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:34-07:00 nsq: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/60772caf32e2cafb0b586056ab042b0… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:34-07:00 pipelimit: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/e0f2c7c3b3aeb7ea44eca9968c20dd3… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:35-07:00 presence: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/66b79559d18aee356b0feb6b717611d… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:35-07:00 registrar: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/f2d056c8b8675681a83c52aea1c4ca3… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:35-07:00 rls: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/db69f64da2ab14ee4e330cd197f77a1… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:35-07:00 sipcapture: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/32ab9c36753c1908d300e8456fa56e0… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:35-07:00 tm: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/d237e1a97bdfa249a41586c9e026a03… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:35-07:00 tsilo: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/3174f25f3dadd70c1026b0638ea65a9… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:35-07:00 usrloc: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/670b2d10208647038cf5d4947371206… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:36-07:00 xmpp: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/0caaa85c4a18991ffc1eb41f3f7d617… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:36-07:00 xprint: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/db11faca2acdc2ac8ebc2ab2cc754f7… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-07-07T16:40:36-07:00 core: update to use kam_rand() - URL: https://github.com/kamailio/kamailio/commit/189cf64a3525f6c3e4d70740db40f64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-08T10:11:12+02:00 Merge pull request #701 from sjthomason/portable-rand Add kam_rand() macro for portability

7 years, 11 months

[kamailio/kamailio] Destination Port Inferred Incorrectly When Assigning $du (#700)

by Colin Morelli

When manually assigning `$du`, the destination port pseudo-var `$dp` is set to 5060 unless explicitly overridden in the URI. This should probably be inferred from the transport param, as it yields an incorrect value when transport=tls (which, unless explicitly overridden, should default to port 5061). --- 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/700

7 years, 11 months

[kamailio/kamailio] Add kam_rand() macro for portability (#701)

by sjthomason

Many platforms with 4 byte integers define RAND_MAX as INT_MAX but some (Solaris and derivatives for example), RAND_MAX is only 32767 but INT_MAX is 2147483647. This change allows falling back to the posix random() and srandom() variants with casts to int if both int and long are 4 bytes, then defining a consistent KAM_RAND_MAX of 2147483647. If both INT_MAX and RAND_MAX are 2 bytes, then we are stuck with ANSI rand(). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/701 -- Commit Summary -- * core: add portable rand() macros * ims_charging: update to use kam_rand() * auth: update to use kam_rand() * carrierroute: update to use kam_rand() * cdp: update to use kam_rand() * cfgutils: update to use kam_rand() * dialog: update to use kam_rand() * dispatcher: update to use kam_rand() * drouting: update to use kam_rand() * ims_auth: update to use kam_rand() * ims_dialog: update to use kam_rand() * ims_registrar_scscf: update to use kam_rand() * iptrtpproxy: update to use kam_rand() * lcr: update to use kam_rand() * nat_traversal: update to use kam_rand() * nsq: update to use kam_rand() * pipelimit: update to use kam_rand() * presence: update to use kam_rand() * registrar: update to use kam_rand() * rls: update to use kam_rand() * sipcapture: update to use kam_rand() * tm: update to use kam_rand() * tsilo: update to use kam_rand() * usrloc: update to use kam_rand() * xmpp: update to use kam_rand() * xprint: update to use kam_rand() * core: update to use kam_rand() -- File Changes -- M main.c (9) M modules/auth/auth_mod.c (5) M modules/carrierroute/cr_func.c (3) M modules/carrierroute/prime_hash.c (4) M modules/cdp/peermanager.c (6) M modules/cdp/session.c (4) M modules/cdp/utils.h (1) M modules/cfgutils/cfgutils.c (5) M modules/dialog/dlg_hash.c (3) M modules/dispatcher/dispatch.c (6) M modules/dispatcher/dispatch.h (1) M modules/dispatcher/dispatcher.c (2) M modules/drouting/drouting.c (11) M modules/ims_auth/authorize.c (5) M modules/ims_charging/ro_session_hash.c (2) M modules/ims_charging/ro_session_hash.h (1) M modules/ims_dialog/dlg_hash.c (3) M modules/ims_registrar_scscf/reg_mod.h (1) M modules/ims_registrar_scscf/registrar_notify.c (2) M modules/ims_registrar_scscf/save.c (2) M modules/ims_registrar_scscf/sip_msg.c (2) M modules/iptrtpproxy/iptrtpproxy.c (3) M modules/lcr/lcr_mod.c (3) M modules/nat_traversal/nat_traversal.c (9) M modules/nsq/reader.c (5) M modules/pipelimit/pipelimit.c (3) M modules/presence/presence.c (3) M modules/registrar/sip_msg.c (3) M modules/rls/notify.c (5) M modules/sipcapture/sipcapture.c (5) M modules/tm/callid.c (7) M modules/tm/h_table.c (5) M modules/tm/uac.c (3) M modules/tsilo/ts_hash.c (3) M modules/usrloc/ul_mi.c (3) M modules/xmpp/util.c (4) M modules/xprint/xp_lib.c (5) M msg_translator.c (3) M pt.c (13) A rand/kam_rand.h (35) M select_core.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/701.patch https://github.com/kamailio/kamailio/pull/701.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/701

7 years, 11 months

[kamailio/kamailio] Packaging: Add new http package for Debian (#699)

by Sebastian Damm

The new module contains the http_client and http_async_client module. A few difficulties with this change: 1. Modules are right now grouped by lib dependencies. This caused the http_client module to end up in the kamailio-utils-modules package. No one would ever search for it there. 2. I tried to package a kamailio-http_async-modules package, but this isn't a valid Debian package name. But when renaming it into kamailio-http-modules, it felt wrong to include just the async http client and leave the http_client module stuck in the utils package, where no one would look for it. So I moved the http_client package, too. 3. The package depends on libevent, which is actually just a dependency of http_async_client. http_client would compile without. I don't know whether this breaks any policies. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/699 -- Commit Summary -- * Packaging: Add new http package for Debian -- File Changes -- M Makefile.groups (8) M pkg/kamailio/deb/debian/control (16) M pkg/kamailio/deb/debian/rules (2) M pkg/kamailio/deb/jessie/control (16) M pkg/kamailio/deb/jessie/rules (2) M pkg/kamailio/deb/precise/control (16) M pkg/kamailio/deb/precise/rules (2) M pkg/kamailio/deb/sid/control (16) M pkg/kamailio/deb/sid/rules (2) M pkg/kamailio/deb/squeeze/control (16) M pkg/kamailio/deb/squeeze/rules (2) M pkg/kamailio/deb/stretch/control (16) M pkg/kamailio/deb/stretch/rules (2) M pkg/kamailio/deb/trusty/control (16) M pkg/kamailio/deb/trusty/rules (2) M pkg/kamailio/deb/wheezy/control (16) M pkg/kamailio/deb/wheezy/rules (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/699.patch https://github.com/kamailio/kamailio/pull/699.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/699

7 years, 11 months

[kamailio] Module:sca Line seize does not release after some 'bye's (#341)

by Kevin Scott Adams

I have a situation that I can't get my head around. Every so often I have a SCA seized and I need to manually release it. Here is the log of the sca and bye from the event logs. messages-20150920:Sep 18 14:35:28 sip-registrar /usr/sbin/kamailio[7608]: ERROR: sca [sca_call_info.c:1580]: sca_call_info_bye_handler(): sca_call_info_bye_handler: sip:Mindfield@kamailio.newgarllc.com dialog leg 96b9ad37-9a7fa462-15c35d3(a)192.168.1.117;1c389191866 is not active messages-20150920:Sep 18 14:35:28 sip-registrar /usr/sbin/kamailio[7610]: NOTICE: acc [acc.c:317]: acc_log_request(): ACC: transaction answered: timestamp=1442601328;method=BYE;from_tag=76C3EC1F-114D759A;to_tag=1c389191866;call_id=96b9ad37-9a7fa462-15c35d3(a)192.168.1.117;code=200;reason=OK;src_user=Mindfield;src_domain=kamailio.newgarllc.com;src_ip=192.168.1.40;dst_ouser=Mindfield;dst_user=Mindfield;dst_domain=192.168.1.117 And the kamcmd showing the seize line (in this case both are seized) sip:Mindfield@kamailio.newgarllc.com 1 active 1442601278 sip:Mindfield@192.168.1.117 sip:1030@192.168.1.40:5060 96b9ad37-9a7fa462-15c35d3(a)192.168.1.117 76C3EC1F-114D759A 1c389191866 I am running Kamailio 4.2.6. The phones are Polycom VVX 310/410 running 5.3.1. And the PSTN gateway is an Audiocodes Mediant 1000 running 6.60A.292.001. The call volume is light so I don't think there is a lot of traffic but there is about 16 phones one SCA. It is not happening all time. Could be a couple days that nothing happens and then there could be a couple days that it happens multiple times a day. I can't find a common element that would be causing this unless the 'bye' is closing the call before the SCA has a chance to do something with it. Thanks Kev --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/341

7 years, 11 months

git:master:81b084e6: Merge pull request #697 from athonet-open/rework_ims_registrar_params

by GitHub

Module: kamailio Branch: master Commit: 81b084e662526bcb9a7eb5d49776e3ff0c4e20d9 URL: https://github.com/kamailio/kamailio/commit/81b084e662526bcb9a7eb5d49776e3f… Author: jaybeepee <jason.penton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-07T15:38:46+02:00 Merge pull request #697 from athonet-open/rework_ims_registrar_params ims_registrar_scscf: Refactor expire calculation --- Modified: modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/81b084e662526bcb9a7eb5d49776e3f… Patch: https://github.com/kamailio/kamailio/commit/81b084e662526bcb9a7eb5d49776e3f… --- diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 624e0a9..15d2571 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -109,39 +109,35 @@ static inline int randomize_expires(int expires, int range) { * the default value */ static inline int calc_contact_expires(contact_t *c, int expires_hdr, int sos_reg) { - unsigned int r; - - if (expires_hdr >= 0U) - r = expires_hdr; - else { - r = (sos_reg > 0) ? default_registrar_cfg.em_default_expires : default_registrar_cfg.default_expires; - goto end; - } - if (c && c->expires) - str2int(&(c->expires->body), (unsigned int*) &r); - if (r > 0) { - if (!sos_reg && r < default_registrar_cfg.min_expires) { - r = default_registrar_cfg.min_expires; - goto end; - } - if (sos_reg && r < default_registrar_cfg.em_min_expires) { - r = default_registrar_cfg.em_min_expires; - goto end; - } - } - if (!sos_reg && r > default_registrar_cfg.max_expires) { - r = default_registrar_cfg.max_expires; - goto end; - } - if (sos_reg && r > default_registrar_cfg.em_max_expires) - r = default_registrar_cfg.em_min_expires; - + int r; + if(c && c->expires) + str2int(&(c->expires->body), (unsigned int*) &r); + else if (expires_hdr >= 0) + r = expires_hdr; + else { + r = (sos_reg > 0) ? default_registrar_cfg.em_default_expires : default_registrar_cfg.default_expires; + goto end; + } + if (!sos_reg && r < default_registrar_cfg.min_expires) { + r = default_registrar_cfg.min_expires; + goto end; + } + if (sos_reg && r < default_registrar_cfg.em_min_expires) { + r = default_registrar_cfg.em_min_expires; + goto end; + } + if (!sos_reg && r > default_registrar_cfg.max_expires) { + r = default_registrar_cfg.max_expires; + goto end; + } + if (sos_reg && r > default_registrar_cfg.em_max_expires) { + r = default_registrar_cfg.em_min_expires; + goto end; + } end: - - r = randomize_expires(r, default_registrar_cfg.default_expires_range); - - LM_DBG("Calculated expires for contact is %d\n", r); - return time(NULL) + r; + r = randomize_expires(r, default_registrar_cfg.default_expires_range); + LM_DBG("Calculated expires for contact is %d\n", r); + return time(NULL) + r; } /*! \brief

7 years, 11 months

[kamailio/kamailio] ims_registrar_scscf: Refactor expire calculation (#697)

by Federico Favaro

Now the expire values is searched on the contact If no expires parameter is present, a fallaback on Expires header is done. If both are not found the default value is chosen You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/697 -- Commit Summary -- * ims_registrar_scscf: Refactor expire calculation -- File Changes -- M modules/ims_registrar_scscf/save.c (60) -- Patch Links -- https://github.com/kamailio/kamailio/pull/697.patch https://github.com/kamailio/kamailio/pull/697.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/697

7 years, 11 months

git:master:51c558c9: ims_registrar_scscf: Refactor expire calculation

by Federico Favaro

Module: kamailio Branch: master Commit: 51c558c94293e1430e271c3772658a671c26960d URL: https://github.com/kamailio/kamailio/commit/51c558c94293e1430e271c3772658a6… Author: Federico Favaro <federico(a)aereo.lan.athonet.com> Committer: Federico Favaro <federico(a)aereo.lan.athonet.com> Date: 2016-07-07T12:01:50+02:00 ims_registrar_scscf: Refactor expire calculation Now the expire values is searched on the contact If no expires parameter is present, a fallaback on Expires header is done. If both are not found the default value is chosen --- Modified: modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/51c558c94293e1430e271c3772658a6… Patch: https://github.com/kamailio/kamailio/commit/51c558c94293e1430e271c3772658a6… --- diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 624e0a9..15d2571 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -109,39 +109,35 @@ static inline int randomize_expires(int expires, int range) { * the default value */ static inline int calc_contact_expires(contact_t *c, int expires_hdr, int sos_reg) { - unsigned int r; - - if (expires_hdr >= 0U) - r = expires_hdr; - else { - r = (sos_reg > 0) ? default_registrar_cfg.em_default_expires : default_registrar_cfg.default_expires; - goto end; - } - if (c && c->expires) - str2int(&(c->expires->body), (unsigned int*) &r); - if (r > 0) { - if (!sos_reg && r < default_registrar_cfg.min_expires) { - r = default_registrar_cfg.min_expires; - goto end; - } - if (sos_reg && r < default_registrar_cfg.em_min_expires) { - r = default_registrar_cfg.em_min_expires; - goto end; - } - } - if (!sos_reg && r > default_registrar_cfg.max_expires) { - r = default_registrar_cfg.max_expires; - goto end; - } - if (sos_reg && r > default_registrar_cfg.em_max_expires) - r = default_registrar_cfg.em_min_expires; - + int r; + if(c && c->expires) + str2int(&(c->expires->body), (unsigned int*) &r); + else if (expires_hdr >= 0) + r = expires_hdr; + else { + r = (sos_reg > 0) ? default_registrar_cfg.em_default_expires : default_registrar_cfg.default_expires; + goto end; + } + if (!sos_reg && r < default_registrar_cfg.min_expires) { + r = default_registrar_cfg.min_expires; + goto end; + } + if (sos_reg && r < default_registrar_cfg.em_min_expires) { + r = default_registrar_cfg.em_min_expires; + goto end; + } + if (!sos_reg && r > default_registrar_cfg.max_expires) { + r = default_registrar_cfg.max_expires; + goto end; + } + if (sos_reg && r > default_registrar_cfg.em_max_expires) { + r = default_registrar_cfg.em_min_expires; + goto end; + } end: - - r = randomize_expires(r, default_registrar_cfg.default_expires_range); - - LM_DBG("Calculated expires for contact is %d\n", r); - return time(NULL) + r; + r = randomize_expires(r, default_registrar_cfg.default_expires_range); + LM_DBG("Calculated expires for contact is %d\n", r); + return time(NULL) + r; } /*! \brief

7 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016