sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:master:cc94a375: modules/ims_charging: correct analysis of return value for t_suspend

by jaybeepee

Module: kamailio Branch: master Commit: cc94a3751dd536053846d7a569e8062d8cfbea7f URL: https://github.com/kamailio/kamailio/commit/cc94a3751dd536053846d7a569e8062… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-11-30T21:09:04+02:00 modules/ims_charging: correct analysis of return value for t_suspend --- Modified: modules/ims_charging/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cc94a3751dd536053846d7a569e8062… Patch: https://github.com/kamailio/kamailio/commit/cc94a3751dd536053846d7a569e8062… --- diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index d2f371d..9dae820 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -499,7 +499,7 @@ static int w_ro_ccr(struct sip_msg *msg, char* c_route_name, char* c_direction, } LM_DBG("Suspending SIP TM transaction\n"); - if (tmb.t_suspend(msg, &tindex, &tlabel) < 0) { + if (tmb.t_suspend(msg, &tindex, &tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); ret = RO_RETURN_ERROR; goto done;

8 years, 11 months

git:master:64491668: modules/ims_qos: correct analysis of return value for t_suspend

by jaybeepee

Module: kamailio Branch: master Commit: 64491668d61b14c213e3fc0a0b55cfcf6c036e39 URL: https://github.com/kamailio/kamailio/commit/64491668d61b14c213e3fc0a0b55cfc… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-11-30T21:07:37+02:00 modules/ims_qos: correct analysis of return value for t_suspend --- Modified: modules/ims_qos/mod.c Modified: modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/64491668d61b14c213e3fc0a0b55cfc… Patch: https://github.com/kamailio/kamailio/commit/64491668d61b14c213e3fc0a0b55cfc… --- diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index cb64390..6a84131 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -1055,7 +1055,7 @@ static int w_rx_aar_register(struct sip_msg *msg, char* route, char* str1, char* } LM_DBG("Suspending SIP TM transaction\n"); - if (tmb.t_suspend(msg, &saved_t_data->tindex, &saved_t_data->tlabel) < 0) { + if (tmb.t_suspend(msg, &saved_t_data->tindex, &saved_t_data->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); free_saved_transaction_global_data(saved_t_data); return CSCF_RETURN_ERROR; diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index ff75a0d..da1dc69 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -1128,7 +1128,7 @@ int assign_server_unreg(struct sip_msg* _m, char* str1, str* direction, char* ro create_return_code(CSCF_RETURN_ERROR); LM_DBG("Suspending SIP TM transaction\n"); - if (tmb.t_suspend(_m, &saved_t->tindex, &saved_t->tlabel) < 0) { + if (tmb.t_suspend(_m, &saved_t->tindex, &saved_t->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); free_saved_transaction_data(saved_t); rerrno = R_SAR_FAILED; @@ -1357,7 +1357,7 @@ int save(struct sip_msg* msg, char* str1, char *route) { create_return_code(CSCF_RETURN_ERROR); LM_DBG("Suspending SIP TM transaction\n"); - if (tmb.t_suspend(msg, &saved_t->tindex, &saved_t->tlabel) < 0) { + if (tmb.t_suspend(msg, &saved_t->tindex, &saved_t->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); free_saved_transaction_data(saved_t); rerrno = R_SAR_FAILED;

8 years, 11 months

git:master:58e5709a: modules/ims_usrloc_pcscf: correct analysis of return value for t_suspend

by jaybeepee

