sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

[kamailio] utils/kamctl: use $(basedir) as tmp dir on building instead of insecure /tmp (#56)

by Victor Seva

Reported by: Helmut Grohne <helmut(a)subdivi.de> See #48 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775681 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/56 -- Commit Summary -- * utils/kamctl: use $(basedir) as tmp dir on building instead of insecure /tmp -- File Changes -- M utils/kamctl/Makefile (138) -- Patch Links -- https://github.com/kamailio/kamailio/pull/56.patch https://github.com/kamailio/kamailio/pull/56.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/56

9 years, 10 months

git:master:f734154f: Merge pull request #55 from lazedo/presence_dialoginfo

by lazedo

Module: kamailio Branch: master Commit: f734154ff35fa95e8a70d9ee13f4f63a36794ea7 URL: https://github.com/kamailio/kamailio/commit/f734154ff35fa95e8a70d9ee13f4f63… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-01-28T20:12:21Z Merge pull request #55 from lazedo/presence_dialoginfo presence_dialoginfo : optionally send dummy dialog --- Modified: modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml Modified: modules/presence_dialoginfo/notify_body.c Modified: modules/presence_dialoginfo/presence_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/f734154ff35fa95e8a70d9ee13f4f63… Patch: https://github.com/kamailio/kamailio/commit/f734154ff35fa95e8a70d9ee13f4f63…

9 years, 10 months

git:master:5c9b3afc: presence_dialoginfo : optionally send dummy dialog

by lazedo

Module: kamailio Branch: master Commit: 5c9b3afca092dfda33c96dbf5195b8f7bbc2d4cf URL: https://github.com/kamailio/kamailio/commit/5c9b3afca092dfda33c96dbf5195b8f… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-01-28T17:31:06Z presence_dialoginfo : optionally send dummy dialog --- Modified: modules/presence_dialoginfo/doc/presence_dialoginfo_admin.xml Modified: modules/presence_dialoginfo/notify_body.c Modified: modules/presence_dialoginfo/presence_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/5c9b3afca092dfda33c96dbf5195b8f… Patch: https://github.com/kamailio/kamailio/commit/5c9b3afca092dfda33c96dbf5195b8f…

9 years, 10 months

git:4.2:25ec4076: presence: do aux_body_processing() if exists after get_p_notify_body()

by Luis Azedo

Module: kamailio Branch: 4.2 Commit: 25ec407671a88d6a993239958642dff114ca70d8 URL: https://github.com/kamailio/kamailio/commit/25ec407671a88d6a993239958642dff… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-01-28T17:40:26Z presence: do aux_body_processing() if exists after get_p_notify_body() - fix for send_notify_request() (cherry picked from commit cfef15ef1ca52abf4d6df129a5768baa0aaf5a07) --- Modified: modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/25ec407671a88d6a993239958642dff… Patch: https://github.com/kamailio/kamailio/commit/25ec407671a88d6a993239958642dff… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 24c0a9d..1511587 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -1526,21 +1526,30 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, { LM_DBG("Could not get the notify_body\n"); } - else /* apply authorization rules if exists */ - if(subs->event->req_auth) + else { - if(subs->auth_rules_doc && subs->event->apply_auth_nbody - && subs->event->apply_auth_nbody(notify_body, - subs,&final_body)<0) + /* call aux_body_processing if exists */ + if(subs->event->aux_body_processing) { - LM_ERR("in function apply_auth\n"); - goto error; + subs->event->aux_body_processing(subs, notify_body); } - if(final_body) + + /* apply authorization rules if exists */ + if(subs->event->req_auth) { - xmlFree(notify_body->s); - pkg_free(notify_body); - notify_body= final_body; + if(subs->auth_rules_doc && subs->event->apply_auth_nbody + && subs->event->apply_auth_nbody(notify_body, + subs,&final_body)<0) + { + LM_ERR("in function apply_auth\n"); + goto error; + } + if(final_body) + { + xmlFree(notify_body->s); + pkg_free(notify_body); + notify_body= final_body; + } } } }

9 years, 10 months

[kamailio] presence : fix send_notify_request (#54)

by lazedo

aux_body_processing after get get_p_notify_body can we backport this commit to 4.2 ? also, please delete branch after merge. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/54 -- Commit Summary -- * presence : fix send_notify_request -- File Changes -- M modules/presence/notify.c (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/54.patch https://github.com/kamailio/kamailio/pull/54.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/54

9 years, 10 months

git:master:cfef15ef: presence: do aux_body_processing() if exists after get_p_notify_body()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cfef15ef1ca52abf4d6df129a5768baa0aaf5a07 URL: https://github.com/kamailio/kamailio/commit/cfef15ef1ca52abf4d6df129a5768ba… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T18:26:37+01:00 presence: do aux_body_processing() if exists after get_p_notify_body() - fix for send_notify_request() --- Modified: modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/cfef15ef1ca52abf4d6df129a5768ba… Patch: https://github.com/kamailio/kamailio/commit/cfef15ef1ca52abf4d6df129a5768ba… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 24c0a9d..1511587 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -1526,21 +1526,30 @@ int send_notify_request(subs_t* subs, subs_t * watcher_subs, { LM_DBG("Could not get the notify_body\n"); } - else /* apply authorization rules if exists */ - if(subs->event->req_auth) + else { - if(subs->auth_rules_doc && subs->event->apply_auth_nbody - && subs->event->apply_auth_nbody(notify_body, - subs,&final_body)<0) + /* call aux_body_processing if exists */ + if(subs->event->aux_body_processing) { - LM_ERR("in function apply_auth\n"); - goto error; + subs->event->aux_body_processing(subs, notify_body); } - if(final_body) + + /* apply authorization rules if exists */ + if(subs->event->req_auth) { - xmlFree(notify_body->s); - pkg_free(notify_body); - notify_body= final_body; + if(subs->auth_rules_doc && subs->event->apply_auth_nbody + && subs->event->apply_auth_nbody(notify_body, + subs,&final_body)<0) + { + LM_ERR("in function apply_auth\n"); + goto error; + } + if(final_body) + { + xmlFree(notify_body->s); + pkg_free(notify_body); + notify_body= final_body; + } } } }

9 years, 10 months

[kamailio] Improoved working with RADIUS AV pairs (#46)

by Dmitriy Borisov

- added modparam import_all_avp parameter (int, true if not zero) - reading all RADIUS AV-pairs to kamailio avp (not only SIP-AVP, if import_all_avp set to true) - skiping name part of value (example: from RADIUS we recieve name - h323-x-header, value - "h323-x-header=blah-blah-blah", in kamailio we have name h323-x-header, value - "blah-blah-blah"), only for non SIP-AVP - all old comments are taken into account You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/46 -- Commit Summary -- * Improoved working with RADIUS AV pairs -- File Changes -- M modules/auth_radius/authrad_mod.c (10) M modules/auth_radius/authrad_mod.h (1) M modules/auth_radius/sterman.c (149) -- Patch Links -- https://github.com/kamailio/kamailio/pull/46.patch https://github.com/kamailio/kamailio/pull/46.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/46

9 years, 10 months

git:master:86a8e92b: auth_radius: documented radius_avps_mode parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 86a8e92b2b849a266b20eff09f9567001ab3a93c URL: https://github.com/kamailio/kamailio/commit/86a8e92b2b849a266b20eff09f95670… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T18:04:17+01:00 auth_radius: documented radius_avps_mode parameter --- Modified: modules/auth_radius/README Modified: modules/auth_radius/doc/auth_radius_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/86a8e92b2b849a266b20eff09f95670… Patch: https://github.com/kamailio/kamailio/commit/86a8e92b2b849a266b20eff09f95670…

9 years, 10 months

git:master:fd881df4: auth_radius: renamed import_all_avp to radius_avps_mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fd881df42e6fc041639539c3c32240bbc30d8ae1 URL: https://github.com/kamailio/kamailio/commit/fd881df42e6fc041639539c3c32240b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T17:59:34+01:00 auth_radius: renamed import_all_avp to radius_avps_mode - more suggestive that it is about radius avps, not the internal kamailio avps --- Modified: modules/auth_radius/authrad_mod.c Modified: modules/auth_radius/authrad_mod.h Modified: modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/fd881df42e6fc041639539c3c32240b… Patch: https://github.com/kamailio/kamailio/commit/fd881df42e6fc041639539c3c32240b… --- diff --git a/modules/auth_radius/authrad_mod.c b/modules/auth_radius/authrad_mod.c index dbfaece..f4a9eac 100644 --- a/modules/auth_radius/authrad_mod.c +++ b/modules/auth_radius/authrad_mod.c @@ -65,7 +65,7 @@ static char* radius_config = DEFAULT_RADIUSCLIENT_CONF; static int service_type = -1; int use_ruri_flag = -1; -int import_all_avp = 0; +int ar_radius_avps_mode = 0; static char *auth_extra_str = 0; struct extra_attr *auth_extra = 0; @@ -94,7 +94,7 @@ static param_export_t params[] = { {"service_type", INT_PARAM, &service_type }, {"use_ruri_flag", INT_PARAM, &use_ruri_flag }, {"auth_extra", PARAM_STRING, &auth_extra_str }, - {"import_all_avp", INT_PARAM, &import_all_avp }, + {"radius_avps_mode", INT_PARAM, &ar_radius_avps_mode }, {0, 0, 0} }; diff --git a/modules/auth_radius/authrad_mod.h b/modules/auth_radius/authrad_mod.h index 7795632..c6561d3 100644 --- a/modules/auth_radius/authrad_mod.h +++ b/modules/auth_radius/authrad_mod.h @@ -40,7 +40,7 @@ extern void *rh; extern struct extra_attr *auth_extra; extern int use_ruri_flag; -extern int import_all_avp; +extern int ar_radius_avps_mode; extern auth_api_s_t auth_api; diff --git a/modules/auth_radius/sterman.c b/modules/auth_radius/sterman.c index da644dc..88eef1d 100644 --- a/modules/auth_radius/sterman.c +++ b/modules/auth_radius/sterman.c @@ -152,9 +152,9 @@ static int generate_avps(VALUE_PAIR* received) LM_DBG("getting AVPs from RADIUS Reply\n"); vp = received; - if ( ! import_all_avp ) + if ( ! ar_radius_avps_mode ) vp=rc_avpair_get(vp,attrs[A_SIP_AVP].v,0); - for( ; vp; vp=import_all_avp?vp->next:rc_avpair_get(vp->next,attrs[A_SIP_AVP].v,0) ) { + for( ; vp; vp=((ar_radius_avps_mode)?vp->next:rc_avpair_get(vp->next,attrs[A_SIP_AVP].v,0)) ) { flags = 0; if (!extract_avp( vp, &flags, &name, &val)){ LM_ERR("error while extracting AVP '%.*s'\n",(int)strlen(vp->name),vp->name);

9 years, 10 months

git:master:5a0faf27: Merge pull request #46 from borikinternet/borik-devel

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a0faf27b2bee82c4ee045046984fdca51b5662e URL: https://github.com/kamailio/kamailio/commit/5a0faf27b2bee82c4ee045046984fdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T17:56:00+01:00 Merge pull request #46 from borikinternet/borik-devel Improoved working with RADIUS AV pairs --- Modified: modules/auth_radius/authrad_mod.c Modified: modules/auth_radius/authrad_mod.h Modified: modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/5a0faf27b2bee82c4ee045046984fdc… Patch: https://github.com/kamailio/kamailio/commit/5a0faf27b2bee82c4ee045046984fdc…

9 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015