sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
381 discussions

git:master: tm: Export additional functions from tm modules

by Hugh Waite

Module: sip-router Branch: master Commit: c86151089e1eed97d264050f1a09501f5eafb0de URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c861510… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Wed Oct 29 15:28:37 2014 +0000 tm: Export additional functions from tm modules - t_load_contacts and t_next_contacts in tm - t_on_branch_failure in tmx --- modules/tm/tm_load.c | 3 +++ modules/tm/tm_load.h | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index e95d618..7740db8 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -148,6 +148,8 @@ int load_tm( struct tm_binds *tmb) tmb->tm_ctx_get = tm_ctx_get; #endif tmb->t_append_branches = t_append_branches; + tmp->t_load_contacts = t_load_contacts; + tmp->t_next_contacts = t_next_contacts; return 1; } @@ -166,6 +168,7 @@ int load_xtm(tm_xapi_t *xapi) xapi->t_on_reply = t_on_reply; xapi->t_check_trans = t_check_trans; xapi->t_is_canceled = t_is_canceled; + xapi->t_on_branch_failure = t_on_branch_failure; return 0; } diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 06905c2..b5e9766 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -51,6 +51,7 @@ #include "t_suspend.h" #include "t_append_branches.h" #include "t_stats.h" +#include "t_serial.h" /* export not usable from scripts */ #define NO_SCRIPT -1 @@ -135,6 +136,8 @@ struct tm_binds { void* reserved5; #endif t_append_branches_f t_append_branches; + cmd_function t_load_contacts; + cmd_function t_next_contacts; }; typedef struct tm_binds tm_api_t; @@ -182,6 +185,7 @@ int t_is_canceled(struct sip_msg* msg); typedef struct tm_xbinds { t_on_route_f t_on_failure; t_on_route_f t_on_branch; + t_on_route_f t_on_branch_failure; t_on_route_f t_on_reply; t_no_param_f t_check_trans; t_no_param_f t_is_canceled;

9 years, 6 months

git:master: core/parser: Fix extract_sendrecv_mode to always return mode if valid

by Hugh Waite