Module: kamailio Branch: master Commit: 58e5709a491dbe90c4fc97e484438090dfea1616 URL: https://github.com/kamailio/kamailio/commit/58e5709a491dbe90c4fc97e48443809… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-11-30T21:06:39+02:00 modules/ims_usrloc_pcscf: correct analysis of return value for t_suspend --- Modified: modules/ims_usrloc_pcscf/udomain.h --- Diff: https://github.com/kamailio/kamailio/commit/58e5709a491dbe90c4fc97e48443809… Patch: https://github.com/kamailio/kamailio/commit/58e5709a491dbe90c4fc97e48443809… --- diff --git a/modules/ims_usrloc_pcscf/udomain.h b/modules/ims_usrloc_pcscf/udomain.h index 26bf1c7..f7643e2 100644 --- a/modules/ims_usrloc_pcscf/udomain.h +++ b/modules/ims_usrloc_pcscf/udomain.h @@ -77,7 +77,6 @@ int update_rx_regsession(struct udomain* _d, str* session_id, struct pcontact* _ int update_pcontact(struct udomain* _d, struct pcontact_info* _ci, struct pcontact* _c); int insert_pcontact(struct udomain* _d, str* _contact, struct pcontact_info* _ci, struct pcontact** _r); int get_pcontact(udomain_t* _d, pcontact_info_t* contact_info, struct pcontact** _r); -int get_pcontact_by_src(udomain_t* _d, str * _host, unsigned short _port, unsigned short _proto, struct pcontact** _c); int assert_identity(udomain_t* _d, str * _host, unsigned short _port, unsigned short _proto, str * _identity); int delete_pcontact(udomain_t* _d, struct pcontact* _r); int update_security(udomain_t* _d, security_type _t, security_t* _s, struct pcontact* _c);

8 years, 11 months

git:master:44c5a4b7: modules/ims_qos: correct analysis of return value for t_suspend

by jaybeepee

Module: kamailio Branch: master Commit: 44c5a4b744f5b6e248103df267405796b1b49834 URL: https://github.com/kamailio/kamailio/commit/44c5a4b744f5b6e248103df26740579… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-11-30T21:05:42+02:00 modules/ims_qos: correct analysis of return value for t_suspend --- Modified: modules/ims_qos/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/44c5a4b744f5b6e248103df26740579… Patch: https://github.com/kamailio/kamailio/commit/44c5a4b744f5b6e248103df26740579… --- diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index c5cb363..cb64390 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -892,7 +892,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int } LM_DBG("Suspending SIP TM transaction\n"); - if (tmb.t_suspend(msg, &saved_t_data->tindex, &saved_t_data->tlabel) < 0) { + if (tmb.t_suspend(msg, &saved_t_data->tindex, &saved_t_data->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); if (auth_session) cdpb.AAASessionsUnlock(auth_session->hash); goto error;

8 years, 11 months

git:master:02b97a72: modules/ims_icscf: correct analysis of return value for t_suspend

by jaybeepee

Module: kamailio Branch: master Commit: 02b97a728cee7c3184314cbf37e2d9c4f7bcf9c2 URL: https://github.com/kamailio/kamailio/commit/02b97a728cee7c3184314cbf37e2d9c… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-11-30T21:05:03+02:00 modules/ims_icscf: correct analysis of return value for t_suspend --- Modified: modules/ims_icscf/location.c Modified: modules/ims_icscf/registration.c --- Diff: https://github.com/kamailio/kamailio/commit/02b97a728cee7c3184314cbf37e2d9c… Patch: https://github.com/kamailio/kamailio/commit/02b97a728cee7c3184314cbf37e2d9c… --- diff --git a/modules/ims_icscf/location.c b/modules/ims_icscf/location.c index 5b1f80b..022803a 100644 --- a/modules/ims_icscf/location.c +++ b/modules/ims_icscf/location.c @@ -143,7 +143,7 @@ int I_perform_location_information_request(struct sip_msg* msg, char* route, cha create_lia_return_code(CSCF_RETURN_ERROR); LM_DBG("Suspending SIP TM transaction\n"); - if (tmb.t_suspend(msg, &saved_t->tindex, &saved_t->tlabel) < 0) { + if (tmb.t_suspend(msg, &saved_t->tindex, &saved_t->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); free_saved_lir_transaction_data(saved_t); diff --git a/modules/ims_icscf/registration.c b/modules/ims_icscf/registration.c index b9d1df5..902b77f 100644 --- a/modules/ims_icscf/registration.c +++ b/modules/ims_icscf/registration.c @@ -201,7 +201,7 @@ int I_perform_user_authorization_request(struct sip_msg* msg, char* route, char* create_uaa_return_code(CSCF_RETURN_ERROR); LM_DBG("Suspending SIP TM transaction\n"); - if (tmb.t_suspend(msg, &saved_t->tindex, &saved_t->tlabel) < 0) { + if (tmb.t_suspend(msg, &saved_t->tindex, &saved_t->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); free_saved_uar_transaction_data(saved_t);

