sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: core:action.c initialized variable before usage

by Marius Zbihlei

Module: sip-router Branch: master Commit: 79cd491934b1a029403c3657d667cc0df80800a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79cd491… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 4 12:58:06 2012 +0300 core:action.c initialized variable before usage --- action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index 6178dd7..ec7df6f 100644 --- a/action.c +++ b/action.c @@ -1580,7 +1580,7 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) struct action* t; int ret; struct sr_module *mod; - unsigned int ms; + unsigned int ms = 0; ret=E_UNSPEC; h->rec_lev++;

12 years, 8 months

git:master: master: core Continue cleaning erroneous definition of functions with no arguments

by Marius Zbihlei

Module: sip-router Branch: master Commit: b264d2c6ec598ceee44a57659345d4033742f875 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b264d2c… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 4 12:51:50 2012 +0300 master:core Continue cleaning erroneous definition of functions with no arguments After testing with gcc 4.5.2, seems that not prototyping function cases extra assembler code regardles of optimization level --- pt.c | 2 +- resolve.c | 6 +++--- rpc_lookup.c | 4 ++-- select_buf.c | 2 +- tcp_main.c | 10 +++++----- tcp_read.c | 2 +- timer.c | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pt.c b/pt.c index 7764a94..46fc30c 100644 --- a/pt.c +++ b/pt.c @@ -80,7 +80,7 @@ unsigned int set_fork_delay(unsigned int v) } /* number of known "common" used fds */ -static int calc_common_open_fds_no() +static int calc_common_open_fds_no(void) { int max_fds_no; diff --git a/resolve.c b/resolve.c index 782c15a..17772b7 100644 --- a/resolve.c +++ b/resolve.c @@ -128,7 +128,7 @@ int register_resolv_reinit_cb(on_resolv_reinit cb) /* counter init function must be called before fork */ -static int stat_init() +static int stat_init(void) { if (counter_register_array("dns", dns_cnt_defs) < 0) goto error; @@ -151,7 +151,7 @@ error: * will be used. See also resolv.conf(5). * returns: 0 on success, -1 on error */ -static int _resolv_init() +static int _resolv_init(void) { res_init(); #ifdef HAVE_RESOLV_RES @@ -173,7 +173,7 @@ static int _resolv_init() } /* wrapper function to initialize the resolver at startup */ -int resolv_init() +int resolv_init(void) { int res = -1; _resolv_init(); diff --git a/rpc_lookup.c b/rpc_lookup.c index fdd1cfc..bbe551c 100644 --- a/rpc_lookup.c +++ b/rpc_lookup.c @@ -52,7 +52,7 @@ static int rpc_sarray_max_size; /* number of entries alloc'ed */ /** init the rpc hash table. * @return 0 on success, -1 on error */ -int init_rpcs() +int init_rpcs(void) { if (str_hash_alloc(&rpc_hash_table, RPC_HASH_SIZE)<0) return -1; @@ -65,7 +65,7 @@ int init_rpcs() -void destroy_rpcs() +void destroy_rpcs(void) { int r; struct str_hash_entry* e; diff --git a/select_buf.c b/select_buf.c index 84c5feb..b3463a8 100644 --- a/select_buf.c +++ b/select_buf.c @@ -136,7 +136,7 @@ char* get_static_buffer(int req_size) { * Reset offset to unused space */ -int reset_static_buffer() { +int reset_static_buffer(void) { int i; if (active_buffer == -1) { diff --git a/tcp_main.c b/tcp_main.c index b846862..1c6344c 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1725,7 +1725,7 @@ error: #ifdef TCP_FD_CACHE -static void tcp_fd_cache_init() +static void tcp_fd_cache_init(void) { int r; for (r=0; r<TCP_FD_CACHE_SIZE; r++) @@ -3174,7 +3174,7 @@ static void send_fd_queue_destroy(struct tcp_send_fd_q *q) -static int init_send_fd_queues() +static int init_send_fd_queues(void) { if (send_fd_queue_init(&send2child_q, SEND_FD_QUEUE_SIZE)!=0) goto error; @@ -3186,7 +3186,7 @@ error: -static void destroy_send_fd_queues() +static void destroy_send_fd_queues(void) { send_fd_queue_destroy(&send2child_q); } @@ -4462,7 +4462,7 @@ static ticks_t tcpconn_main_timeout(ticks_t t, struct timer_ln* tl, void* data) -static inline void tcp_timer_run() +static inline void tcp_timer_run(void) { ticks_t ticks; @@ -4480,7 +4480,7 @@ static inline void tcp_timer_run() * cleanup(). However it's also safe to call it from the tcp_main process. * => with the ser shutdown exception, it cannot execute in parallel * with tcpconn_add() or tcpconn_destroy()*/ -static inline void tcpconn_destroy_all() +static inline void tcpconn_destroy_all(void) { struct tcp_connection *c, *next; unsigned h; diff --git a/tcp_read.c b/tcp_read.c index 05e4d44..f73a239 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -1509,7 +1509,7 @@ error: -inline static void tcp_reader_timer_run() +inline static void tcp_reader_timer_run(void) { ticks_t ticks; diff --git a/timer.c b/timer.c index 205efa6..a735197 100644 --- a/timer.c +++ b/timer.c @@ -411,7 +411,7 @@ void check_ser_drift(); * - it works ok as long as the adjustment interval < MAX_TICKS_T * -- andrei */ -inline static void adjust_ticks() +inline static void adjust_ticks(void) { struct timeval crt_time; long long diff_time; @@ -924,7 +924,7 @@ inline static void timer_list_expire(ticks_t t, struct timer_head* h * WARNING: it should never be called twice for the same *ticks value * (it could cause too fast expires for long timers), *ticks must be also * always increasing */ -static void timer_handler() +static void timer_handler(void) { ticks_t saved_ticks; #ifdef USE_SLOW_TIMER

12 years, 8 months

git:master: fixed some compile warnings

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b93c46c681c17d090f6fda71d91e057ac8e919be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b93c46c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 4 11:11:49 2012 +0200 fixed some compile warnings - reported by Juha Heinanen --- lib/srdb1/db_query.c | 2 +- modules_k/textops/textops.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/srdb1/db_query.c b/lib/srdb1/db_query.c index 99079dc..004d10c 100644 --- a/lib/srdb1/db_query.c +++ b/lib/srdb1/db_query.c @@ -47,7 +47,7 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int (*submit_query)(const db1_con_t*, const str*)) { int ret; - unsigned int ms; + unsigned int ms = 0; if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) ms = TICKS_TO_MS(get_ticks_raw()); diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index 4628a3c..86e47a8 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -2158,7 +2158,7 @@ int fixup_free_regexp_none(void** param, int param_no) static int search_hf_f(struct sip_msg* msg, char* str_hf, char* re, char *flags) { hdr_field_t *hf; - hdr_field_t *hfl; + hdr_field_t *hfl = NULL; str body; gparam_t *gp; regmatch_t pmatch; @@ -2239,7 +2239,7 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag int nmatches; str body; hdr_field_t *hf; - hdr_field_t *hfl; + hdr_field_t *hfl = NULL; gparam_t *gp; char c; int ret;

12 years, 8 months

git:master: lib/srdb1/schema/domain[_attrs].xml: schema fixes

by admin＠sip-router.org

Module: sip-router Branch: master Commit: e9c2f7dc17dd4a4d2ae133d8a04458a86f76a420 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9c2f7d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 3 15:57:27 2012 +0300 lib/srdb1/schema/domain[_attrs].xml: schema fixes --- lib/srdb1/schema/domain.xml | 3 +-- lib/srdb1/schema/domain_attrs.xml | 8 -------- 2 files changed, 1 insertions(+), 10 deletions(-) diff --git a/lib/srdb1/schema/domain.xml b/lib/srdb1/schema/domain.xml index 83be326..acd0d70 100644 --- a/lib/srdb1/schema/domain.xml +++ b/lib/srdb1/schema/domain.xml @@ -31,8 +31,6 @@ <type>string</type> <size>&domain_len;</size> <description>Domain name</description> - <default/> - <natural/> </column> <column id="did"> @@ -41,6 +39,7 @@ <size>&domain_len;</size> <description>Domain id. Value of did column may be NULL, which means that it has the same value as domain column.</description> + <default><null/></default> <null/> </column> diff --git a/lib/srdb1/schema/domain_attrs.xml b/lib/srdb1/schema/domain_attrs.xml index cf3ce3c..6f60781 100644 --- a/lib/srdb1/schema/domain_attrs.xml +++ b/lib/srdb1/schema/domain_attrs.xml @@ -31,8 +31,6 @@ <type>string</type> <size>&domain_len;</size> <description>Domain id</description> - <default/> - <natural/> </column> <column id="name"> @@ -40,16 +38,12 @@ <type>string</type> <size>32</size> <description>Name of attribute</description> - <default/> - <natural/> </column> <column id="type"> <name>type</name> <type>unsigned int</type> <description>Type of attribute (0=integer, 2=string)</description> - <default/> - <natural/> </column> <column id="value"> @@ -57,8 +51,6 @@ <type>string</type> <size>255</size> <description>Value of attribute</description> - <default/> - <natural/> </column> <column>

12 years, 8 months

git:master: modules_k/domain: removed/downgraded INFO syslog messages

by admin＠sip-router.org

Module: sip-router Branch: master Commit: 4401fc5a7dde019578a79c7abf01d3373c92c7b8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4401fc5… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 3 15:05:26 2012 +0300 modules_k/domain: removed/downgraded INFO syslog messages --- modules_k/domain/domain.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/modules_k/domain/domain.c b/modules_k/domain/domain.c index 82d4b41..b13ff7f 100644 --- a/modules_k/domain/domain.c +++ b/modules_k/domain/domain.c @@ -310,11 +310,9 @@ int reload_tables ( void ) /* Choose new hash table and free its old contents */ if (*hash_table == hash_table_1) { - LM_INFO("new hash table is 2\n"); hash_table_free(hash_table_2); new_hash_table = hash_table_2; } else { - LM_INFO("new hash table is 1\n"); hash_table_free(hash_table_1); new_hash_table = hash_table_1; } @@ -464,7 +462,7 @@ int reload_tables ( void ) } } - LM_INFO("inserting <did/domain> = <%s/%s> into hash table\n", + LM_DBG("inserting <did/domain> = <%s/%s> into hash table\n", did.s, domain.s); if (hash_table_install(new_hash_table, &did, &domain) == -1) {

12 years, 8 months

git:master: modules_k/domain: did column of domain table is by default NULL

by admin＠sip-router.org

Module: sip-router Branch: master Commit: a12f916596057443ad8c5824af1a1d4e03cb7ce0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a12f916… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 3 14:30:03 2012 +0300 modules_k/domain: did column of domain table is by default NULL - In order to make migration from 3.2 easier, allow did column of domain table to be NULL. If NULL, value of did is assumed to be same as value of domain. --- lib/srdb1/schema/domain.xml | 6 +++--- modules_k/domain/README | 3 ++- modules_k/domain/doc/domain_admin.xml | 4 +++- modules_k/domain/domain.c | 33 +++++++++++++++++++-------------- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/lib/srdb1/schema/domain.xml b/lib/srdb1/schema/domain.xml index 7e6a6aa..83be326 100644 --- a/lib/srdb1/schema/domain.xml +++ b/lib/srdb1/schema/domain.xml @@ -39,9 +39,9 @@ <name>did</name> <type>string</type> <size>&domain_len;</size> - <description>Domain id</description> - <default/> - <natural/> + <description>Domain id. Value of did column may be NULL, which + means that it has the same value as domain column.</description> + <null/> </column> <column> diff --git a/modules_k/domain/README b/modules_k/domain/README index aa9bf2f..e57406e 100644 --- a/modules_k/domain/README +++ b/modules_k/domain/README @@ -174,7 +174,8 @@ modparam("domain", "domain_attrs_table", "local_domain_attributes") 3.4. did_col (string) Name of column containing domain id (did) of domain in domain and - domain_attrs tables. + domain_attrs tables. In domain table, a did column value may be NULL, + which means that it has same value as domain column. Default value is “did”. diff --git a/modules_k/domain/doc/domain_admin.xml b/modules_k/domain/doc/domain_admin.xml index 9d89555..f11466e 100644 --- a/modules_k/domain/doc/domain_admin.xml +++ b/modules_k/domain/doc/domain_admin.xml @@ -102,7 +102,9 @@ modparam("domain", "domain_attrs_table", "local_domain_attributes") <title><varname>did_col</varname> (string)</title> <para> Name of column containing domain id (did) of domain in domain - and domain_attrs tables. + and domain_attrs tables. In domain table, a did column value + may be NULL, which means that it has same value as + domain column. </para> <para> Default value is <quote>did</quote>. diff --git a/modules_k/domain/domain.c b/modules_k/domain/domain.c index 61e2b07..82d4b41 100644 --- a/modules_k/domain/domain.c +++ b/modules_k/domain/domain.c @@ -414,8 +414,8 @@ int reload_tables ( void ) domain_dbf.free_result(db_handle, res); res = NULL; - cols[0] = &did_col; - cols[1] = &domain_col; + cols[0] = &domain_col; + cols[1] = &did_col; if (domain_dbf.use_table(db_handle, &domain_table) < 0) { LM_ERR("error while trying to use domain table\n"); @@ -437,26 +437,31 @@ int reload_tables ( void ) if ((VAL_NULL(ROW_VALUES(row)) == 1) || (VAL_TYPE(ROW_VALUES(row)) != DB1_STRING)) { - LM_ERR("did at row <%u> is null or not string\n", i); + LM_ERR("domain at row <%u> is null or not string\n", i); goto err; } - did.s = (char *)VAL_STRING(ROW_VALUES(row)); - did.len = strlen(did.s); - if (did.len == 0) { - LM_ERR("did at row <%u> is empty string\n", i); + domain.s = (char *)VAL_STRING(ROW_VALUES(row)); + domain.len = strlen(domain.s); + if (domain.len == 0) { + LM_ERR("domain at row <%u> is empty string\n", i); goto err; } - if ((VAL_NULL(ROW_VALUES(row) + 1) == 1) || + if ((VAL_NULL(ROW_VALUES(row) + 1) != 1) && (VAL_TYPE(ROW_VALUES(row) + 1) != DB1_STRING)) { - LM_ERR("domain at row <%u> is null or not string\n", i); + LM_ERR("did at row <%u> is not null or string\n", i); goto err; } - domain.s = (char *)VAL_STRING(ROW_VALUES(row) + 1); - domain.len = strlen(domain.s); - if (domain.len == 0) { - LM_ERR("domain at row <%u> is empty string\n", i); - goto err; + if (VAL_NULL(ROW_VALUES(row) + 1) == 1) { + did.s = domain.s; + did.len = domain.len; + } else { + did.s = (char *)VAL_STRING(ROW_VALUES(row) + 1); + did.len = strlen(did.s); + if (did.len == 0) { + LM_ERR("did at row <%u> is empty string\n", i); + goto err; + } } LM_INFO("inserting <did/domain> = <%s/%s> into hash table\n",

12 years, 8 months

git:master: modules_k/domain: added support for domain attributes

by admin＠sip-router.org

Module: sip-router Branch: master Commit: b6ce51e2ab0179404ba22165ea375e76d56a6f7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6ce51e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 3 13:15:35 2012 +0300 modules_k/domain: added support for domain attributes - Added new function lookup_domain that in addition to checking if domain is local, adds attributes of local domain into AVPs. - Domain attributes are stored in new table domain_attrs. - Removed support for db only mode and, as consequence, removed db_mode module variable. --- lib/srdb1/schema/domain.xml | 11 +- lib/srdb1/schema/domain_attrs.xml | 79 ++++++ lib/srdb1/schema/kamailio-domain.xml | 1 + modules_k/domain/README | 185 ++++++++++----- modules_k/domain/doc/domain.xml | 2 +- modules_k/domain/doc/domain_admin.xml | 154 +++++++++--- modules_k/domain/domain.c | 431 +++++++++++++++++++++++---------- modules_k/domain/domain.h | 7 +- modules_k/domain/domain_mod.c | 351 +++++++++++++++------------ modules_k/domain/domain_mod.h | 25 ++- modules_k/domain/hash.c | 220 +++++++++++++---- modules_k/domain/hash.h | 8 +- modules_k/domain/mi.c | 40 ++-- 13 files changed, 1061 insertions(+), 453 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b6c…

12 years, 8 months

[tracker] Task closed: not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#210 - not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c) User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=210 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.

12 years, 8 months

[tracker] Comment added: not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#210 - not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c) User who did this - Daniel-Constantin Mierla (miconda) ---------- For the records, such patch files (generated by git patch) can be directly applied with: git am /path/to/patchfile It preservers the details of the submitted patch. I am closing this one. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=210#comment514 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.

12 years, 8 months

[tracker] Task changed: not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#210 - not null-terminated string in function pipport2su (modules_k/siptrace/siptrace.c) User who did this: Alexandr Dubovikov (adubovikov) Percent Complete: 0% -> 100% More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=210 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.

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012