Module: sip-router Branch: master Commit: 0a019df8f2922a940a41742ce0e4560bb6523d6c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a019df… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Wed Oct 8 21:11:55 2014 +0100 core/parser: Fix extract_sendrecv_mode to always return mode if valid - All four sendrecv directions return 0 - is_on_hold flag set for inactive and sendonly --- parser/sdp/sdp_helpr_funcs.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 6436b85..52fe655 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -384,13 +384,12 @@ int extract_sendrecv_mode(str *body, str *sendrecv_mode, int *is_on_hold) cp1 = body->s; if ( !( (strncasecmp(cp1, "a=sendrecv", 10) == 0) || (strncasecmp(cp1, "a=recvonly", 10) == 0))) { - if ( !( (strncasecmp(cp1, "a=inactive", 10) == 0) || - (strncasecmp(cp1, "a=sendonly", 10) == 0) )) { - return -1; - } else { + if ((strncasecmp(cp1, "a=inactive", 10) == 0) || + (strncasecmp(cp1, "a=sendonly", 10) == 0) ) { *is_on_hold = 1; + } else { + return -1; } - return -1; } sendrecv_mode->s = body->s + 2; /* skip `a=' */

9 years, 6 months

[tracker] Task opened: sqlops sql_pvquery() error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Savolainen Dmitri (snen) Attached to Project - sip-router Summary - sqlops sql_pvquery() error Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - sqlops sql_pvquery() error: if multiple rows are returned, when using (x)avp. avp[0],avp[1]... are equal and contain first returned item possible patch <code> index aa5cfc3..fc17f83 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -600,7 +600,7 @@ int sql_do_pvquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, LM_ERR("Missing pv spec for column %d\n", j+1); goto error; } - if (db_val2pv_spec(msg, &RES_ROWS(db_res)[0].values[j], &pv->sname) != 0) { + if (db_val2pv_spec(msg, &RES_ROWS(db_res)[i].values[j], &pv->sname) != 0) { LM_ERR("Failed to convert value for column %.*s\n", RES_NAMES(db_res)[j]->len, RES_NAMES(db_res)[j]->s); goto error; </code> More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=487 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 6 months

git:master: modules/ims_usrloc_scscf: fixed poor pointer management in linked list looping

by Jason Penton

Module: sip-router Branch: master Commit: 9ba58f876a36b4e8fc9fb368f65af754acc0dae1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ba58f8… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Oct 29 17:06:30 2014 +0200 modules/ims_usrloc_scscf: fixed poor pointer management in linked list looping --- modules/ims_usrloc_scscf/udomain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_usrloc_scscf/udomain.c b/modules/ims_usrloc_scscf/udomain.c index 55df735..bb42cf6 100644 --- a/modules/ims_usrloc_scscf/udomain.c +++ b/modules/ims_usrloc_scscf/udomain.c @@ -339,9 +339,9 @@ void mem_timer_udomain(udomain_t* _d) { #ifdef EXTRA_DEBUG LM_DBG("ULSLOT %d LOCKED\n", i); #endif - timer_impurecord(ptr); t = ptr; ptr = ptr->next; + timer_impurecord(t); if (t->reg_state == IMPU_NOT_REGISTERED && t->shead == 0) { //remove it - housekeeping - not sure why its still here...?

9 years, 6 months

git:master: modules/ims_usrloc_scscf: add callback when contact is deleted/ removed

by Jason Penton

Module: sip-router Branch: master Commit: 7d273d96a24527e029349f747203f1bbcf65c7b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d273d9… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Oct 29 17:05:17 2014 +0200 modules/ims_usrloc_scscf: add callback when contact is deleted/removed --- modules/ims_usrloc_scscf/impurecord.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index 9ff1dad..4bc82a1 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -938,6 +938,12 @@ int unlink_contact_from_impu(impurecord_t* impu, ucontact_t* contact, int write_ } else { if (ptr == contact) { LM_DBG("unlinking contact [%.*s] from impu [%.*s]\n", contact->c.len, contact->c.s, impu->public_identity.len, impu->public_identity.s); + + if (exists_ulcb_type(impu->cbs, UL_IMPU_DELETE_CONTACT)) { + LM_DBG("Running callback UL_IMPU_DELETE_CONTACT for contact [%.*s] and impu [%.*s]\n", impu->public_identity.len, impu->public_identity.s, ptr->c.len, ptr->c.s); + run_ul_callbacks(impu->cbs, UL_IMPU_DELETE_CONTACT, impu, ptr); + } + found = 1; impu->newcontacts[i]=0; impu->num_contacts--;

9 years, 6 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Richard Good

Module: sip-router Branch: master Commit: bf51da956727e235456f49c2ef9d1d7ce6880b37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf51da9… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Oct 29 13:17:25 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

9 years, 6 months

git:master: modules/ims_registrar_scscf: new parameter user_data_always - if set S-CSCF always requests user data from HSS

by Richard Good

Module: sip-router Branch: master Commit: 9cfe0e32f8bcf2a0e480972b7ae91d3a52f473ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cfe0e3… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Oct 29 13:16:23 2014 +0200 modules/ims_registrar_scscf: new parameter user_data_always - if set S-CSCF always requests user data from HSS --- .../doc/ims_registrar_scscf_admin.xml | 19 +++++++++++++++++++ modules/ims_registrar_scscf/reg_mod.c | 3 +++ modules/ims_registrar_scscf/save.c | 16 +++++++++++----- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml b/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml index d54561e..0964b5e 100644 --- a/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml +++ b/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml @@ -305,6 +305,25 @@ ...</programlisting> </example> </section> + + <section> + <title>user_data_always (integer)</title> + + <para>If specified this will make the S-CSCF always request user + data from HSS.</para> + + <para><emphasis> Default value is 0 (disabled)</emphasis></para> + + <example> + <title>Set <varname>user_data_always</varname>parameter</title> + + <programlisting format="linespecific">... + modparam("ims_registrar_scscf", "user_data_always", 1) +... + </programlisting> + </example> + </section> + </section> <section> diff --git a/modules/ims_registrar_scscf/reg_mod.c b/modules/ims_registrar_scscf/reg_mod.c index 6ce9705..3a39ec1 100644 --- a/modules/ims_registrar_scscf/reg_mod.c +++ b/modules/ims_registrar_scscf/reg_mod.c @@ -94,6 +94,8 @@ int store_data_on_dereg = 0; /**< should we store SAR data on de-registration * int ue_unsubscribe_on_dereg = 0; /*many UEs do not unsubscribe on de reg - therefore we should remove their subscription and not send a notify Some UEs do unsubscribe then everything is fine*/ +int user_data_always = 0; /* Always Reports that user data is missing to HSS */ + /* parameters storage */ str cxdx_dest_realm = str_init("ims.smilecoms.com"); @@ -244,6 +246,7 @@ static param_export_t params[] = { {"subscription_min_expires", INT_PARAM, &subscription_min_expires}, {"subscription_max_expires", INT_PARAM, &subscription_max_expires}, {"ue_unsubscribe_on_dereg", INT_PARAM, &ue_unsubscribe_on_dereg}, + {"user_data_always", INT_PARAM, &user_data_always}, {0, 0, 0} }; diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 4903e12..3066019 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -84,6 +84,7 @@ extern struct tm_binds tmb; extern int store_data_on_dereg; /**< should we store SAR user data on de-registration */ extern int ue_unsubscribe_on_dereg; +extern int user_data_always; /*! \brief * Calculate absolute expires value per contact as follows: @@ -1224,11 +1225,16 @@ int save(struct sip_msg* msg, char* str1, char *route) { } } } - if (require_user_data) - data_available = AVP_IMS_SAR_USER_DATA_NOT_AVAILABLE; - else - data_available = AVP_IMS_SAR_USER_DATA_ALREADY_AVAILABLE; - + + if (!user_data_always) { + if (require_user_data) + data_available = AVP_IMS_SAR_USER_DATA_NOT_AVAILABLE; + else + data_available = AVP_IMS_SAR_USER_DATA_ALREADY_AVAILABLE; + } else { + data_available = AVP_IMS_SAR_USER_DATA_NOT_AVAILABLE; + } + //before we send lets suspend the transaction t = tmb.t_gett(); if (t == NULL || t == T_UNDEFINED) {

9 years, 6 months

git:4.2: dialog: fixed adding contact header to REFER generated by dlg_bridge

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.2 Commit: 97cab82e1217776b248a424b6d0ee6aaf9b092de URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97cab82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 29 12:07:57 2014 +0100 dialog: fixed adding contact header to REFER generated by dlg_bridge - reported by Paul Smith (cherry picked from commit ab7519006b6a53792d66b6903a4b0694083179b6) --- modules/dialog/dlg_transfer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dlg_transfer.c b/modules/dialog/dlg_transfer.c index 1c6de03..b338559 100644 --- a/modules/dialog/dlg_transfer.c +++ b/modules/dialog/dlg_transfer.c @@ -195,7 +195,7 @@ static int dlg_refer_callee(dlg_transfer_ctx_t *dtc) memcpy(hdrs.s+23+dlg_bridge_controller.len+CRLF_LEN+dtc->to.len, CRLF, CRLF_LEN); memcpy(hdrs.s+23+dlg_bridge_controller.len+CRLF_LEN+dtc->to.len+CRLF_LEN, - dlg_bridge_controller.s, dlg_bridge_controller.len); + dlg_bridge_ref_hdrs.s, dlg_bridge_ref_hdrs.len); set_uac_req(&uac_r, &met, &hdrs, NULL, dialog_info, TMCB_LOCAL_COMPLETED, dlg_refer_tm_callback, (void*)dtc);

9 years, 6 months

git:master: dialog: fixed adding contact header to REFER generated by dlg_bridge

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ab7519006b6a53792d66b6903a4b0694083179b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab75190… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 29 12:07:57 2014 +0100 dialog: fixed adding contact header to REFER generated by dlg_bridge - reported by Paul Smith --- modules/dialog/dlg_transfer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dlg_transfer.c b/modules/dialog/dlg_transfer.c index 1c6de03..b338559 100644 --- a/modules/dialog/dlg_transfer.c +++ b/modules/dialog/dlg_transfer.c @@ -195,7 +195,7 @@ static int dlg_refer_callee(dlg_transfer_ctx_t *dtc) memcpy(hdrs.s+23+dlg_bridge_controller.len+CRLF_LEN+dtc->to.len, CRLF, CRLF_LEN); memcpy(hdrs.s+23+dlg_bridge_controller.len+CRLF_LEN+dtc->to.len+CRLF_LEN, - dlg_bridge_controller.s, dlg_bridge_controller.len); + dlg_bridge_ref_hdrs.s, dlg_bridge_ref_hdrs.len); set_uac_req(&uac_r, &met, &hdrs, NULL, dialog_info, TMCB_LOCAL_COMPLETED, dlg_refer_tm_callback, (void*)dtc);

9 years, 6 months

git:master: modules/ims_registrar_scscf: Changed SIP notify process from PROC_SIPINIT to PROC_MIN

by Richard Good

Module: sip-router Branch: master Commit: e59c0919d6cd28e7dbacb4de2d4b616f3f8b054d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e59c091… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Oct 29 11:07:00 2014 +0200 modules/ims_registrar_scscf: Changed SIP notify process from PROC_SIPINIT to PROC_MIN --- modules/ims_registrar_scscf/reg_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_scscf/reg_mod.c b/modules/ims_registrar_scscf/reg_mod.c index 285140e..6ce9705 100644 --- a/modules/ims_registrar_scscf/reg_mod.c +++ b/modules/ims_registrar_scscf/reg_mod.c @@ -479,7 +479,7 @@ static int child_init(int rank) { int pid; if (rank == PROC_MAIN) { - pid = fork_process(PROC_SIPINIT, "sip_notification_event_process", 1); + pid = fork_process(PROC_MIN, "sip_notification_event_process", 1); if (pid < 0) return -1; //error if (pid == 0) {

9 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014