8 years, 11 months

git:master:acc79d89: modules/ims_auth: correct analysis of return value for t_suspend

by jaybeepee

Module: kamailio Branch: master Commit: acc79d89660433c5f8827efb16f224709571f342 URL: https://github.com/kamailio/kamailio/commit/acc79d89660433c5f8827efb16f2247… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-11-30T20:59:26+02:00 modules/ims_auth: correct analysis of return value for t_suspend --- Modified: modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/acc79d89660433c5f8827efb16f2247… Patch: https://github.com/kamailio/kamailio/commit/acc79d89660433c5f8827efb16f2247… --- diff --git a/modules/ims_auth/authorize.c b/modules/ims_auth/authorize.c index 001412c..ae83436 100644 --- a/modules/ims_auth/authorize.c +++ b/modules/ims_auth/authorize.c @@ -465,10 +465,9 @@ int challenge(struct sip_msg* msg, char* str1, char* alg, int is_proxy_auth, cha saved_t->is_proxy_auth = is_proxy_auth; LM_DBG("Suspending SIP TM transaction\n"); - if (tmb.t_suspend(msg, &saved_t->tindex, &saved_t->tlabel) < 0) { + if (tmb.t_suspend(msg, &saved_t->tindex, &saved_t->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); free_saved_transaction_data(saved_t); - stateful_request_reply(msg, 480, MSG_480_DIAMETER_ERROR); return CSCF_RETURN_BREAK; } @@ -856,6 +855,10 @@ int authenticate(struct sip_msg* msg, char* _realm, char* str2, int is_proxy_aut /* if QOP is sent, nc must be specified */ /* the expected nc is the last used one plus 1 */ int p; + if (!nc.s || nc.len < 8 ) { + LM_ERR("qop specified with no nonce count... failing\n"); + goto cleanup; + } for (p = 0; p < 8; ++p) { /* nc is 8LHEX (RFC 2617 §3.2.2) */ nc_parsed = (nc_parsed << 4) | UNHEX((int) nc.s[p]); } @@ -870,7 +873,7 @@ int authenticate(struct sip_msg* msg, char* _realm, char* str2, int is_proxy_aut av->status = AUTH_VECTOR_USELESS; goto cleanup; } - } + } switch (av->type) { case AUTH_AKAV1_MD5:

8 years, 11 months

git:master:e112a2ea: ims_charging: Added the possibility to omit the rating-group (also for STOP-Requests)

by Carsten Bock

