sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
429 discussions

git:master: enum: define the max size for numbers
by Daniel-Constantin Mierla 24 Mar '13

24 Mar '13

Module: sip-router Branch: master Commit: ef8fae0e21ca09725c7f9c06384e0a4ce37c4c6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef8fae0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 13:24:58 2013 +0100 enum: define the max size for numbers - set it to 22 (previously hardcoded value was 17) - easier to adjust and check for overlenght - patch by Marcus Hunger --- modules/enum/enum.c | 8 ++++---- modules/enum/enum.h | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 756f4e5..166be63 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -256,7 +256,7 @@ static inline int is_e164(str* _user) int i; char c; - if ((_user->len > 2) && (_user->len < 17) && ((_user->s)[0] == '+')) { + if ((_user->len > 2) && (_user->len < MAX_NUM_LEN) && ((_user->s)[0] == '+')) { for (i = 1; i < _user->len; i++) { c = (_user->s)[i]; if ((c < '0') || (c > '9')) return -1; @@ -309,7 +309,7 @@ int is_from_user_enum_2(struct sip_msg* _msg, char* _suffix, char* _service) struct naptr_rdata* naptr; str pattern, replacement, result; - char string[17]; + char string[MAX_NUM_LEN]; if (parse_from_header(_msg) < 0) { LM_ERR("Failed to parse From header\n"); @@ -754,7 +754,7 @@ int enum_query(struct sip_msg* _msg, str* suffix, str* service) char *user_s; int user_len, i, j; char name[MAX_DOMAIN_SIZE]; - char string[17]; + char string[MAX_NUM_LEN]; LM_DBG("enum_query on suffix <%.*s> service <%.*s>\n", suffix->len, suffix->s, service->len, service->s); @@ -818,7 +818,7 @@ int i_enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service) int cc_len; struct rdata* head; - char string[17]; + char string[MAX_NUM_LEN]; str *suffix, *service; diff --git a/modules/enum/enum.h b/modules/enum/enum.h index 2dffce0..d3d5e2a 100644 --- a/modules/enum/enum.h +++ b/modules/enum/enum.h @@ -37,8 +37,9 @@ #define MAX_DOMAIN_SIZE 256 -#define MAX_COMPONENT_SIZE 32 /* separator, apex, ... This simplifies checks */ - +#define MAX_NUM_LEN 22 +#define MAX_COMPONENT_SIZE (MAX_NUM_LEN * 2) /* separator, apex, ... This simplifies checks */ + /* * Check if from user is an e164 number and has a naptr record

1 0

git:master: db_mysql: new module parameter - insert_delayed
by Daniel-Constantin Mierla 24 Mar '13

24 Mar '13

Module: sip-router Branch: master Commit: 61c706ef813520ce0ac6767e6be7ef6e52bd6b3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61c706e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 13:07:39 2013 +0100 db_mysql: new module parameter - insert_delayed - if set to 1, then all INSERT API queries will be converted in INSERT DELAYED (only DB API insert, not for raw queries) --- modules/db_mysql/README | 28 ++++++++++++++++++++++------ modules/db_mysql/doc/db_mysql_admin.xml | 20 ++++++++++++++++++++ modules/db_mysql/km_db_mysql.c | 1 + modules/db_mysql/km_db_mysql.h | 1 + modules/db_mysql/km_dbase.c | 11 ++++++++--- modules/db_mysql/mysql_mod.c | 1 + 6 files changed, 53 insertions(+), 9 deletions(-) diff --git a/modules/db_mysql/README b/modules/db_mysql/README index 13a578f..def06aa 100644 --- a/modules/db_mysql/README +++ b/modules/db_mysql/README @@ -28,6 +28,7 @@ Daniel-Constantin Mierla 3.1. ping_interval (integer) 3.2. timeout_interval (integer) 3.3. auto_reconnect (integer) + 3.4. insert_delayed (integer) 4. Functions 5. Installation @@ -38,9 +39,10 @@ Daniel-Constantin Mierla 1.1. Set ping_interval parameter 1.2. Set timeout_interval parameter 1.3. Set auto_reconnect parameter - 1.4. Set a my.cnf group in db_url parameter - 1.5. Adding a kamailio group to my.cnf - 1.6. Using [client] and specific group + 1.4. Set insert_delayed parameter + 1.5. Set a my.cnf group in db_url parameter + 1.6. Adding a kamailio group to my.cnf + 1.7. Using [client] and specific group Chapter 1. Admin Guide @@ -57,6 +59,7 @@ Chapter 1. Admin Guide 3.1. ping_interval (integer) 3.2. timeout_interval (integer) 3.3. auto_reconnect (integer) + 3.4. insert_delayed (integer) 4. Functions 5. Installation @@ -89,6 +92,7 @@ Chapter 1. Admin Guide 3.1. ping_interval (integer) 3.2. timeout_interval (integer) 3.3. auto_reconnect (integer) + 3.4. insert_delayed (integer) 3.1. ping_interval (integer) @@ -132,6 +136,18 @@ modparam("db_mysql", "timeout_interval", 2) modparam("db_mysql", "auto_reconnect", 0) ... +3.4. insert_delayed (integer) + + If set to 1, all INSERT SQL queries will be sent to MySQL server as + INSERT DELAYED. + + Default value is 0 (1 - on / 0 - off). + + Example 1.4. Set insert_delayed parameter +... +modparam("db_mysql", "insert_delayed", 1) +... + 4. Functions No function exported to be used from configuration file. @@ -158,12 +174,12 @@ modparam("db_mysql", "auto_reconnect", 0) * mysql://user:pass@[group]/db * mysql://[group]/db - Example 1.4. Set a my.cnf group in db_url parameter + Example 1.5. Set a my.cnf group in db_url parameter ... modparam("usrloc", "db_url", "mysql://[kamailio]/kamailio) ... - Example 1.5. Adding a kamailio group to my.cnf + Example 1.6. Adding a kamailio group to my.cnf ... [kamailio] socket = /path/to/mysql.sock @@ -177,7 +193,7 @@ default-character-set = utf8 both your specific group and the client group, then the value is taken from the last one. - Example 1.6. Using [client] and specific group + Example 1.7. Using [client] and specific group ... [client] socket = /var/run/mysql/mysqld.sock diff --git a/modules/db_mysql/doc/db_mysql_admin.xml b/modules/db_mysql/doc/db_mysql_admin.xml index 36ce140..738c464 100644 --- a/modules/db_mysql/doc/db_mysql_admin.xml +++ b/modules/db_mysql/doc/db_mysql_admin.xml @@ -121,6 +121,26 @@ modparam("db_mysql", "auto_reconnect", 0) </programlisting> </example> </section> + <section id="db_mysql.p.insert_delayed"> + <title><varname>insert_delayed</varname> (integer)</title> + <para> + If set to 1, all INSERT SQL queries will be sent to MySQL server as + INSERT DELAYED. + </para> + <para> + <emphasis> + Default value is 0 (1 - on / 0 - off). + </emphasis> + </para> + <example> + <title>Set <varname>insert_delayed</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_mysql", "insert_delayed", 1) +... +</programlisting> + </example> + </section> </section> <section> <title>Functions</title> diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 462dc60..8a51f3d 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -50,6 +50,7 @@ unsigned int db_mysql_timeout_interval = 2; /* Default is 6 seconds */ unsigned int db_mysql_auto_reconnect = 1; /* Default is enabled */ +unsigned int db_mysql_insert_all_delayed = 0; /* Default is off */ /* MODULE_VERSION */ diff --git a/modules/db_mysql/km_db_mysql.h b/modules/db_mysql/km_db_mysql.h index 9fd9747..09997f7 100644 --- a/modules/db_mysql/km_db_mysql.h +++ b/modules/db_mysql/km_db_mysql.h @@ -42,6 +42,7 @@ extern unsigned int db_mysql_timeout_interval; extern unsigned int db_mysql_auto_reconnect; +extern unsigned int db_mysql_insert_all_delayed; int db_mysql_bind_api(db_func_t *dbb); diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index e1cce08..029a674 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -404,10 +404,15 @@ int db_mysql_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) * \param _n number of key=value pairs * \return zero on success, negative value on failure */ -int db_mysql_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n) +int db_mysql_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + const int _n) { - return db_do_insert(_h, _k, _v, _n, db_mysql_val2str, - db_mysql_submit_query); + if(unlikely(db_mysql_insert_all_delayed==1)) + return db_do_insert_delayed(_h, _k, _v, _n, db_mysql_val2str, + db_mysql_submit_query); + else + return db_do_insert(_h, _k, _v, _n, db_mysql_val2str, + db_mysql_submit_query); } diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index 74c61af..328965d 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -107,6 +107,7 @@ static param_export_t params[] = { {"timeout_interval", INT_PARAM, &db_mysql_timeout_interval}, {"auto_reconnect", INT_PARAM, &db_mysql_auto_reconnect}, + {"insert_delayed", INT_PARAM, &db_mysql_insert_all_delayed}, {0, 0, 0} };

1 0

git:master: Makefile: exclude debian sym link when generating tarball
by Daniel-Constantin Mierla 24 Mar '13

24 Mar '13

Module: sip-router Branch: master Commit: 9cbe03b3b42826c656b73a8793a8c2db9e7c3d29 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cbe03b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 12:50:50 2013 +0100 Makefile: exclude debian sym link when generating tarball --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index b7443e0..42086dd 100644 --- a/Makefile +++ b/Makefile @@ -622,6 +622,7 @@ tar: makefile_vars $(auto_gen_keep) $(TAR) -C .. \ --exclude=$(notdir $(CURDIR))/test* \ --exclude=$(notdir $(CURDIR))/tmp* \ + --exclude=$(notdir $(CURDIR))/debian \ --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME) \ --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME)-* \ --exclude=$(notdir $(CURDIR))/$(MAIN_NAME)_tls* \

1 0

msrp_parser compilation warnings
by Olle E. Johansson 24 Mar '13

24 Mar '13

CC (gcc) [M msrp.so] msrp_parser.o msrp_parser.c: In function ‘msrp_parse_uri’: msrp_parser.c:540: warning: format ‘%ld’ expects type ‘long int’, but argument 9 has type ‘int’ msrp_parser.c:540: warning: format ‘%ld’ expects type ‘long int’, but argument 7 has type ‘int’ msrp_parser.c:540: warning: format ‘%ld’ expects type ‘long int’, but argument 8 has type ‘int’ msrp_parser.c:540: warning: format ‘%ld’ expects type ‘long int’, but argument 6 has type ‘int’ msrp_parser.c:540: warning: format ‘%ld’ expects type ‘long int’, but argument 6 has type ‘int’ gcc version 4.1.2 20080704 (Red Hat 4.1.2-54) Centos 5.9 /O

2 1

git:master: msrp: fix compile warning of argument type in dbg message
by Daniel-Constantin Mierla 24 Mar '13

24 Mar '13

Module: sip-router Branch: master Commit: 7339d847adfd098c58426e96e5e3730ad580d543 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7339d84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 24 12:38:45 2013 +0100 msrp: fix compile warning of argument type in dbg message - reported by Olle E. Johansson --- modules/msrp/msrp_parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/msrp/msrp_parser.c b/modules/msrp/msrp_parser.c index 585d090..d7a2ced 100644 --- a/modules/msrp/msrp_parser.c +++ b/modules/msrp/msrp_parser.c @@ -538,7 +538,7 @@ int msrp_parse_uri(char *start, int len, msrp_uri_t *uri) error: LM_ERR("parsing error in [%.*s] at [%ld]\n", - len, start, s - start); + len, start, (long int)(s - start)); memset(uri, 0, sizeof(msrp_uri_t)); return -1; }

