sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:admorten/sca: Makefile: fixed path to kamailio.default in deb specs dir

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: b35936b9e17aa66eb415dcc11b4dc1d6f7688409 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b35936b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu May 2 13:43:58 2013 +0200 Makefile: fixed path to kamailio.default in deb specs dir --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 0bde59c..4f2de07 100644 --- a/Makefile +++ b/Makefile @@ -1030,7 +1030,7 @@ install_initd_debian install-initd-debian: > /etc/init.d/$(NAME) chmod +x /etc/init.d/$(NAME) sed -e "s#RUN_KAMAILIO=no#RUN_KAMAILIO=yes#g" \ - < pkg/kamailio/debian/kamailio.default \ + < pkg/kamailio/deb/debian/kamailio.default \ > /etc/default/$(NAME) mkdir -p /var/run/$(NAME) adduser --quiet --system --group --disabled-password \

11 years, 2 months

git:admorten/sca: modules/registrar: added regid_mode module param

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: 2b1a199ca78dd08abe4f3f1e250be0c39fe9b38f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b1a199… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed May 1 18:04:47 2013 +0300 modules/registrar: added regid_mode module param - Tells if REGISTER contact regid (if present) is used when REGISTER request is saved even if request does not indicate support for outbound. --- modules/registrar/README | 185 ++++++++++++++++------------- modules/registrar/doc/registrar_admin.xml | 27 ++++ modules/registrar/reg_mod.c | 7 + modules/registrar/reg_mod.h | 4 + modules/registrar/save.c | 2 +- 5 files changed, 142 insertions(+), 83 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2b1…

11 years, 2 months

