sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
273 discussions

git:master:dc2d3c3f: Makefile: kamailio user home dir set to /var/run/kamailio for install-initd-centos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dc2d3c3f609c81e21928390110952f4070ea9c62 URL: https://github.com/kamailio/kamailio/commit/dc2d3c3f609c81e21928390110952f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-19T12:06:30+02:00 Makefile: kamailio user home dir set to /var/run/kamailio for install-initd-centos - affects the useradd command - it was pointing to lib dir --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/dc2d3c3f609c81e21928390110952f4… Patch: https://github.com/kamailio/kamailio/commit/dc2d3c3f609c81e21928390110952f4… --- diff --git a/Makefile b/Makefile index efd58cc..2d28777 100644 --- a/Makefile +++ b/Makefile @@ -999,7 +999,7 @@ install_initd_centos install-initd-centos: > /etc/default/$(NAME) /usr/sbin/groupadd -r $(NAME) /usr/sbin/useradd -r -g $(NAME) -s /bin/false -c "Kamailio Daemon" \ - -d ${lib_prefix}/${lib_dir} $(NAME) + -d /var/run/$(NAME) $(NAME) .PHONY: dbschema dbschema:

8 years, 11 months

git:master:0870ab88: sdpops: don't return 0 if no match for sdp_get_line_startswith()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0870ab88262bb61124899ad98d06a72a6cdc7129 URL: https://github.com/kamailio/kamailio/commit/0870ab88262bb61124899ad98d06a72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-19T11:56:56+02:00 sdpops: don't return 0 if no match for sdp_get_line_startswith() - that causes exit of config execution - reported by Sebastian Damm --- Modified: modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0870ab88262bb61124899ad98d06a72… Patch: https://github.com/kamailio/kamailio/commit/0870ab88262bb61124899ad98d06a72… --- diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 2a4aa6b..f853996 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -1657,7 +1657,7 @@ static int w_sdp_get_line_startswith(sip_msg_t *msg, char *avp, char *s_line) p = find_sdp_line(line.s + line.len, body.s + body.len, sline.s[0]); } - return 0; + return -1; } /**

8 years, 11 months

