sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:master:f665c765: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: f665c7651d14442cac10163051ab49166907dd12 URL: https://github.com/kamailio/kamailio/commit/f665c7651d14442cac10163051ab491… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-18T13:01:44+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/f665c7651d14442cac10163051ab491… Patch: https://github.com/kamailio/kamailio/commit/f665c7651d14442cac10163051ab491…

1 0

git:master:4e4053ca: dispatcher: documentation for ds_db_extra_attrs param
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 4e4053ca0312bc856321203613e9a6a026b7a3cd URL: https://github.com/kamailio/kamailio/commit/4e4053ca0312bc856321203613e9a6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T12:53:20+02:00 dispatcher: documentation for ds_db_extra_attrs param --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4e4053ca0312bc856321203613e9a6a… Patch: https://github.com/kamailio/kamailio/commit/4e4053ca0312bc856321203613e9a6a… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 501a07d7fb..19c68bf4b3 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -955,6 +955,33 @@ end </example> </section> + <section id="dispatcher.p.ds_db_extra_attrs"> + <title><varname>ds_db_extra_attrs</varname> (str)</title> + <para> + Set a list of column names to be loaded from database dispatcher table + and be concatenated to 'attrs' field. The format is: + 'aname1=cname1;aname2=cname2;...;anameN=cnameN'. + </para> + <para> + The 'anameX' is the attribute name and 'cnameX' is column name. The + additional columns must be added to database dispatcher table and their + type must be VARCHAR (string). + </para> + <para> + <emphasis> + Default value is <quote>empty</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_db_extra_attrs</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix") +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:433577dd: dispatcher: new paraemter ds_db_extra_attrs
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 433577ddfca4cbfc1147168297dba611f89a5a00 URL: https://github.com/kamailio/kamailio/commit/433577ddfca4cbfc1147168297dba61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T12:45:19+02:00 dispatcher: new paraemter ds_db_extra_attrs - allow specifying database table columns to be loaded in the attrs field --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/433577ddfca4cbfc1147168297dba61… Patch: https://github.com/kamailio/kamailio/commit/433577ddfca4cbfc1147168297dba61…

1 0

git:master:927ddcf0: db_perlvdb: unref in case of error
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 927ddcf084b637385df103fb489d843e0255f4f8 URL: https://github.com/kamailio/kamailio/commit/927ddcf084b637385df103fb489d843… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T10:00:14+02:00 db_perlvdb: unref in case of error --- Modified: src/modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/927ddcf084b637385df103fb489d843… Patch: https://github.com/kamailio/kamailio/commit/927ddcf084b637385df103fb489d843… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index 677f09a850..f263774658 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -263,9 +263,9 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { /* Fetch column definitions */ colarrayref = perlvdb_perlmethod(perlres, PERL_VDB_COLDEFSMETHOD, NULL, NULL, NULL, NULL); - if (!(SvROK(colarrayref))) goto error; + if (colarrayref==NULL || !(SvROK(colarrayref))) goto error; colarray = (AV *)SvRV(colarrayref); - if (!(SvTYPE(colarray) == SVt_PVAV)) goto error; + if (colarray==NULL || !(SvTYPE(colarray) == SVt_PVAV)) goto error; colcount = av_len(colarray) + 1; @@ -305,7 +305,7 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { } rowarray = (AV *)SvRV(rowarrayref); - if (!(SvTYPE(rowarray) == SVt_PVAV)) goto error; + if (rowarray == NULL || !(SvTYPE(rowarray) == SVt_PVAV)) goto error; rowcount = av_len(rowarray) + 1; @@ -403,10 +403,12 @@ int perlresult2dbres(SV *perlres, db1_res_t **r) { } end: - if (colarray) av_undef(colarray); + if(colarray) av_undef(colarray); if (rowarray) av_undef(rowarray); return retval; error: + if(colarray) av_undef(colarray); + if (rowarray) av_undef(rowarray); LM_CRIT("broken result set. Exiting, leaving Kamailio in unknown state.\n"); return -1; }

1 0

