sr-dev December 2014

sr-dev@lists.kamailio.org

33 participants
255 discussions

query dbtext from kamctl
by Luis Azedo 07 Dec '14

07 Dec '14

Hi , we have a need to query dbtext data from kamctl but we need to issue a kamcmd db_text.dump each time so that we can get updated values. what would be the best way to query updated dbtext data without the db_text.dump step ? maybe implement db_text.sql and use a parser (db2_ops?) to transform sql statement and get the data ? Tks

2 1

git:lazedo/4.2.1: Merge branch '4.2' into lazedo/4.2.1
by Luis Azedo 07 Dec '14

07 Dec '14

Module: sip-router Branch: lazedo/4.2.1 Commit: 543e5dd2e6a9e266e3edd8c2389945528aa7200a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=543e5dd… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: Sun Dec 7 11:55:45 2014 +0000 Merge branch '4.2' into lazedo/4.2.1 * 4.2: exec: use proper header field iterator to print env variables core: keep the password only if the user part is set acc: free extra attributes for db, radius and diameter modules/pua: do not override send_publish return value at error nat_traversal: use dedicated function for testing via address against source ip nathelper: use dedicated function for testing via address against source ip core: dedicated function to check Via address with source ip ---

1 0

git:master: tmx: added its for mi functions in doc
by Daniel-Constantin Mierla 07 Dec '14

07 Dec '14

