sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
254 discussions

git:master: modules/cdp/acctstatemachine.c: fixed incorrect reservation expiry warning

by Richard Good

Module: sip-router Branch: master Commit: 355ab783a99e413eb96a385ab067336316aaafda URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=355ab78… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Oct 29 12:40:42 2013 +0200 modules/cdp/acctstatemachine.c: fixed incorrect reservation expiry warning First check if acc state is OPEN before sending reservation expiry warning --- modules/cdp/session.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/cdp/session.c b/modules/cdp/session.c index dc41e1f..77a1f45 100644 --- a/modules/cdp/session.c +++ b/modules/cdp/session.c @@ -448,13 +448,16 @@ int cdp_sessions_timer(time_t now, void* ptr) int res_valid_for = x->u.cc_acc.reserved_units_validity_time; int last_reservation = x->u.cc_acc.reserved_units; int buffer_time = 15; //15 seconds - TODO: add as config parameter - if (last_res_timestamp) { - //we have obv already started reservations - if ((last_res_timestamp + res_valid_for) < (time(0) + last_reservation + buffer_time)) { - LM_DBG("reservation about to expire, sending callback\n"); - cc_acc_client_stateful_sm_process(x, ACC_CC_EV_RSVN_WARNING, 0); - } - + //we should check for reservation expiries if the state is open + if(x->u.cc_acc.state==ACC_CC_ST_OPEN){ + if (last_res_timestamp) { + //we have obv already started reservations + if ((last_res_timestamp + res_valid_for) < (time(0) + last_reservation + buffer_time)) { + LM_DBG("reservation about to expire, sending callback\n"); + cc_acc_client_stateful_sm_process(x, ACC_CC_EV_RSVN_WARNING, 0); + } + + } } /* TODO: if reservation has expired we need to tear down the session. Ideally * the client application (module) should do this but for completeness we should

11 years

[tracker] Task opened: avpops: avp_copy add xavp

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 - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - avpops: avp_copy add xavp Task Type - Feature Request Category - Module Status - New Assigned To - Víctor Seva Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - We have avp_copy on avpops module but we don't have anything to copy xavps. $xavp(a[0]=>b) = avp(x); $avp(x) = $xavp(a[0]=>b); $xavp(a[0]) = $xavp(b[1]); $xavp(a) = $xavp(b); More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=359 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.

11 years

