sr-dev August 2013

sr-dev@lists.kamailio.org

29 participants
148 discussions

git:master: cdp: fixed spelling and removed some erroneous code

by Jason Penton

Module: sip-router Branch: master Commit: 71594a81f012432782d1f7b6f59c725130928ee7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71594a8… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Aug 19 13:41:45 2013 +0200 cdp: fixed spelling and removed some erroneous code --- modules/cdp/acctstatemachine.c | 3 +-- modules/cdp/session.c | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/cdp/acctstatemachine.c b/modules/cdp/acctstatemachine.c index 957b064..8537d0d 100644 --- a/modules/cdp/acctstatemachine.c +++ b/modules/cdp/acctstatemachine.c @@ -245,10 +245,9 @@ inline int cc_acc_client_stateful_sm_process(cdp_session_t* s, int event, AAAMes } if (s) { - if (s->cb) - (s->cb)(ACC_CC_EV_SESSION_TIMEOUT, s); AAASessionsUnlock(s->hash); } + return ret; } diff --git a/modules/cdp/session.c b/modules/cdp/session.c index 1577766..dc41e1f 100644 --- a/modules/cdp/session.c +++ b/modules/cdp/session.c @@ -116,10 +116,6 @@ void free_session(cdp_session_t *x) case AUTH_SERVER_STATEFULL: break; case ACCT_CC_CLIENT: - if (x->u.generic_data) { - LM_ERR("free_session(): The session->u.generic_data should be freed and reset before dropping the session!" - "Possible memory leak!\n"); - } break; default: LM_ERR("free_session(): Unknown session type %d!\n",x->type); @@ -415,7 +411,7 @@ void cdp_sessions_log() case ACCT_CC_CLIENT: LM_DBG(ANSI_GRAY"\tCCAcct State [%d] Charging Active [%c (%d)s] Reserved Units(valid=%ds) [%d] Generic [%p]\n", x->u.cc_acc.state, - x->u.cc_acc.charging_start_time?'Y':'N', + (x->u.cc_acc.charging_start_time&&x->u.cc_acc.state!=ACC_CC_ST_DISCON)?'Y':'N', x->u.cc_acc.charging_start_time?(int)((int)time(0) - (int)x->u.cc_acc.charging_start_time):-1, x->u.cc_acc.reserved_units?(int)((int)x->u.cc_acc.last_reservation_request_time + x->u.cc_acc.reserved_units_validity_time) - (int)time(0):-1, x->u.cc_acc.reserved_units, @@ -441,8 +437,10 @@ int cdp_sessions_timer(time_t now, void* ptr) switch (x->type){ case ACCT_CC_CLIENT: if (x->u.cc_acc.type == ACC_CC_TYPE_SESSION) { - //check for old, stale sessions - if (time(0) > (x->u.cc_acc.discon_time + GRACE_DISCON_TIMEOUT)) { + //check for old, stale sessions, we need to do something more elegant + //here to ensure that if a CCR start record is sent and the client never sends anything + //else that we catch it and clean up the session from within CDP, calling all callbacks, etc + if ((time(0) > (x->u.cc_acc.discon_time + GRACE_DISCON_TIMEOUT)) && (x->u.cc_acc.state==ACC_CC_ST_DISCON)) { cc_acc_client_stateful_sm_process(x, ACC_CC_EV_SESSION_STALE, 0); } //check reservation timers - again here we are assuming CC-Time applications @@ -458,9 +456,12 @@ int cdp_sessions_timer(time_t now, void* ptr) } } + /* 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 + * put a failsafe here too. + */ } break; - case AUTH_CLIENT_STATEFULL: if (x->u.auth.timeout>=0 && x->u.auth.timeout<=now){ //Session timeout @@ -753,7 +754,8 @@ AAASession* AAACreateCCAccSession(AAASessionCallback_f *cb, int is_session, void s = cdp_new_cc_acc_session(id, is_session); if (s) { - s->u.auth.generic_data = generic_data; + if (generic_data) + s->u.auth.generic_data = generic_data; s->cb = cb; if (s->cb) (s->cb)(ACC_CC_EV_SESSION_CREATED, s); @@ -768,7 +770,7 @@ AAASession* AAACreateCCAccSession(AAASessionCallback_f *cb, int is_session, void int AAAStartChargingCCAccSession(AAASession *s) { if (s->type != ACCT_CC_CLIENT && s->u.cc_acc.type != ACC_CC_TYPE_SESSION) { - LM_ERR("Can't start charing on a credit-control session that is not session based\n"); + LM_ERR("Can't start charging on a credit-control session that is not session based\n"); return -1; }

10 years, 8 months

[tracker] Task closed: dispatcher.reload doesn't work with DB

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#331 - dispatcher.reload doesn't work with DB User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug Additional comments about closing: Not matching the code in latest 4.0 branch. Provide an unified diff if it is still an issue from your point of view. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=331 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.

10 years, 8 months

Simple module - beginner questions

by DanB

Hey Guys, We are in the process of writing our first Kamailio module and would need if possible some guidance. Following questions came up: * We need to keep track about call-start and call-stop events. Do you recommend us dialog or dialog-ng module for that? * To learn the basic of Kamailio module development, can you recommend us a very simple and basic module to have a look on (like a hello world or something). * We would need to be able to control calls (eg kill them when the account credits are finished, is dialog also the way to go for that)? * We would need to be able to receive rpc requests from a remote server. What do you recommend us as approach: using existing rpc modules and expose our own apis through that or fire up our own rpc server instead? Thanks in advance for any tip! DanB

10 years, 8 months

git:master: Only update received info, if a contact is "new" contact. In case of multiple registration for one AoR, each registration will have a different contact.

by admin＠sip-router.org

Module: sip-router Branch: master Commit: ea442b3155bf25ff48f7fd125b2ffa72a5631852 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea442b3… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Sun Aug 18 17:47:08 2013 +0200 Only update received info, if a contact is "new" contact. In case of multiple registration for one AoR, each registration will have a different contact. --- modules/ims_registrar_pcscf/save.c | 50 ++++++++++++++++++++---------------- modules/ims_usrloc_pcscf/udomain.c | 2 +- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/modules/ims_registrar_pcscf/save.c b/modules/ims_registrar_pcscf/save.c index 5ace6e5..676f949 100644 --- a/modules/ims_registrar_pcscf/save.c +++ b/modules/ims_registrar_pcscf/save.c @@ -141,32 +141,38 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma ci.num_service_routes = service_route_cnt; ci.reg_state = PCONTACT_REGISTERED; - // Received Info: First try AVP, otherwise simply take the source of the request: - memset(&val, 0, sizeof(int_str)); - if (rcv_avp_name.n!=0 && search_first_avp(rcv_avp_type, rcv_avp_name, &val, 0) && val.s.len > 0) { - if (val.s.len>RECEIVED_MAX_SIZE) { - LM_ERR("received too long\n"); - goto error; - } - if (parse_uri(val.s.s, val.s.len, &parsed_received) < 0) { - LM_DBG("Error parsing Received URI <%.*s>\n", val.s.len, val.s.s); - continue; - } - ci.received_host = parsed_received.host; - ci.received_port = parsed_received.port_no; - ci.received_proto = parsed_received.proto; - } else { - ci.received_host.len = ip_addr2sbuf(&req->rcv.src_ip, srcip, sizeof(srcip)); - ci.received_host.s = srcip; - ci.received_port = req->rcv.src_port; - ci.received_proto = req->rcv.proto; - } - // Set to default, if not set: - if (ci.received_port == 0) ci.received_port = 5060; + ci.received_host.len = 0; + ci.received_host.s = 0; + ci.received_port = 0; + ci.received_proto = 0; ul.lock_udomain(_d, &c->uri); if (ul.get_pcontact(_d, &c->uri, &pcontact) != 0) { //need to insert new contact LM_DBG("Adding pcontact: <%.*s>, expires: %d which is in %d seconds\n", c->uri.len, c->uri.s, expires, expires-local_time_now); + + // Received Info: First try AVP, otherwise simply take the source of the request: + memset(&val, 0, sizeof(int_str)); + if (rcv_avp_name.n!=0 && search_first_avp(rcv_avp_type, rcv_avp_name, &val, 0) && val.s.len > 0) { + if (val.s.len>RECEIVED_MAX_SIZE) { + LM_ERR("received too long\n"); + goto error; + } + if (parse_uri(val.s.s, val.s.len, &parsed_received) < 0) { + LM_DBG("Error parsing Received URI <%.*s>\n", val.s.len, val.s.s); + continue; + } + ci.received_host = parsed_received.host; + ci.received_port = parsed_received.port_no; + ci.received_proto = parsed_received.proto; + } else { + ci.received_host.len = ip_addr2sbuf(&req->rcv.src_ip, srcip, sizeof(srcip)); + ci.received_host.s = srcip; + ci.received_port = req->rcv.src_port; + ci.received_proto = req->rcv.proto; + } + // Set to default, if not set: + if (ci.received_port == 0) ci.received_port = 5060; + if (ul.insert_pcontact(_d, &c->uri, &ci, &pcontact) != 0) { LM_ERR("Failed inserting new pcontact\n"); } else { diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index ef15bea..8c0d370 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -376,7 +376,7 @@ int update_pcontact(struct udomain* _d, struct pcontact_info* _ci, struct pconta } } - // update received info: + // update received info (if info is available): if (_ci->received_host.len > 0) { if (_c->received_host.s) shm_free(_c->received_host.s);

10 years, 9 months

[tracker] Task opened: add arbitrary params in Path header (Attachment added)

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 - Seudin Kasumovic (seudin) Attached to Project - sip-router Summary - add arbitrary params in Path header Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - rfc3327 allow Path header to contains arbitrary RR semi pram. This patch allow to configure optional AVP variable to be used when build Path header. Note: Patch is made on 4.0.3. 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=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.

10 years, 9 months

git:master: Do some debug output, when searching for user based on IP/Port/ Proto.

by admin＠sip-router.org

Module: sip-router Branch: master Commit: ec1c1bab23e4fff3bd5cd60c2f254e646dcbc9ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec1c1ba… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Fri Aug 16 17:08:15 2013 +0200 Do some debug output, when searching for user based on IP/Port/Proto. --- modules/ims_usrloc_pcscf/udomain.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index f82c941..ef15bea 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -443,10 +443,19 @@ int get_pcontact_by_src(udomain_t* _d, str * _host, unsigned short _port, unsign { c = _d->table[i].first; while(c) { + LM_DBG("Port %d (search %d), Proto %d (search %d), reg_state %s (search %s)\n", + c->received_port, _port, c->received_proto, _proto, + reg_state_to_string(c->reg_state), reg_state_to_string(PCONTACT_REGISTERED) + ); // First check, if Proto and Port matches: if ((c->reg_state == PCONTACT_REGISTERED) && (c->received_port == _port) && (c->received_proto == _proto)) { + LM_DBG("Received host len %d (search %d)\n", c->received_host.len, _host->len); // Then check the length: if (c->received_host.len == _host->len) { + LM_DBG("Received host %.*s (search %.*s)\n", + c->received_host.len, c->received_host.s, + _host->len, _host->s); + // Finally really compare the "received_host" if (!memcmp(c->received_host.s, _host->s, _host->len)) { *_c = c;

10 years, 9 months

git:3.2: acc(k): table name for db acc can be dynamic

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.2 Commit: fec398c8d6f2cd2e038b19aceedfa2e50a3c57e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fec398c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 12 14:52:07 2010 +0200 acc(k): table name for db acc can be dynamic - you can include variables in table name and will be evaluated at runtime: modparam("acc", "db_table_acc", "acc_$time(year)_$time(mon)") will write now to table acc_2010_10 - same can be done for missed_calls table name - second parameter of acc_db_request() supports as well config variables (cherry picked from commit e8f6a95d43b6a4340cf7e97213af5c71fa2a69e9) --- modules_k/acc/acc_logic.c | 52 +++++++++++++++++++++++++++++++++++++++----- modules_k/acc/acc_mod.c | 24 ++++++++++++++++++++ modules_k/acc/acc_mod.h | 2 + 3 files changed, 72 insertions(+), 6 deletions(-) diff --git a/modules_k/acc/acc_logic.c b/modules_k/acc/acc_logic.c index e5033ea..e1c49a9 100644 --- a/modules_k/acc/acc_logic.c +++ b/modules_k/acc/acc_logic.c @@ -39,6 +39,7 @@ #include <string.h> #include "../../dprint.h" +#include "../../sr_module.h" #include "../../parser/parse_from.h" #include "../../parser/parse_content.h" #include "../../modules/tm/tm_load.h" @@ -103,8 +104,6 @@ struct acc_enviroment acc_env; #define is_acc_prepare_on(_rq) \ (is_acc_flag_set(_rq,acc_prepare_flag)) - - static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ); @@ -182,6 +181,35 @@ int w_acc_log_request(struct sip_msg *rq, char *comment, char *foo) #ifdef SQL_ACC +int acc_db_set_table_name(struct sip_msg *msg, void *param, str *table) +{ +#define DB_TABLE_NAME_SIZE 64 + static char db_table_name_buf[DB_TABLE_NAME_SIZE]; + str dbtable; + + if(param!=NULL) { + if(get_str_fparam(&dbtable, msg, (fparam_t*)param)<0) { + LM_ERR("cannot get acc db table name\n"); + return -1; + } + if(dbtable.len>=DB_TABLE_NAME_SIZE) { + LM_ERR("acc db table name too big [%.*s] max %d\n", + dbtable.len, dbtable.s, DB_TABLE_NAME_SIZE); + return -1; + } + strncpy(db_table_name_buf, dbtable.s, dbtable.len); + env_set_text(db_table_name_buf, dbtable.len); + } else { + if(table==NULL) { + LM_ERR("no acc table name\n"); + return -1; + } + env_set_text(table->s, table->len); + } + return 0; +} + + int w_acc_db_request(struct sip_msg *rq, char *comment, char *table) { if (!table) { @@ -190,9 +218,12 @@ int w_acc_db_request(struct sip_msg *rq, char *comment, char *table) } if (acc_preparse_req(rq)<0) return -1; + if(acc_db_set_table_name(rq, (void*)table, NULL)<0) { + LM_ERR("cannot set table name\n"); + return -1; + } env_set_to( rq->to ); env_set_comment((struct acc_param*)comment); - env_set_text(table, strlen(table)); return acc_db_request(rq); } #endif @@ -340,7 +371,10 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, } #ifdef SQL_ACC if (is_db_mc_on(req)) { - env_set_text(db_table_mc.s, db_table_mc.len); + if(acc_db_set_table_name(req, db_table_mc_data, &db_table_mc)<0) { + LM_ERR("cannot set missed call db table name\n"); + return; + } acc_db_request( req ); flags_to_reset |= db_missed_flag; } @@ -411,7 +445,10 @@ static inline void acc_onreply( struct cell* t, struct sip_msg *req, } #ifdef SQL_ACC if (is_db_acc_on(req)) { - env_set_text( db_table_acc.s, db_table_acc.len); + if(acc_db_set_table_name(req, db_table_acc_data, &db_table_acc)<0) { + LM_ERR("cannot set acc db table name\n"); + return; + } acc_db_request(req); } #endif @@ -452,7 +489,10 @@ static inline void acc_onack( struct cell* t, struct sip_msg *req, } #ifdef SQL_ACC if (is_db_acc_on(req)) { - env_set_text( db_table_acc.s, db_table_acc.len); + if(acc_db_set_table_name(ack, db_table_acc_data, &db_table_acc)<0) { + LM_ERR("cannot set acc db table name\n"); + return; + } acc_db_request( ack ); } #endif diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index c913eba..c301937 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -179,7 +179,9 @@ static char *db_extra_str = 0; /*!< db extra variables */ struct acc_extra *db_extra = 0; static str db_url = {NULL, 0}; /*!< Database url */ str db_table_acc = str_init("acc"); /*!< name of database tables */ +void *db_table_acc_data = NULL; str db_table_mc = str_init("missed_calls"); +void *db_table_mc_data = NULL; /* names of columns in tables acc/missed calls*/ str acc_method_col = str_init("method"); str acc_fromtag_col = str_init("from_tag"); @@ -342,6 +344,8 @@ static int acc_fixup(void** param, int param_no) if (db_url.s==0) { pkg_free(p); *param = 0; + } else { + return fixup_var_pve_str_12(param, 2); } #endif } @@ -431,7 +435,27 @@ static int mod_init( void ) } } db_table_acc.len = strlen(db_table_acc.s); + if(db_table_acc.len!=3 || strncmp(db_table_acc.s, "acc", 3)!=0) + { + db_table_acc_data = db_table_acc.s; + if(fixup_var_pve_str_12(&db_table_acc_data, 1)<0) + { + LM_ERR("unable to parse acc table name [%.*s]\n", + db_table_acc.len, db_table_acc.s); + return -1; + } + } db_table_mc.len = strlen(db_table_mc.s); + if(db_table_mc.len!=12 || strncmp(db_table_mc.s, "missed_calls", 12)!=0) + { + db_table_mc_data = db_table_mc.s; + if(fixup_var_pve_str_12(&db_table_mc_data, 1)<0) + { + LM_ERR("unable to parse mc table name [%.*s]\n", + db_table_mc.len, db_table_mc.s); + return -1; + } + } acc_method_col.len = strlen(acc_method_col.s); acc_fromtag_col.len = strlen(acc_fromtag_col.s); acc_totag_col.len = strlen(acc_totag_col.s); diff --git a/modules_k/acc/acc_mod.h b/modules_k/acc/acc_mod.h index ca76eff..5e7792a 100644 --- a/modules_k/acc/acc_mod.h +++ b/modules_k/acc/acc_mod.h @@ -78,7 +78,9 @@ extern int db_flag; extern int db_missed_flag; extern str db_table_acc; +extern void *db_table_acc_data; extern str db_table_mc; +extern void *db_table_mc_data; extern str acc_method_col; extern str acc_fromuri_col;

10 years, 9 months

Kamailio v4.0.3 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v4.0.3 stable release is out. This is a maintenance release of the latest stable branch, 4.0, that includes fixes since release of v4.0.0. There is no change to database schema or configuration language structure that you have to do on installations of v4.0.0. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.0.3. For more details about version 4.0.3 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2013/08/kamailio-v4-0-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

10 years, 9 months

[tracker] Comment added: dispatcher.reload doesn't work with DB

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#331 - dispatcher.reload doesn't work with DB User who did this - Daniel-Constantin Mierla (miconda) ---------- Provide the patch with 'diff -u ...' and attach it as a file, don't paste it in the comment, because if it is valid, cannot be applied without manual editing. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=331#comment1051 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.

10 years, 9 months

[tracker] Task opened: dispatcher.reload doesn't work with DB

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 - Jerry Hu (Jerry2013) Attached to Project - sip-router Summary - dispatcher.reload doesn't work with DB Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - using DB for dispatcher list, doing 'kamcmd dispatcher.reload' shows "invalid DB handler". here's the patch: # diff dispatcher.c dispatcher.c.orig 779,780c779 < if(ds_connect_db()!=0 || ds_load_db()<0) { < ds_disconnect_db(); --- > if(ds_load_db()<0) 782,783d780 < } < ds_disconnect_db(); 935c932 < if (ds_load_list(dslistfile)!=0) --- > if (ds_load_list(dslistfile)!=0) { 936a934,935 > return; > } 938c937 < if(ds_connect_db()!=0 || ds_load_db()<0) --- > if(ds_load_db()<0) { 940c939,940 < ds_disconnect_db(); --- > return; > } More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=331 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.

10 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2013