sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:6b3d6842: ims_registrar_pcscf: Make sure, that the event list is initialized.

by Carsten Bock

Module: kamailio Branch: master Commit: 6b3d6842b0f5706a5b3612104bd0ceab073f1cbc URL: https://github.com/kamailio/kamailio/commit/6b3d6842b0f5706a5b3612104bd0cea… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-01-22T13:51:17+02:00 ims_registrar_pcscf: Make sure, that the event list is initialized. --- Modified: modules/ims_registrar_pcscf/async_reginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/6b3d6842b0f5706a5b3612104bd0cea… Patch: https://github.com/kamailio/kamailio/commit/6b3d6842b0f5706a5b3612104bd0cea… --- diff --git a/modules/ims_registrar_pcscf/async_reginfo.c b/modules/ims_registrar_pcscf/async_reginfo.c index 2403722..c037f74 100644 --- a/modules/ims_registrar_pcscf/async_reginfo.c +++ b/modules/ims_registrar_pcscf/async_reginfo.c @@ -56,6 +56,9 @@ reginfo_event_list_t *reginfo_event_list = 0; int init_reginfo_event_list() { + if (reginfo_event_list) + return 1; + reginfo_event_list = shm_malloc(sizeof(reginfo_event_list_t)); if (!reginfo_event_list) { LM_ERR("No more SHM mem\n"); @@ -242,6 +245,9 @@ reginfo_event_t* pop_reginfo_event() { reginfo_event_t *ev; + // Make sure, it's initialized: + init_reginfo_event_list(); + lock_get(reginfo_event_list->lock); while (reginfo_event_list->head == 0) { lock_release(reginfo_event_list->lock);

9 years, 5 months

git:master:80fbeff6: Add Pseude-Variable to get username of Contact, that was used during registration.

by Carsten Bock

Module: kamailio Branch: master Commit: 80fbeff64fe752a8998a774263fd00c9cddd65b5 URL: https://github.com/kamailio/kamailio/commit/80fbeff64fe752a8998a774263fd00c… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-01-22T12:56:23+02:00 Add Pseude-Variable to get username of Contact, that was used during registration. --- Modified: modules/ims_registrar_pcscf/reg_mod.c Modified: modules/ims_registrar_pcscf/service_routes.c Modified: modules/ims_registrar_pcscf/service_routes.h --- Diff: https://github.com/kamailio/kamailio/commit/80fbeff64fe752a8998a774263fd00c… Patch: https://github.com/kamailio/kamailio/commit/80fbeff64fe752a8998a774263fd00c… --- diff --git a/modules/ims_registrar_pcscf/reg_mod.c b/modules/ims_registrar_pcscf/reg_mod.c index 0e27bb9..9d50862 100644 --- a/modules/ims_registrar_pcscf/reg_mod.c +++ b/modules/ims_registrar_pcscf/reg_mod.c @@ -127,6 +127,7 @@ static int assert_identity_fixup(void ** param, int param_no); /* Pseudo-Variables */ static int pv_get_asserted_identity_f(struct sip_msg *, pv_param_t *, pv_value_t *); +static int pv_get_registration_contact_f(struct sip_msg *, pv_param_t *, pv_value_t *); /** * Update the time. @@ -183,6 +184,8 @@ stat_export_t mod_stats[] = { static pv_export_t mod_pvs[] = { {{"pcscf_asserted_identity", (sizeof("pcscf_asserted_identity")-1)}, /* The first identity of the contact. */ PVT_OTHER, pv_get_asserted_identity_f, 0, 0, 0, 0, 0}, + {{"pcscf_registration_contact", (sizeof("pcscf_registration_contact")-1)}, /* The contact used during REGISTER */ + PVT_OTHER, pv_get_registration_contact_f, 0, 0, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -479,3 +482,16 @@ pv_get_asserted_identity_f(struct sip_msg *msg, pv_param_t *param, if (ret_val != NULL) return pv_get_strval(msg, param, res, ret_val); else return -1; } + + +/* + * Get the asserted Identity for the current user + */ +static int +pv_get_registration_contact_f(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str * ret_val = get_registration_contact(msg); + if (ret_val != NULL) return pv_get_strval(msg, param, res, ret_val); + else return -1; +} diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 69a0046..ca253ef 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -38,6 +38,7 @@ static pcontact_t * c = NULL; extern usrloc_api_t ul; extern int ignore_contact_rxport_check; static str * asserted_identity; +static str * registration_contact; /*! * \brief Parse the message and find first occurrence of Route header field. @@ -222,7 +223,9 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d) { } } asserted_identity = NULL; + registration_contact = NULL; if (c) { + registration_contact = &c->contact_user; p = c->head; while (p) { if (p->is_default == 1) @@ -495,6 +498,18 @@ str * get_asserted_identity(struct sip_msg* _m) { } else return asserted_identity; } + +/** + * Get the contact used during registration of this user + */ +str * get_registration_contact(struct sip_msg* _m) { + if (_m->id != current_msg_id) { + LM_ERR("Unable to get contact used during registration: Please call is_registered first!\n"); + return NULL; + } else return registration_contact; +} + + /** * checked if passed identity is an asserted identity */ diff --git a/modules/ims_registrar_pcscf/service_routes.h b/modules/ims_registrar_pcscf/service_routes.h index c7daf8f..c7887f5 100644 --- a/modules/ims_registrar_pcscf/service_routes.h +++ b/modules/ims_registrar_pcscf/service_routes.h @@ -47,6 +47,11 @@ int is_registered(struct sip_msg* _m, udomain_t* _d); str * get_asserted_identity(struct sip_msg* _m); /** + * Get the contact used during registration of this user + */ +str * get_registration_contact(struct sip_msg* _m); + +/** * Assert a given identity of a user */ int assert_identity(struct sip_msg* _m, udomain_t* _d, str identity);