git:master: kamctl: updated db creation scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c4a4b4f599ba428330899e804877e85d3fdcc3a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4a4b4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 29 11:08:49 2013 +0100 kamctl: updated db creation scripts --- utils/kamctl/db_berkeley/kamailio/mohqcalls | 2 -- utils/kamctl/db_berkeley/kamailio/mohqueues | 2 -- utils/kamctl/db_berkeley/kamailio/version | 4 ++++ utils/kamctl/db_sqlite/alias_db-create.sql | 5 +++-- utils/kamctl/dbtext/kamailio/mohqcalls | 1 - utils/kamctl/dbtext/kamailio/mohqueues | 1 - utils/kamctl/dbtext/kamailio/version | 2 ++ utils/kamctl/mysql/alias_db-create.sql | 5 +++-- utils/kamctl/oracle/alias_db-create.sql | 5 +++-- utils/kamctl/postgres/alias_db-create.sql | 5 +++-- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/mohqcalls b/utils/kamctl/db_berkeley/kamailio/mohqcalls index b80902e..0ecaef4 100644 --- a/utils/kamctl/db_berkeley/kamailio/mohqcalls +++ b/utils/kamctl/db_berkeley/kamailio/mohqcalls @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|NIL|NIL|NIL|NIL|'to_date('','yyyy-mm-dd hh24:mi:ss')' -mohqcalls| -mohqcalls|1 diff --git a/utils/kamctl/db_berkeley/kamailio/mohqueues b/utils/kamctl/db_berkeley/kamailio/mohqueues index f5eeb2c..eafd9ce 100644 --- a/utils/kamctl/db_berkeley/kamailio/mohqueues +++ b/utils/kamctl/db_berkeley/kamailio/mohqueues @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|NIL|NIL|NIL|NIL -mohqueues| -mohqueues|1 diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index c981eaa..e9e350b 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -76,6 +76,10 @@ matrix| matrix|1 missed_calls| missed_calls|3 +mohqcalls| +mohqcalls|1 +mohqueues| +mohqueues|1 mtree| mtree|1 mtrees| diff --git a/utils/kamctl/db_sqlite/alias_db-create.sql b/utils/kamctl/db_sqlite/alias_db-create.sql index 90656e9..f9975de 100644 --- a/utils/kamctl/db_sqlite/alias_db-create.sql +++ b/utils/kamctl/db_sqlite/alias_db-create.sql @@ -4,9 +4,10 @@ CREATE TABLE dbaliases ( alias_username VARCHAR(64) DEFAULT '' NOT NULL, alias_domain VARCHAR(64) DEFAULT '' NOT NULL, username VARCHAR(64) DEFAULT '' NOT NULL, - domain VARCHAR(64) DEFAULT '' NOT NULL, - CONSTRAINT dbaliases_alias_idx UNIQUE (alias_username, alias_domain) + domain VARCHAR(64) DEFAULT '' NOT NULL ); +CREATE INDEX dbaliases_alias_user_idx ON dbaliases (alias_username); +CREATE INDEX dbaliases_alias_idx ON dbaliases (alias_username, alias_domain); CREATE INDEX dbaliases_target_idx ON dbaliases (username, domain); diff --git a/utils/kamctl/dbtext/kamailio/mohqcalls b/utils/kamctl/dbtext/kamailio/mohqcalls index feacec1..c5454dc 100644 --- a/utils/kamctl/dbtext/kamailio/mohqcalls +++ b/utils/kamctl/dbtext/kamailio/mohqcalls @@ -1,2 +1 @@ id(int,auto) mohq_id(int) call_id(string) call_status(int) call_from(string) call_contact(string,null) call_time(int) -mohqcalls:1 diff --git a/utils/kamctl/dbtext/kamailio/mohqueues b/utils/kamctl/dbtext/kamailio/mohqueues index 687cb17..a44840b 100644 --- a/utils/kamctl/dbtext/kamailio/mohqueues +++ b/utils/kamctl/dbtext/kamailio/mohqueues @@ -1,2 +1 @@ id(int,auto) name(string) uri(string) mohdir(string,null) mohfile(string) debug(int) -mohqueues:1 diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index be869b3..c3ca5ad 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -33,6 +33,8 @@ location:6 location_attrs:1 matrix:1 missed_calls:3 +mohqcalls:1 +mohqueues:1 mtree:1 mtrees:2 pdt:1 diff --git a/utils/kamctl/mysql/alias_db-create.sql b/utils/kamctl/mysql/alias_db-create.sql index cfb73b9..86fe793 100644 --- a/utils/kamctl/mysql/alias_db-create.sql +++ b/utils/kamctl/mysql/alias_db-create.sql @@ -4,9 +4,10 @@ CREATE TABLE dbaliases ( alias_username VARCHAR(64) DEFAULT '' NOT NULL, alias_domain VARCHAR(64) DEFAULT '' NOT NULL, username VARCHAR(64) DEFAULT '' NOT NULL, - domain VARCHAR(64) DEFAULT '' NOT NULL, - CONSTRAINT alias_idx UNIQUE (alias_username, alias_domain) + domain VARCHAR(64) DEFAULT '' NOT NULL ); +CREATE INDEX alias_user_idx ON dbaliases (alias_username); +CREATE INDEX alias_idx ON dbaliases (alias_username, alias_domain); CREATE INDEX target_idx ON dbaliases (username, domain); diff --git a/utils/kamctl/oracle/alias_db-create.sql b/utils/kamctl/oracle/alias_db-create.sql index 57a9ba9..03ec78a 100644 --- a/utils/kamctl/oracle/alias_db-create.sql +++ b/utils/kamctl/oracle/alias_db-create.sql @@ -4,8 +4,7 @@ CREATE TABLE dbaliases ( alias_username VARCHAR2(64) DEFAULT '', alias_domain VARCHAR2(64) DEFAULT '', username VARCHAR2(64) DEFAULT '', - domain VARCHAR2(64) DEFAULT '', - CONSTRAINT dbaliases_alias_idx UNIQUE (alias_username, alias_domain) + domain VARCHAR2(64) DEFAULT '' ); CREATE OR REPLACE TRIGGER dbaliases_tr @@ -16,5 +15,7 @@ END dbaliases_tr; / BEGIN map2users('dbaliases'); END; / +CREATE INDEX dbaliases_alias_user_idx ON dbaliases (alias_username); +CREATE INDEX dbaliases_alias_idx ON dbaliases (alias_username, alias_domain); CREATE INDEX dbaliases_target_idx ON dbaliases (username, domain); diff --git a/utils/kamctl/postgres/alias_db-create.sql b/utils/kamctl/postgres/alias_db-create.sql index 1bf29ea..5947b02 100644 --- a/utils/kamctl/postgres/alias_db-create.sql +++ b/utils/kamctl/postgres/alias_db-create.sql @@ -4,9 +4,10 @@ CREATE TABLE dbaliases ( alias_username VARCHAR(64) DEFAULT '' NOT NULL, alias_domain VARCHAR(64) DEFAULT '' NOT NULL, username VARCHAR(64) DEFAULT '' NOT NULL, - domain VARCHAR(64) DEFAULT '' NOT NULL, - CONSTRAINT dbaliases_alias_idx UNIQUE (alias_username, alias_domain) + domain VARCHAR(64) DEFAULT '' NOT NULL ); +CREATE INDEX dbaliases_alias_user_idx ON dbaliases (alias_username); +CREATE INDEX dbaliases_alias_idx ON dbaliases (alias_username, alias_domain); CREATE INDEX dbaliases_target_idx ON dbaliases (username, domain);