1 0

git:master: snmpstats Clear upp method-supported logic a bit and add " dialog-ng" for call statefullness
by Olle E. Johansson 24 Mar '13

24 Mar '13

Module: sip-router Branch: master Commit: bb76415ba7b623242a84b295728e61d307ab48fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb76415… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Mar 24 11:45:43 2013 +0100 snmpstats Clear upp method-supported logic a bit and add "dialog-ng" for call statefullness --- modules/snmpstats/snmpSIPMethodSupportedTable.c | 20 +++++--------------- modules/snmpstats/snmpSIPServerObjects.c | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/modules/snmpstats/snmpSIPMethodSupportedTable.c b/modules/snmpstats/snmpSIPMethodSupportedTable.c index 756dfce..92cc8b6 100644 --- a/modules/snmpstats/snmpSIPMethodSupportedTable.c +++ b/modules/snmpstats/snmpSIPMethodSupportedTable.c @@ -140,23 +140,16 @@ void init_kamailioSIPMethodSupportedTable(void) * NOTE: My way of checking what METHODS we support is probably wrong. * Please feel free to correct it! */ - if (module_loaded("sl")) { - createRow(1, "METHOD_INVITE"); - createRow(2, "METHOD_CANCEL"); - createRow(3, "METHOD_ACK"); - } - - if (module_loaded("tm")) { - createRow(4, "METHOD_BYE"); - } + createRow(1, "METHOD_INVITE"); + createRow(2, "METHOD_CANCEL"); + createRow(3, "METHOD_ACK"); + createRow(4, "METHOD_BYE"); if (module_loaded("options") || module_loaded("siputils")) { createRow(6, "METHOD_OPTIONS"); } - if (module_loaded("dialog")) { - createRow(7, "METHOD_UPDATE"); - } + createRow(7, "METHOD_UPDATE"); if (module_loaded("registrar")) { createRow(8, "METHOD_REGISTER"); @@ -166,9 +159,6 @@ void init_kamailioSIPMethodSupportedTable(void) createRow(5, "METHOD_INFO"); createRow(9, "METHOD_MESSAGE"); - - /* I'm not sure what these guys are, so saying we support them by - * default. */ createRow(12, "METHOD_PRACK"); createRow(13, "METHOD_REFER"); createRow(14, "METHOD_PUBLISH"); diff --git a/modules/snmpstats/snmpSIPServerObjects.c b/modules/snmpstats/snmpSIPServerObjects.c index 07e64e4..4ab497d 100644 --- a/modules/snmpstats/snmpSIPServerObjects.c +++ b/modules/snmpstats/snmpSIPServerObjects.c @@ -196,7 +196,7 @@ int handle_kamailioSIPProxyStatefulness(netsnmp_mib_handler *handler, { int statefullness; - if (module_loaded("dialog")) + if (module_loaded("dialog") || module_loaded("dialog_ng")) { statefullness = PROXY_STATEFULNESS_CALL_STATEFUL; }

1 0

git:master: snmpstats Add SNMP support for shared memory
by Olle E. Johansson 24 Mar '13

24 Mar '13

Module: sip-router Branch: master Commit: 3580d7fbc3318a2eefaa62e60fcad363e953cccb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3580d7f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Mar 24 11:38:27 2013 +0100 snmpstats Add SNMP support for shared memory This is just the first proof-of-concept addition, will add more of the core variables for memory and TCP connections --- modules/snmpstats/kamailioServer.c | 126 ++++++++++++++++++++++++ modules/snmpstats/kamailioServer.h | 42 ++++++++ modules/snmpstats/mibs/KAMAILIO-MIB | 65 ++++++++++++ modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB | 1 - modules/snmpstats/sub_agent.c | 8 ++ 5 files changed, 241 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=358…

1 0

[tracker] Comment added: usrloc module stops updating some records in db_mode 2 (Attachment added)
by sip-router 23 Mar '13

23 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Jordan (jordan) ---------- I've attached the output of 'kamailio -V'. This is 3.3.4 compiled and installed from the source tarball on March 4, 2013. The bad contact hasn't expired according to the output of 'kamctl ul show', but look at the value stored in the database. I forgot to mention that I generated the output of bad.txt yesterday, on March 22, 2013. The `expires` and `last_modified` fields in the database show March 5, 2013---nearly 20 days earlier. One thing I noticed is the Call-ID is different in the DB vs. in-memory. Kamailio is sending SQL update queries with the where clause matching on three fields: username, contact, and callid. Since kamailio has a different Call-ID in memory, the row is never matched when it tries to update. ---------- One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=278#comment794 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 closed: Internal timer lags real time by the startup time
by sip-router 23 Mar '13

23 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#243 - Internal timer lags real time by the startup time User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=243 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 closed: Problem with SUBSCRIBE presence status on WEBSOCKET protocol
by sip-router 23 Mar '13

23 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#276 - Problem with SUBSCRIBE presence status on WEBSOCKET protocol User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=276 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

← Newer
1
...
12
13
14
15
16
17
18
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013