sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

git:master:9034787e: presence: allow use of $subs in notify process

by GitHub

Module: kamailio Branch: master Commit: 9034787ec863277a61372cf9cfe6f156407cd47c URL: https://github.com/kamailio/kamailio/commit/9034787ec863277a61372cf9cfe6f15… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-22T14:32:50Z presence: allow use of $subs in notify process --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/9034787ec863277a61372cf9cfe6f15… Patch: https://github.com/kamailio/kamailio/commit/9034787ec863277a61372cf9cfe6f15… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index c9b40fc..18e5ce0 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -55,6 +55,7 @@ int goto_on_notify_reply=-1; extern int pres_local_log_level; extern int pres_local_log_facility; +extern subs_t* _pres_subs_last_sub; c_back_param* shm_dup_cbparam(subs_t*); void free_cbparam(c_back_param* cb_param); @@ -1498,6 +1499,7 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, str* final_body= NULL; uac_req_t uac_r; str* aux_body = NULL; + subs_t* backup_subs = NULL; LM_DBG("dialog info:\n"); printf_subs(subs); @@ -1618,9 +1620,13 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, LM_DBG("expires %d status %d\n", subs->expires, subs->status); cb_param = mem_copy_subs(subs, SHM_MEM_TYPE); + backup_subs = _pres_subs_last_sub; + _pres_subs_last_sub = subs; + set_uac_req(&uac_r, &met, &str_hdr, notify_body, td, TMCB_LOCAL_COMPLETED, p_tm_callback, (void*)cb_param); result = tmb.t_request_within(&uac_r); + _pres_subs_last_sub = backup_subs; if(result< 0) { LM_ERR("in function tmb.t_request_within\n");

7 years, 10 months