Module: sip-router Branch: master Commit: 7d6c87d4ba129dd2e7d28e183dbbf43b2df12557 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d6c87d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 7 12:23:07 2014 +0100 tmx: added its for mi functions in doc - better indexing for web --- modules/tmx/doc/tmx_admin.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index cb4a834..9958185 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -465,7 +465,7 @@ event_route [tm:branch-failure:contact] { <section> <title>MI Commands</title> - <section> + <section id="tmx.mi.t_uac_dlg"> <title> <function moreinfo="none">t_uac_dlg</function> </title> @@ -503,7 +503,7 @@ event_route [tm:branch-failure:contact] { </itemizedlist> </section> - <section> + <section id="tmx.mi.t_uac_cancel"> <title> <function moreinfo="none">t_uac_cancel</function> </title> @@ -523,7 +523,7 @@ event_route [tm:branch-failure:contact] { </itemizedlist> </section> - <section> + <section id="tmx.mi.t_hash"> <title> <function moreinfo="none">t_hash</function> </title> @@ -538,7 +538,7 @@ event_route [tm:branch-failure:contact] { </itemizedlist> </section> - <section> + <section id="tmx.mi.t_reply"> <title> <function moreinfo="none">t_reply</function> </title> @@ -573,7 +573,7 @@ event_route [tm:branch-failure:contact] { </para></listitem> </itemizedlist> </section> - <section> + <section id="tmx.mi.t_reply_callid"> <title> <function moreinfo="none">t_reply_callid</function> </title>

1 0

git:master: db_text Add newline at end of debug/info/error output
by Olle E. Johansson 07 Dec '14

07 Dec '14

Module: sip-router Branch: master Commit: 5937c668d790262d88d220029e3c9e9b017a7901 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5937c66… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 7 11:41:24 2014 +0100 db_text Add newline at end of debug/info/error output --- modules/db_text/dbt_api.c | 12 ++++++------ modules/db_text/dbt_lib.c | 6 +++--- modules/db_text/dbt_res.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/db_text/dbt_api.c b/modules/db_text/dbt_api.c index 8dff6f7..f94190a 100644 --- a/modules/db_text/dbt_api.c +++ b/modules/db_text/dbt_api.c @@ -59,7 +59,7 @@ static int dbt_get_columns(db1_res_t* _r, dbt_result_p _dres) return -2; } if (db_allocate_columns(_r, RES_COL_N(_r)) != 0) { - LM_ERR("could not allocate columns"); + LM_ERR("could not allocate columns\n"); return -3; } @@ -75,7 +75,7 @@ static int dbt_get_columns(db1_res_t* _r, dbt_result_p _dres) db_free_columns(_r); return -4; } - LM_DBG("allocate %d bytes for RES_NAMES[%d] at %p", + LM_DBG("allocate %d bytes for RES_NAMES[%d] at %p\n", (int)sizeof(str), col, RES_NAMES(_r)[col]); RES_NAMES(_r)[col]->s = _dres->colv[col].name.s; @@ -114,7 +114,7 @@ static int dbt_convert_row(db1_res_t* _res, db_row_t* _r, dbt_row_p _r1) } if (db_allocate_row(_res, _r) != 0) { - LM_ERR("could not allocate row"); + LM_ERR("could not allocate row\n"); return -2; } @@ -129,7 +129,7 @@ static int dbt_convert_row(db1_res_t* _res, db_row_t* _r, dbt_row_p _r1) break; case DB1_BIGINT: - LM_ERR("BIGINT not supported"); + LM_ERR("BIGINT not supported\n"); return -1; case DB1_DOUBLE: @@ -178,7 +178,7 @@ static int dbt_convert_row(db1_res_t* _res, db_row_t* _r, dbt_row_p _r1) break; default: - LM_ERR("val type [%d] not supported", RES_TYPES(_res)[i]); + LM_ERR("val type [%d] not supported\n", RES_TYPES(_res)[i]); return -1; } } @@ -202,7 +202,7 @@ static int dbt_convert_rows(db1_res_t* _r, dbt_result_p _dres) return 0; } if (db_allocate_rows(_r) < 0) { - LM_ERR("could not allocate rows"); + LM_ERR("could not allocate rows\n"); return -2; } row = 0; diff --git a/modules/db_text/dbt_lib.c b/modules/db_text/dbt_lib.c index c4aee80..dc63c0e 100644 --- a/modules/db_text/dbt_lib.c +++ b/modules/db_text/dbt_lib.c @@ -264,7 +264,7 @@ dbt_table_p dbt_db_get_table(dbt_cache_p _dc, const str *_s) int hashidx; if(!_dbt_cachetbl || !_dc || !_s || !_s->s || _s->len<=0) { - LM_ERR("invalid parameter"); + LM_ERR("invalid parameter\n"); return NULL; } @@ -304,7 +304,7 @@ dbt_table_p dbt_db_get_table(dbt_cache_p _dc, const str *_s) if(!_tbc) { - LM_ERR("could not load database from file [%.*s]", _s->len, _s->s); + LM_ERR("could not load database from file [%.*s]\n", _s->len, _s->s); lock_release(&_dbt_cachetbl[hashidx].sem); return NULL; } @@ -438,7 +438,7 @@ int dbt_is_neq_type(db_type_t _t0, db_type_t _t1) return 0; case DB1_BIGINT: - LM_ERR("BIGINT not supported"); + LM_ERR("BIGINT not supported\n"); return 0; case DB1_DATETIME: diff --git a/modules/db_text/dbt_res.c b/modules/db_text/dbt_res.c index c64a7f2..f115992 100644 --- a/modules/db_text/dbt_res.c +++ b/modules/db_text/dbt_res.c @@ -456,7 +456,7 @@ int dbt_cmp_val(dbt_val_p _vp, db_val_t* _v) (_vp->val.int_val>_v->val.int_val)?1:0; case DB1_BIGINT: - LM_ERR("BIGINT not supported"); + LM_ERR("BIGINT not supported\n"); return -1; case DB1_DOUBLE:

1 0

git:master: evapi Add link to external library.
by Olle E. Johansson 07 Dec '14

07 Dec '14

Module: sip-router Branch: master Commit: 8370ef43f0fbd2ee447ab65c5b5172677a47f644 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8370ef4… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 7 09:19:00 2014 +0100 evapi Add link to external library. --- modules/evapi/README | 2 +- modules/evapi/doc/evapi_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/evapi/README b/modules/evapi/README index d62b7f4..6035cce 100644 --- a/modules/evapi/README +++ b/modules/evapi/README @@ -109,7 +109,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libev + * libev - http://software.schmorp.de/pkg/libev 3. Parameters diff --git a/modules/evapi/doc/evapi_admin.xml b/modules/evapi/doc/evapi_admin.xml index 281e4d3..ef2e34a 100644 --- a/modules/evapi/doc/evapi_admin.xml +++ b/modules/evapi/doc/evapi_admin.xml @@ -54,7 +54,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libev</emphasis> + <emphasis>libev</emphasis> - <ulink url="http://software.schmorp.de/pkg/libev">http://software.schmorp.de/pkg/libev</ulink> </para> </listitem> </itemizedlist>