Module: kamailio Branch: master Commit: e112a2ea4bbc8c53e813442e606fb6fb79b1d3b8 URL: https://github.com/kamailio/kamailio/commit/e112a2ea4bbc8c53e813442e606fb6f… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-11-30T13:22:07+01:00 ims_charging: Added the possibility to omit the rating-group (also for STOP-Requests) --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/e112a2ea4bbc8c53e813442e606fb6f… Patch: https://github.com/kamailio/kamailio/commit/e112a2ea4bbc8c53e813442e606fb6f… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index aac2af3..adb536d 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -211,8 +211,11 @@ inline int Ro_add_multiple_service_credit_Control_stop(AAAMessage *msg, int used set_4bytes(x, active_service_identifier); Ro_add_avp_list(&mscc_list, x, 4, AVP_Service_Identifier, AAA_AVP_FLAG_MANDATORY, 0, AVP_DUPLICATE_DATA, __FUNCTION__); - set_4bytes(x, active_rating_group); - Ro_add_avp_list(&mscc_list, x, 4, AVP_Rating_Group, AAA_AVP_FLAG_MANDATORY, 0, AVP_DUPLICATE_DATA, __FUNCTION__); + // Rating Group = -1 => omit Rating group + if (active_rating_group >= 0) { + set_4bytes(x, active_rating_group); + Ro_add_avp_list(&mscc_list, x, 4, AVP_Rating_Group, AAA_AVP_FLAG_MANDATORY, 0, AVP_DUPLICATE_DATA, __FUNCTION__); + } used_group = cdpb.AAAGroupAVPS(mscc_list); cdpb.AAAFreeAVPList(&mscc_list);

8 years, 11 months

git:master:8855f0fb: ims_charging: Added the possibility to omit the rating-group

by Carsten Bock

Module: kamailio Branch: master Commit: 8855f0fbe28b94e5298176310d7cbf587bd264da URL: https://github.com/kamailio/kamailio/commit/8855f0fbe28b94e5298176310d7cbf5… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-11-30T13:14:05+01:00 ims_charging: Added the possibility to omit the rating-group --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/8855f0fbe28b94e5298176310d7cbf5… Patch: https://github.com/kamailio/kamailio/commit/8855f0fbe28b94e5298176310d7cbf5… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index f736311..aac2af3 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -246,8 +246,11 @@ inline int Ro_add_multiple_service_credit_Control(AAAMessage *msg, unsigned int set_4bytes(x, active_service_identifier); Ro_add_avp_list(&mscc_list, x, 4, AVP_Service_Identifier, AAA_AVP_FLAG_MANDATORY, 0, AVP_DUPLICATE_DATA, __FUNCTION__); - set_4bytes(x, active_rating_group); - Ro_add_avp_list(&mscc_list, x, 4, AVP_Rating_Group, AAA_AVP_FLAG_MANDATORY, 0, AVP_DUPLICATE_DATA, __FUNCTION__); + // Rating Group = -1 => omit Rating group + if (active_rating_group >= 0) { + set_4bytes(x, active_rating_group); + Ro_add_avp_list(&mscc_list, x, 4, AVP_Rating_Group, AAA_AVP_FLAG_MANDATORY, 0, AVP_DUPLICATE_DATA, __FUNCTION__); + } /* if we must Used-Service-Unit */ if (used_unit >= 0) {

8 years, 11 months

