sr-dev July 2014

sr-dev@lists.kamailio.org

25 participants
140 discussions

[tracker] Comment added: PARAM_STR vs STR_PARAM (Attachment added)
by sip-router 23 Jul '14

23 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#453 - PARAM_STR vs STR_PARAM User who did this - Alekzander Spiridonov (alekz) ---------- Patches in attachment. ---------- 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=453#comment1557 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] Task opened: PARAM_STR vs STR_PARAM
by sip-router 23 Jul '14

23 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alekzander Spiridonov (alekz) Attached to Project - sip-router Summary - PARAM_STR vs STR_PARAM Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - As a follow-up for mailing thread "PARAM_STR vs STR_PARAM". The first bunch of patches (mostly patch-per-module except couple modules in separate tar). 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 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:master: Improve example for Proxy-CSCF Rx Usage
by Carsten Bock 23 Jul '14

23 Jul '14

Module: sip-router Branch: master Commit: 6395e97f14c8be6bf20466b94140bd106406aea2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6395e97… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Jul 23 16:55:20 2014 +0200 Improve example for Proxy-CSCF Rx Usage --- examples/pcscf/kamailio.cfg | 48 +++++++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 20 deletions(-) diff --git a/examples/pcscf/kamailio.cfg b/examples/pcscf/kamailio.cfg index 8133ece..961fe25 100644 --- a/examples/pcscf/kamailio.cfg +++ b/examples/pcscf/kamailio.cfg @@ -764,7 +764,7 @@ route[RTPPROXY_TERM] { route[REGISTER] { #!ifdef WITH_RX xlog("L_DBG","Subscribing to signalling bearer status\n"); - if (Rx_AAR_Register("REG_AAR_REPLY, "location") == 0) + if (Rx_AAR_Register("REG_AAR_REPLY", "location") == 0) exit; } @@ -889,12 +889,12 @@ route[Orig_Initial] #!ifdef WITH_RX xlog("L_DBG","Diameter: Orig authorizing media via Rx\n"); - if(Rx_AAR("ORIG_SESSION_AAR_REPLY","orig")==0){ + if(Rx_AAR("ORIG_SESSION_AAR","orig")==0){ exit; } } -route[ORIG_SESSION_AAR_REPLY] { +route[ORIG_SESSION_AAR] { if ($avp(s:aar_return_code) != 1) { xlog("L_ERR", "Diameter: AAR failed\n"); send_reply("403", "QoS not authorized"); @@ -929,15 +929,19 @@ onreply_route[Orig_Initial_reply] #!ifdef WITH_RX if (t_check_status("180|183|200")){ xlog("L_DBG","Diameter: Orig authorizing media via Rx\n"); - Rx_AAR("orig"); - if ($avp(s:aar_return_code) < 0) { - xlog("L_ERR", "IMS: AAR failed Orig\n"); - dlg_terminate("all", "Sorry no QoS available"); - } else { - xlog("L_DBG", "Diameter: Orig AAR success on media authorization\n"); - } - xlog("L_DBG", "IMS: Received 183/200 inside orig_initial_reply\n"); + if(Rx_AAR("ORIG_SESSION_AAR_REPLY","orig")==0){ + exit; + } } +} + +route[ORIG_SESSION_AAR_REPLY] { + if ($avp(s:aar_return_code) != 1) { + xlog("L_ERR", "IMS: AAR failed Orig\n"); + dlg_terminate("all", "Sorry no QoS available"); + } else { + xlog("L_DBG", "Diameter: Orig AAR success on media authorization\n"); + } #!endif # Note: We only do the RTP-Update for the successful case, # the others simply time-out (if we would do otherwise, RTP-Relaying @@ -1087,12 +1091,12 @@ route[Term_Initial] #!ifdef WITH_RX xlog("L_DBG","Diameter: Term authorizing media via Rx\n"); - if(Rx_AAR("TERM_SESSION_AAR_REPLY","orig")==0){ + if(Rx_AAR("TERM_SESSION_AAR","term")==0){ exit; } } -route[TERM_SESSION_AAR_REPLY] { +route[TERM_SESSION_AAR] { if ($avp(s:aar_return_code) != 1) { xlog("L_ERR", "Diameter: AAR failed\n"); send_reply("403", "QoS not authorized"); @@ -1138,14 +1142,18 @@ onreply_route[Term_Initial_reply] #!ifdef WITH_RX if (t_check_status("180|183|200")){ - xlog("L_DBG","Diameter Term authorizing media via Rx\n"); - if (!Rx_AAR("term")) { - xlog("L_ERR", "IMS: AAR failed Term\n"); - dlg_terminate("all", "Sorry no QoS available"); - } else { - xlog("L_DBG", "Diameter: Term AAR success on media authorization\n"); + xlog("L_DBG","Diameter: Orig authorizing media via Rx\n"); + if(Rx_AAR("TERM_SESSION_AAR_REPLY","term")==0){ + exit; } - xlog("L_DBG", "IMS: SENDING EARLY BYE\n"); + } +} + +route[TERM_SESSION_AAR_REPLY] { + if ($avp(s:aar_return_code) != 1) { + xlog("L_ERR", "Diameter: AAR failed\n"); + send_reply("403", "QoS not authorized"); + exit; } #!endif

1 0

server for git repository is down
by Daniel-Constantin Mierla 22 Jul '14

22 Jul '14

Hello, a short note to say that the server for git repository on sip-router.org is down. The hosting provider hasn't reported any maintenance, I am digging further into it to see what happened. Meanwhile, the mirror on github can be used if anyone wants to fetch the source tree: - https://github.com/kamailio/kamailio Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 1

git:master: uac: clean old records in timer callback after a while from a reload
by Daniel-Constantin Mierla 22 Jul '14

22 Jul '14

Module: sip-router Branch: master Commit: 24edcab2012f43f25a0b3f6fb5e0645854ecb050 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24edcab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 22 13:42:54 2014 +0200 uac: clean old records in timer callback after a while from a reload --- modules/uac/uac_reg.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index f1344be..0950557 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -966,6 +966,15 @@ void uac_reg_timer(unsigned int ticks) it = it->next; } } + + if(_reg_htable_gc!=NULL) + { + lock_get(_reg_htable_gc_lock); + if(_reg_htable_gc->stime!=0 + && _reg_htable_gc->stime < tn - UAC_REG_GC_INTERVAL) + uac_reg_reset_ht_gc(); + lock_release(_reg_htable_gc_lock); + } } #define reg_db_set_attr(attr, pos) do { \