git:master:67d5aac3: tm: t_serial - safety checks for xavp search result
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 67d5aac30d7e44f0d19e41df88fce39f67192483 URL: https://github.com/kamailio/kamailio/commit/67d5aac30d7e44f0d19e41df88fce39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T09:47:15+02:00 tm: t_serial - safety checks for xavp search result --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/67d5aac30d7e44f0d19e41df88fce39… Patch: https://github.com/kamailio/kamailio/commit/67d5aac30d7e44f0d19e41df88fce39… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index 019b35dbb4..8f8ee0646d 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -642,7 +642,11 @@ int ki_t_next_contacts(struct sip_msg* msg) } vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; + if (vavp != NULL) { + flags = vavp->val.v.i; + } else { + flags = 0; + } vavp = xavp_get(&ruid_name, xavp->val.v.xavp); if (vavp != NULL) { @@ -774,8 +778,7 @@ int ki_t_next_contact_flow(struct sip_msg* msg) /* Load Request-URI and branches */ t_get_this_branch_instance(msg, &this_instance); - if (this_instance.len == 0) - { + if (this_instance.len == 0) { LM_DBG("No instance on this branch\n"); return -2; } @@ -792,13 +795,10 @@ int ki_t_next_contact_flow(struct sip_msg* msg) next_xavp = xavp_get_next(xavp); vavp = xavp_get(&instance_name, xavp->val.v.xavp); - if (vavp == NULL) - { + if (vavp == NULL) { /* Does not match this instance */ goto next_xavp; - } - else - { + } else { instance = vavp->val.v.s; if ((instance.len != this_instance.len) || (strncmp(instance.s, this_instance.s, instance.len) != 0)) @@ -807,7 +807,11 @@ int ki_t_next_contact_flow(struct sip_msg* msg) } vavp = xavp_get(&uri_name, xavp->val.v.xavp); - uri = vavp->val.v.s; + if (vavp == NULL) { + goto next_xavp; + } else { + uri = vavp->val.v.s; + } vavp = xavp_get(&dst_uri_name, xavp->val.v.xavp); if (vavp != NULL) { @@ -842,13 +846,27 @@ int ki_t_next_contact_flow(struct sip_msg* msg) } vavp = xavp_get(&flags_name, xavp->val.v.xavp); - flags = vavp->val.v.i; + if (vavp != NULL) { + flags = vavp->val.v.i; + } else { + flags = 0; + } vavp = xavp_get(&ruid_name, xavp->val.v.xavp); - ruid = vavp->val.v.s; + if (vavp != NULL) { + ruid = vavp->val.v.s; + } else { + ruid.s = ""; + ruid.len = 0; + } vavp = xavp_get(&ua_name, xavp->val.v.xavp); - location_ua = vavp->val.v.s; + if (vavp != NULL) { + location_ua = vavp->val.v.s; + } else { + location_ua.s = ""; + location_ua.len = 0; + } LM_DBG("Appending branch uri-'%.*s' dst-'%.*s' path-'%.*s'" " inst-'%.*s' ruid-'%.*s' location_ua-'%.*s'\n",

1 0

git:master:f8ae1b62: app_ruby: removed wrong assignment
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: f8ae1b6278ade0f1fb73b536774f936e2d66373a URL: https://github.com/kamailio/kamailio/commit/f8ae1b6278ade0f1fb73b536774f936… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T09:33:23+02:00 app_ruby: removed wrong assignment --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/f8ae1b6278ade0f1fb73b536774f936… Patch: https://github.com/kamailio/kamailio/commit/f8ae1b6278ade0f1fb73b536774f936… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 23246d7f4b..f16b15fe95 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -574,7 +574,6 @@ static VALUE app_ruby_sr_modf(int argc, VALUE* argv, VALUE self) ret = 1; act = NULL; - argc = 0; memset(rbv, 0, MAX_ACTIONS*sizeof(char*)); memset(paramv, 0, MAX_ACTIONS*sizeof(char*)); env_R = app_ruby_sr_env_get(); @@ -1070,4 +1069,4 @@ int app_ruby_kemi_export_libs(void) int app_ruby_init_rpc(void) { return 0; -} \ No newline at end of file +}

1 0