git:master:d3e45d32: utils/kamctl: updated sql scripts for table version

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3e45d3204a9966f9beb5135082e3870c528c1ba URL: https://github.com/kamailio/kamailio/commit/d3e45d3204a9966f9beb5135082e387… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-30T09:17:06+01:00 utils/kamctl: updated sql scripts for table version --- Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/standard-create.sql Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mysql/standard-create.sql Modified: utils/kamctl/oracle/standard-create.sql Modified: utils/kamctl/postgres/standard-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/d3e45d3204a9966f9beb5135082e387… Patch: https://github.com/kamailio/kamailio/commit/d3e45d3204a9966f9beb5135082e387… --- diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index de38c48..5796a95 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -8,6 +8,8 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|0 +version| +version|1 acc| acc|5 acc_cdrs| diff --git a/utils/kamctl/db_sqlite/standard-create.sql b/utils/kamctl/db_sqlite/standard-create.sql index ae5ce2a..b576b1a 100644 --- a/utils/kamctl/db_sqlite/standard-create.sql +++ b/utils/kamctl/db_sqlite/standard-create.sql @@ -1,3 +1,4 @@ +INSERT INTO version (table_name, table_version) values ('version','1'); CREATE TABLE version ( table_name VARCHAR(32) NOT NULL, table_version INTEGER DEFAULT 0 NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 899ab5a..adcfd00 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -1,4 +1,5 @@ table_name(string) table_version(int) +version:1 acc:5 acc_cdrs:2 active_watchers:11 diff --git a/utils/kamctl/mysql/standard-create.sql b/utils/kamctl/mysql/standard-create.sql index eeeacf9..588b332 100644 --- a/utils/kamctl/mysql/standard-create.sql +++ b/utils/kamctl/mysql/standard-create.sql @@ -1,3 +1,4 @@ +INSERT INTO version (table_name, table_version) values ('version','1'); CREATE TABLE `version` ( `table_name` VARCHAR(32) NOT NULL, `table_version` INT UNSIGNED DEFAULT 0 NOT NULL, diff --git a/utils/kamctl/oracle/standard-create.sql b/utils/kamctl/oracle/standard-create.sql index 6f29e49..d4407fb 100644 --- a/utils/kamctl/oracle/standard-create.sql +++ b/utils/kamctl/oracle/standard-create.sql @@ -1,3 +1,4 @@ +INSERT INTO version (table_name, table_version) values ('version','1'); CREATE TABLE version ( table_name VARCHAR2(32), table_version NUMBER(10) DEFAULT 0 NOT NULL, diff --git a/utils/kamctl/postgres/standard-create.sql b/utils/kamctl/postgres/standard-create.sql index ae5ce2a..b576b1a 100644 --- a/utils/kamctl/postgres/standard-create.sql +++ b/utils/kamctl/postgres/standard-create.sql @@ -1,3 +1,4 @@ +INSERT INTO version (table_name, table_version) values ('version','1'); CREATE TABLE version ( table_name VARCHAR(32) NOT NULL, table_version INTEGER DEFAULT 0 NOT NULL,

8 years, 11 months

git:master:3895cd2e: textops: Fix get_body_part() end of body headers

by Stefan Mititelu

Module: kamailio Branch: master Commit: 3895cd2e08c26594a3cff866caea2b431eb71d1e URL: https://github.com/kamailio/kamailio/commit/3895cd2e08c26594a3cff866caea2b4… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2015-11-28T12:51:29+02:00 textops: Fix get_body_part() end of body headers Remember the end of body headers and use it for get_body_part(). --- Modified: modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/3895cd2e08c26594a3cff866caea2b4… Patch: https://github.com/kamailio/kamailio/commit/3895cd2e08c26594a3cff866caea2b4… --- diff --git a/modules/textops/textops.c b/modules/textops/textops.c index c653c6c..74d7726 100644 --- a/modules/textops/textops.c +++ b/modules/textops/textops.c @@ -2031,6 +2031,7 @@ static int remove_multibody_f(struct sip_msg* msg, char* p1) static int get_body_part_helper(sip_msg_t* msg, char* ctype, char* ovar, int mode) { char *start, *end, *bstart; + char *body_headers_end; unsigned int len, t; str content_type, body; str boundary = {0,0}; @@ -2084,6 +2085,7 @@ static int get_body_part_helper(sip_msg_t* msg, char* ctype, char* ovar, int mod } end = end + 2; len = len - content_type.len - 2; + body_headers_end = end; if (find_line_start(boundary.s, boundary.len, &end, &len)) { @@ -2099,12 +2101,8 @@ static int get_body_part_helper(sip_msg_t* msg, char* ctype, char* ovar, int mod pkg_free(boundary.s); boundary.s = NULL; if(mode==1) { - end = start; - if (!find_line_start(CRLF, CRLF_LEN, &end, &len)) { - LM_ERR("no CRLF found after body headers\n"); - goto err; - } - val.rs.s = end + CRLF_LEN; + end = body_headers_end; + val.rs.s = end; val.rs.len = bstart - val.rs.s; } else { val.rs.s = start;

8 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015