1 0

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

22 Jul '14

Module: sip-router Branch: master Commit: 99da07de696c1f5368bf74ea82fe7df7f8db61a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99da07d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 22 13:33:24 2014 +0200 uac: new rpc command - uac.reg_reload - reload the records from database - old records are kept for at least 150sec more to be sure no active registration process is using them - therefore reload cannot executed more often than 150sec --- modules/uac/uac_reg.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 154 insertions(+), 10 deletions(-) diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index da3fdd0..f1344be 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -50,6 +50,7 @@ #define UAC_REG_AUTHSENT (1<<3) #define MAX_UACH_SIZE 2048 +#define UAC_REG_GC_INTERVAL 150 typedef struct _reg_uac { @@ -88,10 +89,13 @@ typedef struct _reg_entry typedef struct _reg_ht { unsigned int htsize; + time_t stime; reg_entry_t *entries; } reg_ht_t; static reg_ht_t *_reg_htable = NULL; +static reg_ht_t *_reg_htable_gc = NULL; +static gen_lock_t *_reg_htable_gc_lock = NULL; int reg_use_domain = 0; int reg_timer_interval = 90; @@ -168,10 +172,50 @@ int uac_reg_init_ht(unsigned int sz) { int i; + _reg_htable_gc_lock = (gen_lock_t*)shm_malloc(sizeof(gen_lock_t)); + if(_reg_htable_gc_lock == NULL) + { + LM_ERR("no more shm for lock\n"); + return -1; + } + if(lock_init(_reg_htable_gc_lock)==0) + { + LM_ERR("cannot init global lock\n"); + shm_free((void*)_reg_htable_gc_lock); + return -1; + } + _reg_htable_gc = (reg_ht_t*)shm_malloc(sizeof(reg_ht_t)); + if(_reg_htable_gc==NULL) + { + LM_ERR("no more shm\n"); + lock_destroy(_reg_htable_gc_lock); + shm_free((void*)_reg_htable_gc_lock); + return -1; + } + memset(_reg_htable_gc, 0, sizeof(reg_ht_t)); + _reg_htable_gc->htsize = sz; + + _reg_htable_gc->entries = + (reg_entry_t*)shm_malloc(_reg_htable_gc->htsize*sizeof(reg_entry_t)); + if(_reg_htable_gc->entries==NULL) + { + LM_ERR("no more shm.\n"); + shm_free(_reg_htable_gc); + lock_destroy(_reg_htable_gc_lock); + shm_free((void*)_reg_htable_gc_lock); + return -1; + } + memset(_reg_htable_gc->entries, 0, _reg_htable_gc->htsize*sizeof(reg_entry_t)); + + _reg_htable = (reg_ht_t*)shm_malloc(sizeof(reg_ht_t)); if(_reg_htable==NULL) { LM_ERR("no more shm\n"); + shm_free(_reg_htable_gc->entries); + shm_free(_reg_htable_gc); + lock_destroy(_reg_htable_gc_lock); + shm_free((void*)_reg_htable_gc_lock); return -1; } memset(_reg_htable, 0, sizeof(reg_ht_t)); @@ -182,7 +226,11 @@ int uac_reg_init_ht(unsigned int sz) if(_reg_htable->entries==NULL) { LM_ERR("no more shm.\n"); + shm_free(_reg_htable_gc->entries); + shm_free(_reg_htable_gc); shm_free(_reg_htable); + lock_destroy(_reg_htable_gc_lock); + shm_free((void*)_reg_htable_gc_lock); return -1; } memset(_reg_htable->entries, 0, _reg_htable->htsize*sizeof(reg_entry_t)); @@ -199,6 +247,10 @@ int uac_reg_init_ht(unsigned int sz) } shm_free(_reg_htable->entries); shm_free(_reg_htable); + shm_free(_reg_htable_gc->entries); + shm_free(_reg_htable_gc); + lock_destroy(_reg_htable_gc_lock); + shm_free((void*)_reg_htable_gc_lock); return -1; } } @@ -215,6 +267,37 @@ int uac_reg_free_ht(void) reg_item_t *it = NULL; reg_item_t *it0 = NULL; + if(_reg_htable_gc_lock != NULL) + { + lock_destroy(_reg_htable_gc_lock); + shm_free((void*)_reg_htable_gc_lock); + _reg_htable_gc_lock = NULL; + } + if(_reg_htable_gc!=NULL) + { + for(i=0; i<_reg_htable_gc->htsize; i++) + { + it = _reg_htable_gc->entries[i].byuuid; + while(it) + { + it0 = it; + it = it->next; + shm_free(it0); + } + it = _reg_htable_gc->entries[i].byuser; + while(it) + { + it0 = it; + it = it->next; + shm_free(it0->r); + shm_free(it0); + } + } + shm_free(_reg_htable_gc->entries); + shm_free(_reg_htable_gc); + _reg_htable_gc = NULL; + } + if(_reg_htable==NULL) { LM_DBG("no hash table\n"); @@ -250,31 +333,30 @@ int uac_reg_free_ht(void) /** * */ -int uac_reg_reset_ht(void) +int uac_reg_reset_ht_gc(void) { int i; reg_item_t *it = NULL; reg_item_t *it0 = NULL; - if(_reg_htable==NULL) + if(_reg_htable_gc==NULL) { LM_DBG("no hash table\n"); return -1; } - for(i=0; i<_reg_htable->htsize; i++) + for(i=0; i<_reg_htable_gc->htsize; i++) { - lock_get(&_reg_htable->entries[i].lock); /* free entries */ - it = _reg_htable->entries[i].byuuid; + it = _reg_htable_gc->entries[i].byuuid; while(it) { it0 = it; it = it->next; shm_free(it0); } - _reg_htable->entries[i].byuuid = NULL; - _reg_htable->entries[i].isize=0; - it = _reg_htable->entries[i].byuser; + _reg_htable_gc->entries[i].byuuid = NULL; + _reg_htable_gc->entries[i].isize=0; + it = _reg_htable_gc->entries[i].byuser; while(it) { it0 = it; @@ -282,10 +364,48 @@ int uac_reg_reset_ht(void) shm_free(it0->r); shm_free(it0); } + _reg_htable_gc->entries[i].byuser = NULL; + _reg_htable_gc->entries[i].usize = 0; + } + return 0; +} + +/** + * + */ +int uac_reg_ht_shift(void) +{ + time_t tn; + int i; + + if(_reg_htable==NULL || _reg_htable_gc==NULL) + { + LM_ERR("data struct invalid\n"); + return -1; + } + tn = time(NULL); + + lock_get(_reg_htable_gc_lock); + if(_reg_htable_gc->stime > tn-UAC_REG_GC_INTERVAL) { + lock_release(_reg_htable_gc_lock); + LM_ERR("shifting the memory table is not possible in less than %d\n", UAC_REG_GC_INTERVAL); + return -1; + } + uac_reg_reset_ht_gc(); + for(i=0; i<_reg_htable->htsize; i++) + { + /* shift entries */ + _reg_htable_gc->entries[i].byuuid = _reg_htable->entries[i].byuuid; + _reg_htable_gc->entries[i].byuser = _reg_htable->entries[i].byuser; + _reg_htable_gc->stime = time(NULL); + + /* reset active table entries */ + _reg_htable->entries[i].byuuid = NULL; + _reg_htable->entries[i].isize=0; _reg_htable->entries[i].byuser = NULL; _reg_htable->entries[i].usize = 0; - lock_release(&_reg_htable->entries[i].lock); } + lock_release(_reg_htable_gc_lock); return 0; } @@ -989,12 +1109,16 @@ int uac_reg_load_db(void) } } while(RES_ROW_N(db_res)>0); reg_dbf.free_result(reg_db_con, db_res); + reg_dbf.close(reg_db_con); done: return 0; error: - reg_dbf.free_result(reg_db_con, db_res); + if (reg_db_con) { + reg_dbf.free_result(reg_db_con, db_res); + reg_dbf.close(reg_db_con); + } return -1; } @@ -1385,13 +1509,33 @@ static void rpc_uac_reg_disable(rpc_t* rpc, void* ctx) rpc_uac_reg_update_flag(rpc, ctx, 0, UAC_REG_DISABLED); } +static const char* rpc_uac_reg_reload_doc[2] = { + "Reload records from database.", + 0 +}; +static void rpc_uac_reg_reload(rpc_t* rpc, void* ctx) +{ + int ret; + if(uac_reg_ht_shift()<0) { + rpc->fault(ctx, 500, "Failed to shift records - check log messages"); + return; + } + lock_get(_reg_htable_gc_lock); + ret = uac_reg_load_db(); + lock_release(_reg_htable_gc_lock); + if(ret<0) { + rpc->fault(ctx, 500, "Failed to reload records - 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}, {0, 0, 0, 0} };

1 0

git:master: uac: documented rpc command uac.reg_reload
by Daniel-Constantin Mierla 22 Jul '14

22 Jul '14

Module: sip-router Branch: master Commit: 81ee937ed9e7db314ad6a2849dd3b17ab5aebae3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81ee937… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 22 13:45:13 2014 +0200 uac: documented rpc command uac.reg_reload --- modules/uac/README | 17 +++++++++++++++-- modules/uac/doc/uac_admin.xml | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/modules/uac/README b/modules/uac/README index 18d725e..a709f8d 100644 --- a/modules/uac/README +++ b/modules/uac/README @@ -68,6 +68,7 @@ Ramona-Elena Modroiu 6.2. uac.reg_info 6.3. uac.reg_enable 6.4. uac.reg_disable + 6.5. uac.reg_reload 7. Remote Registration @@ -103,7 +104,8 @@ Ramona-Elena Modroiu 1.28. uac.reg_info usage 1.29. uac.reg_enable usage 1.30. uac.reg_disable usage - 1.31. lookup remote registrations usage + 1.31. uac.reg_reload usage + 1.32. lookup remote registrations usage Chapter 1. Admin Guide @@ -154,6 +156,7 @@ Chapter 1. Admin Guide 6.2. uac.reg_info 6.3. uac.reg_enable 6.4. uac.reg_disable + 6.5. uac.reg_reload 7. Remote Registration @@ -689,6 +692,7 @@ failure_route[REMOTE_AUTH] { 6.2. uac.reg_info 6.3. uac.reg_enable 6.4. uac.reg_disable + 6.5. uac.reg_reload 6.1. uac.reg_dump @@ -738,6 +742,15 @@ failure_route[REMOTE_AUTH] { kamcmd uac.reg_disable l_uuid account123 ... +6.5. uac.reg_reload + + Reload the records from database for remote registrations. + + Example 1.31. uac.reg_reload usage +... + kamcmd uac.reg_reload +... + 7. Remote Registration The module can register contact addresses to remote REGISTRAR servers. @@ -771,7 +784,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.31. lookup remote registrations usage + Example 1.32. 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 ebf029f..45cab3c 100644 --- a/modules/uac/doc/uac_admin.xml +++ b/modules/uac/doc/uac_admin.xml @@ -878,6 +878,23 @@ failure_route[REMOTE_AUTH] { </example> </section> + <section id="uac.r.uac.reg_reload"> + <title> + <function moreinfo="none">uac.reg_reload</function> + </title> + <para> + Reload the records from database for remote registrations. + </para> + <example> + <title><function>uac.reg_reload</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_reload +... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master: uac: documented rpc commands uac.reg_enable and uac.reg_disable
by Daniel-Constantin Mierla 22 Jul '14

22 Jul '14

Module: sip-router Branch: master Commit: 361052ff5ea85a304f68860e9c50de93ef742fee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=361052f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 17:28:11 2014 +0200 uac: documented rpc commands uac.reg_enable and uac.reg_disable --- modules/uac/README | 38 ++++++++++++++++++++++++++++++++++++-- modules/uac/doc/uac_admin.xml | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/modules/uac/README b/modules/uac/README index 6bd44b2..18d725e 100644 --- a/modules/uac/README +++ b/modules/uac/README @@ -66,6 +66,8 @@ Ramona-Elena Modroiu 6.1. uac.reg_dump 6.2. uac.reg_info + 6.3. uac.reg_enable + 6.4. uac.reg_disable 7. Remote Registration @@ -99,7 +101,9 @@ Ramona-Elena Modroiu 1.26. uac_reg_request_to usage 1.27. uac.reg_dump usage 1.28. uac.reg_info usage - 1.29. lookup remote registrations usage + 1.29. uac.reg_enable usage + 1.30. uac.reg_disable usage + 1.31. lookup remote registrations usage Chapter 1. Admin Guide @@ -148,6 +152,8 @@ Chapter 1. Admin Guide 6.1. uac.reg_dump 6.2. uac.reg_info + 6.3. uac.reg_enable + 6.4. uac.reg_disable 7. Remote Registration @@ -681,6 +687,8 @@ failure_route[REMOTE_AUTH] { 6.1. uac.reg_dump 6.2. uac.reg_info + 6.3. uac.reg_enable + 6.4. uac.reg_disable 6.1. uac.reg_dump @@ -704,6 +712,32 @@ failure_route[REMOTE_AUTH] { kamcmd uac.reg_info l_uuid account123 ... +6.3. uac.reg_enable + + Enable a remote registration record based on a filter. The command has + two parameter: attribute and value. The attribute can be: l_uuid, + l_username, r_username or auth_username. The value is what should be + matcheg against the value of the attribute in the remote registration + record. + + Example 1.29. uac.reg_enable usage +... + kamcmd uac.reg_enable l_uuid account123 +... + +6.4. uac.reg_disable + + Disable a remote registration record based on a filter. The command has + two parameter: attribute and value. The attribute can be: l_uuid, + l_username, r_username or auth_username. The value is what should be + matcheg against the value of the attribute in the remote registration + record. + + Example 1.30. uac.reg_disable usage +... + kamcmd uac.reg_disable l_uuid account123 +... + 7. Remote Registration The module can register contact addresses to remote REGISTRAR servers. @@ -737,7 +771,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.29. lookup remote registrations usage + Example 1.31. 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 a579255..ebf029f 100644 --- a/modules/uac/doc/uac_admin.xml +++ b/modules/uac/doc/uac_admin.xml @@ -834,7 +834,48 @@ failure_route[REMOTE_AUTH] { ... </programlisting> </example> + </section> + <section id="uac.r.uac.reg_enable"> + <title> + <function moreinfo="none">uac.reg_enable</function> + </title> + <para> + Enable a remote registration record based on + a filter. The command has two parameter: attribute and value. + The attribute can be: l_uuid, l_username, r_username or auth_username. + The value is what should be matcheg against the value of the attribute + in the remote registration record. + </para> + <example> + <title><function>uac.reg_enable</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_enable l_uuid account123 +... + </programlisting> + </example> + </section> + + <section id="uac.r.uac.reg_disable"> + <title> + <function moreinfo="none">uac.reg_disable</function> + </title> + <para> + Disable a remote registration record based on + a filter. The command has two parameter: attribute and value. + The attribute can be: l_uuid, l_username, r_username or auth_username. + The value is what should be matcheg against the value of the attribute + in the remote registration record. + </para> + <example> + <title><function>uac.reg_disable</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_disable l_uuid account123 +... + </programlisting> + </example> </section> </section>

2 1

[tracker] Comment added: CRASH: Program terminated with signal 6, Aborted.
by sip-router 21 Jul '14

21 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#449 - CRASH: Program terminated with signal 6, Aborted. User who did this - Nuno Miguel Reis (nmreis) ---------- Hi Daniel. Did you have a chance to look at this? Do you need anything else from me? Best Regards, Nuno. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=449#comment1556 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:master: uac: added commands to enable/ disable records in remote registration table
by Daniel-Constantin Mierla 21 Jul '14

21 Jul '14

Module: sip-router Branch: master Commit: dd1ca987775be186761f8c83ea7ee9584bbebc96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd1ca98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 21 17:24:28 2014 +0200 uac: added commands to enable/disable records in remote registration table - introduced a mutex per slot in memory hash table to avoid races on updating the fields of registration records --- modules/uac/uac_reg.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 173 insertions(+), 3 deletions(-) diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 595f49a..da3fdd0 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -30,6 +30,7 @@ #include "../../ut.h" #include "../../trim.h" #include "../../hashes.h" +#include "../../locking.h" #include "../../parser/parse_uri.h" #include "../../parser/parse_from.h" #include "../../parser/parse_to.h" @@ -81,6 +82,7 @@ typedef struct _reg_entry unsigned int usize; reg_item_t *byuser; reg_item_t *byuuid; + gen_lock_t lock; } reg_entry_t; typedef struct _reg_ht @@ -164,6 +166,8 @@ int uac_reg_init_db(void) */ int uac_reg_init_ht(unsigned int sz) { + int i; + _reg_htable = (reg_ht_t*)shm_malloc(sizeof(reg_ht_t)); if(_reg_htable==NULL) { @@ -182,6 +186,22 @@ int uac_reg_init_ht(unsigned int sz) return -1; } memset(_reg_htable->entries, 0, _reg_htable->htsize*sizeof(reg_entry_t)); + for(i=0; i<_reg_htable->htsize; i++) + { + if(lock_init(&_reg_htable->entries[i].lock)==0) + { + LM_ERR("cannot initalize lock[%d] n", i); + i--; + while(i>=0) + { + lock_destroy(&_reg_htable->entries[i].lock); + i--; + } + shm_free(_reg_htable->entries); + shm_free(_reg_htable); + return -1; + } + } return 0; } @@ -202,6 +222,7 @@ int uac_reg_free_ht(void) } for(i=0; i<_reg_htable->htsize; i++) { + lock_get(&_reg_htable->entries[i].lock); /* free entries */ it = _reg_htable->entries[i].byuuid; while(it) @@ -218,6 +239,7 @@ int uac_reg_free_ht(void) shm_free(it0->r); shm_free(it0); } + lock_destroy(&_reg_htable->entries[i].lock); } shm_free(_reg_htable->entries); shm_free(_reg_htable); @@ -225,6 +247,48 @@ int uac_reg_free_ht(void) return 0; } +/** + * + */ +int uac_reg_reset_ht(void) +{ + int i; + reg_item_t *it = NULL; + reg_item_t *it0 = NULL; + + if(_reg_htable==NULL) + { + LM_DBG("no hash table\n"); + return -1; + } + for(i=0; i<_reg_htable->htsize; i++) + { + lock_get(&_reg_htable->entries[i].lock); + /* free entries */ + it = _reg_htable->entries[i].byuuid; + while(it) + { + it0 = it; + it = it->next; + shm_free(it0); + } + _reg_htable->entries[i].byuuid = NULL; + _reg_htable->entries[i].isize=0; + it = _reg_htable->entries[i].byuser; + while(it) + { + it0 = it; + it = it->next; + shm_free(it0->r); + shm_free(it0); + } + _reg_htable->entries[i].byuser = NULL; + _reg_htable->entries[i].usize = 0; + lock_release(&_reg_htable->entries[i].lock); + } + return 0; +} + #define reg_compute_hash(_s) get_hash1_raw((_s)->s,(_s)->len) #define reg_get_entry(_h,_size) ((_h)&((_size)-1)) @@ -251,9 +315,11 @@ int reg_ht_add_byuuid(reg_uac_t *reg) memset(ri, 0, sizeof(reg_item_t)); slot = reg_get_entry(reg->h_uuid, _reg_htable->htsize); ri->r = reg; + lock_get(&_reg_htable->entries[slot].lock); ri->next = _reg_htable->entries[slot].byuuid; _reg_htable->entries[slot].byuuid = ri; _reg_htable->entries[slot].isize++; + lock_release(&_reg_htable->entries[slot].lock); return 0; } @@ -280,9 +346,11 @@ int reg_ht_add_byuser(reg_uac_t *reg) memset(ri, 0, sizeof(reg_item_t)); slot = reg_get_entry(reg->h_user, _reg_htable->htsize); ri->r = reg; + lock_get(&_reg_htable->entries[slot].lock); ri->next = _reg_htable->entries[slot].byuser; _reg_htable->entries[slot].byuser = ri; _reg_htable->entries[slot].usize++; + lock_release(&_reg_htable->entries[slot].lock); return 0; } @@ -770,7 +838,7 @@ void uac_reg_timer(unsigned int ticks) tn = time(NULL); for(i=0; i<_reg_htable->htsize; i++) { - /* free entries */ + /* walk through entries */ it = _reg_htable->entries[i].byuuid; while(it) { @@ -1094,7 +1162,8 @@ static void rpc_uac_reg_dump(rpc_t* rpc, void* ctx) for(i=0; i<_reg_htable->htsize; i++) { - /* free entries */ + lock_get(&_reg_htable->entries[i].lock); + /* walk through entries */ reg = _reg_htable->entries[i].byuuid; while(reg) { @@ -1121,11 +1190,13 @@ static void rpc_uac_reg_dump(rpc_t* rpc, void* ctx) "timer_expires", (int)reg->r->timer_expires )<0) { + lock_release(&_reg_htable->entries[i].lock); rpc->fault(ctx, 500, "Internal error adding item"); return; } reg = reg->next; } + lock_release(&_reg_htable->entries[i].lock); } } @@ -1167,7 +1238,8 @@ static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) for(i=0; i<_reg_htable->htsize; i++) { - /* free entries */ + /* walk through entries */ + lock_get(&_reg_htable->entries[i].lock); reg = _reg_htable->entries[i].byuuid; while(reg) { @@ -1180,6 +1252,7 @@ static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) } else if(attr.len==13 && strncmp(attr.s, "auth_username", 13)==0) { rval = &reg->r->auth_username; } else { + lock_release(&_reg_htable->entries[i].lock); LM_ERR("usupoorted filter attribute %.*s\n", attr.len, attr.s); rpc->fault(ctx, 500, "Unsupported Filter Attribtue"); return; @@ -1209,6 +1282,7 @@ static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) "timer_expires", (int)reg->r->timer_expires )<0) { + lock_release(&_reg_htable->entries[i].lock); rpc->fault(ctx, 500, "Internal error adding item"); return; } @@ -1216,12 +1290,108 @@ static void rpc_uac_reg_info(rpc_t* rpc, void* ctx) } reg = reg->next; } + lock_release(&_reg_htable->entries[i].lock); + } +} + + +static void rpc_uac_reg_update_flag(rpc_t* rpc, void* ctx, int mode, int fval) +{ + int i; + reg_item_t *reg = NULL; + void* th; + str none = {"none", 4}; + time_t tn; + str attr = {0}; + str val = {0}; + str *rval; + + if(_reg_htable==NULL) + { + rpc->fault(ctx, 500, "Not enabled"); + return; + } + + if(rpc->scan(ctx, "S.S", &attr, &group, &val)<2) + { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(attr.len<=0 || attr.s==NULL || val.len<=0 || val.s==NULL) + { + LM_ERR("bad parameter values\n"); + rpc->fault(ctx, 500, "Invalid Parameter Values"); + return; + } + + tn = time(NULL); + + for(i=0; i<_reg_htable->htsize; i++) + { + lock_get(&_reg_htable->entries[i].lock); + /* walk through entries */ + reg = _reg_htable->entries[i].byuuid; + while(reg) + { + if(attr.len==10 && strncmp(attr.s, "l_username", 10)==0) { + rval = &reg->r->l_username; + } else if(attr.len==10 && strncmp(attr.s, "r_username", 10)==0) { + rval = &reg->r->r_username; + } else if(attr.len==6 && strncmp(attr.s, "l_uuid", 6)==0) { + rval = &reg->r->l_uuid; + } else if(attr.len==13 && strncmp(attr.s, "auth_username", 13)==0) { + rval = &reg->r->auth_username; + } else { + lock_release(&_reg_htable->entries[i].lock); + LM_ERR("usupoorted filter attribute %.*s\n", attr.len, attr.s); + rpc->fault(ctx, 500, "Unsupported Filter Attribtue"); + return; + } + + if(rval->len==val.len && strncmp(val.s, rval->s, val.len)==0) { + /* found */ + if(mode==1) { + reg->r->flags |= fval; + } else { + reg->r->flags &= ~fval; + } + reg->r->timer_expires = time(NULL) + 1; + lock_release(&_reg_htable->entries[i].lock); + return; + } + reg = reg->next; + } + lock_release(&_reg_htable->entries[i].lock); } } +static const char* rpc_uac_reg_enable_doc[2] = { + "Enable registration for a particular record.", + 0 +}; + +static void rpc_uac_reg_enable(rpc_t* rpc, void* ctx) +{ + rpc_uac_reg_update_flag(rpc, ctx, 1, UAC_REG_DISABLED); +} + +static const char* rpc_uac_reg_disable_doc[2] = { + "Disable registration for a particular record.", + 0 +}; + +static void rpc_uac_reg_disable(rpc_t* rpc, void* ctx) +{ + rpc_uac_reg_update_flag(rpc, ctx, 0, UAC_REG_DISABLED); +} + + + 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}, {0, 0, 0, 0} };

2 1

← Newer
1
...
4
5
6
7
8
9
10
...
14
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