git:admorten/sca: modules/htable: added htable.reload rpc command

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: ce461b43aaf2422d8f223fad78c6d193f8b9277e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce461b4… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed May 1 12:34:25 2013 +0300 modules/htable: added htable.reload rpc command --- modules/htable/README | 29 ++++++++++--- modules/htable/doc/htable_admin.xml | 25 +++++++++++ modules/htable/htable.c | 82 +++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 6 deletions(-) diff --git a/modules/htable/README b/modules/htable/README index 4a48560..bf28a7a 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -17,7 +17,7 @@ Alex Balashov <abalashov(a)evaristesys.com> - Copyright � 2008-2011 http://www.asipto.com + Copyright (c) 2008-2011 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -64,7 +64,8 @@ Alex Balashov 7.1. htable.get htable key 7.2. htable.delete htable key 7.3. htable.dump htable - 7.4. htable.listTables + 7.4. htable.reload htable + 7.5. htable.listTables 8. Event routes @@ -134,7 +135,8 @@ Chapter 1. Admin Guide 7.1. htable.get htable key 7.2. htable.delete htable key 7.3. htable.dump htable - 7.4. htable.listTables + 7.4. htable.reload htable + 7.5. htable.listTables 8. Event routes @@ -494,7 +496,7 @@ sht_rm_value_re("ha=>.*"); * $shtval(htable=>key) Exported pseudo-variables are documented at - http://www.kamailio.org/dokuwiki/. + http://www.kamailio.org/wiki/. 6. MI Commands @@ -552,7 +554,8 @@ sht_rm_value_re("ha=>.*"); 7.1. htable.get htable key 7.2. htable.delete htable key 7.3. htable.dump htable - 7.4. htable.listTables + 7.4. htable.reload htable + 7.5. htable.listTables 7.1. htable.get htable key @@ -600,7 +603,21 @@ kamcmd htable.get students anna kamcmd htable.dump ipban ... -7.4. htable.listTables +7.4. htable.reload htable + + Reload hash table from database. + + Name: dhtable.reload + + Parameters: + * htable : Name of the hash table to reload + + Example: +... +kamcmd htable.reload ipban +... + +7.5. htable.listTables Lists all defined tables diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index d652c8f..978298f 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -760,6 +760,31 @@ kamcmd htable.dump ipban </section> <section> <title> + <function moreinfo="none">htable.reload htable</function> + </title> + <para> + Reload hash table from database. + </para> + <para> + Name: <emphasis>dhtable.reload</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable : Name of the hash table to reload</para> + </listitem> + + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +kamcmd htable.reload ipban +... +</programlisting> + </section> + <section> + <title> <function moreinfo="none">htable.listTables</function> </title> <para> diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 2b22542..e740d71 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -534,6 +534,10 @@ static const char* htable_list_doc[2] = { "List all htables.", 0 }; +static const char* htable_reload_doc[2] = { + "Reload hash table.", + 0 +}; static void htable_rpc_delete(rpc_t* rpc, void* c) { str htname, keyname; @@ -737,11 +741,89 @@ error: return; } +static void htable_rpc_reload(rpc_t* rpc, void* c) +{ + str htname; + ht_t *ht; + ht_t nht; + ht_cell_t *first; + ht_cell_t *it; + int i; + + if(ht_db_url.len<=0) { + rpc->fault(c, 500, "No htable db_url"); + return; + } + if(ht_db_init_con()!=0) { + rpc->fault(c, 500, "Failed to init htable db connection"); + return; + } + if(ht_db_open_con()!=0) { + rpc->fault(c, 500, "Failed to open htable db connection"); + return; + } + + if (rpc->scan(c, "S", &htname) < 1) + { + rpc->fault(c, 500, "No htable name given"); + return; + } + ht = ht_get_table(&htname); + if(ht==NULL) + { + rpc->fault(c, 500, "No such htable"); + return; + } + + + memcpy(&nht, ht, sizeof(ht_t)); + nht.entries = (ht_entry_t*)shm_malloc(nht.htsize*sizeof(ht_entry_t)); + if(nht.entries == NULL) + { + ht_db_close_con(); + rpc->fault(c, 500, "Mtree reload failed"); + return; + } + memset(nht.entries, 0, nht.htsize*sizeof(ht_entry_t)); + + if(ht_db_load_table(&nht, &ht->dbtable, 0)<0) + { + ht_db_close_con(); + rpc->fault(c, 500, "Mtree reload failed"); + return; + } + + /* replace old entries */ + for(i=0; i<nht.htsize; i++) + { + lock_get(&ht->entries[i].lock); + first = ht->entries[i].first; + ht->entries[i].first = nht.entries[i].first; + ht->entries[i].esize = nht.entries[i].esize; + lock_release(&ht->entries[i].lock); + nht.entries[i].first = first; + } + /* free old entries */ + for(i=0; i<nht.htsize; i++) + { + first = nht.entries[i].first; + while(first) + { + it = first; + first = first->next; + ht_cell_free(it); + } + } + ht_db_close_con(); + return; +} + rpc_export_t htable_rpc[] = { {"htable.dump", htable_rpc_dump, htable_dump_doc, 0}, {"htable.delete", htable_rpc_delete, htable_delete_doc, 0}, {"htable.get", htable_rpc_get, htable_get_doc, 0}, {"htable.listTables", htable_rpc_list, htable_list_doc, 0}, + {"htable.reload", htable_rpc_reload, htable_reload_doc, 0}, {0, 0, 0, 0} };

11 years, 2 months