9 years, 5 months

For developers: update of your write access to git repository (now on github)

by Daniel-Constantin Mierla

Hello, a message with explicit subject in order to make it easier to be spotted, to be sure every active developer is becoming aware of the change. The GIT repository for Kamailio project is now hosted to Github: - https://github.com/kamailio/kamailio To be able to push commits directly to it, send me your Github user id. If you already did it, then just ignore this message. Your local clone taken from git.sip-router.org needs to get an update to remote URL - inside the folder do: git remote set-url origin https://github.com/kamailio/kamailio.git You can use ssh with Github, if you prefer it: git remote set-url origin ssh+git://git@github.com/kamailio/kamailio.git For more details on access, see: - https://help.github.com/articles/which-remote-url-should-i-use/ Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

9 years, 5 months

git:master:4442bedb: Merge pull request #49 from mamikk/pvauth-checks-fix

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4442bedb85e4baadceed610e394e63c03b011657 URL: https://github.com/kamailio/kamailio/commit/4442bedb85e4baadceed610e394e63c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-21T22:31:10+01:00 Merge pull request #49 from mamikk/pvauth-checks-fix auth: use correct parameter for pv_auth_check checks --- Modified: modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4442bedb85e4baadceed610e394e63c… Patch: https://github.com/kamailio/kamailio/commit/4442bedb85e4baadceed610e394e63c… --- diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index f4b74b1..fe57a89 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -755,7 +755,7 @@ static int pv_auth_check(sip_msg_t *msg, char *realm, ret = pv_authenticate(msg, &srealm, &spasswd, vflags, HDR_PROXYAUTH_T, &msg->first_line.u.request.method); - if(ret==AUTH_OK && (vflags&AUTH_CHECK_ID_F)) { + if(ret==AUTH_OK && (vchecks&AUTH_CHECK_ID_F)) { hdr = (msg->proxy_auth==0)?msg->authorization:msg->proxy_auth; srealm = ((auth_body_t*)(hdr->parsed))->digest.username.user;

9 years, 5 months

git:master:2cdda10a: auth: use correct parameter for pv_auth_check checks

by Martin Mikkelsen

Module: kamailio Branch: master Commit: 2cdda10aa232e545ba79ca71876f0160a68e324b URL: https://github.com/kamailio/kamailio/commit/2cdda10aa232e545ba79ca71876f016… Author: Martin Mikkelsen <martin.mikkelsen(a)zisson.no> Committer: Martin Mikkelsen <martin.mikkelsen(a)zisson.no> Date: 2015-01-21T16:55:15+01:00 auth: use correct parameter for pv_auth_check checks The pv_auth_check has a flags and a checks parameter but the flags parameter is used for both. This means that if flags has the 1-bit set it will enable both HA1-passwords and from/to URI checks and setting the 1-bit in the checks parameter does not do anything. This fixes the parameters so that the checks parameter is used for the to/from URI checks. --- Modified: modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cdda10aa232e545ba79ca71876f016… Patch: https://github.com/kamailio/kamailio/commit/2cdda10aa232e545ba79ca71876f016… --- diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index f4b74b1..fe57a89 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -755,7 +755,7 @@ static int pv_auth_check(sip_msg_t *msg, char *realm, ret = pv_authenticate(msg, &srealm, &spasswd, vflags, HDR_PROXYAUTH_T, &msg->first_line.u.request.method); - if(ret==AUTH_OK && (vflags&AUTH_CHECK_ID_F)) { + if(ret==AUTH_OK && (vchecks&AUTH_CHECK_ID_F)) { hdr = (msg->proxy_auth==0)?msg->authorization:msg->proxy_auth; srealm = ((auth_body_t*)(hdr->parsed))->digest.username.user;

9 years, 5 months

