Module: kamailio
Branch: master
Commit: f26152e77648fb0c25ec0c80bc22a3890a4975cd
URL: https://github.com/kamailio/kamailio/commit/f26152e77648fb0c25ec0c80bc22a38…
Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com>
Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com>
Date: 2016-05-20T16:55:27+03:00
ims_registar_scscf: Fix subscr data handling in SAA
During re-registration, in SAR, User-Data-Already-Available AVP is set.
However in SAA handling, error is generated if User-Data is not sent by
the HSS. This behavior is not correct.
For reference, check TS 29.228, Table 6.1.2.1.
---
Modified: modules/ims_registrar_scscf/cxdx_sar.c
---
Diff: https://github.com/kamailio/kamailio/commit/f26152e77648fb0c25ec0c80bc22a38…
Patch: https://github.com/kamailio/kamailio/commit/f26152e77648fb0c25ec0c80bc22a38…
---
diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c
index eac67fc..4b88ed7 100644
--- a/modules/ims_registrar_scscf/cxdx_sar.c
+++ b/modules/ims_registrar_scscf/cxdx_sar.c
@@ -238,18 +238,23 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *saa, long elaps
}
if (data->sar_assignment_type == AVP_IMS_SAR_REGISTRATION || data->sar_assignment_type == AVP_IMS_SAR_RE_REGISTRATION) {
- if (build_p_associated_uri(s) != 0) {
- LM_ERR("Unable to build p_associated_uri\n");
- rerrno = R_SAR_FAILED;
- goto error;
+ if (s) {
+ if (build_p_associated_uri(s) != 0) {
+ LM_ERR("Unable to build p_associated_uri\n");
+ rerrno = R_SAR_FAILED;
+ goto error;
+ }
}
+
}
- //here we update the contacts and also build the new contact header for the 200 OK reply
- if (update_contacts(t->uas.request, data->domain, &data->public_identity, data->sar_assignment_type, &s, &ccf1, &ccf2, &ecf1, &ecf2, &data->contact_header) <= 0) {
- LM_ERR("Error processing REGISTER\n");
- rerrno = R_SAR_FAILED;
- goto error;
+ if (s) {
+ //here we update the contacts and also build the new contact header for the 200 OK reply
+ if (update_contacts_new(t->uas.request, data->domain, &data->public_identity, data->sar_assignment_type, &s, &ccf1, &ccf2, &ecf1, &ecf2, &data->contact_header) <= 0) {
+ LM_ERR("Error processing REGISTER\n");
+ rerrno = R_SAR_FAILED;
+ goto error;
+ }
}
if (data->contact_header) {
Providing same API and functionality as auth module, but using SHA-256 instead of MD5 for digest authentication.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/627
-- Commit Summary --
* Merge remote-tracking branch 'refs/remotes/kamailio/master'
* Merge remote branch 'upstream/master'
* Add new module auth_sha256 based on module auth, but using SHA-256 instead of MD5 for digest authentication.
-- File Changes --
A modules/auth_sha256/Makefile (18)
A modules/auth_sha256/README (874)
A modules/auth_sha256/api.c (233)
A modules/auth_sha256/api.h (162)
A modules/auth_sha256/auth.xml (695)
A modules/auth_sha256/auth_mod.c (1206)
A modules/auth_sha256/auth_mod.h (46)
A modules/auth_sha256/challenge.c (286)
A modules/auth_sha256/challenge.h (52)
A modules/auth_sha256/doc/Makefile (4)
A modules/auth_sha256/doc/auth.xml (77)
A modules/auth_sha256/doc/auth_functions.xml (398)
A modules/auth_sha256/doc/auth_params.xml (697)
A modules/auth_sha256/nc.c (244)
A modules/auth_sha256/nc.h (74)
A modules/auth_sha256/nid.c (99)
A modules/auth_sha256/nid.h (89)
A modules/auth_sha256/nonce.c (464)
A modules/auth_sha256/nonce.h (226)
A modules/auth_sha256/ot_nonce.c (234)
A modules/auth_sha256/ot_nonce.h (80)
A modules/auth_sha256/rfc2617.c (148)
A modules/auth_sha256/rfc2617.h (96)
A modules/auth_sha256/todo.txt (9)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/627.patchhttps://github.com/kamailio/kamailio/pull/627.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/627
This is an alternative solution to pull request: https://github.com/kamailio/kamailio/pull/627
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/628
-- Commit Summary --
* Merge remote-tracking branch 'refs/remotes/kamailio/master'
* Merge remote branch 'upstream/master'
* Add new module auth_sha256 based on module auth, but using SHA-256 instead of MD5 for digest authentication.
* auth: Add option to use SHA-256 instead of MD5 in digest authentication
* auth_sha256: delete module that was integrated in module auth
-- File Changes --
M modules/auth/Makefile (2)
M modules/auth/api.c (9)
M modules/auth/auth_mod.c (29)
M modules/auth/auth_mod.h (6)
M modules/auth/doc/auth_params.xml (26)
M modules/auth/rfc2617.c (4)
M modules/auth/rfc2617.h (4)
A modules/auth/rfc2617_sha256.c (148)
A modules/auth/rfc2617_sha256.h (71)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/628.patchhttps://github.com/kamailio/kamailio/pull/628.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/628