sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: xmpp: register and start xmpp manager process

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7b7542b8e2323e70b2b32b5b659d296219374850 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b7542b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 21:27:59 2010 +0200 xmpp: register and start xmpp manager process - reported by Elias Baixas --- modules_k/xmpp/xmpp.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/modules_k/xmpp/xmpp.c b/modules_k/xmpp/xmpp.c index 5d634d4..e7a0093 100644 --- a/modules_k/xmpp/xmpp.c +++ b/modules_k/xmpp/xmpp.c @@ -134,6 +134,7 @@ MODULE_VERSION struct tm_binds tmb; static int mod_init(void); +static int child_init(int rank); static void xmpp_process(int rank); static int cmd_send_message(struct sip_msg* msg, char* _foo, char* _bar); @@ -200,7 +201,7 @@ struct module_exports exports = { mod_init, /* Initialization function */ 0, /* Response function */ 0, /* Destroy function */ - 0, /* Child init function */ + child_init, /* Child init function */ }; /* @@ -242,6 +243,30 @@ static int mod_init(void) { return -1; } + /* add space for one extra process */ + register_procs(1); + + + return 0; +} + +/** + * initialize child processes + */ +static int child_init(int rank) +{ + int pid; + + if (rank==PROC_MAIN) { + pid=fork_process(PROC_NOCHLDINIT, "XMPP Manager", 1); + if (pid<0) + return -1; /* error */ + if(pid==0){ + /* child */ + xmpp_process(1); + } + } + return 0; }

14 years, 4 months

#include a directory

by Juha Heinanen

i was reading tls module source and got the impression that tls config file stuff is using sip router general config file mechanism. then i went to see if there is a capability to include a directory, but based on the wiki page http://sip-router.org/wiki/cookbooks/core-cookbook/devel is does not look like it. anyway, in my opinion one way or another tls.reload needs to be able to reload all config files in a given directory. otherwise management of certs is not convenient. -- juha

14 years, 4 months

git:master: dialog(k): required table version is now 5

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cc0a479e87f83794e6e43606f05d7703c63997ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc0a479… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 18:23:56 2010 +0200 dialog(k): required table version is now 5 --- modules_k/dialog/dlg_db_handler.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_db_handler.h b/modules_k/dialog/dlg_db_handler.h index cd3ddcd..8b953be 100644 --- a/modules_k/dialog/dlg_db_handler.h +++ b/modules_k/dialog/dlg_db_handler.h @@ -54,7 +54,7 @@ #define REQ_URI_COL "req_uri" #define DIALOG_TABLE_NAME "dialog" -#define DLG_TABLE_VERSION 4 +#define DLG_TABLE_VERSION 5 /*every minute the dialogs' information will be refreshed*/ #define DB_DEFAULT_UPDATE_PERIOD 60

14 years, 4 months

git:master: dialog: store name of time-out route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 48c3a21a059a5307d64ff34bd5d34cf4c7677c3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48c3a21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 18:13:43 2010 +0200 dialog: store name of time-out route - upon restart, if new routes where added or the order was changed, there was a chance that the index of the route was different - no store the string name of route and resolve it again at startup --- modules_k/dialog/dialog.c | 4 ++-- modules_k/dialog/dlg_db_handler.c | 28 +++++++++++++++++++--------- modules_k/dialog/dlg_db_handler.h | 4 ++-- modules_k/dialog/dlg_handlers.c | 4 +++- modules_k/dialog/dlg_hash.c | 26 ++++++++++++++++++++++++++ modules_k/dialog/dlg_hash.h | 9 +++++++++ modules_k/dialog/dlg_var.c | 7 +++++-- modules_k/dialog/dlg_var.h | 2 ++ 8 files changed, 68 insertions(+), 16 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=48c…

14 years, 4 months