git:admorten/sca: modules/mtree: added mtree.reload rcp command

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: ea9983d2346d5789ebb17f9eb58626e0967ed6c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea9983d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed May 1 11:54:20 2013 +0300 modules/mtree: added mtree.reload rcp command --- modules/mtree/README | 15 ++++++++- modules/mtree/doc/mtree_admin.xml | 12 ++++++++ modules/mtree/mtree_mod.c | 57 +++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index 05f3422..d548e89 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -20,9 +20,9 @@ Juha Heinanen <jh(a)tutpro.com> - Copyright � 2010 Daniel-Constantin Mierla (asipto.com) + Copyright (c) 2010 Daniel-Constantin Mierla (asipto.com) - Copyright � 2011 Juha Heinanen + Copyright (c) 2011 Juha Heinanen __________________________________________________________________ Table of Contents @@ -64,6 +64,7 @@ Juha Heinanen 6. RPC Commands 6.1. mtree.summary + 6.2. mtree.reload List of Examples @@ -121,6 +122,7 @@ Chapter 1. Admin Guide 6. RPC Commands 6.1. mtree.summary + 6.2. mtree.reload 1. Overview @@ -375,9 +377,18 @@ mt_match("mytree", "$rU", "0"); 6. RPC Commands 6.1. mtree.summary + 6.2. mtree.reload 6.1. mtree.summary List usage summary for all trees. Parameters: none. + +6.2. mtree.reload + + Reload mtree from database to memory. + + Parameters: + * _mtree_ + - name of mtree or empty string meaning all mtrees diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index 62154f0..0d81e72 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -428,6 +428,18 @@ mt_match("mytree", "$rU", "0"); </para> <para>Parameters: none.</para> </section> + <section> + <title> + <function moreinfo="none">mtree.reload</function> + </title> + <para> + Reload mtree from database to memory. + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>_mtree_</para> - name of mtree or empty string meaning all mtrees</listitem> + </itemizedlist> + </section> </section> </chapter> diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index ac22d48..464f1c5 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -1044,8 +1044,65 @@ static const char* rpc_mtree_summary_doc[2] = { 0 }; +void rpc_mtree_reload(rpc_t* rpc, void* c) +{ + str tname = {0, 0}; + m_tree_t *pt; + + if(db_table.len>0) + { + /* re-loading all information from database */ + if(mt_load_db_trees()!=0) + { + LM_ERR("cannot re-load mtrees from database\n"); + goto error; + } + } else { + if(!mt_defined_trees()) + { + LM_ERR("empty mtree list\n"); + goto error; + } + + /* read tree name */ + if (rpc->scan(c, "S", &tname) != 1) { + rpc->fault(c, 500, "Failed to get table name parameter"); + return; + } + + pt = mt_get_first_tree(); + + while(pt!=NULL) + { + if(tname.s==NULL + || (tname.s!=NULL && pt->tname.len>=tname.len + && strncmp(pt->tname.s, tname.s, tname.len)==0)) + { + /* re-loading table from database */ + if(mt_load_db(&pt->tname)!=0) + { + LM_ERR("cannot re-load mtree from database\n"); + goto error; + } + } + pt = pt->next; + } + } + + return; + +error: + rpc->fault(c, 500, "Mtree Reload Failed"); +} + +static const char* rpc_mtree_reload_doc[2] = { + "Reload mtrees from database to memory", + 0 +}; + rpc_export_t mtree_rpc[] = { {"mtree.summary", rpc_mtree_summary, rpc_mtree_summary_doc, 0}, + {"mtree.reload", rpc_mtree_reload, rpc_mtree_reload_doc, 0}, {0, 0, 0, 0} };

11 years, 2 months

git:admorten/sca: modules/usrloc: added missing rpc commands

by Andrew Mortensen

Module: sip-router Branch: admorten/sca Commit: 101092466c0f5711f8e81a7c685b42db89015eae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1010924… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed May 1 09:43:51 2013 +0300 modules/usrloc: added missing rpc commands - added missing rpc commands ul.rm, ul.rm_contact, ul.flush, and ul.add by patch provided by V�ctor Seva --- modules/usrloc/README | 51 ++++++++ modules/usrloc/doc/usrloc_admin.xml | 96 ++++++++++++++ modules/usrloc/ul_rpc.c | 241 +++++++++++++++++++++++++++++++++++ 3 files changed, 388 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=101…

11 years, 2 months

git:master: mangler: fix double definition of contact_flds_separator, reported from ld

by Henning Westerholt

Module: sip-router Branch: master Commit: 003d87edc23f62de98a1a22db03b12ea58abcbc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=003d87e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Thu May 2 21:17:57 2013 +0200 mangler: fix double definition of contact_flds_separator, reported from ld --- modules/mangler/contact_ops.h | 2 +- modules/mangler/mangler.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/mangler/contact_ops.h b/modules/mangler/contact_ops.h index 066dff2..caf0e2a 100644 --- a/modules/mangler/contact_ops.h +++ b/modules/mangler/contact_ops.h @@ -49,7 +49,7 @@ #define DEFAULT_SEPARATOR "*" -char *contact_flds_separator; +extern char *contact_flds_separator; struct uri_format diff --git a/modules/mangler/mangler.h b/modules/mangler/mangler.h index 06bb4d7..ee6a4b8 100644 --- a/modules/mangler/mangler.h +++ b/modules/mangler/mangler.h @@ -43,7 +43,6 @@ extern regex_t *portExpression; extern regex_t *ipExpression; -extern char *contact_flds_separator; #endif

11 years, 2 months