11 years

git:master: srdb1: drop unique constrant on alias user+domain in dbaliases

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ecc6e35b31d59e6e9995a03c6ab00f21a23b1be9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecc6e35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 29 11:07:03 2013 +0100 srdb1: drop unique constrant on alias user+domain in dbaliases - it doesn't work for multiple branches when use_domain is set, reported by Vassilis Radis --- lib/srdb1/schema/dbaliases.xml | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/schema/dbaliases.xml b/lib/srdb1/schema/dbaliases.xml index 04c2c03..12078e3 100644 --- a/lib/srdb1/schema/dbaliases.xml +++ b/lib/srdb1/schema/dbaliases.xml @@ -12,7 +12,10 @@ <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - <db:para>This table us used by the alias_db module as an alternative for user aliases via userloc. More information about the alias_db module can be found at: &KAMAILIO_MOD_DOC;alias_db.html + <db:para>This table us used by the alias_db module as an + alternative for user aliases via userloc. More information + about the alias_db module can be found at: + &KAMAILIO_MOD_DOC;alias_db.html </db:para> </description> @@ -61,10 +64,14 @@ </column> <index> + <name>alias_user_idx</name> + <colref linkend="alias_username"/> + </index> + + <index> <name>alias_idx</name> <colref linkend="alias_username"/> <colref linkend="alias_domain"/> - <unique/> </index> <index>

11 years