[kamailio/kamailio] presence: allow use of $subs in notify process (#944)

by lazedo

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/944 -- Commit Summary -- * presence: allow use of $subs in notify process -- File Changes -- M src/modules/presence/notify.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/944.patch https://github.com/kamailio/kamailio/pull/944.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/944

7 years, 10 months

git:master:32b4d1e6: Merge pull request #942 from ffontaine/master

by GitHub

Module: kamailio Branch: master Commit: 32b4d1e62c44d593ecdabf6f9cf4c379d0d1ec83 URL: https://github.com/kamailio/kamailio/commit/32b4d1e62c44d593ecdabf6f9cf4c37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-23T20:55:21+01:00 Merge pull request #942 from ffontaine/master Create ktls_no_curl --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/32b4d1e62c44d593ecdabf6f9cf4c37… Patch: https://github.com/kamailio/kamailio/commit/32b4d1e62c44d593ecdabf6f9cf4c37… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 9bce61e..950e63a 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -87,7 +87,10 @@ mod_list_http_async=http_async_client mod_list_memcached=memcached # - modules depending on openssl library -mod_list_tlsdeps=auth_identity crypto tls +mod_list_tlsdeps=crypto tls + +# - modules depending on openssl (+curl) library +mod_list_tlsdeps_curl=auth_identity # - modules depending on openssl library mod_list_outbound=outbound @@ -201,7 +204,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_xmpp) $(mod_list_carrierroute) \ $(mod_list_berkeley) $(mod_list_utils) \ $(mod_list_memcached) \ - $(mod_list_tlsdeps) $(mod_list_websocket) \ + $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) \ + $(mod_list_websocket) \ $(mod_list_snmpstats) $(mod_list_presence) \ $(mod_list_lua) $(mod_list_python) \ $(mod_list_geoip) $(mod_list_sqlite) \ @@ -243,7 +247,7 @@ module_group_standard=$(mod_list_basic) $(mod_list_extra) \ module_group_common=$(mod_list_db) $(mod_list_dbuid) \ $(mod_list_pcre) $(mod_list_radius) \ $(mod_list_xmldeps) $(mod_list_presence) \ - $(mod_list_tlsdeps) + $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) # For db use (db modules, excluding drivers) module_group_db=$(mod_list_db) @@ -333,7 +337,10 @@ module_group_khttp_async=$(mod_list_http_async) module_group_kmemcached=$(mod_list_memcached) # pkg tls module -module_group_ktls=$(mod_list_tlsdeps) +module_group_ktls_basic=$(mod_list_tlsdeps) + +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) # pkg websocket module module_group_kwebsocket=$(mod_list_websocket)

7 years, 10 months

git:master:a5e5aaa1: Create ktls_basic

by Fabrice Fontaine

Module: kamailio Branch: master Commit: a5e5aaa12f962de1acd376aa7d31c07d89ddc07c URL: https://github.com/kamailio/kamailio/commit/a5e5aaa12f962de1acd376aa7d31c07… Author: Fabrice Fontaine <fabrice.fontaine(a)orange.com> Committer: Fabrice Fontaine <fabrice.fontaine(a)orange.com> Date: 2017-01-19T17:07:27+01:00 Create ktls_basic Create ktls_basic group to be able to compile ktls module when curl is not available Signed-off-by: Fabrice Fontaine <fabrice.fontaine(a)orange.com> --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/a5e5aaa12f962de1acd376aa7d31c07… Patch: https://github.com/kamailio/kamailio/commit/a5e5aaa12f962de1acd376aa7d31c07… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 9bce61e..950e63a 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -87,7 +87,10 @@ mod_list_http_async=http_async_client mod_list_memcached=memcached # - modules depending on openssl library -mod_list_tlsdeps=auth_identity crypto tls +mod_list_tlsdeps=crypto tls + +# - modules depending on openssl (+curl) library +mod_list_tlsdeps_curl=auth_identity # - modules depending on openssl library mod_list_outbound=outbound @@ -201,7 +204,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_xmpp) $(mod_list_carrierroute) \ $(mod_list_berkeley) $(mod_list_utils) \ $(mod_list_memcached) \ - $(mod_list_tlsdeps) $(mod_list_websocket) \ + $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) \ + $(mod_list_websocket) \ $(mod_list_snmpstats) $(mod_list_presence) \ $(mod_list_lua) $(mod_list_python) \ $(mod_list_geoip) $(mod_list_sqlite) \ @@ -243,7 +247,7 @@ module_group_standard=$(mod_list_basic) $(mod_list_extra) \ module_group_common=$(mod_list_db) $(mod_list_dbuid) \ $(mod_list_pcre) $(mod_list_radius) \ $(mod_list_xmldeps) $(mod_list_presence) \ - $(mod_list_tlsdeps) + $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) # For db use (db modules, excluding drivers) module_group_db=$(mod_list_db) @@ -333,7 +337,10 @@ module_group_khttp_async=$(mod_list_http_async) module_group_kmemcached=$(mod_list_memcached) # pkg tls module -module_group_ktls=$(mod_list_tlsdeps) +module_group_ktls_basic=$(mod_list_tlsdeps) + +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) # pkg websocket module module_group_kwebsocket=$(mod_list_websocket)

7 years, 10 months

[kamailio/kamailio] Create ktls_no_curl (#942)

by Fabrice Fontaine

Create ktls_no_curl group to be able to compile ktls module when curl is not available Signed-off-by: Fabrice Fontaine <fabrice.fontaine(a)orange.com> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/942 -- Commit Summary -- * Create ktls_no_curl -- File Changes -- M src/Makefile.groups (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/942.patch https://github.com/kamailio/kamailio/pull/942.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/942

7 years, 10 months

git:master:7bb5fb5a: tm: more old log macros converted to new style

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7bb5fb5ac25b5eb8ca2cbc3c41cd4e5f2f795501 URL: https://github.com/kamailio/kamailio/commit/7bb5fb5ac25b5eb8ca2cbc3c41cd4e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-23T15:58:34+01:00 tm: more old log macros converted to new style --- Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/test.c --- Diff: https://github.com/kamailio/kamailio/commit/7bb5fb5ac25b5eb8ca2cbc3c41cd4e5… Patch: https://github.com/kamailio/kamailio/commit/7bb5fb5ac25b5eb8ca2cbc3c41cd4e5…

7 years, 10 months

Resetting private variables between requests?

by Armen Babikyan

Hello, I recall reading somewhere that all private variables (i.e. $var(foo)-style pvs) are reset/destroyed between request_route executions, but I have a suspicion this is not happening - either in some limited cases or perhaps in all cases. I suppose the most telling symptom is that I see no references to either destroy_vars() or reset_vars() functions that are defined in $kamailio/modules/pv/pv_svar.{c,h}. Is this behavior intentional? If so, I'll see what I can do about implementing a mechanism that manually resets (or destroys?) variables with a "$var(all) = $null;"-type of statement (similar to "$uac_req(all) = $null;"), or making a modparam setting that automatically does this. Thoughts welcome. Thanks! Armen

7 years, 10 months

git:master:47084e4b: tm: uac - updated log messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47084e4bbfb27d40d804ecfc5f78b31f13ffd23a URL: https://github.com/kamailio/kamailio/commit/47084e4bbfb27d40d804ecfc5f78b31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-22T20:28:40+01:00 tm: uac - updated log messages --- Modified: src/modules/tm/uac.c Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/47084e4bbfb27d40d804ecfc5f78b31… Patch: https://github.com/kamailio/kamailio/commit/47084e4bbfb27d40d804ecfc5f78b31…

7 years, 10 months

git:master:adf13dbe: modules: readme files regenerated - presence ...

by Kamailio Dev

Module: kamailio Branch: master Commit: adf13dbe843704fdc830097a7a793d25a6a56757 URL: https://github.com/kamailio/kamailio/commit/adf13dbe843704fdc830097a7a793d2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-01-22T15:31:23+01:00 modules: readme files regenerated - presence ... --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/adf13dbe843704fdc830097a7a793d2… Patch: https://github.com/kamailio/kamailio/commit/adf13dbe843704fdc830097a7a793d2… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index c8153e8..c9e86a2 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -757,8 +757,9 @@ modparam("presence", "subs_remove_match", 1) deleting the subscription after processing of event_route[presence:notify-reply]. If value = 1, it deletes the subscription. If xavp_cfg parameter is set but this attribute is - not in the avp, the subscription is not deleted. this does apply - for code 404 and 481 where subscription is deleted. + not in the avp, the subscription is not deleted. this does not + apply for codes 404, 481 and 408 (when timeout_rm_subs = 1) where + subscription is deleted. Default value is empty (not set).

7 years, 10 months

git:master:04ffb3b1: presence: update delete_subscription documentation

by GitHub

Module: kamailio Branch: master Commit: 04ffb3b1d13483534e724820c231fa6e18112ba3 URL: https://github.com/kamailio/kamailio/commit/04ffb3b1d13483534e724820c231fa6… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-22T14:27:23Z presence: update delete_subscription documentation --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/04ffb3b1d13483534e724820c231fa6… Patch: https://github.com/kamailio/kamailio/commit/04ffb3b1d13483534e724820c231fa6… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 2f68df8..6abcc72 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -785,8 +785,8 @@ modparam("presence", "subs_remove_match", 1) give extra control of deleting the subscription after processing of event_route[presence:notify-reply]. If value = 1, it deletes the subscription. If xavp_cfg parameter is set but this attribute is not in the avp, - the subscription is not deleted. this does apply for code 404 and 481 - where subscription is deleted.</para> + the subscription is not deleted. this does not apply for codes 404, 481 + and 408 (when timeout_rm_subs = 1) where subscription is deleted.</para> </listitem> </itemizedlist> <para>

7 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017