git:master: dbschema: dialog table structure updated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 50e3f0644b3b044f8d02e724cd1e742b88d91606 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50e3f06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 18:15:16 2010 +0200 dbschema: dialog table structure updated - toroute column was changed in string type and renamed to toroute_name --- lib/srdb1/schema/dialog.xml | 14 ++++++++++++-- utils/kamctl/db_berkeley/kamailio/dialog | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 12 +++++++++++- utils/kamctl/dbtext/kamailio/dialog | 2 +- utils/kamctl/dbtext/kamailio/version | 7 ++++++- utils/kamctl/mysql/dialog-create.sql | 3 ++- utils/kamctl/oracle/dialog-create.sql | 3 ++- utils/kamctl/postgres/dialog-create.sql | 3 ++- 8 files changed, 38 insertions(+), 10 deletions(-) diff --git a/lib/srdb1/schema/dialog.xml b/lib/srdb1/schema/dialog.xml index 9e69cf7..1bc3807 100644 --- a/lib/srdb1/schema/dialog.xml +++ b/lib/srdb1/schema/dialog.xml @@ -9,7 +9,7 @@ <table id="dialog" xmlns:db="http://docbook.org/ns/docbook"> <name>dialog</name> - <version>4</version> + <version>5</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Persistent dialog information for the dialog module. More @@ -181,7 +181,17 @@ <type>unsigned int</type> <size>10</size> <default>0</default> - <description>The route to be executed at dialog timeout. + <description>The ID of route to be executed at dialog timeout (ignored from v3.1, + using instead toroute_name). + </description> + </column> + + <column> + <name>toroute_name</name> + <type>string</type> + <size>32</size> + <null/> + <description>The name of route to be executed at dialog timeout. </description> </column> diff --git a/utils/kamctl/db_berkeley/kamailio/dialog b/utils/kamctl/db_berkeley/kamailio/dialog index 0a1420c..8eb740b 100644 --- a/utils/kamctl/db_berkeley/kamailio/dialog +++ b/utils/kamctl/db_berkeley/kamailio/dialog @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) hash_entry(int) hash_id(int) callid(str) from_uri(str) from_tag(str) to_uri(str) to_tag(str) caller_cseq(str) callee_cseq(str) caller_route_set(str) callee_route_set(str) caller_contact(str) callee_contact(str) caller_sock(str) callee_sock(str) state(int) start_time(int) timeout(int) sflags(int) toroute(int) req_uri(str) +id(int) hash_entry(int) hash_id(int) callid(str) from_uri(str) from_tag(str) to_uri(str) to_tag(str) caller_cseq(str) callee_cseq(str) caller_route_set(str) callee_route_set(str) caller_contact(str) callee_contact(str) caller_sock(str) callee_sock(str) state(int) start_time(int) timeout(int) sflags(int) toroute(int) toroute_name(str) req_uri(str) METADATA_KEY 1 2 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0|0|0|NIL +NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0|0|0|NIL|NIL diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 93da593..93e3eb1 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -27,7 +27,7 @@ cpl|1 dbaliases| dbaliases|1 dialog| -dialog|4 +dialog|5 dialplan| dialplan|1 dispatcher| @@ -60,12 +60,20 @@ imc_rooms| imc_rooms|1 METADATA_DEFAULTS NIL|NIL|NULL|NULL|NIL|NIL +lcr_gw| +lcr_gw|1 +lcr_rule| +lcr_rule|1 +lcr_rule_target| +lcr_rule_target|1 location| location|1004 matrix| matrix|1 missed_calls| missed_calls|3 +mtree| +mtree|1 pdt| pdt|1 presentity| @@ -90,6 +98,8 @@ subscriber| subscriber|6 trusted| trusted|5 +uacreg| +uacreg|1 uri| uri|1 userblacklist| diff --git a/utils/kamctl/dbtext/kamailio/dialog b/utils/kamctl/dbtext/kamailio/dialog index 0b852ca..f58f905 100644 --- a/utils/kamctl/dbtext/kamailio/dialog +++ b/utils/kamctl/dbtext/kamailio/dialog @@ -1 +1 @@ -id(int,auto) hash_entry(int) hash_id(int) callid(string) from_uri(string) from_tag(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) caller_route_set(string,null) callee_route_set(string,null) caller_contact(string) callee_contact(string) caller_sock(string) callee_sock(string) state(int) start_time(int) timeout(int) sflags(int) toroute(int) req_uri(string) +id(int,auto) hash_entry(int) hash_id(int) callid(string) from_uri(string) from_tag(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) caller_route_set(string,null) callee_route_set(string,null) caller_contact(string) callee_contact(string) caller_sock(string) callee_sock(string) state(int) start_time(int) timeout(int) sflags(int) toroute(int) toroute_name(string,null) req_uri(string) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index b80c2e7..60a7a5f 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -8,7 +8,7 @@ carrier_name:1 carrierroute:3 cpl:1 dbaliases:1 -dialog:4 +dialog:5 dialplan:1 dispatcher:4 domain:1 @@ -25,9 +25,13 @@ htable:1 imc_members:1 imc_rooms:1 id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) grp_id(int) priority(int) +lcr_gw:1 +lcr_rule:1 +lcr_rule_target:1 location:1004 matrix:1 missed_calls:3 +mtree:1 pdt:1 presentity:3 pua:6 @@ -40,6 +44,7 @@ sip_trace:2 speed_dial:2 subscriber:6 trusted:5 +uacreg:1 uri:1 userblacklist:1 usr_preferences:2 diff --git a/utils/kamctl/mysql/dialog-create.sql b/utils/kamctl/mysql/dialog-create.sql index b89f3a3..77ba968 100644 --- a/utils/kamctl/mysql/dialog-create.sql +++ b/utils/kamctl/mysql/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','4'); +INSERT INTO version (table_name, table_version) values ('dialog','5'); CREATE TABLE dialog ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, hash_entry INT(10) UNSIGNED NOT NULL, @@ -21,6 +21,7 @@ CREATE TABLE dialog ( timeout INT(10) UNSIGNED DEFAULT 0 NOT NULL, sflags INT(10) UNSIGNED DEFAULT 0 NOT NULL, toroute INT(10) UNSIGNED DEFAULT 0 NOT NULL, + toroute_name VARCHAR(32), req_uri VARCHAR(128) NOT NULL ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/dialog-create.sql b/utils/kamctl/oracle/dialog-create.sql index 4911fa1..f06cbc4 100644 --- a/utils/kamctl/oracle/dialog-create.sql +++ b/utils/kamctl/oracle/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','4'); +INSERT INTO version (table_name, table_version) values ('dialog','5'); CREATE TABLE dialog ( id NUMBER(10) PRIMARY KEY, hash_entry NUMBER(10), @@ -21,6 +21,7 @@ CREATE TABLE dialog ( timeout NUMBER(10) DEFAULT 0 NOT NULL, sflags NUMBER(10) DEFAULT 0 NOT NULL, toroute NUMBER(10) DEFAULT 0 NOT NULL, + toroute_name VARCHAR2(32), req_uri VARCHAR2(128) ); diff --git a/utils/kamctl/postgres/dialog-create.sql b/utils/kamctl/postgres/dialog-create.sql index 90faadf..3ee4d2e 100644 --- a/utils/kamctl/postgres/dialog-create.sql +++ b/utils/kamctl/postgres/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','4'); +INSERT INTO version (table_name, table_version) values ('dialog','5'); CREATE TABLE dialog ( id SERIAL PRIMARY KEY NOT NULL, hash_entry INTEGER NOT NULL, @@ -21,6 +21,7 @@ CREATE TABLE dialog ( timeout INTEGER DEFAULT 0 NOT NULL, sflags INTEGER DEFAULT 0 NOT NULL, toroute INTEGER DEFAULT 0 NOT NULL, + toroute_name VARCHAR(32), req_uri VARCHAR(128) NOT NULL );

14 years, 4 months

.d subdir for tls config file

by Juha Heinanen

from tls docs i got the impression that tls config file is currently a single file. because peers come and go, it would be nice if config entries could be read also from a config.d directory when tls.reload is called. may be too late for 3.1? -- juha

14 years, 4 months

git:master: dispatcher(k): removed ds_append_branch param

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fceed40e838650a1da4c35a6a5aa3808fd324d2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fceed40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 17:07:48 2010 +0200 dispatcher(k): removed ds_append_branch param - this is not needed anymore since 3.1 has r-uri change auto-discovery --- modules_k/dispatcher/README | 81 ++++++++++--------------- modules_k/dispatcher/dispatch.c | 8 --- modules_k/dispatcher/dispatch.h | 1 - modules_k/dispatcher/dispatcher.c | 2 - modules_k/dispatcher/doc/dispatcher_admin.xml | 22 ------- 5 files changed, 32 insertions(+), 82 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index 78d0b8c..bcf71b7 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -58,11 +58,10 @@ Carsten Bock 3.21. ds_probing_threshhold (int) 3.22. ds_ping_reply_codes (string) 3.23. ds_probing_mode (int) - 3.24. ds_append_branch (int) - 3.25. ds_hash_size (int) - 3.26. ds_hash_expire (int) - 3.27. ds_hash_initexpire (int) - 3.28. ds_hash_check_interval (int) + 3.24. ds_hash_size (int) + 3.25. ds_hash_expire (int) + 3.26. ds_hash_initexpire (int) + 3.27. ds_hash_check_interval (int) 4. Exported Functions @@ -116,15 +115,14 @@ Carsten Bock 1.22. Set the “ds_probing_threshhold” parameter 1.23. Set the “ds_ping_reply_codes” parameter 1.24. Set the “ds_probing_mode” parameter - 1.25. Set the “ds_append_branch” parameter - 1.26. Set the “ds_hash_size” parameter - 1.27. Set the “ds_hash_expire” parameter - 1.28. Set the “ds_hash_initexpire” parameter - 1.29. Set the “ds_hash_check_interval” parameter - 1.30. ds_select_dst usage - 1.31. ds_load_unset usage - 1.32. dispatcher list file - 1.33. Kamailio config script - sample dispatcher usage + 1.25. Set the “ds_hash_size” parameter + 1.26. Set the “ds_hash_expire” parameter + 1.27. Set the “ds_hash_initexpire” parameter + 1.28. Set the “ds_hash_check_interval” parameter + 1.29. ds_select_dst usage + 1.30. ds_load_unset usage + 1.31. dispatcher list file + 1.32. Kamailio config script - sample dispatcher usage Chapter 1. Admin Guide @@ -161,11 +159,10 @@ Chapter 1. Admin Guide 3.21. ds_probing_threshhold (int) 3.22. ds_ping_reply_codes (string) 3.23. ds_probing_mode (int) - 3.24. ds_append_branch (int) - 3.25. ds_hash_size (int) - 3.26. ds_hash_expire (int) - 3.27. ds_hash_initexpire (int) - 3.28. ds_hash_check_interval (int) + 3.24. ds_hash_size (int) + 3.25. ds_hash_expire (int) + 3.26. ds_hash_initexpire (int) + 3.27. ds_hash_check_interval (int) 4. Exported Functions @@ -241,11 +238,10 @@ Chapter 1. Admin Guide 3.21. ds_probing_threshhold (int) 3.22. ds_ping_reply_codes (string) 3.23. ds_probing_mode (int) - 3.24. ds_append_branch (int) - 3.25. ds_hash_size (int) - 3.26. ds_hash_expire (int) - 3.27. ds_hash_initexpire (int) - 3.28. ds_hash_check_interval (int) + 3.24. ds_hash_size (int) + 3.25. ds_hash_expire (int) + 3.26. ds_hash_initexpire (int) + 3.27. ds_hash_check_interval (int) 3.1. list_file (string) @@ -577,20 +573,7 @@ Note modparam("dispatcher", "ds_probing_mode", 1) ... -3.24. ds_append_branch (int) - - If set to 1, functions will automaticall append a new branch if called - in FAILURE_ROUTE. If set to 0, script writer has to call - append_branch() in config after calling dispatcher functions. - - Default value is “1”. - - Example 1.25. Set the “ds_append_branch” parameter - ... - modparam("dispatcher", "ds_append_branch", 0) - ... - -3.25. ds_hash_size (int) +3.24. ds_hash_size (int) The value to be used as power of two to set the number of slots to hash table storing data for call load dispatching (e.g., value 8 will create @@ -599,24 +582,24 @@ Note Default value is “0”. - Example 1.26. Set the “ds_hash_size” parameter + Example 1.25. Set the “ds_hash_size” parameter ... modparam("dispatcher", "ds_hash_size", 9) ... -3.26. ds_hash_expire (int) +3.25. ds_hash_expire (int) Expiration time in seconds to remove the load on a destination if no BYE was received meanwhile. Default value is “7200”. - Example 1.27. Set the “ds_hash_expire” parameter + Example 1.26. Set the “ds_hash_expire” parameter ... modparam("dispatcher", "ds_hash_expire", 3600) ... -3.27. ds_hash_initexpire (int) +3.26. ds_hash_initexpire (int) Expiration time in seconds to remove the load on a destination if no 200 for INVITE was received meanwhile and state updated with @@ -624,19 +607,19 @@ Note Default value is “7200”. - Example 1.28. Set the “ds_hash_initexpire” parameter + Example 1.27. Set the “ds_hash_initexpire” parameter ... modparam("dispatcher", "ds_hash_initexpire", 60) ... -3.28. ds_hash_check_interval (int) +3.27. ds_hash_check_interval (int) Time interval in seconds to scan internal hash table with call load dispatching data for expired items. Default value is “30”. - Example 1.29. Set the “ds_hash_check_interval” parameter + Example 1.28. Set the “ds_hash_check_interval” parameter ... modparam("dispatcher", "ds_hash_check_interval", 60) ... @@ -703,7 +686,7 @@ Note This function can be used from REQUEST_ROUTE. - Example 1.30. ds_select_dst usage + Example 1.29. ds_select_dst usage ... ds_select_dst("1", "0"); ... @@ -799,7 +782,7 @@ ds_select_dst("1", "$var(a)"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE and ONREPLY_ROUTE. - Example 1.31. ds_load_unset usage + Example 1.30. ds_load_unset usage ... route { ... @@ -907,7 +890,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) For database, each element of a line resides in a different column. Next is a dispatcher.list file example: - Example 1.32. dispatcher list file + Example 1.31. dispatcher list file ... # $Id$ # dispatcher destination sets @@ -932,7 +915,7 @@ r,opt) Next picture displays a sample usage of dispatcher. - Example 1.33. Kamailio config script - sample dispatcher usage + Example 1.32. Kamailio config script - sample dispatcher usage ... # $Id$ # sample config file for dispatcher module diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 1c74b82..46b7b03 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1562,14 +1562,6 @@ static inline int ds_update_dst(struct sip_msg *msg, str *uri, int mode) ruri_mark_new(); /* re-use uri for serial forking */ break; } - if(ds_append_branch!=0 && is_route_type(FAILURE_ROUTE)) - { - if (append_branch(msg, 0, duri, 0, Q_UNSPECIFIED, 0, 0)!=1 ) - { - LM_ERR("append_branch action failed\n"); - return -1; - } - } return 0; } diff --git a/modules_k/dispatcher/dispatch.h b/modules_k/dispatcher/dispatch.h index 4b61231..7f6637b 100644 --- a/modules_k/dispatcher/dispatch.h +++ b/modules_k/dispatcher/dispatch.h @@ -87,7 +87,6 @@ extern str ds_ping_from; extern int probing_threshhold; /*!< number of failed requests, before a destination is taken into probing */ extern int ds_probing_mode; -extern int ds_append_branch; int init_data(void); int init_ds_db(void); diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 39258d7..3f8f229 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -112,7 +112,6 @@ static str ds_ping_reply_codes_str= {NULL, 0}; static int** ds_ping_reply_codes = NULL; static int* ds_ping_reply_codes_cnt; -int ds_append_branch = 1; int ds_hash_size = 0; int ds_hash_expire = 7200; int ds_hash_initexpire = 7200; @@ -210,7 +209,6 @@ static param_export_t params[]={ {"ds_ping_interval", INT_PARAM, &ds_ping_interval}, {"ds_ping_reply_codes", STR_PARAM, &ds_ping_reply_codes_str}, {"ds_probing_mode", INT_PARAM, &ds_probing_mode}, - {"ds_append_branch", INT_PARAM, &ds_append_branch}, {"ds_hash_size", INT_PARAM, &ds_hash_size}, {"ds_hash_expire", INT_PARAM, &ds_hash_expire}, {"ds_hash_initexpire", INT_PARAM, &ds_hash_initexpire}, diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index bd5b7a7..f0d694c 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -589,28 +589,6 @@ modparam("dispatcher", "force_dst", 1) </section> <section> - <title><varname>ds_append_branch</varname> (int)</title> - <para> - If set to 1, functions will automaticall append a new branch if - called in FAILURE_ROUTE. If set to 0, script writer has to call - append_branch() in config after calling dispatcher functions. - </para> - <para> - <emphasis> - Default value is <quote>1</quote>. - </emphasis> - </para> - <example> - <title>Set the <quote>ds_append_branch</quote> parameter</title> - <programlisting format="linespecific"> - ... - modparam("dispatcher", "ds_append_branch", 0) - ... - </programlisting> - </example> - </section> - - <section> <title><varname>ds_hash_size</varname> (int)</title> <para> The value to be used as power of two to set the number of slots

14 years, 4 months

git:master: kamailio.cfg: fixed type in nat sipping flag name

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e2fc8e8092d2e25a11f0fc12d26a5c2f4c4c0eb5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2fc8e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 16:58:01 2010 +0200 kamailio.cfg: fixed type in nat sipping flag name - reported by Rouskol Andrey --- etc/kamailio.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index c2ef9e9..08183ff 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -546,7 +546,7 @@ route[REGISTRAR] { { setbflag(FLB_NATB); # uncomment next line to do SIP NAT pinging - ## setbflag(FLB_SIPPING); + ## setbflag(FLB_NATSIPPING); } if (!save("location")) sl_reply_error();

14 years, 4 months

git:master: mtree: option to ignore duplicates

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 427e4c0f5f8dd8665a5484e724154921a2b896b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=427e4c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 16:51:56 2010 +0200 mtree: option to ignore duplicates - when testing with lot of data generated randomnly (usage and performance profiling) there might be duplicates that can be ignored --- modules/mtree/README | 19 +++++++++++++++++-- modules/mtree/doc/mtree_admin.xml | 20 ++++++++++++++++++++ modules/mtree/mtree.c | 3 +++ modules/mtree/mtree_mod.c | 2 ++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index 7aaa4fd..6391512 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -35,6 +35,7 @@ Daniel-Constantin Mierla 3.8. char_list (string) 3.9. pv_value (string) 3.10. mt_tree_type (integer) + 3.11. mt_ignore_duplicates (integer) 4. Exported Functions @@ -58,7 +59,8 @@ Daniel-Constantin Mierla 1.8. Set char_list parameter 1.9. Set pv_value parameter 1.10. Set mt_tree_type parameter - 1.11. mt_match usage + 1.11. Set mt_ignore_duplicates parameter + 1.12. mt_match usage Chapter 1. Admin Guide @@ -82,6 +84,7 @@ Chapter 1. Admin Guide 3.8. char_list (string) 3.9. pv_value (string) 3.10. mt_tree_type (integer) + 3.11. mt_ignore_duplicates (integer) 4. Exported Functions @@ -126,6 +129,7 @@ Chapter 1. Admin Guide 3.8. char_list (string) 3.9. pv_value (string) 3.10. mt_tree_type (integer) + 3.11. mt_ignore_duplicates (integer) 3.1. db_url (string) @@ -239,6 +243,17 @@ modparam("mtree", "pv_value", "$var(mtval)") modparam("mtree", "mt_tree_type", 1) ... +3.11. mt_ignore_duplicates (integer) + + Ignore duplicated prefixes when loading data. + + Default value is 0. + + Example 1.11. Set mt_ignore_duplicates parameter +... +modparam("mtree", "mt_ignore_duplicates", 1) +... + 4. Exported Functions 4.1. mt_match(mtree, pv, mode) @@ -248,7 +263,7 @@ modparam("mtree", "mt_tree_type", 1) Match 'pv' value against mtree. mode is reserved for further use, now set any integer or PV. - Example 1.11. mt_match usage + Example 1.12. mt_match usage ... mt_match("mytree", "$rU", "0"); ... diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index 64e4c00..fd471a1 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -255,6 +255,26 @@ modparam("mtree", "mt_tree_type", 1) </example> </section> + <section> + <title><varname>mt_ignore_duplicates</varname> (integer)</title> + <para> + Ignore duplicated prefixes when loading data. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>mt_ignore_duplicates</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mtree", "mt_ignore_duplicates", 1) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index 84a798d..3678040 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -43,6 +43,7 @@ extern pv_spec_t pv_value; extern pv_spec_t pv_dstid; extern pv_spec_t pv_weight; extern int _mt_tree_type; +extern int _mt_ignore_duplicates; /** structures containing prefix-value pairs */ static m_tree_t **_ptree = NULL; @@ -207,6 +208,8 @@ int mt_add_to_tree(m_tree_t *pt, str *sp, str *sv) sp->len, sp->s, sv->len, sv->s, itn0[_mt_char_table[(unsigned int)sp->s[l]]].tvalue.len, itn0[_mt_char_table[(unsigned int)sp->s[l]]].tvalue.s); + if(_mt_ignore_duplicates!=0) + return 1; return -1; } diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index e89987a..aeb98ad 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -90,6 +90,7 @@ pv_spec_t pv_dstid; pv_spec_t pv_weight; pv_spec_t pv_count; int _mt_tree_type = MT_TREE_SVAL; +int _mt_ignore_duplicates = 0; /* lock, ref counter and flag used for reloading the date */ static gen_lock_t *mt_lock = 0; @@ -136,6 +137,7 @@ static param_export_t params[]={ {"pv_weight", STR_PARAM, &weight_param.s}, {"pv_count", STR_PARAM, &count_param.s}, {"mt_tree_type", INT_PARAM, &_mt_tree_type}, + {"mt_ignore_duplicates", INT_PARAM, &_mt_ignore_duplicates}, {0, 0, 0} };

14 years, 4 months

git:master: mtree: exposed internal usage data via mi

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f448386d214b5bca734ea4ba1dc5388b23b3a5f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f448386… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 1 15:36:50 2010 +0200 mtree: exposed internal usage data via mi - good for troubleshooting memory usage --- modules/mtree/README | 33 ++++++++++++++++------ modules/mtree/doc/mtree_admin.xml | 20 +++++++++++++ modules/mtree/mtree.c | 6 ++++ modules/mtree/mtree.h | 3 ++ modules/mtree/mtree_mod.c | 55 +++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 9 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index f11bac1..7aaa4fd 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2010 Daniel-Constantin Mierla (asipto.com) + Copyright © 2010 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ Table of Contents @@ -44,6 +44,7 @@ Daniel-Constantin Mierla 5.1. mt_list 5.2. mt_reload + 5.3. mt_summary List of Examples @@ -90,6 +91,7 @@ Chapter 1. Admin Guide 5.1. mt_list 5.2. mt_reload + 5.3. mt_summary 1. Overview @@ -129,7 +131,7 @@ Chapter 1. Admin Guide URL of the database server to be used. - Default value is "mysql://openser:openserrw@localhost/openser". + Default value is “mysql://openser:openserrw@localhost/openser”. Example 1.1. Set db_url parameter ... @@ -141,7 +143,7 @@ modparam("mtree", "db_url", "dbdriver://username:password@dbhost/dbname") Name of DB table where data for trees is store. It is ignored if a 'mtree' parameter is defined. - Default value is "mtrees". + Default value is “mtrees”. Example 1.2. Set db_table parameter ... @@ -152,7 +154,7 @@ modparam("mtree", "db_table", "mymtrees") Definition of memory tree - Default value is "none". + Default value is “none”. Example 1.3. Set mtree parameter ... @@ -163,7 +165,7 @@ modparam("mtree", "mtree", "name=mytable;dbtable=routes;type=0;") Name of 'tname' column. - Default value is "tname". + Default value is “tname”. Example 1.4. Set tname_column parameter ... @@ -174,7 +176,7 @@ modparam("mtree", "tname_column", "name") Name of 'tprefix' column. - Default value is "tprefix". + Default value is “tprefix”. Example 1.5. Set tprefix_column parameter ... @@ -185,7 +187,7 @@ modparam("mtree", "tprefix_column", "prefix") Name of 'tvalue' column. - Default value is "tvalue". + Default value is “tvalue”. Example 1.6. Set tvalue_column parameter ... @@ -207,7 +209,7 @@ modparam("mtree", "fetch_rows", 4000) The list with characters allowed in prefix. - Default value is "0123456789". + Default value is “0123456789”. Example 1.8. Set char_list parameter ... @@ -219,7 +221,7 @@ modparam("mtree", "char_list", "0123456789*+") The PV spec where to store the matched value. It can be any writtable PV. - Default value is "$avp(s:tvalue)". + Default value is “$avp(s:tvalue)”. Example 1.9. Set pv_value parameter ... @@ -255,6 +257,7 @@ mt_match("mytree", "$rU", "0"); 5.1. mt_list 5.2. mt_reload + 5.3. mt_summary 5.1. mt_list @@ -284,3 +287,15 @@ mt_match("mytree", "$rU", "0"); :mt_reload:_reply_fifo_file_ _mtname_ _empty_line_ + +5.3. mt_summary + + List usage summary for all trees. + + Name: mt_summary + + Parameters: none. + + MI FIFO Command Format: + :mt_summary:_reply_fifo_file_ + _empty_line_ diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index f4b9698..64e4c00 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -329,6 +329,26 @@ mt_match("mytree", "$rU", "0"); _empty_line_ </programlisting> </section> + + <section> + <title> + <function moreinfo="none">mt_summary</function> + </title> + <para> + List usage summary for all trees. + </para> + <para> + Name: <emphasis>mt_summary</emphasis> + </para> + <para>Parameters: none.</para> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :mt_summary:_reply_fifo_file_ + _empty_line_ + </programlisting> + </section> </section> </chapter> diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index f88c9e5..84a798d 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -162,6 +162,8 @@ int mt_add_to_tree(m_tree_t *pt, str *sp, str *sv) return -1; } memset(pt->head, 0, MT_NODE_SIZE*sizeof(mt_node_t)); + pt->nrnodes++; + pt->memsize += MT_NODE_SIZE*sizeof(mt_node_t); } itn0 = pt->head; @@ -184,6 +186,8 @@ int mt_add_to_tree(m_tree_t *pt, str *sp, str *sv) return -1; } memset(itn, 0, MT_NODE_SIZE*sizeof(mt_node_t)); + pt->nrnodes++; + pt->memsize += MT_NODE_SIZE*sizeof(mt_node_t); itn0[_mt_char_table[(unsigned int)sp->s[l]]].child = itn; } l++; @@ -213,6 +217,8 @@ int mt_add_to_tree(m_tree_t *pt, str *sp, str *sv) LM_ERR("no more shm mem!\n"); return -1; } + pt->memsize += (sv->len+1)*sizeof(char); + pt->nritems++; strncpy(itn0[_mt_char_table[(unsigned int)sp->s[l]]].tvalue.s, sv->s, sv->len); itn0[_mt_char_table[(unsigned int)sp->s[l]]].tvalue.len = sv->len; diff --git a/modules/mtree/mtree.h b/modules/mtree/mtree.h index 0bacb90..8cbe006 100644 --- a/modules/mtree/mtree.h +++ b/modules/mtree/mtree.h @@ -54,6 +54,9 @@ typedef struct _m_tree str tname; str dbtable; int type; + unsigned int nrnodes; + unsigned int nritems; + unsigned int memsize; mt_node_t *head; struct _m_tree *next; diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 2ab5ae5..e89987a 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -111,6 +111,7 @@ static int mt_match(struct sip_msg *msg, gparam_t *dm, gparam_t *var, static struct mi_root* mt_mi_reload(struct mi_root*, void* param); static struct mi_root* mt_mi_list(struct mi_root*, void* param); +static struct mi_root* mt_mi_summary(struct mi_root*, void* param); static int mt_load_db(str *tname); static int mt_load_db_trees(); @@ -141,6 +142,7 @@ static param_export_t params[]={ static mi_export_t mi_cmds[] = { { "mt_reload", mt_mi_reload, 0, 0, child_init }, { "mt_list", mt_mi_list, 0, 0, 0 }, + { "mt_summary", mt_mi_summary, 0, 0, 0 }, { 0, 0, 0, 0, 0} }; @@ -886,3 +888,56 @@ error: return 0; } +struct mi_root* mt_mi_summary(struct mi_root* cmd_tree, void* param) +{ + m_tree_t *pt; + struct mi_root* rpl_tree = NULL; + struct mi_node* node = NULL; + struct mi_attr* attr= NULL; + str val; + + if(!mt_defined_trees()) + { + LM_ERR("empty tree list\n"); + return init_mi_tree( 500, "No trees", 8); + } + + rpl_tree = init_mi_tree(200, MI_OK_S, MI_OK_LEN); + if(rpl_tree == NULL) + return 0; + + pt = mt_get_first_tree(); + + while(pt!=NULL) + { + node = add_mi_node_child(&rpl_tree->node, 0, "MT", 2, 0, 0); + if(node == NULL) + goto error; + attr = add_mi_attr(node, MI_DUP_VALUE, "TNAME", 5, + pt->tname.s, pt->tname.len); + if(attr == NULL) + goto error; + val.s = int2str(pt->memsize, &val.len); + attr = add_mi_attr(node, MI_DUP_VALUE, "MEMSIZE", 7, + val.s, val.len); + if(attr == NULL) + goto error; + val.s = int2str(pt->nrnodes, &val.len); + attr = add_mi_attr(node, MI_DUP_VALUE, "NRNODES", 7, + val.s, val.len); + if(attr == NULL) + goto error; + val.s = int2str(pt->nritems, &val.len); + attr = add_mi_attr(node, MI_DUP_VALUE, "NRITEMS", 7, + val.s, val.len); + if(attr == NULL) + goto error; + + pt = pt->next; + } + + return rpl_tree; +error: + free_mi_tree(rpl_tree); + return 0; +}

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev