sr-dev July 2014

sr-dev@lists.kamailio.org

25 participants
141 discussions

[tracker] Task reopened: PARAM_STR vs STR_PARAM
by sip-router 28 Jul '14

28 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been re-opened: FS#453 - PARAM_STR vs STR_PARAM User who did this - Víctor Seva (linuxmaniac) More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=453 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 … [View More]

1 0

git:master: pkg/kamailio/deb: Update version to 4.2.0~dev8
by Victor Seva 26 Jul '14

26 Jul '14

Module: sip-router Branch: master Commit: 90093f8633b807a2067c8e0500533ba3ad590a89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90093f8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat Jul 26 10:05:18 2014 +0200 pkg/kamailio/deb: Update version to 4.2.0~dev8 --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/jessie/changelog | 6 ++++++ pkg/… [View More]kamailio/deb/precise/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ pkg/kamailio/deb/trusty/changelog | 6 ++++++ pkg/kamailio/deb/wheezy/changelog | 6 ++++++ 6 files changed, 36 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index cd572ee..6f40a34 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev8) unstable; urgency=medium + + * update version to 4.2.0~dev8 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 26 Jul 2014 10:03:22 +0200 + kamailio (4.2.0~dev7) unstable; urgency=medium * update version to 4.2.0~dev7 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index cd572ee..6f40a34 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev8) unstable; urgency=medium + + * update version to 4.2.0~dev8 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 26 Jul 2014 10:03:22 +0200 + kamailio (4.2.0~dev7) unstable; urgency=medium * update version to 4.2.0~dev7 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index cd572ee..6f40a34 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev8) unstable; urgency=medium + + * update version to 4.2.0~dev8 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 26 Jul 2014 10:03:22 +0200 + kamailio (4.2.0~dev7) unstable; urgency=medium * update version to 4.2.0~dev7 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index cd572ee..6f40a34 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev8) unstable; urgency=medium + + * update version to 4.2.0~dev8 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 26 Jul 2014 10:03:22 +0200 + kamailio (4.2.0~dev7) unstable; urgency=medium * update version to 4.2.0~dev7 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index cd572ee..6f40a34 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev8) unstable; urgency=medium + + * update version to 4.2.0~dev8 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 26 Jul 2014 10:03:22 +0200 + kamailio (4.2.0~dev7) unstable; urgency=medium * update version to 4.2.0~dev7 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index cd572ee..6f40a34 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev8) unstable; urgency=medium + + * update version to 4.2.0~dev8 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 26 Jul 2014 10:03:22 +0200 + kamailio (4.2.0~dev7) unstable; urgency=medium * update version to 4.2.0~dev7 [View Less]

1 0

[tracker] Task closed: PARAM_STR vs STR_PARAM
by sip-router 26 Jul '14

26 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#453 - PARAM_STR vs STR_PARAM User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: Patches pushed to master branch. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=453 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did … [View More]

1 0

git:master: Makefile.defs: version set to 4.2.0-dev8
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: bf727eeceb85ad06472274906f2b8d40b1b2610a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf727ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 23:26:18 2014 +0200 Makefile.defs: version set to 4.2.0-dev8 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs … [View More]

1 0

New commits on branch master
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc383b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 23:16:31 2014 +0200 sms: domain is not allocated in pkg by the module - skip freeing in mod destroy URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1556fa1… Author: Alekzander Spiridonov <sipidronov(a)gmail.com> Date: Wed Jul 23 08:25:37 2014 -0700 rtpproxy: replace STR_PARAM … [View More]

1 0

