sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
301 discussions

git:master:039231a3: usrloc: support filter by server_id at get_all_ucontacts

by Victor Seva

Module: kamailio Branch: master Commit: 039231a3b61c00fe36e868417144daa9f04936ba URL: https://github.com/kamailio/kamailio/commit/039231a3b61c00fe36e868417144daa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-04T08:15:53+02:00 usrloc: support filter by server_id at get_all_ucontacts --- Modified: modules/usrloc/dlist.c Modified: modules/usrloc/dlist.h Modified: modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/039231a3b61c00fe36e868417144daa… Patch: https://github.com/kamailio/kamailio/commit/039231a3b61c00fe36e868417144daa…

9 years, 5 months

[kamailio] usrloc: add filtering by server_id support (#229)

by Victor Seva

Use the new field server_id on usrloc module to be able to load/get contacts filtered by server_id You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/229 -- Commit Summary -- * usrloc: support filter by server_id at get_all_ucontacts * usrloc: add module option to support preload using server_id as filter -- File Changes -- M modules/usrloc/dlist.c (33) M modules/usrloc/dlist.h (3) M modules/usrloc/udomain.c (26) M modules/usrloc/ul_mod.c (4) M modules/usrloc/ul_mod.h (2) M modules/usrloc/usrloc.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/229.patch https://github.com/kamailio/kamailio/pull/229.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/229

9 years, 5 months

[kamailio] Update INSTALL (#226)

by Fred Posner

Changed "flavor" to "flavour" -- maybe when more US users come we can switch to US spelling ;) Updated bug tracker to github. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/226 -- Commit Summary -- * Update INSTALL -- File Changes -- M INSTALL (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/226.patch https://github.com/kamailio/kamailio/pull/226.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/226

9 years, 5 months

git:master:115e1eb1: INSTALL: updated bug tracker URL

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 115e1eb10566ffafe0f37aed92df8413f660ea6c URL: https://github.com/kamailio/kamailio/commit/115e1eb10566ffafe0f37aed92df841… Author: Fred Posner <fred(a)palner.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-06T08:53:16+02:00 INSTALL: updated bug tracker URL - fixed flavour typo --- Modified: INSTALL --- Diff: https://github.com/kamailio/kamailio/commit/115e1eb10566ffafe0f37aed92df841… Patch: https://github.com/kamailio/kamailio/commit/115e1eb10566ffafe0f37aed92df841… --- diff --git a/INSTALL b/INSTALL index 130ae70..8a3ea13 100644 --- a/INSTALL +++ b/INSTALL @@ -50,7 +50,7 @@ Starting with version 3.0.0, the two SIP server flavours are built from same source code tree. In version 4.0.0 the two source code trees were merged even more, so a combined module directory is now used. -Kamailio flavor is the one built by default. SER is, historically speaking, the +Kamailio flavour is the one built by default. SER is, historically speaking, the first open source SIP server started in 2001. Kamailio forked from SER in 2005 under the initial name OpenSER. @@ -772,7 +772,7 @@ A: In both cases, the reason is probably an error in request routing script Q: Where to report issues? -A: Use bug tracker at: http://sip-router.org/tracker +A: Use bug tracker at: https://github.com/kamailio/kamailio/issues Q: Any F.A.Q. that could be helpful to check before reporting an issue?

9 years, 5 months

git:master:ef55950a: ims_usrloc_scscf: Fix return-code in case of memory allocation errors + some debug output

by Carsten Bock

Module: kamailio Branch: master Commit: ef55950a9465a7aed4e0a791e1685a112cece63f URL: https://github.com/kamailio/kamailio/commit/ef55950a9465a7aed4e0a791e1685a1… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-07-04T21:52:32+02:00 ims_usrloc_scscf: Fix return-code in case of memory allocation errors + some debug output --- Modified: modules/ims_usrloc_scscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/ef55950a9465a7aed4e0a791e1685a1… Patch: https://github.com/kamailio/kamailio/commit/ef55950a9465a7aed4e0a791e1685a1… --- diff --git a/modules/ims_usrloc_scscf/udomain.c b/modules/ims_usrloc_scscf/udomain.c index 1c7f748..c82a177 100644 --- a/modules/ims_usrloc_scscf/udomain.c +++ b/modules/ims_usrloc_scscf/udomain.c @@ -589,6 +589,9 @@ int get_impus_from_subscription_as_string(udomain_t* _d, impurecord_t* impu_rec, for (i = 0; i < impu_rec->s->service_profiles_cnt; i++) { for (j = 0; j < impu_rec->s->service_profiles[i].public_identities_cnt; j++) { impi = &(impu_rec->s->service_profiles[i].public_identities[j]); + LM_DBG("Got Record %.*s (%i)\n", impi->public_identity.len, + impi->public_identity.s, impi->public_identity.len); + if (barring < 0) { //get all records bytes_needed += impi->public_identity.len; @@ -608,7 +611,7 @@ int get_impus_from_subscription_as_string(udomain_t* _d, impurecord_t* impu_rec, *impus = (str*) pkg_malloc(len); //TODO: rather put this on the stack... dont' fragment pkg.... if (*impus == 0) { LM_ERR("no more pkg_mem\n"); - return 0; + return 1; } char* ptr = (char*) (*impus + *num_impus); @@ -734,4 +737,4 @@ void unref_contact_unsafe(ucontact_t* c) { } delete_ucontact(c); } -} \ No newline at end of file +}

9 years, 5 months

git:master:d37f5345: ims_usrloc_scscf: Fix ref-counting from previous commit...

by Carsten Bock

Module: kamailio Branch: master Commit: d37f534564f9f1e39ba5133bbac8098416192b6b URL: https://github.com/kamailio/kamailio/commit/d37f534564f9f1e39ba5133bbac8098… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-07-04T19:19:02+02:00 ims_usrloc_scscf: Fix ref-counting from previous commit... --- Modified: modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/d37f534564f9f1e39ba5133bbac8098… Patch: https://github.com/kamailio/kamailio/commit/d37f534564f9f1e39ba5133bbac8098… --- diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index d996fca..a41eafd 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -846,8 +846,14 @@ int update_impurecord(struct udomain* _d, str* public_identity, impurecord_t* im unlock_subscription_slot(subs_ptr->sl); } else { //TODO: we may want to do a deep comparison of the subscription and update.... - if (compare_subscription(subs_ptr, subscription) != 0) + if (compare_subscription(subs_ptr, subscription) != 0) { subs_ptr = subscription; + } else { + // Treat it as a new Subscription - it's not the same as the previos one + ref_subscription_unsafe(subs_ptr); //we reference coz we are using it - will be unreferenced later. + add_subscription_unsafe(subs_ptr); + unlock_subscription_slot(subs_ptr->sl); + } } lock_subscription(subs_ptr); subscription_locked = 1;

9 years, 5 months

git:master:47e990e2: ims_charging: Add Multiple-Services Indicator

by Carsten Bock

Module: kamailio Branch: master Commit: 47e990e2ab562ccdd95dca1376c35a71b640af76 URL: https://github.com/kamailio/kamailio/commit/47e990e2ab562ccdd95dca1376c35a7… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-07-04T18:16:06+02:00 ims_charging: Add Multiple-Services Indicator --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/47e990e2ab562ccdd95dca1376c35a7… Patch: https://github.com/kamailio/kamailio/commit/47e990e2ab562ccdd95dca1376c35a7… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index ab2488a..00a89ad 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -181,9 +181,13 @@ inline int Ro_add_termination_cause(AAAMessage *msg, unsigned int term_code) { /* called only when building stop record AVPS */ inline int Ro_add_multiple_service_credit_Control_stop(AAAMessage *msg, int used_unit, int active_rating_group, int active_service_identifier) { + char x[4]; AAA_AVP_LIST used_list, mscc_list; str used_group; - char x[4]; + + // Add Multiple-Services AVP Indicator + set_4bytes(x, 1); + Ro_add_avp(msg, x, 4, AVP_Multiple_Services_Indicator, AAA_AVP_FLAG_MANDATORY, 0, AVP_DUPLICATE_DATA, __FUNCTION__); //unsigned int service_id = 1000; //Removed these are now configurable config file params @@ -216,11 +220,14 @@ inline int Ro_add_multiple_service_credit_Control_stop(AAAMessage *msg, int used } inline int Ro_add_multiple_service_credit_Control(AAAMessage *msg, unsigned int requested_unit, int used_unit, int active_rating_group, int active_service_identifier) { + // Add Multiple-Services AVP Indicator + char x[4]; + set_4bytes(x, 1); + Ro_add_avp(msg, x, 4, AVP_Multiple_Services_Indicator, AAA_AVP_FLAG_MANDATORY, 0, AVP_DUPLICATE_DATA, __FUNCTION__); + AAA_AVP_LIST list, used_list, mscc_list; str group, used_group; - char x[4]; - list.head = 0; list.tail = 0; used_list.head = 0;

9 years, 5 months

git:master:961f6bad: ims_usrloc_scscf: Do not re-use Subscription, if it's for a different IMPU

by Carsten Bock

Module: kamailio Branch: master Commit: 961f6bad29a8079ad26a3851ee453c1c236e9ebf URL: https://github.com/kamailio/kamailio/commit/961f6bad29a8079ad26a3851ee453c1… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-07-04T18:14:02+02:00 ims_usrloc_scscf: Do not re-use Subscription, if it's for a different IMPU --- Modified: modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/961f6bad29a8079ad26a3851ee453c1… Patch: https://github.com/kamailio/kamailio/commit/961f6bad29a8079ad26a3851ee453c1… --- diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index c5fbc99..d996fca 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -774,12 +774,30 @@ void free_ims_subscription_data(ims_subscription *s) { /* Still needs to be implemented */ int compare_subscription(ims_subscription* new, ims_subscription* orig) { - int i, j; + int i, j, k, l; LM_DBG("Comparing subscription for IMPI [%.*s]\n", orig->private_identity.len, orig->private_identity.s); for (i = 0; i < orig->service_profiles_cnt; i++) { - for (j = 0; j < orig->service_profiles[i].public_identities_cnt; j++) { - + for (k = 0; k < new->service_profiles_cnt; k++) { + for (l = 0; l < new->service_profiles[k].public_identities_cnt; l++) { + LM_DBG("new %.*s (%i) vs. orig %.*s (%i)\n", + new->service_profiles[k].public_identities[l].public_identity.len, + new->service_profiles[k].public_identities[l].public_identity.s, + new->service_profiles[k].public_identities[l].public_identity.len, + orig->service_profiles[i].public_identities[j].public_identity.len, + orig->service_profiles[i].public_identities[j].public_identity.s, + orig->service_profiles[i].public_identities[j].public_identity.len); + + if (orig->service_profiles[i].public_identities[j].public_identity.len == + new->service_profiles[k].public_identities[l].public_identity.len) { + if (memcmp(orig->service_profiles[i].public_identities[j].public_identity.s, + new->service_profiles[k].public_identities[l].public_identity.s, + new->service_profiles[k].public_identities[l].public_identity.len) == 0) + return 1; + } + + } + } } } @@ -828,7 +846,8 @@ int update_impurecord(struct udomain* _d, str* public_identity, impurecord_t* im unlock_subscription_slot(subs_ptr->sl); } else { //TODO: we may want to do a deep comparison of the subscription and update.... - subs_ptr = subscription; + if (compare_subscription(subs_ptr, subscription) != 0) + subs_ptr = subscription; } lock_subscription(subs_ptr); subscription_locked = 1; @@ -917,9 +936,11 @@ int update_impurecord(struct udomain* _d, str* public_identity, impurecord_t* im } else { LM_DBG("new subscription is the same as the old one....not doing anything"); //check that the service profile and associated impus are in the subscription, if not, add... - if (compare_subscription(subs_ptr, *s) != 0) { - LM_WARN("TODO: There is a new service profile we need to add to the subscription\n"); - } + /* if (compare_subscription(subs_ptr, *s) != 0) { + unref_subscription((*_r)->s); //different subscription which we don't have lock on yet. + ref_subscription_unsafe(subs_ptr); + (*_r)->s = subs_ptr; + } */ } }

9 years, 5 months

accessing nonce, response, cnonce in auth digest header

by Luis Azedo

Hi List, i'm trying to access nonce, cnonce and response params inside auth digest header but i'm failing miserably. any suggestions i can do this in the script ? tried to use @hf_value2.authorization.nonce but it returns the full header (maybe i didn't understood how it works?) so i was thinking, if there isn't an easy way to get this, i could extend the pv module to add $an, $acn, $ar (or better names, suggestion welcomed) to get these values. thoughts ? Best

9 years, 5 months

git:4.3:41a211e6: modules/rls: normalize RLS entry URIs

by Juha Heinanen

Module: kamailio Branch: 4.3 Commit: 41a211e6c13dcecaa6752238d63dfae932433ea7 URL: https://github.com/kamailio/kamailio/commit/41a211e6c13dcecaa6752238d63dfae… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-07-03T21:54:22+03:00 modules/rls: normalize RLS entry URIs - RLS entry URI is xs:AnyURI, which may be an absolute or relative URI. In relative URI, URI scheme is missing. (cherry picked from commit 68bb6b35098f5555ca35ddb21527660e46b7336a) --- Modified: modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/41a211e6c13dcecaa6752238d63dfae… Patch: https://github.com/kamailio/kamailio/commit/41a211e6c13dcecaa6752238d63dfae… --- diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index 09d988b..a4735b2 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -982,23 +982,32 @@ int send_resource_subs(char* uri, void* param) str pres_uri, *tmp_str; struct sip_uri parsed_pres_uri; int duplicate = 0; + str *normalized_uri; subs_info_t *s = (subs_info_t *) ((void**)param)[0]; list_entry_t **rls_contact_list = (list_entry_t **) ((void**)param)[1]; pres_uri.s = uri; pres_uri.len = strlen(uri); - if (parse_uri(pres_uri.s, pres_uri.len, &parsed_pres_uri) < 0) - { - LM_ERR("bad uri: %.*s\n", pres_uri.len, pres_uri.s); - return -1; + + normalized_uri = normalize_sip_uri(&pres_uri); + if (normalized_uri->s == NULL || normalized_uri->len == 0) { + LM_ERR("failed to normalize RLS entry URI %.*s\n", + pres_uri.len, pres_uri.s); + return -1; + } + + if (parse_uri(normalized_uri->s, normalized_uri->len, &parsed_pres_uri) + < 0) { + LM_ERR("bad uri: %.*s\n", normalized_uri->len, normalized_uri->s); + return -1; } if (check_self(&parsed_pres_uri.host, 0, PROTO_NONE) != 1 && rls_disable_remote_presence != 0) { LM_WARN("Unable to subscribe to remote contact %.*s for watcher %.*s\n", - pres_uri.len, pres_uri.s, + normalized_uri->len, normalized_uri->s, s->watcher_uri->len, s->watcher_uri->s); return 1; @@ -1009,8 +1018,8 @@ int send_resource_subs(char* uri, void* param) if (rls_max_backend_subs > 0 && ++counter > rls_max_backend_subs) return 1; - s->pres_uri = &pres_uri; - s->remote_target = &pres_uri; + s->pres_uri = normalized_uri; + s->remote_target = normalized_uri; /* Build list of contacts... checking each contact exists only once */ if ((tmp_str = (str *)pkg_malloc(sizeof(str))) == NULL) @@ -1024,8 +1033,8 @@ int send_resource_subs(char* uri, void* param) LM_ERR("out of private memory\n"); return -1; } - memcpy(tmp_str->s, pres_uri.s, pres_uri.len); - tmp_str->len = pres_uri.len; + memcpy(tmp_str->s, normalized_uri->s, normalized_uri->len); + tmp_str->len = normalized_uri->len; *rls_contact_list = list_insert(tmp_str, *rls_contact_list, &duplicate); if (duplicate != 0) {

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015