1 0

git:master: Makefile.defs: version set to 4.3.0-dev2
by Daniel-Constantin Mierla 06 Dec '14

06 Dec '14

Module: sip-router Branch: master Commit: 6daafdb5b6c9fc72698d43f81656bd511cacce69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6daafdb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 6 09:47:52 2014 +0100 Makefile.defs: version set to 4.3.0-dev2 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index f05c3e6..cceda7c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -165,7 +165,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master: ims_usrloc_scscf: fixed typo in str printing
by Daniel-Constantin Mierla 06 Dec '14

06 Dec '14

Module: sip-router Branch: master Commit: bf59479da6d49f087da6ff0b2eab9ced8830ef4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf59479… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 6 09:21:53 2014 +0100 ims_usrloc_scscf: fixed typo in str printing --- modules/ims_usrloc_scscf/subscribe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_usrloc_scscf/subscribe.c b/modules/ims_usrloc_scscf/subscribe.c index 31766fe..4209e7c 100644 --- a/modules/ims_usrloc_scscf/subscribe.c +++ b/modules/ims_usrloc_scscf/subscribe.c @@ -355,7 +355,7 @@ void external_delete_subscriber(reg_subscriber *s, udomain_t* _t, int lock_domai } void delete_subscriber(impurecord_t* urec, reg_subscriber *s) { - LM_DBG("Deleting subscriber [%.*s] from IMPU: [%.*s]", s->watcher_uri.len, s->watcher_uri.s, urec->public_identity.len, urec->public_identitys); + LM_DBG("Deleting subscriber [%.*s] from IMPU: [%.*s]", s->watcher_uri.len, s->watcher_uri.s, urec->public_identity.len, urec->public_identity.s); if (db_mode == WRITE_THROUGH && db_unlink_subscriber_from_impu(urec, s) !=0) { LM_ERR("Failed to delete DB linking subscriber [%.*s] to IMPU [%.*s]...continuing but db will be out of sync!\n",

1 0

git:master: tmx: added section ids for functions
by Daniel-Constantin Mierla 06 Dec '14

06 Dec '14

Module: sip-router Branch: master Commit: dc6d9ba4c4f581e37c2bcbb7f1a3b4defe847e13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc6d9ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 6 01:03:14 2014 +0100 tmx: added section ids for functions --- modules/tmx/doc/tmx_admin.xml | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index f091984..cb4a834 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -83,7 +83,7 @@ modparam("tmx", "precheck_trans", 0) <section> <title>Functions</title> - <section> + <section id="tmx.f.t_cancel_branches"> <title> <function moreinfo="none">t_cancel_branches(which)</function> </title> @@ -120,7 +120,7 @@ if (t_cancel_branches("all")) { </programlisting> </example> </section> - <section> + <section id="tmx.f.t_cancel_callid"> <title> <function moreinfo="none">t_cancel_callid(callid, cseq, flag [, rcode]) </function> @@ -166,7 +166,7 @@ if (t_cancel_callid("123qaz", "5", "22", "200")) { </programlisting> </example> </section> - <section> + <section id="tmx.f.t_reply_callid"> <title> <function moreinfo="none">t_reply_callid(callid, cseq, code, reason) </function> @@ -205,7 +205,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { </programlisting> </example> </section> - <section> + <section id="tmx.f.t_flush_flags"> <title> <function moreinfo="none">t_flush_flags()</function> </title> @@ -226,7 +226,7 @@ t_flush_flags(); </programlisting> </example> </section> - <section> + <section id="tmx.f.t_is_failure_route"> <title> <function moreinfo="none">t_is_failure_route()</function> </title> @@ -251,7 +251,7 @@ route[abc] { </programlisting> </example> </section> - <section> + <section id="tmx.f.t_is_branch_route"> <title> <function moreinfo="none">t_is_branch_route()</function> </title> @@ -276,7 +276,7 @@ route[abc] { </programlisting> </example> </section> - <section> + <section id="tmx.f.t_is_reply_route"> <title> <function moreinfo="none">t_is_reply_route()</function> </title> @@ -301,7 +301,7 @@ route[abc] { </programlisting> </example> </section> - <section> + <section id="tmx.f.t_suspend"> <title> <function moreinfo="none">t_suspend()</function> </title> @@ -327,7 +327,7 @@ if(t_suspend()) </programlisting> </example> </section> - <section> + <section id="tmx.f.t_continue"> <title> <function moreinfo="none">t_continue(tindex, tlabel, rtname) </function> @@ -367,7 +367,7 @@ t_continue('123', '456', 'MYROUTE'); </example> </section> - <section> + <section id="tmx.f.t_reuse_branch"> <title> <function moreinfo="none">t_reuse_branch()</function> </title>

1 0

git:4.1: exec: use proper header field iterator to print env variables
by Daniel-Constantin Mierla 05 Dec '14

05 Dec '14

Module: sip-router Branch: 4.1 Commit: ce0a5c1a0df6b305b09e1ad7d23d1a92842c0d70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce0a5c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 5 22:40:25 2014 +0100 exec: use proper header field iterator to print env variables - issue introduced with the patch for shellshock - reported by and credits for troubleshooting to Kristian Kielhofner (cherry picked from commit 8855e3e7fcece4ca2ab33e1f9c54b15831152400) (cherry picked from commit db8859587bb5b97637e1f815ab631fc42e8d49c9) --- modules/exec/exec_hf.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/exec/exec_hf.c b/modules/exec/exec_hf.c index 4fc248d..60c5312 100644 --- a/modules/exec/exec_hf.c +++ b/modules/exec/exec_hf.c @@ -258,21 +258,23 @@ static int print_hf_var(struct hf_wrapper *w, int offset) memcpy(envvar, w->prefix, w->prefix_len); c=envvar+w->prefix_len; memcpy(c, hname, hlen ); c+=hlen; *c=EV_ASSIGN;c++; - if (exec_bash_safety && !strncmp(w->u.hf->body.s,"() {",MIN(w->u.hf->body.len,4))) { + if (exec_bash_safety && !strncmp(w->u.hf->body.s, "() {", + MIN(w->u.hf->body.len,4))) { memcpy(c, w->u.hf->body.s+offset+2, w->u.hf->body.len-2 ); c+=(w->u.hf->body.len-2); } else { memcpy(c, w->u.hf->body.s+offset, w->u.hf->body.len ); c+=w->u.hf->body.len; } - for (wi=w->next_same; wi; wi=wi->next_same) { + for(wi=w->next_same; wi; wi=wi->next_same) { *c=HF_SEPARATOR;c++; - if (exec_bash_safety && !strncmp(w->u.hf->body.s,"() {",MIN(w->u.hf->body.len,4))) { - memcpy(c, w->u.hf->body.s+offset+2, w->u.hf->body.len-2 ); - c+=(w->u.hf->body.len-2); + if (exec_bash_safety && !strncmp(wi->u.hf->body.s, "() {", + MIN(w->u.hf->body.len,4))) { + memcpy(c, wi->u.hf->body.s+offset+2, wi->u.hf->body.len-2 ); + c+=(wi->u.hf->body.len-2); } else { - memcpy(c, w->u.hf->body.s+offset, w->u.hf->body.len ); - c+=w->u.hf->body.len; + memcpy(c, wi->u.hf->body.s+offset, wi->u.hf->body.len ); + c+=wi->u.hf->body.len; } } *c=0; /* zero termination */

1 0

git:4.1: core: keep the password only if the user part is set
by Daniel-Constantin Mierla 05 Dec '14

05 Dec '14

Module: sip-router Branch: 4.1 Commit: bb9c3af9be386f3933713ef180c293ac9162e3e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb9c3af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 5 18:17:39 2014 +0100 core: keep the password only if the user part is set - a report by Timo Klecker (cherry picked from commit 8c3d167b63096d3b465c53aca92ee18c5255188c) (cherry picked from commit f03a1769c55b4992613e153bd8d7bd012fc67525) --- action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/action.c b/action.c index 5fa50ee..5c078ce 100644 --- a/action.c +++ b/action.c @@ -943,8 +943,8 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if (a->type==SET_USERPASS_T) tmp=0; else tmp=uri.passwd.s; - /* passwd */ - if (tmp){ + /* passwd - keep it only if user is set */ + if (user && tmp){ len=uri.passwd.len; if(crt+len+1>end) goto error_uri; *crt=':'; crt++; memcpy(crt,tmp,len);crt+=len;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2014