[tracker] Task opened: modules/usrloc: ul.dump RPC command doesn't dump the right q value (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 - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - modules/usrloc: ul.dump RPC command doesn't dump the right q value Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Before: vseva@kamailiodev:~/kamailio$ ./utils/sercmd/kamcmd ul.dump { Domain: location Size: 512 AoRs: { } Stats: { Records: 0 Max-Slots: 0 } } vseva@kamailiodev:~/kamailio$ ./utils/sercmd/kamcmd ul.add location foo(a)1.example.com sip:192.168.1.1:5060 0 1.0 koko 1 2 3 vseva@kamailiodev:~/kamailio$ ./utils/sercmd/kamcmd ul.dump { Domain: location Size: 512 AoRs: { AoR: foo HashID: 6992683 Contacts: { Contact: { Address: sip:192.168.1.1:5060 Expires: permanent Q: 0.000000 Call-ID: dfjrewr12386fd6-343(a)kamailio.mi CSeq: 1 User-Agent: SIP Router MI Server Received: [not set] Path: [not set] State: CS_NEW Flags: 1 CFlags: 2 Socket: [not set] Methods: 3 Ruid: ulcx-518066f6-58d-1 Instance: [not set] Reg-Id: 0 Last-Keepalive: 0 Last-Modified: 0 } } } Stats: { Records: 1 Max-Slots: 1 } } After: vseva@kamailiodev:~/kamailio$ ./utils/sercmd/kamcmd ul.dump { Domain: location Size: 512 AoRs: { } Stats: { Records: 0 Max-Slots: 0 } } vseva@kamailiodev:~/kamailio$ ./utils/sercmd/kamcmd ul.add location foo(a)1.example.com sip:192.168.1.1:5060 0 1.0 koko 1 2 3 vseva@kamailiodev:~/kamailio$ ./utils/sercmd/kamcmd ul.dump { Domain: location Size: 512 AoRs: { AoR: foo HashID: 6992683 Contacts: { Contact: { Address: sip:192.168.1.1:5060 Expires: permanent Q: 1.000000 Call-ID: dfjrewr12386fd6-343(a)kamailio.mi CSeq: 1 User-Agent: SIP Router MI Server Received: [not set] Path: [not set] State: CS_NEW Flags: 1 CFlags: 2 Socket: [not set] Methods: 3 Ruid: ulcx-518065e0-439-2 Instance: [not set] Reg-Id: 0 Last-Keepalive: 0 Last-Modified: 0 } } } Stats: { Records: 1 Max-Slots: 1 } } vseva@kamailiodev:~/kamailio$ 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=291 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, 2 months

git:master: Makefile: fixed path to kamailio.default in deb specs dir

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d6dba0e1b649bcfacaac2dd3496b497e944ebaba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6dba0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 2 13:43:58 2013 +0200 Makefile: fixed path to kamailio.default in deb specs dir --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 0bde59c..4f2de07 100644 --- a/Makefile +++ b/Makefile @@ -1030,7 +1030,7 @@ install_initd_debian install-initd-debian: > /etc/init.d/$(NAME) chmod +x /etc/init.d/$(NAME) sed -e "s#RUN_KAMAILIO=no#RUN_KAMAILIO=yes#g" \ - < pkg/kamailio/debian/kamailio.default \ + < pkg/kamailio/deb/debian/kamailio.default \ > /etc/default/$(NAME) mkdir -p /var/run/$(NAME) adduser --quiet --system --group --disabled-password \

11 years, 2 months

git:master: modules/registrar: added regid_mode module param

by Juha Heinanen

Module: sip-router Branch: master Commit: 50e9baf2131befa2243a221566b6505a55216208 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50e9baf… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed May 1 18:04:47 2013 +0300 modules/registrar: added regid_mode module param - Tells if REGISTER contact regid (if present) is used when REGISTER request is saved even if request does not indicate support for outbound. --- modules/registrar/README | 185 ++++++++++++++++------------- modules/registrar/doc/registrar_admin.xml | 27 ++++ modules/registrar/reg_mod.c | 7 + modules/registrar/reg_mod.h | 4 + modules/registrar/save.c | 2 +- 5 files changed, 142 insertions(+), 83 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=50e…

11 years, 2 months

[tracker] Task closed: usrloc: Add missing RPC commands

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#290 - usrloc: Add missing RPC commands User who did this - Juha Heinanen (jh) Reason for closing: Implemented Additional comments about closing: patch was applied More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=290 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, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013