sr-dev November 2013

sr-dev@lists.kamailio.org

29 participants
220 discussions

git:master: tmx: backup and restore existing T and branch pointers for t_cancel_callid()
by Daniel-Constantin Mierla 24 Nov '13

24 Nov '13

Module: sip-router Branch: master Commit: 60372d613544af1f8f06122eb77fa2a9636a6c3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60372d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 24 16:06:41 2013 +0100 tmx: backup and restore existing T and branch pointers for t_cancel_callid() - reported and initial patch by Guillaume Bour --- modules/tmx/tmx_mod.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/tmx/tmx_mod.c b/modules/tmx/tmx_mod.c index 53a466c..89f5e65 100644 --- a/modules/tmx/tmx_mod.c +++ b/modules/tmx/tmx_mod.c @@ -334,6 +334,8 @@ static int fixup_cancel_callid(void** param, int param_no) static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *flag) { struct cell *trans; + struct cell *bkt; + int bkb; struct cancel_info cancel_data; str cseq_s; str callid_s; @@ -359,6 +361,8 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla return -1; } + bkt = _tmx_tmb.t_gett(); + bkb = _tmx_tmb.t_gett_branch(); if( _tmx_tmb.t_lookup_callid(&trans, callid_s, cseq_s) < 0 ) { DBG("Lookup failed - no transaction\n"); return -1; @@ -373,6 +377,7 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); //_tmx_tmb.unref_cell(trans); + _tmx_tmb.t_sett(bkt, bkb); return 1; }

1 0

git:master: tm: exported set_t() and get_t_branch() viam tm api
by Daniel-Constantin Mierla 24 Nov '13

24 Nov '13