git:master: uac: new rpc command uac.reg_refresh
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: 09ced05fc90602675366ccfc041bbb7278cd3b59 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09ced05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 18:03:03 2014 +0200 uac: new rpc command uac.reg_refresh - load a record from database based on l_uuid. If record is already in memory, then the password field is updated, otherwise … [View More]a new full record is added in memory --- modules/uac/uac_reg.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 209 insertions(+), 8 deletions(-) diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 0950557..0793451 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -51,6 +51,7 @@ #define MAX_UACH_SIZE 2048 #define UAC_REG_GC_INTERVAL 150 +#define UAC_REG_MAX_PASSWD_SIZE 63 typedef struct _reg_uac { @@ -62,9 +63,9 @@ typedef struct _reg_uac str r_username; str r_domain; str realm; + str auth_proxy; str auth_username; str auth_password; - str auth_proxy; unsigned int flags; unsigned int expires; time_t timer_expires; @@ -495,18 +496,25 @@ int reg_ht_add(reg_uac_t *reg) if(reg==NULL || _reg_htable==NULL) { - LM_ERR("bad paramaers: %p/%p\n", reg, _reg_htable); + LM_ERR("bad parameters: %p/%p\n", reg, _reg_htable); + return -1; + } + if(reg->auth_password.len>UAC_REG_MAX_PASSWD_SIZE) + { + LM_ERR("bad parameters: %p/%p -- password too long %d\n", + reg, _reg_htable, reg->auth_password.len); return -1; } + len = reg->l_uuid.len + 1 + reg->l_username.len + 1 + reg->l_domain.len + 1 + reg->r_username.len + 1 + reg->r_domain.len + 1 + reg->realm.len + 1 + + reg->auth_proxy.len + 1 + reg->auth_username.len + 1 - + reg->auth_password.len + 1 - + reg->auth_proxy.len + 1; + + UAC_REG_MAX_PASSWD_SIZE /*reg->auth_password.len*/ + 1; nr = (reg_uac_t*)shm_malloc(sizeof(reg_uac_t) + len); if(nr==NULL) { @@ -526,9 +534,10 @@ int reg_ht_add(reg_uac_t *reg) reg_copy_shm(&nr->r_username, &reg->r_username); reg_copy_shm(&nr->r_domain, &reg->r_domain); reg_copy_shm(&nr->realm, &reg->realm); + reg_copy_shm(&nr->auth_proxy, &reg->auth_proxy); reg_copy_shm(&nr->auth_username, &reg->auth_username); + /* password at the end, to be able to update it easily */ reg_copy_shm(&nr->auth_password, &reg->auth_password); - reg_copy_shm(&nr->auth_proxy, &reg->auth_proxy); reg_ht_add_byuser(nr); reg_ht_add_byuuid(nr); @@ -540,6 +549,46 @@ int reg_ht_add(reg_uac_t *reg) /** * */ +int reg_ht_update_password(reg_uac_t *reg) +{ + unsigned int slot; + reg_item_t *ri = NULL; + + if(_reg_htable==NULL) + { + LM_ERR("reg hash table not initialized\n"); + return -1; + } + + if(reg->auth_password.len>UAC_REG_MAX_PASSWD_SIZE) + { + LM_ERR("password is too big: %d\n", reg->auth_password.len); + return -1; + } + + slot = reg_get_entry(reg->h_user, _reg_htable->htsize); + lock_get(&_reg_htable->entries[slot].lock); + ri = _reg_htable->entries[slot].byuser; + while(ri) { + if(ri->r->l_uuid.len == reg->l_uuid.len + && strncmp(ri->r->l_uuid.s, reg->l_uuid.s, reg->l_uuid.len)==0) + { + /* record found */ + strncpy(ri->r->auth_password.s, reg->auth_password.s, reg->auth_password.len); + ri->r->auth_password.len = reg->auth_password.len; + ri->r->auth_password.s[reg->auth_password.len] = '\0'; + lock_release(&_reg_htable->entries[slot].lock); + return 0; + } + ri = ri->next; + } + lock_release(&_reg_htable->entries[slot].lock); + return -1; +} + +/** + * + */ reg_uac_t *reg_ht_get_byuuid(str *uuid) { unsigned int hash; @@ -1037,7 +1086,7 @@ int uac_reg_load_db(void) reg_db_con = reg_dbf.init(&reg_db_url); if(reg_db_con==NULL) { - LM_ERR("failed to connect to the database\n"); + LM_ERR("failed to connect to the database\n"); return -1; } if (reg_dbf.use_table(reg_db_con, &reg_db_table) < 0) @@ -1134,6 +1183,134 @@ error: /** * */ +int uac_reg_db_refresh(str *pl_uuid) +{ + db1_con_t *reg_db_con = NULL; + db_func_t reg_dbf; + reg_uac_t reg; + db_key_t db_cols[10] = { + &l_uuid_column, + &l_username_column, + &l_domain_column, + &r_username_column, + &r_domain_column, + &realm_column, + &auth_username_column, + &auth_password_column, + &auth_proxy_column, + &expires_column + }; + db_key_t db_keys[1] = {&l_uuid_column}; + db_val_t db_vals[1]; + + db1_res_t* db_res = NULL; + int i, ret; + + /* binding to db module */ + if(reg_db_url.s==NULL) + { + LM_ERR("no db url\n"); + return -1; + } + + if(db_bind_mod(&reg_db_url, &reg_dbf)) + { + LM_ERR("database module not found\n"); + return -1; + } + + if (!DB_CAPABILITY(reg_dbf, DB_CAP_ALL)) + { + LM_ERR("database module does not " + "implement all functions needed by the module\n"); + return -1; + } + + /* open a connection with the database */ + reg_db_con = reg_dbf.init(&reg_db_url); + if(reg_db_con==NULL) + { + LM_ERR("failed to connect to the database\n"); + return -1; + } + if (reg_dbf.use_table(reg_db_con, &reg_db_table) < 0) + { + LM_ERR("failed to use_table\n"); + return -1; + } + + db_vals[0].type = DB1_STR; + db_vals[0].nul = 0; + db_vals[0].val.str_val.s = pl_uuid->s; + db_vals[0].val.str_val.len = pl_uuid->len; + + if((ret=reg_dbf.query(reg_db_con, db_keys, NULL, db_vals, db_cols, + 1 /*nr keys*/, 10 /*nr cols*/, 0, &db_res))!=0 + || RES_ROW_N(db_res)<=0 ) + { + reg_dbf.free_result(reg_db_con, db_res); + if( ret==0) + { + return 0; + } else { + goto error; + } + } + + memset(&reg, 0, sizeof(reg_uac_t));; + i = 0; + /* check for NULL values ?!?! */ + reg_db_set_attr(l_uuid, 0); + reg_db_set_attr(l_username, 1); + reg_db_set_attr(l_domain, 2); + reg_db_set_attr(r_username, 3); + reg_db_set_attr(r_domain, 4); + /* realm may be empty */ + if(!VAL_NULL(&RES_ROWS(db_res)[i].values[5])) { + reg.realm.s = (char*)(RES_ROWS(db_res)[i].values[5].val.string_val); + reg.realm.len = strlen(reg.realm.s); + } + reg_db_set_attr(auth_username, 6); + reg_db_set_attr(auth_password, 7); + reg_db_set_attr(auth_proxy, 8); + reg.expires = (unsigned int)RES_ROWS(db_res)[i].values[9].val.int_val; + + lock_get(_reg_htable_gc_lock); + if(reg_ht_get_byuuid(pl_uuid)!=NULL) + { + if(reg_ht_update_password(&reg)<0) + { + lock_release(_reg_htable_gc_lock); + LM_ERR("Error updating reg to htable\n"); + goto error; + } + } else { + if(reg_ht_add(&reg)<0) + { + lock_release(_reg_htable_gc_lock); + LM_ERR("Error adding reg to htable\n"); + goto error; + } + } + lock_release(_reg_htable_gc_lock); + + reg_dbf.free_result(reg_db_con, db_res); + reg_dbf.close(reg_db_con); + +done: + return 0; + +error: + if (reg_db_con) { + reg_dbf.free_result(reg_db_con, db_res); + reg_dbf.close(reg_db_con); + } + return -1; +} + +/** + * + */ int uac_reg_lookup(struct sip_msg *msg, str *src, pv_spec_t *dst, int mode) { char b_ruri[MAX_URI_SIZE]; @@ -1355,7 +1532,7 @@ static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) return; } - if(rpc->scan(ctx, "S.S", &attr, &group, &val)<2) + if(rpc->scan(ctx, "S.S", &attr, &val)<2) { rpc->fault(ctx, 500, "Invalid Parameters"); return; @@ -1445,7 +1622,7 @@ static void rpc_uac_reg_update_flag(rpc_t* rpc, void* ctx, int mode, int fval) return; } - if(rpc->scan(ctx, "S.S", &attr, &group, &val)<2) + if(rpc->scan(ctx, "S.S", &attr, &val)<2) { rpc->fault(ctx, 500, "Invalid Parameters"); return; @@ -1539,12 +1716,36 @@ static void rpc_uac_reg_reload(rpc_t* rpc, void* ctx) } } +static const char* rpc_uac_reg_refresh_doc[2] = { + "Refresh a record from database.", + 0 +}; + +static void rpc_uac_reg_refresh(rpc_t* rpc, void* ctx) +{ + int ret; + str l_uuid; + + if(rpc->scan(ctx, "S", &l_uuid)<1) + { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + + ret = uac_reg_db_refresh(&l_uuid); + if(ret<0) { + rpc->fault(ctx, 500, "Failed to refresh record - check log messages"); + return; + } +} + rpc_export_t uac_reg_rpc[] = { {"uac.reg_dump", rpc_uac_reg_dump, rpc_uac_reg_dump_doc, 0}, {"uac.reg_info", rpc_uac_reg_info, rpc_uac_reg_info_doc, 0}, {"uac.reg_enable", rpc_uac_reg_enable, rpc_uac_reg_enable_doc, 0}, {"uac.reg_disable", rpc_uac_reg_disable, rpc_uac_reg_disable_doc, 0}, {"uac.reg_reload", rpc_uac_reg_reload, rpc_uac_reg_reload_doc, 0}, + {"uac.reg_refresh", rpc_uac_reg_refresh, rpc_uac_reg_refresh_doc, 0}, {0, 0, 0, 0} }; [View Less]