git:master:606a8d69: sipt: use static buffer to avoid pkg leak inside sipt_get_redirection_number()
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 606a8d6915f385460776b0d682b6471d2176db7f URL: https://github.com/kamailio/kamailio/commit/606a8d6915f385460776b0d682b6471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T09:29:17+02:00 sipt: use static buffer to avoid pkg leak inside sipt_get_redirection_number() --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/606a8d6915f385460776b0d682b6471… Patch: https://github.com/kamailio/kamailio/commit/606a8d6915f385460776b0d682b6471… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index a1f0b348d1..c4b415fa7c 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -337,7 +337,7 @@ static int sipt_get_redirection_number_nai(struct sip_msg *msg, pv_param_t *para static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - char *sb_s_buf = pkg_malloc(sizeof(char) * (26)); + static char sb_s_buf[26]; str body; body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len);

1 0

git:master:5f91017c: log_custom: check return code for udp send
by Daniel-Constantin Mierla 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 5f91017c0393faa02201ccc3693fee6381ea691a URL: https://github.com/kamailio/kamailio/commit/5f91017c0393faa02201ccc3693fee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-18T09:22:38+02:00 log_custom: check return code for udp send --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5f91017c0393faa02201ccc3693fee6… Patch: https://github.com/kamailio/kamailio/commit/5f91017c0393faa02201ccc3693fee6… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index f88a783b7c..e635baf75e 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -148,7 +148,9 @@ void _lc_core_log_udp(int lpriority, const char *format, ...) n += snprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, "(%d) ", my_pid()); n += vsnprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, format, arglist); va_end(arglist); - udp_send(&_lc_udp_dst, obuf, n); + if(udp_send(&_lc_udp_dst, obuf, n)!=0) { + LM_DBG("udp send returned non zero\n"); + } } int ki_log_udp(sip_msg_t *msg, str *txt)

1 0

git:5.0:93539394: core: better protection against invalid name lookup in DNS caching support
by Henning Westerholt 17 Jun '18

17 Jun '18

Module: kamailio Branch: 5.0 Commit: 93539394b22a1c755821b09574b93d72d34d7689 URL: https://github.com/kamailio/kamailio/commit/93539394b22a1c755821b09574b93d7… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-17T17:25:58+02:00 core: better protection against invalid name lookup in DNS caching support (cherry picked from commit 74847c386f627ba89a0cb282e85d653388d45e24) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/93539394b22a1c755821b09574b93d7… Patch: https://github.com/kamailio/kamailio/commit/93539394b22a1c755821b09574b93d7… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 5d35c52dee..04f230b7cc 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -536,6 +536,13 @@ inline static struct dns_hash_entry* _dns_hash_find(str* name, int type, ret=0; now=get_ticks_raw(); *err=0; + + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!name->s || name->len <= 0)) { + LM_ERR("invalid name, no cache lookup possible\n"); + *err=-1; + return 0; + } again: *h=dns_hash_no(name->s, name->len, type); #ifdef DNS_CACHE_DEBUG

1 0

git:5.1:191d970e: core: better protection against invalid name lookup in DNS caching support
by Henning Westerholt 17 Jun '18

17 Jun '18

Module: kamailio Branch: 5.1 Commit: 191d970eb1815109c6c6d273da3481afc856f396 URL: https://github.com/kamailio/kamailio/commit/191d970eb1815109c6c6d273da3481a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-17T17:25:44+02:00 core: better protection against invalid name lookup in DNS caching support (cherry picked from commit 74847c386f627ba89a0cb282e85d653388d45e24) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/191d970eb1815109c6c6d273da3481a… Patch: https://github.com/kamailio/kamailio/commit/191d970eb1815109c6c6d273da3481a… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 43ceb93ff6..ab91a2077a 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -536,6 +536,13 @@ inline static struct dns_hash_entry* _dns_hash_find(str* name, int type, ret=0; now=get_ticks_raw(); *err=0; + + /* just in case that e.g. the VIA parser get confused */ + if(unlikely(!name->s || name->len <= 0)) { + LM_ERR("invalid name, no cache lookup possible\n"); + *err=-1; + return 0; + } again: *h=dns_hash_no(name->s, name->len, type); #ifdef DNS_CACHE_DEBUG

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018