Module: sip-router Branch: master Commit: 777dd5e28ff6b4fcc3b1c44e841eb415c974075f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=777dd5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 24 16:05:49 2013 +0100 tm: exported set_t() and get_t_branch() viam tm api - allows to backup and restore pointers to T and branch --- modules/tm/t_lookup.h | 3 +++ modules/tm/tm_load.c | 2 ++ modules/tm/tm_load.h | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_lookup.h b/modules/tm/t_lookup.h index 32a9e8a..cced995 100644 --- a/modules/tm/t_lookup.h +++ b/modules/tm/t_lookup.h @@ -86,10 +86,13 @@ int t_check_msg(struct sip_msg* , int *branch ); typedef struct cell * (*tgett_f)(void); struct cell *get_t(void); + +typedef int (*tgett_branch_f)(void); int get_t_branch(void); /* use carefully or better not at all -- current transaction is * primarily set by lookup functions */ +typedef void (*tsett_f)(struct cell *t, int branch); void set_t(struct cell *t, int branch); diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index d431a38..285120a 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -105,6 +105,8 @@ int load_tm( struct tm_binds *tmb) tmb->free_dlg = free_dlg; tmb->print_dlg = print_dlg; tmb->t_gett = get_t; + tmb->t_gett_branch = get_t_branch; + tmb->t_sett = set_t; tmb->calculate_hooks = w_calculate_hooks; tmb->t_uac = t_uac; tmb->t_uac_with_ids = t_uac_with_ids; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 6d5959e..3d1a3f5 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -82,6 +82,8 @@ struct tm_binds { free_dlg_f free_dlg; print_dlg_f print_dlg; tgett_f t_gett; + tgett_branch_f t_gett_branch; + tsett_f t_sett; calculate_hooks_f calculate_hooks; t_uac_t t_uac; t_uac_with_ids_t t_uac_with_ids;

1 0

git:4.0: dialog: init cseq to 0 if not available yet for one side
by Daniel-Constantin Mierla 24 Nov '13

24 Nov '13

Module: sip-router Branch: 4.0 Commit: 1103009d674b2bf7a6c31e4d351d832370dded58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1103009… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 5 10:33:55 2013 +0100 dialog: init cseq to 0 if not available yet for one side - based on a report by Morten Isaksen (cherry picked from commit 082a6c43938cf8e3839d46fd070e391bd522d4ed) --- modules/dialog/dlg_hash.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index bba619a..6081165 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -484,18 +484,24 @@ int dlg_set_leg_info(struct dlg_cell *dlg, str* tag, str *rr, str *contact, str *cseq, unsigned int leg) { char *p; + str cs = {"0", 1}; + + /* if we don't have cseq, set it to 0 */ + if(cseq->len>0) { + cs = *cseq; + } if(dlg->tag[leg].s) shm_free(dlg->tag[leg].s); dlg->tag[leg].s = (char*)shm_malloc( tag->len + rr->len + contact->len ); if(dlg->cseq[leg].s) { - if (dlg->cseq[leg].len < cseq->len) { + if (dlg->cseq[leg].len < cs.len) { shm_free(dlg->cseq[leg].s); - dlg->cseq[leg].s = (char*)shm_malloc(cseq->len); + dlg->cseq[leg].s = (char*)shm_malloc(cs.len); } } else { - dlg->cseq[leg].s = (char*)shm_malloc( cseq->len ); + dlg->cseq[leg].s = (char*)shm_malloc( cs.len ); } if ( dlg->tag[leg].s==NULL || dlg->cseq[leg].s==NULL) { @@ -531,8 +537,8 @@ int dlg_set_leg_info(struct dlg_cell *dlg, str* tag, str *rr, str *contact, } /* cseq */ - dlg->cseq[leg].len = cseq->len; - memcpy( dlg->cseq[leg].s, cseq->s, cseq->len); + dlg->cseq[leg].len = cs.len; + memcpy( dlg->cseq[leg].s, cs.s, cs.len); return 0; }

1 0

ndb_cassandra - New module proposal
by Luis Martin Gil 24 Nov '13

24 Nov '13

Hello, I developed a module for Kamailio SIP project. I would like Kamailio’s community to consider this work to be included in the next versions of the project. The module is called ’ndb_cassandra’, it is a non-driver db module to write and retrieve information using Apache Cassandra. It depends on thrift version 0.7.0. You can check the source code here, https://github.com/luismartingil/ndb_cassandra I would like to contribute back to Kamailio project and I think this module could be very useful. Please let me know the viability of this add-on. Thanks, Luis Martin Gil

2 1

kamailio 4.0.3 crash
by Dragos Oancea 24 Nov '13

24 Nov '13

Hello We had this crash today with kamailio 4.0.3 . It ran stable for few weeks until this crash. GDB here: http://pastebin.com/rACV31z8 Regards, Dragos

2 6

[tracker] Task opened: modules/mtree: mt_match RPC export (Attachment added)
by sip-router 22 Nov '13

22 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Seudin Kasumovic (seudin) Attached to Project - sip-router Summary - modules/mtree: mt_match RPC export Task Type - Improvement Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi Kamailians, Attached patch exports mt_match from mtree module to MI and RPC interface. Original mt_match has got minor extension to provide matched length to be used in print result for RPC and MI. Exported mt_match could be used for quick check matching from cli or admin GUI. Regards, Seudin One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=373 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.

1 0

[tracker] Comment added: Out of memory when a request is sent to itself
by sip-router 22 Nov '13

22 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#372 - Out of memory when a request is sent to itself User who did this - Konstantin (Konstantin) ---------- We investigated this issue in the context of the bigger problem. We use several custom modules and we met an issue which causes Kamailio server crash. In all cases we can see that the shared memory is corrupted somehow. For example, //Program terminated with signal 11, Segmentation fault. #0 0x08176264 in fm_malloc () (gdb) bt #0 0x08176264 in fm_malloc () #1 0x001a43e2 in shm_malloc (_dom=0x390cdf30, _aor=0x1b9aa4, _contact=0xbfc49408, _ci=0x1b9b20) at ../../mem/shm_mem.h:256 #2 shm_str_dup (_dom=0x390cdf30, _aor=0x1b9aa4, _contact=0xbfc49408, _ci=0x1b9b20) at ../../ut.h:700 #3 new_ucontact (_dom=0x390cdf30, _aor=0x1b9aa4, _contact=0xbfc49408, _ci=0x1b9b20) at ucontact.c:206 #4 0x001b2cd6 in mem_insert_ucontact (_r=0x1b9aa0, _c=0xbfc49408, _ci=0x1b9b20) at urecord.//c:156 Could you recommend how to analyze this problem or tools how to analyze core dumps to identify the place where the shared memory was corrupted? May be there is a way or tool to investigate the shared memory content and its integrity to find out the place where control structures were broken? Thank you in advance. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=372#comment1179 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.

1 0

git:4.1: modules/usrloc: Update contact field when updating a contact in the DB
by Hugh Waite 22 Nov '13

22 Nov '13

Module: sip-router Branch: 4.1 Commit: 20822c5227962508d13bce48a653e594cbfaeff1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20822c5… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Fri Nov 22 09:35:55 2013 +0000 modules/usrloc: Update contact field when updating a contact in the DB - Fixes FS#368 (cherry picked from commit a55018deb431ef32ee2bcd45610903327850757d) --- modules/usrloc/ucontact.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 323dc4b..4877c7f 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -650,8 +650,8 @@ int db_update_ucontact_addr(ucontact_t* _c) db_val_t vals1[4]; int n1; - db_key_t keys2[14]; - db_val_t vals2[14]; + db_key_t keys2[15]; + db_val_t vals2[15]; int nr_cols2; @@ -782,6 +782,13 @@ int db_update_ucontact_addr(ucontact_t* _c) vals2[nr_cols2].val.int_val = (int)_c->reg_id; nr_cols2++; + keys2[nr_cols2] = &contact_col; + vals2[nr_cols2].type = DB1_STR; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val = _c->c; + LM_DBG("contact:%.*s\n", vals2[nr_cols2].val.str_val.len, vals2[nr_cols2].val.str_val.s); + nr_cols2++; + if (use_domain) { keys1[n1] = &domain_col; vals1[n1].type = DB1_STR; @@ -850,8 +857,8 @@ int db_update_ucontact_ruid(ucontact_t* _c) db_val_t vals1[1]; int n1; - db_key_t keys2[14]; - db_val_t vals2[14]; + db_key_t keys2[15]; + db_val_t vals2[15]; int n2; @@ -978,6 +985,13 @@ int db_update_ucontact_ruid(ucontact_t* _c) vals2[n2].val.int_val = (int)_c->reg_id; n2++; + keys2[n2] = &contact_col; + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->c; + LM_DBG("contact:%.*s\n", vals2[n2].val.str_val.len, vals2[n2].val.str_val.s); + n2++; + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1;

1 0

git:4.1: modules/avpops: Fix 'uninitialised variable' warning
by Hugh Waite 22 Nov '13

22 Nov '13

Module: sip-router Branch: 4.1 Commit: 553d6aff9eecaec38547910d4dd46fcd71b57583 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=553d6af… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Fri Nov 22 09:39:40 2013 +0000 modules/avpops: Fix 'uninitialised variable' warning (cherry picked from commit 54020b00893ee259baee714d7d17adc6d31f9112) --- modules/avpops/avpops_impl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index ee2e052..ecf31b0 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -1152,8 +1152,8 @@ int ops_check_avp( struct sip_msg* msg, struct fis_param* src, struct search_state st1, st2; unsigned short name_type1; unsigned short name_type2; - struct usr_avp *avp1; - struct usr_avp *avp2; + struct usr_avp *avp1 = NULL; + struct usr_avp *avp2 = NULL; regmatch_t pmatch; int_str avp_name1; int_str avp_name2; @@ -1253,7 +1253,6 @@ cycle1: } else if(val->u.sval->type==PVT_XAVP) { - avp2 = 0; if(xavp2==NULL) if(get_xavp_param(msg, val->u.sval, &xavp2, &xavp2_flags)<0) goto error; @@ -1263,7 +1262,6 @@ cycle1: goto next; } } else { - avp2 = 0; if(pv_get_spec_value(msg, val->u.sval, &xvalue)!=0) { LM_ERR("cannot get dst value\n"); @@ -1286,7 +1284,6 @@ cycle1: check_val.s = val->u.s; check_flags = AVP_VAL_STR; } - avp2 = 0; } cycle2:

1 0

git:4.1: modules/registrar: Invalidate temporary GRUUs when the Call-ID changes for a sip.instance
by Hugh Waite 22 Nov '13

22 Nov '13

Module: sip-router Branch: 4.1 Commit: 18afdc79aeb2b46c6eda4b66e40efae49d524701 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18afdc7… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Fri Nov 22 09:28:38 2013 +0000 modules/registrar: Invalidate temporary GRUUs when the Call-ID changes for a sip.instance - Fixes FS#368 (cherry picked from commit 27eba09b603b265ce4213d238c132249189ae6e8) --- modules/registrar/save.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index bc816cd..fc5d564 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -716,10 +716,10 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, ptr=_r->contacts; while(ptr) { - ptr0 = ptr; + ptr0 = ptr->next; if(ptr!=c) ul.delete_ucontact(_r, ptr); - ptr=ptr0->next; + ptr=ptr0; } updated=1; } @@ -746,13 +746,32 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, ptr=_r->contacts; while(ptr) { - ptr0 = ptr; + ptr0 = ptr->next; if(ptr!=c) ul.delete_ucontact(_r, ptr); - ptr=ptr0->next; + ptr=ptr0; } updated=1; } + /* If call-id has changed then delete all records with this sip.instance + then insert new record */ + if (ci->instance.s != NULL && + (ci->callid->len != c->callid.len || + strncmp(ci->callid->s, c->callid.s, ci->callid->len) != 0)) + { + ptr = _r->contacts; + while (ptr) + { + ptr0 = ptr->next; + if ((ptr != c) && ptr->instance.len == c->instance.len && + strncmp(ptr->instance.s, c->instance.s, ptr->instance.len) == 0) + { + ul.delete_ucontact(_r, ptr); + } + ptr = ptr0; + } + updated = 1; + } if (ul.update_ucontact(_r, c, ci) < 0) { rerrno = R_UL_UPD_C; LM_ERR("failed to update contact\n");

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2013