git:master: pua_publish: more verbose output for error case when sending publish

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: da3d48de7d52df83fcb568530441e7ac6475baae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da3d48d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 29 10:08:04 2013 +0100 pua_publish: more verbose output for error case when sending publish --- modules/pua_usrloc/ul_publish.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/pua_usrloc/ul_publish.c b/modules/pua_usrloc/ul_publish.c index 4eaf7a9..24dd3c9 100644 --- a/modules/pua_usrloc/ul_publish.c +++ b/modules/pua_usrloc/ul_publish.c @@ -323,8 +323,8 @@ void ul_publish(ucontact_t* c, int type, void* param) print_publ(publ); if((error=pua_send_publish(publ))< 0) { - LM_ERR("while sending publish\n"); - if(type & UL_CONTACT_UPDATE && error == ERR_PUBLISH_NO_BODY) { + LM_ERR("while sending publish for ul event %d\n", type); + if((type & UL_CONTACT_UPDATE) && error == ERR_PUBLISH_NO_BODY) { /* This error can occur if Kamailio was restarted/stopped and for any reason couldn't store a pua * entry in 'pua' DB table. It can also occur if 'pua' table is cleaned externally while Kamailio * is stopped so cannot retrieve these entries from DB when restarting.

11 years

git:master: modules/ims_registrar_pcscf: replaced incorrect LM_ERR with LM_DBG

by Richard Good

Module: sip-router Branch: master Commit: 73d509f04029dddc94bedba23460d43c81acc13a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73d509f… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Oct 29 10:51:32 2013 +0200 modules/ims_registrar_pcscf: replaced incorrect LM_ERR with LM_DBG --- modules/ims_registrar_pcscf/service_routes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 42590b5..8af77e2 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -215,7 +215,7 @@ int check_service_routes(struct sip_msg* _m, udomain_t* _d) { LM_DBG("hdr is %p\n", hdr); LM_DBG("r is %p\n", r); if (r) - LM_ERR("Next Route is %.*s\n", r->nameaddr.uri.len, r->nameaddr.uri.s); + LM_DBG("Next Route is %.*s\n", r->nameaddr.uri.len, r->nameaddr.uri.s); } /* Then check the following headers: */ for (i=0; i< c->num_service_routes; i++) {

11 years

git:master: modules/tm: fixed placement of variable declarations to top of scope block

by Jason Penton

Module: sip-router Branch: master Commit: 41a9fbf38ba84e542a546893a6ce9c48f14f3aa3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41a9fbf… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Oct 29 10:31:52 2013 +0200 modules/tm: fixed placement of variable declarations to top of scope block --- modules/tm/t_suspend.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index c9cb01d..789d25a 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -380,6 +380,8 @@ done: /* unref the transaction */ t_unref(t->uas.request); }else{ + struct hdr_field *hdr, *prev = 0, *tmp = 0; + tm_ctx_set_branch_index(T_BR_UNDEFINED); /* unref the transaction */ t_unref(t->uac[branch].reply); @@ -391,7 +393,6 @@ done: del_nonshm_lump_rpl( &(t->uac[branch].reply->reply_lump) ); /* free header's parsed structures that were added */ - struct hdr_field *hdr, *prev = 0, *tmp = 0; for( hdr=t->uac[branch].reply->headers ; hdr ; hdr=hdr->next ) { if ( hdr->parsed && hdr_allocs_parse(hdr) && (hdr->parsed<(void*)t->uac[branch].reply ||

11 years

[tracker] Task closed: add arbitrary params in Path header

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#332 - add arbitrary params in Path header User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=332 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.

11 years

git:master: modules/tm: cosmetic fixes and comment fixes

by Jason Penton

Module: sip-router Branch: master Commit: 716932aa77a0f22f00d2ccee8a89cd84b6674f0a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=716932a… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Oct 29 09:49:42 2013 +0200 modules/tm: cosmetic fixes and comment fixes --- modules/tm/t_suspend.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 23fdb03..c9cb01d 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -384,15 +384,14 @@ done: /* unref the transaction */ t_unref(t->uac[branch].reply); LOG(L_DBG,"DEBUG: t_continue_reply: Freeing earlier cloned reply\n"); - /* free header's parsed structures that were added by failure handlers */ + /* free lumps that were added during reply processing */ del_nonshm_lump( &(t->uac[branch].reply->add_rm) ); del_nonshm_lump( &(t->uac[branch].reply->body_lumps) ); del_nonshm_lump_rpl( &(t->uac[branch].reply->reply_lump) ); - struct hdr_field* hdr; - struct hdr_field* prev = 0; - struct hdr_field* tmp = 0; + /* free header's parsed structures that were added */ + struct hdr_field *hdr, *prev = 0, *tmp = 0; for( hdr=t->uac[branch].reply->headers ; hdr ; hdr=hdr->next ) { if ( hdr->parsed && hdr_allocs_parse(hdr) && (hdr->parsed<(void*)t->uac[branch].reply ||

11 years

git:master: modules/tm: last pkg_mem leak resolved for async replies ( nonshm lumps)

by Jason Penton

Module: sip-router Branch: master Commit: a7d9ea3ceda6b933807f0345e327849e60d0fa57 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7d9ea3… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Oct 29 09:42:45 2013 +0200 modules/tm: last pkg_mem leak resolved for async replies (nonshm lumps) --- modules/tm/t_suspend.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index d898984..23fdb03 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -47,6 +47,9 @@ #include "t_suspend.h" +#include "../../data_lump.h" +#include "../../data_lump_rpl.h" + /* Suspends the transaction for later use. * Save the returned hash_index and label to get * back to the SIP request processing, see the readme. @@ -382,6 +385,11 @@ done: t_unref(t->uac[branch].reply); LOG(L_DBG,"DEBUG: t_continue_reply: Freeing earlier cloned reply\n"); /* free header's parsed structures that were added by failure handlers */ + + del_nonshm_lump( &(t->uac[branch].reply->add_rm) ); + del_nonshm_lump( &(t->uac[branch].reply->body_lumps) ); + del_nonshm_lump_rpl( &(t->uac[branch].reply->reply_lump) ); + struct hdr_field* hdr; struct hdr_field* prev = 0; struct hdr_field* tmp = 0;

11 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2013