[kamailio] Allow domain_attrs 'type' field to be a mysql BIGINT (#182)

by divereigh

Allow 'type' field in domain_attrs to be a DB1_BIGINT as well as a DB1_INT. If you are using a view with 'type' as a calculated field on a 64 bit machine, then mysql will return the type of 'type' to be a bigint, not an int (and no amount of CASTing or CONVERTing will fix it). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/182 -- Commit Summary -- * Allow 'type' field in domain_attrs to be a DB1_BIGINT as well as a -- File Changes -- M modules/domain/domain.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/182.patch https://github.com/kamailio/kamailio/pull/182.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/182

8 years, 11 months

git:master:e6f3a512: domain: allow 'type' field in domain_attrs to be a DB1_BIGINT

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e6f3a512c599678fca08daca561bcad4c05add23 URL: https://github.com/kamailio/kamailio/commit/e6f3a512c599678fca08daca561bcad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-19T10:41:08+02:00 domain: allow 'type' field in domain_attrs to be a DB1_BIGINT - in addition to allowing DB1_INT - makes it work with MySQL views on 64bit systems - based on a patch by divereigh, GH#182 --- Modified: modules/domain/domain.c --- Diff: https://github.com/kamailio/kamailio/commit/e6f3a512c599678fca08daca561bcad… Patch: https://github.com/kamailio/kamailio/commit/e6f3a512c599678fca08daca561bcad… --- diff --git a/modules/domain/domain.c b/modules/domain/domain.c index 19943ab..65b6aed 100644 --- a/modules/domain/domain.c +++ b/modules/domain/domain.c @@ -362,11 +362,16 @@ int reload_tables ( void ) } if ((VAL_NULL(ROW_VALUES(row) + 2) == 1) || - (VAL_TYPE(ROW_VALUES(row) + 2) != DB1_INT)) { + ((VAL_TYPE(ROW_VALUES(row) + 2) != DB1_INT) && + (VAL_TYPE(ROW_VALUES(row) + 2) != DB1_BIGINT))) { LM_ERR("type at row <%u> is null or not int\n", i); goto err; } - type = (int)VAL_INT(ROW_VALUES(row) + 2); + if(VAL_TYPE(ROW_VALUES(row) + 2) == DB1_BIGINT) { + type = (int)VAL_BIGINT(ROW_VALUES(row) + 2); + } else { + type = (int)VAL_INT(ROW_VALUES(row) + 2); + } if ((type != 0) && (type != 2)) { LM_ERR("unknown type <%d> at row <%u>\n", type, i); goto err;

8 years, 11 months

git:master:e0e6994f: Merge pull request #175 from smititelu/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e0e6994fcaa52bb1819bc8aea5d6edc6f9bf8e22 URL: https://github.com/kamailio/kamailio/commit/e0e6994fcaa52bb1819bc8aea5d6edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-19T10:35:23+02:00 Merge pull request #175 from smititelu/master debugger module: add per module facility logging + add a debug SIP message config function --- Modified: dprint.c Modified: dprint.h Modified: modules/debugger/debugger_api.c Modified: modules/debugger/debugger_api.h Modified: modules/debugger/debugger_config.c Modified: modules/debugger/debugger_config.h Modified: modules/debugger/debugger_mod.c Modified: modules/debugger/doc/debugger_admin.xml Modified: msg_translator.c Modified: msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/e0e6994fcaa52bb1819bc8aea5d6edc… Patch: https://github.com/kamailio/kamailio/commit/e0e6994fcaa52bb1819bc8aea5d6edc…

8 years, 11 months

git:master:363027e7: debugger: add a new dbg_sip_msg() config function

by Stefan Mititelu

Module: kamailio Branch: master Commit: 363027e7fc5020ba80f0b183fc87921f3d3b641b URL: https://github.com/kamailio/kamailio/commit/363027e7fc5020ba80f0b183fc87921… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-06-10T15:43:36+03:00 debugger: add a new dbg_sip_msg() config function Added a config function which prints how the sip message would look like if it were to be sent out at that point in config. Displays how the message looks after apllying all the lumps; but it is just printing, not actual lump application. Updated doku. --- Modified: dprint.h Modified: modules/debugger/debugger_mod.c Modified: modules/debugger/doc/debugger_admin.xml Modified: msg_translator.c Modified: msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/363027e7fc5020ba80f0b183fc87921… Patch: https://github.com/kamailio/kamailio/commit/363027e7fc5020ba80f0b183fc87921…

8 years, 11 months

git:master:57e05de6: debugger: updated documentation for the new facility parameters.

by Stefan Mititelu

Module: kamailio Branch: master Commit: 57e05de6dbb2de117be32b785944dabdbff4e49e URL: https://github.com/kamailio/kamailio/commit/57e05de6dbb2de117be32b785944dab… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-06-10T15:41:43+03:00 debugger: updated documentation for the new facility parameters. Updated documentation for the new debugger facility params. --- Modified: modules/debugger/doc/debugger_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/57e05de6dbb2de117be32b785944dab… Patch: https://github.com/kamailio/kamailio/commit/57e05de6dbb2de117be32b785944dab… --- diff --git a/modules/debugger/doc/debugger_admin.xml b/modules/debugger/doc/debugger_admin.xml index 031e9e0..c4b6eb2 100644 --- a/modules/debugger/doc/debugger_admin.xml +++ b/modules/debugger/doc/debugger_admin.xml @@ -19,8 +19,9 @@ <para> This module provides an interactive config file debugger. It can print a trace of config script execution for a SIP message to log and set - breakpoints on every script action, allowing step-by-step execution of - the routing and response scripts. + breakpoints on every script action, allowing step-by-step execution of + the routing and response scripts. Moreover, this module allows setting + static and dynamic module specific debug settings. </para> <para> Debugging can be done from local or remote host via RPC interface (e.g., @@ -247,8 +248,11 @@ modparam("debugger", "step_loops", 100) <title><varname>mod_hash_size</varname> (int)</title> <para> Used to compute power of two as size of internal hash table to store levels - per module (e.g., if its set to 4, internal hash table has 16 slots). This - parameter is accesible readonly via the Kamailio config framework. + per module (e.g., if its set to 4, internal hash table has 16 slots). One + must set it's value grater than 0 such that memory to be allocated + to save the module specific debug levels or facility configured by + <varname>mod_level</varname> or <varname>mod_facility</varname>. + This parameter is accesible readonly via the Kamailio config framework. </para> <para> <emphasis> @@ -306,6 +310,52 @@ modparam("debugger", "mod_level", "tm=3") </example> </section> + <section id="dbg.p.mod_facility_mode"> + <title><varname>mod_facility_mode</varname> (int)</title> + <para> + Enable or disable per module log facility (0 - disabled, 1 - enabled). + This parameter is tunable via the Kamailio config framework. To use + per module log facility you also have to set <varname>mod_hash_size</varname>. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>mod_facility_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "mod_facility_mode", 1) +... + </programlisting> + </example> + </section> + + <section id="dbg.p.mod_facility"> + <title><varname>mod_facility</varname> (str)</title> + <para> + Specify module log facility - the value must be in the format: + modulename=facility. The parameter can be set many times. For core + log facility, use module name 'core'. You also must enable + <varname>mod_facility_mode</varname> and <varname>mod_hash_size</varname>. + </para> + <para> + NOTE: See the <emphasis>syslog()</emphasis> library call for facility names (http://linux.die.net/man/3/syslog). + The most used facilities are LOG_LOCAL[0-7]. + </para> + + <example> + <title>Set <varname>mod_facility</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "mod_facility", "core=LOG_LOCAL0") +modparam("debugger", "mod_facility", "debugger=LOG_LOCAL1") +... + </programlisting> + </example> + </section> + <section id="dbg.p.log_assign"> <title><varname>log_assign</varname> (int)</title> <para>

8 years, 11 months

git:master:e5250430: debugger: add support for static and dynamic, module specific, logging facility

by Stefan Mititelu

Module: kamailio Branch: master Commit: e5250430035b6e620dd1ac86d2fb9ebcbc717d84 URL: https://github.com/kamailio/kamailio/commit/e5250430035b6e620dd1ac86d2fb9eb… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-06-10T15:41:43+03:00 debugger: add support for static and dynamic, module specific, logging facility Added two new debugger params which will support setting per module logging facility. This is useful when one might want to change logging for a certain module to a different file. mod_facility_mode (0/1) is used for enabling this. mod_facility (str) is used for setting the facility. --- Modified: dprint.c Modified: dprint.h Modified: modules/debugger/debugger_api.c Modified: modules/debugger/debugger_api.h Modified: modules/debugger/debugger_config.c Modified: modules/debugger/debugger_config.h Modified: modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e5250430035b6e620dd1ac86d2fb9eb… Patch: https://github.com/kamailio/kamailio/commit/e5250430035b6e620dd1ac86d2fb9eb…

8 years, 11 months

[kamailio] debugger module: add per module facility logging (#175)

by Stefan Mititelu

Added 2 new params to the debugger module such as the per module facility logging is now possible. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/175 -- Commit Summary -- * debugger: add support for static and dynamic, module specific, logging facility * debugger: updated documentation for the new facility parameters. -- File Changes -- M dprint.c (45) M dprint.h (17) M modules/debugger/debugger_api.c (176) M modules/debugger/debugger_api.h (2) M modules/debugger/debugger_config.c (6) M modules/debugger/debugger_config.h (3) M modules/debugger/debugger_mod.c (47) M modules/debugger/doc/debugger_admin.xml (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/175.patch https://github.com/kamailio/kamailio/pull/175.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/175

8 years, 11 months

git:master:2a42a17d: Merge pull request #216 from kamailio/db_text_raw_query

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2a42a17d4ff434da065a988be1c8b9cdaa1938ed URL: https://github.com/kamailio/kamailio/commit/2a42a17d4ff434da065a988be1c8b9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-19T10:04:48+02:00 Merge pull request #216 from kamailio/db_text_raw_query db_text : support 'order by' in raw query --- Modified: modules/db_text/dbt_raw_query.c Modified: modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/2a42a17d4ff434da065a988be1c8b9c… Patch: https://github.com/kamailio/kamailio/commit/2a42a17d4ff434da065a988be1c8b9c… --- diff --git a/modules/db_text/dbt_raw_query.c b/modules/db_text/dbt_raw_query.c index 143a585..ef62503 100644 --- a/modules/db_text/dbt_raw_query.c +++ b/modules/db_text/dbt_raw_query.c @@ -41,6 +41,7 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) char* fields_end_ptr = NULL; char* fields_ptr = NULL; char* where_ptr = NULL; + char* order_start_ptr = NULL; char** tokens = NULL; str table; dbt_table_p _tbc = NULL; @@ -52,6 +53,10 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) db_key_t* _k = NULL; db_op_t* _op = NULL; db_val_t* _v = NULL; + str order; + db_key_t k_order = NULL; + + LM_DBG("SQLRAW : %.*s\n", _s->len, _s->s); fields_end_ptr = strcasestr(_s->s, " from "); if(fields_end_ptr == NULL) @@ -63,6 +68,11 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) fields_ptr[len] = '\0'; fields_ptr = dbt_trim(fields_ptr); + order_start_ptr = strcasestr(_s->s, " order by "); + if(order_start_ptr != NULL) { + *order_start_ptr = '\0'; + order_start_ptr += 10; + } where_ptr = strcasestr(_s->s, " where "); @@ -80,6 +90,7 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) table.s = table_ptr; table.len = len; + LM_DBG("using table '%.*s'\n", table.len, table.s); if(dbt_use_table(_h, &table) != 0) { LM_ERR("use table is invalid %.*s\n", table.len, table.s); @@ -120,9 +131,13 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); - _tbc = NULL; - - res = dbt_query(_h, _k, _op, _v, result_cols, nc, cols, NULL, _r); + _tbc = NULL; + if(order_start_ptr != NULL) { + order.s = order_start_ptr; + order.len = strlen(order_start_ptr); + k_order = &order; + } + res = dbt_query(_h, _k, _op, _v, result_cols, nc, cols, k_order, _r); error: diff --git a/modules/db_text/dbt_raw_util.c b/modules/db_text/dbt_raw_util.c index f000f3b..97012cc 100644 --- a/modules/db_text/dbt_raw_util.c +++ b/modules/db_text/dbt_raw_util.c @@ -31,7 +31,8 @@ #include "dbt_raw_util.h" -static const char* _regexp = "\\s*(and|or)?\\s*(\\w*)\\s*(>=|<=|<>|=|>|<)\\s*(')?([a-zA-Z0-9_-]*)(')?"; +//static const char* _regexp = "\\s*(and|or)?\\s*(\\w*)\\s*(>=|<=|<>|=|>|<)\\s*(')?([a-zA-Z0-9_-]*)(')?"; +static const char* _regexp = "\\s*(and|or)?\\s*(\\w*)\\s*(>=|<=|<>|=|>|<)\\s*(['\"])?([^'\"]*)(['\"])?"; char** dbt_str_split(char* a_str, const char a_delim, int* c) {

8 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015