[kamailio] auth: use correct parameter for pv_auth_check checks (#49)

by Martin Mikkelsen

The pv_auth_check has a flags and a checks parameter but the flags parameter is used for both. This means that if flags has the 1-bit set it will enable both HA1-passwords and from/to URI checks and setting the 1-bit in the checks parameter does not do anything. This fixes the parameters so that the checks parameter is used for the to/from URI checks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/49 -- Commit Summary -- * auth: use correct parameter for pv_auth_check checks -- File Changes -- M modules/auth/auth_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/49.patch https://github.com/kamailio/kamailio/pull/49.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/49

9 years, 5 months

git:master:72c8f8c6: modules/ims_registrar_scscf: in notify set contact expires to 0 if negative

by Richard Good

Module: kamailio Branch: master Commit: 72c8f8c6f898be0bb1b0400d191d7ab55cc47c3c URL: https://github.com/kamailio/kamailio/commit/72c8f8c6f898be0bb1b0400d191d7ab… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-01-21T12:05:25+02:00 modules/ims_registrar_scscf: in notify set contact expires to 0 if negative --- Modified: modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/72c8f8c6f898be0bb1b0400d191d7ab… Patch: https://github.com/kamailio/kamailio/commit/72c8f8c6f898be0bb1b0400d191d7ab… --- diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index 0118cfb..d1d19ad 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -1523,6 +1523,8 @@ str generate_reginfo_full(udomain_t* _t, str* impu_list, int num_impus) { buf.len = 0; pad.s = padc; pad.len = 0; + + int expires; LM_DBG("Getting reginfo_full"); @@ -1561,14 +1563,24 @@ str generate_reginfo_full(udomain_t* _t, str* impu_list, int num_impus) { if (ptr->q != -1) { LM_DBG("q value not equal to -1"); float q = (float) ptr->q / 1000; + expires = ptr->expires - act_time; + if(expires < 0) { + LM_WARN("Contact expires is negative - setting to 0\n"); + expires = 0; + } sprintf(pad.s, contact_s_q.s, ptr, r_active.len, r_active.s, - r_registered.len, r_registered.s, ptr->expires - act_time, + r_registered.len, r_registered.s, expires, q); } else { LM_DBG("q value equal to -1"); - sprintf(pad.s, contact_s.s, ptr, r_active.len, r_active.s, + expires = ptr->expires - act_time; + if(expires < 0) { + LM_WARN("Contact expires is negative - setting to 0\n"); + expires = 0; + } + sprintf(pad.s, contact_s.s, ptr, r_active.len, r_active.s, r_registered.len, r_registered.s, - ptr->expires - act_time); + expires); } pad.len = strlen(pad.s); STR_APPEND(buf, pad); @@ -1657,6 +1669,11 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type) { if (r) { expires = c->expires - act_time; + if(expires < 0) { + LM_WARN("Contact expires is negative - setting to 0\n"); + expires = 0; + } + if (//richard we only use expired and unregistered (event_type == IMS_REGISTRAR_CONTACT_EXPIRED || event_type == IMS_REGISTRAR_CONTACT_UNREGISTERED)

9 years, 5 months

git:master:8cdbe797: ims_registrar_scscf: Check length of the contents before trying copy the contents to the buffer (Bug-Fix)

by Carsten Bock

Module: kamailio Branch: master Commit: 8cdbe797a659a431e7edc269c81ef40148413b30 URL: https://github.com/kamailio/kamailio/commit/8cdbe797a659a431e7edc269c81ef40… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-01-20T19:10:31+02:00 ims_registrar_scscf: Check length of the contents before trying copy the contents to the buffer (Bug-Fix) --- Modified: modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/8cdbe797a659a431e7edc269c81ef40… Patch: https://github.com/kamailio/kamailio/commit/8cdbe797a659a431e7edc269c81ef40… --- diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index 2ab9ec0..0118cfb 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -1879,6 +1879,11 @@ reg_notification * new_notification(str subscription_state, str buf; char bufc[MAX_REGINFO_SIZE]; + if (content.len > MAX_REGINFO_SIZE) { + LM_ERR("content size (%d) exceeds MAX_REGINFO_SIZE (%d)!\n", content.len, MAX_REGINFO_SIZE); + return 0; + } + sprintf(bufc, content.s, r->version); buf.s = bufc; buf.len = strlen(bufc);

9 years, 5 months

[kamailio] Improved working with RADIUS returned AV-Pairs in auth_radius module: (#22)

by Dmitriy Borisov

- Correct extraction wfrom all types of SIP-AVP pairs - Correct extraction other (not all, but STR, INT, DATE and IPADDR do) types of RADIUS AV-Pairs at the same time - If name is begin of value (cisco attributes placed in this behavior sometimes) this part of value + one character delimiter is ignored Yes, my previous pull request has a malicious malloc and free. This changed too You can merge this Pull Request by running: git pull https://github.com/borikinternet/kamailio master Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/22 -- Commit Summary -- * Improved working with RADIUS returned AV-Pairs in auth_radius module: -- File Changes -- M modules/auth_radius/sterman.c (141) -- Patch Links -- https://github.com/kamailio/kamailio/pull/22.patch https://github.com/kamailio/kamailio/pull/22.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/22

9 years, 5 months

[kamailio] Improve for correct working with all RADIUS AV pairs (#14)

by borikinternet

In this pull request I`d correct work with retrieved from RADIUS AV pairs for modules auth_radius, misc_radius and peering. Now this modules correctly put to $avp() all retrieved params: - integer name and integer value - integer name and string value - string name and integer value - string name and string value All above said and for SIP-AVP params too. You can merge this Pull Request by running: git pull https://github.com/borikinternet/kamailio master Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/14 -- Commit Summary -- * Improve for correct working with all RADIUS AV pairs -- File Changes -- M modules/auth_radius/sterman.c (180) M modules/misc_radius/functions.c (228) M modules/peering/verify.c (205) -- Patch Links -- https://github.com/kamailio/kamailio/pull/14.patch https://github.com/kamailio/kamailio/pull/14.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/14

9 years, 5 months

← Newer
1
...
12
13
14
15
16
17
18
...
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