1 0

git:master: uac: documentation for rpc command uac.reg_refresh
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: b61ac1ca1cc410915e61c122350b8af3e4690a93 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b61ac1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 18:08:41 2014 +0200 uac: documentation for rpc command uac.reg_refresh --- modules/uac/README | 20 ++++++++++++++++++-- modules/uac/doc/uac_admin.xml | 20 ++++++++++++… [View More]++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/modules/uac/README b/modules/uac/README index a709f8d..79070c0 100644 --- a/modules/uac/README +++ b/modules/uac/README @@ -69,6 +69,7 @@ Ramona-Elena Modroiu 6.3. uac.reg_enable 6.4. uac.reg_disable 6.5. uac.reg_reload + 6.6. uac.reg_refresh 7. Remote Registration @@ -105,7 +106,8 @@ Ramona-Elena Modroiu 1.29. uac.reg_enable usage 1.30. uac.reg_disable usage 1.31. uac.reg_reload usage - 1.32. lookup remote registrations usage + 1.32. uac.reg_refresh usage + 1.33. lookup remote registrations usage Chapter 1. Admin Guide @@ -157,6 +159,7 @@ Chapter 1. Admin Guide 6.3. uac.reg_enable 6.4. uac.reg_disable 6.5. uac.reg_reload + 6.6. uac.reg_refresh 7. Remote Registration @@ -693,6 +696,7 @@ failure_route[REMOTE_AUTH] { 6.3. uac.reg_enable 6.4. uac.reg_disable 6.5. uac.reg_reload + 6.6. uac.reg_refresh 6.1. uac.reg_dump @@ -751,6 +755,18 @@ failure_route[REMOTE_AUTH] { kamcmd uac.reg_reload ... +6.6. uac.reg_refresh + + Load one record by l_uuid from database for remote registrations. If + the record exists in memory, its authentication password is updated, + otherwise a new record is added. The command has a parameter, which is + the value of l_uuid field. + + Example 1.32. uac.reg_refresh usage +... + kamcmd uac.reg_refresh account123 +... + 7. Remote Registration The module can register contact addresses to remote REGISTRAR servers. @@ -784,7 +800,7 @@ failure_route[REMOTE_AUTH] { if the call is coming from a remote SIP provider and can change the R-URI to local username@domain. Afterwards you can run location lookup. - Example 1.32. lookup remote registrations usage + Example 1.33. lookup remote registrations usage ... if(uac_reg_lookup("$rU", "$ru")) { xlog("request from a remote SIP provider [$ou => $ru]\n"); diff --git a/modules/uac/doc/uac_admin.xml b/modules/uac/doc/uac_admin.xml index 45cab3c..f4c5580 100644 --- a/modules/uac/doc/uac_admin.xml +++ b/modules/uac/doc/uac_admin.xml @@ -895,6 +895,26 @@ failure_route[REMOTE_AUTH] { </example> </section> + <section id="uac.r.uac.reg_refresh"> + <title> + <function moreinfo="none">uac.reg_refresh</function> + </title> + <para> + Load one record by l_uuid from database for remote registrations. + If the record exists in memory, its authentication password is + updated, otherwise a new record is added. The command has a + parameter, which is the value of l_uuid field. + </para> + <example> + <title><function>uac.reg_refresh</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_refresh account123 +... + </programlisting> + </example> + </section> + </section> <section> [View Less]

1 0

Kamailio as SIP Registrar without Authentication Digest
by Aymen Chetoui 25 Jul '14

25 Jul '14

Hi all, I've configured the following architecture : SipML5 -> OverSIP -> *Kamailio* -> OverSIP -> SipML5 In cas we have two clients that are registered but not authenticated with Digest Authentication. One client can call the other thanks to *Kamailio* (SIP INVITE correctly routed) : I would like to know how the clients locations are handled, I have checked the *Kamailio* database and found nothing there. Although Kamailio doesn't know in advance the private identity of each … [View More]

1 0

git:master: tmx: documented reason code parameter for t_cancel_callid()
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: ce7aee6e59d2b4980625f9c4dfef171048341319 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce7aee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 17:17:22 2014 +0200 tmx: documented reason code parameter for t_cancel_callid() --- modules/tmx/README | 14 ++++++++++---- modules/tmx/doc/tmx_admin.xml | 11 +++++++++… [View More]+- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/modules/tmx/README b/modules/tmx/README index 9a6b472..73eba24 100644 --- a/modules/tmx/README +++ b/modules/tmx/README @@ -38,7 +38,7 @@ Juha Heinanen 3. Functions 3.1. t_cancel_branches(which) - 3.2. t_cancel_callid(callid, cseq, flag) + 3.2. t_cancel_callid(callid, cseq, flag [, rcode]) 3.3. t_reply_callid(callid, cseq, code, reason) 3.4. t_flush_flags() 3.5. t_is_failure_route() @@ -97,7 +97,7 @@ Chapter 1. Admin Guide 3. Functions 3.1. t_cancel_branches(which) - 3.2. t_cancel_callid(callid, cseq, flag) + 3.2. t_cancel_callid(callid, cseq, flag [, rcode]) 3.3. t_reply_callid(callid, cseq, code, reason) 3.4. t_flush_flags() 3.5. t_is_failure_route() @@ -156,7 +156,7 @@ Chapter 1. Admin Guide 3. Functions 3.1. t_cancel_branches(which) - 3.2. t_cancel_callid(callid, cseq, flag) + 3.2. t_cancel_callid(callid, cseq, flag [, rcode]) 3.3. t_reply_callid(callid, cseq, code, reason) 3.4. t_flush_flags() 3.5. t_is_failure_route() @@ -185,7 +185,7 @@ if (t_cancel_branches("all")) { } ... -3.2. t_cancel_callid(callid, cseq, flag) +3.2. t_cancel_callid(callid, cseq, flag [, rcode]) Cancel first INVITE transaction identified by callid and cseq. It sets the flag if the value is greater than zero @@ -194,6 +194,8 @@ if (t_cancel_branches("all")) { * callid - call-id value. * cseq - cseq number. * flag - index of the flag to set. + * rcode - code to be added as cause attribute in Reason header for + generated CANCEL request. This parameter is optional. This function can be used in ANY_ROUTE. @@ -203,6 +205,10 @@ if (t_cancel_callid("123qaz", "5", "22")) { xlog("transaction cancelled\n"); } ... +if (t_cancel_callid("123qaz", "5", "22", "200")) { + xlog("transaction cancelled with [Reason: cause=200]\n"); +} +... 3.3. t_reply_callid(callid, cseq, code, reason) diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index 9042763..643281b 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -97,7 +97,7 @@ if (t_cancel_branches("all")) { </section> <section> <title> - <function moreinfo="none">t_cancel_callid(callid, cseq, flag) + <function moreinfo="none">t_cancel_callid(callid, cseq, flag [, rcode]) </function> </title> <para> @@ -117,6 +117,11 @@ if (t_cancel_branches("all")) { <listitem><para> <emphasis>flag</emphasis> - index of the flag to set. </para></listitem> + <listitem><para> + <emphasis>rcode</emphasis> - code to be added as + cause attribute in Reason header for generated + CANCEL request. This parameter is optional. + </para></listitem> </itemizedlist> <para> This function can be used in ANY_ROUTE. @@ -129,6 +134,10 @@ if (t_cancel_callid("123qaz", "5", "22")) { xlog("transaction cancelled\n"); } ... +if (t_cancel_callid("123qaz", "5", "22", "200")) { + xlog("transaction cancelled with [Reason: cause=200]\n"); +} +... </programlisting> </example> </section> [View Less]

1 0

git:master: tmx: t_cancel_callid() can take a 4th parameter with reason header code for cancel
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: 08f8911c8ddb527544c2ea603b5e0db7626d3196 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08f8911… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 17:11:37 2014 +0200 tmx: t_cancel_callid() can take a 4th parameter with reason header code for cancel --- modules/tmx/tmx_mod.c | 39 +++++++++++++++++++++++++++++++++++---- 1 … [View More]files changed, 35 insertions(+), 4 deletions(-) diff --git a/modules/tmx/tmx_mod.c b/modules/tmx/tmx_mod.c index fe3f512..e17e8e6 100644 --- a/modules/tmx/tmx_mod.c +++ b/modules/tmx/tmx_mod.c @@ -50,8 +50,10 @@ static void destroy(void); static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2); static int fixup_cancel_branches(void** param, int param_no); -static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, +static int w_t_cancel_callid_3(struct sip_msg* msg, char *cid, char *cseq, char *flag); +static int w_t_cancel_callid_4(struct sip_msg* msg, char *cid, char *cseq, + char *flag, char *creason); static int fixup_cancel_callid(void** param, int param_no); static int t_reply_callid(struct sip_msg* msg, char *cid, char *cseq, char *rc, char *rs); @@ -159,7 +161,9 @@ static mi_export_t mi_cmds [] = { static cmd_export_t cmds[]={ {"t_cancel_branches", (cmd_function)t_cancel_branches, 1, fixup_cancel_branches, 0, ONREPLY_ROUTE }, - {"t_cancel_callid", (cmd_function)t_cancel_callid, 3, + {"t_cancel_callid", (cmd_function)w_t_cancel_callid_3, 3, + fixup_cancel_callid, 0, ANY_ROUTE }, + {"t_cancel_callid", (cmd_function)w_t_cancel_callid_4, 4, fixup_cancel_callid, 0, ANY_ROUTE }, {"t_reply_callid", (cmd_function)t_reply_callid, 4, fixup_reply_callid, 0, ANY_ROUTE }, @@ -333,7 +337,7 @@ 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) +static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *flag, char *creason) { struct cell *trans; struct cell *bkt; @@ -342,7 +346,9 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla str cseq_s; str callid_s; int fl; + int rcode; + rcode = 0; fl = -1; if(fixup_get_svalue(msg, (gparam_p)cid, &callid_s)<0) @@ -362,6 +368,14 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla LM_ERR("cannot get flag\n"); return -1; } + if(creason!=NULL && fixup_get_ivalue(msg, (gparam_p)creason, &rcode)<0) + { + LM_ERR("cannot get flag\n"); + return -1; + } + if(rcode<100 || rcode>699) + rcode = 0; + bkt = _tmx_tmb.t_gett(); bkb = _tmx_tmb.t_gett_branch(); @@ -374,6 +388,7 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla if(trans->uas.request && fl>0 && fl<32) setflag(trans->uas.request, fl); init_cancel_info(&cancel_data); + cancel_data.reason.cause = rcode; cancel_data.cancel_bitmap = 0; _tmx_tmb.prepare_to_cancel(trans, &cancel_data.cancel_bitmap, 0); _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); @@ -387,12 +402,28 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla /** * */ +static int w_t_cancel_callid_3(struct sip_msg* msg, char *cid, char *cseq, char *flag) +{ + return t_cancel_callid(msg, cid, cseq, flag, NULL); +} + +/** + * + */ +static int w_t_cancel_callid_4(struct sip_msg* msg, char *cid, char *cseq, char *flag, char *creason) +{ + return t_cancel_callid(msg, cid, cseq, flag, creason); +} + +/** + * + */ static int fixup_reply_callid(void** param, int param_no) { if (param_no==1 || param_no==2 || param_no==4) { return fixup_spve_null(param, 1); } - if (param_no==3) { + if (param_no==3 || param_no==4) { return fixup_igp_null(param, 1); } return 0; [View Less]

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2014