sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

git:master:1014788a: presence: remove unused variable
by Daniel-Constantin Mierla 18 Sep '16

18 Sep '16

Module: kamailio Branch: master Commit: 1014788aa32468e734cd082d9c770adc7daa05e4 URL: https://github.com/kamailio/kamailio/commit/1014788aa32468e734cd082d9c770ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-18T09:17:32+02:00 presence: remove unused variable - coherent whitespacing --- Modified: modules/presence/event_list.c Modified: modules/presence/utils_func.c --- Diff: https://github.com/kamailio/kamailio/commit/1014788aa32468e734cd082d9c770ad… Patch: https://github.com/kamailio/kamailio/commit/1014788aa32468e734cd082d9c770ad…

1 0

git:master:0f791078: db_perlvdb: fixed warning of using static function inside inline one
by Daniel-Constantin Mierla 18 Sep '16

18 Sep '16

Module: kamailio Branch: master Commit: 0f791078260f2ccfd22a268831fb8dcfb00b24f3 URL: https://github.com/kamailio/kamailio/commit/0f791078260f2ccfd22a268831fb8dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-18T09:16:57+02:00 db_perlvdb: fixed warning of using static function inside inline one --- Modified: modules/db_perlvdb/perlvdbfunc.c --- Diff: https://github.com/kamailio/kamailio/commit/0f791078260f2ccfd22a268831fb8dc… Patch: https://github.com/kamailio/kamailio/commit/0f791078260f2ccfd22a268831fb8dc… --- diff --git a/modules/db_perlvdb/perlvdbfunc.c b/modules/db_perlvdb/perlvdbfunc.c index 041baae..9dc27ce 100644 --- a/modules/db_perlvdb/perlvdbfunc.c +++ b/modules/db_perlvdb/perlvdbfunc.c @@ -37,7 +37,7 @@ * including decreasing ref cnt */ -inline long IV2int(SV *in) { +long IV2int(SV *in) { int ret = -1; if (SvOK(in)) {

1 0

git:master:564f5c61: ldap: removed unused variable
by Daniel-Constantin Mierla 18 Sep '16

18 Sep '16

Module: kamailio Branch: master Commit: 564f5c612999d762b24bcaf2047bb063d1d5ecbf URL: https://github.com/kamailio/kamailio/commit/564f5c612999d762b24bcaf2047bb06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-18T09:09:28+02:00 ldap: removed unused variable --- Modified: modules/ldap/ldap_escape.c --- Diff: https://github.com/kamailio/kamailio/commit/564f5c612999d762b24bcaf2047bb06… Patch: https://github.com/kamailio/kamailio/commit/564f5c612999d762b24bcaf2047bb06… --- diff --git a/modules/ldap/ldap_escape.c b/modules/ldap/ldap_escape.c index e6507f8..9fb4ca2 100644 --- a/modules/ldap/ldap_escape.c +++ b/modules/ldap/ldap_escape.c @@ -29,8 +29,6 @@ #include <ctype.h> #include "ldap_escape.h" -static const char hex[] = "0123456789ABCDEF"; - /* * escape string following RFC 4515 (LDAP filter syntax) escaping rules: * @@ -48,8 +46,8 @@ static const char hex[] = "0123456789ABCDEF"; int ldap_rfc4515_escape(str *sin, str *sout, int url_encode) { char *src, *dst; - - if (sin == NULL || sout == NULL || sin->s == NULL || sout->s == NULL + + if (sin == NULL || sout == NULL || sin->s == NULL || sout->s == NULL || sin->len <= 0 || sout->len < 3*sin->len+1) { return -1;

1 0

git:master:5b37c3de: db_text: fixed misleading indentation reported by gcc 6.2
by Daniel-Constantin Mierla 18 Sep '16

18 Sep '16

Module: kamailio Branch: master Commit: 5b37c3de2c213184240f65e6a6827167d7e1a761 URL: https://github.com/kamailio/kamailio/commit/5b37c3de2c213184240f65e6a682716… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-18T09:07:07+02:00 db_text: fixed misleading indentation reported by gcc 6.2 - coherent whitespacing --- Modified: modules/db_text/db_text.c Modified: modules/db_text/db_text.h Modified: modules/db_text/dbt_api.c Modified: modules/db_text/dbt_api.h Modified: modules/db_text/dbt_base.c Modified: modules/db_text/dbt_file.c Modified: modules/db_text/dbt_lib.c Modified: modules/db_text/dbt_lib.h Modified: modules/db_text/dbt_raw_query.c Modified: modules/db_text/dbt_raw_query.h Modified: modules/db_text/dbt_raw_util.c Modified: modules/db_text/dbt_raw_util.h Modified: modules/db_text/dbt_res.c Modified: modules/db_text/dbt_res.h Modified: modules/db_text/dbt_tb.c Modified: modules/db_text/dbt_util.c --- Diff: https://github.com/kamailio/kamailio/commit/5b37c3de2c213184240f65e6a682716… Patch: https://github.com/kamailio/kamailio/commit/5b37c3de2c213184240f65e6a682716…

1 0

git:master:8c169ba0: pv: adjusted indentation after if blocks to avoid gcc 6.2 warnings
by Daniel-Constantin Mierla 17 Sep '16

17 Sep '16

Module: kamailio Branch: master Commit: 8c169ba0919e46222f1732d6ab084f499ea2972b URL: https://github.com/kamailio/kamailio/commit/8c169ba0919e46222f1732d6ab084f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-17T11:40:16+02:00 pv: adjusted indentation after if blocks to avoid gcc 6.2 warnings --- Modified: modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/8c169ba0919e46222f1732d6ab084f4… Patch: https://github.com/kamailio/kamailio/commit/8c169ba0919e46222f1732d6ab084f4…

1 0

git:master:b20b076e: tm: fixed misleading indentation of block after an IF (reported by gcc 6.2)
by Daniel-Constantin Mierla 17 Sep '16

17 Sep '16

Module: kamailio Branch: master Commit: b20b076e292fc7720352f64ccabb3caafbfae1d3 URL: https://github.com/kamailio/kamailio/commit/b20b076e292fc7720352f64ccabb3ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-17T11:40:16+02:00 tm: fixed misleading indentation of block after an IF (reported by gcc 6.2) --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/b20b076e292fc7720352f64ccabb3ca… Patch: https://github.com/kamailio/kamailio/commit/b20b076e292fc7720352f64ccabb3ca…

1 0

git:master:f8e47835: counters: fixed rpc command to get counter by group and name
by Daniel-Constantin Mierla 17 Sep '16

17 Sep '16

Module: kamailio Branch: master Commit: f8e47835950fa472ef313b7f303b0989b76f9dbe URL: https://github.com/kamailio/kamailio/commit/f8e47835950fa472ef313b7f303b098… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-17T11:40:16+02:00 counters: fixed rpc command to get counter by group and name --- Modified: modules/counters/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/f8e47835950fa472ef313b7f303b098… Patch: https://github.com/kamailio/kamailio/commit/f8e47835950fa472ef313b7f303b098… --- diff --git a/modules/counters/counters.c b/modules/counters/counters.c index d90ead1..5fd8739 100644 --- a/modules/counters/counters.c +++ b/modules/counters/counters.c @@ -24,9 +24,9 @@ /*! * \defgroup counters Counters/statistics - * + * */ - + #include "../../modparam.h" #include "../../dprint.h" #include "../../compiler_opt.h" @@ -239,7 +239,7 @@ static int cnt_int_fixup(void** param, int param_no) static int cnt_inc_f(struct sip_msg* msg, char* handle, char* bar) { counter_handle_t h; - + h.id = (long)(void*)handle; counter_inc(h); return 1; @@ -251,7 +251,7 @@ static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) { counter_handle_t h; int v; - + h.id = (long)(void*)handle; if (unlikely(get_int_fparam(&v, msg, (fparam_t*)val) < 0)) { ERR("non integer parameter\n"); @@ -266,7 +266,7 @@ static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) { counter_handle_t h; - + h.id = (long)(void*)handle; counter_reset(h); return 1; @@ -284,12 +284,13 @@ static void cnt_get_rpc(rpc_t* rpc, void* c) char* name; counter_val_t v; counter_handle_t h; - + if (rpc->scan(c, "s", &group) < 1) return; - if (rpc->scan(c, "*s", &name) < 1) + if (rpc->scan(c, "*s", &name) < 1) { cnt_grp_get_all(rpc, c, group); return; + } /* group & name read */ if (counter_lookup(&h, group, name) < 0) { rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); @@ -308,7 +309,7 @@ static void cnt_get_raw_rpc(rpc_t* rpc, void* c) char* name; counter_val_t v; counter_handle_t h; - + if (rpc->scan(c, "ss", &group, &name) < 2) { /* rpc->fault(c, 400, "group and counter name required"); */ return; @@ -329,7 +330,7 @@ static void cnt_reset_rpc(rpc_t* rpc, void* c) char* group; char* name; counter_handle_t h; - + if (rpc->scan(c, "ss", &group, &name) < 2) { /* rpc->fault(c, 400, "group and counter name required"); */ return; @@ -383,7 +384,7 @@ static void rpc_print_name_val(void* param, str* g, str* n, static void cnt_grps_list_rpc(rpc_t* rpc, void* c) { struct rpc_list_params packed_params; - + packed_params.rpc = rpc; packed_params.ctx = c; counter_iterate_grp_names(rpc_print_name, &packed_params); @@ -395,7 +396,7 @@ static void cnt_var_list_rpc(rpc_t* rpc, void* c) { char* group; struct rpc_list_params packed_params; - + if (rpc->scan(c, "s", &group) < 1) { /* rpc->fault(c, 400, "group name required"); */ return; @@ -411,7 +412,7 @@ static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group) { void* s; struct rpc_list_params packed_params; - + if (rpc->add(c, "{", &s) < 0) return; packed_params.rpc = rpc; packed_params.ctx = s; @@ -423,7 +424,7 @@ static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group) static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) { char* group; - + if (rpc->scan(c, "s", &group) < 1) { /* rpc->fault(c, 400, "group name required"); */ return; @@ -439,7 +440,7 @@ static void cnt_help_rpc(rpc_t* rpc, void* ctx) char* name; char* desc; counter_handle_t h; - + if (rpc->scan(ctx, "ss", &group, &name) < 2) { /* rpc->fault(c, 400, "group and counter name required"); */ return;

1 0

git:master:6fbf225f: rtpproxy: removed svn id, history and fixed indentation
by Daniel-Constantin Mierla 17 Sep '16

17 Sep '16

Module: kamailio Branch: master Commit: 6fbf225f6aa1a9838391f5aa68f650fbecf1d944 URL: https://github.com/kamailio/kamailio/commit/6fbf225f6aa1a9838391f5aa68f650f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-17T11:40:16+02:00 rtpproxy: removed svn id, history and fixed indentation --- Modified: modules/rtpproxy/rtpproxy.c Modified: modules/rtpproxy/rtpproxy.h Modified: modules/rtpproxy/rtpproxy_db.c Modified: modules/rtpproxy/rtpproxy_funcs.c Modified: modules/rtpproxy/rtpproxy_funcs.h Modified: modules/rtpproxy/rtpproxy_stream.c Modified: modules/rtpproxy/rtpproxy_stream.h --- Diff: https://github.com/kamailio/kamailio/commit/6fbf225f6aa1a9838391f5aa68f650f… Patch: https://github.com/kamailio/kamailio/commit/6fbf225f6aa1a9838391f5aa68f650f…

1 0

presence/mwi error
by Juha Heinanen 17 Sep '16

17 Sep '16

Using latest master, I'm getting error Sep 16 20:16:36 lohi /usr/bin/pres-serv[1744]: ERROR: presence [presentity.c:319]: parse_dialog_state_from_body(): failed to parse xml document 'Messages-Waiting: no#015#012Message-Account: sip:jh@vm.test.tutpro.com#015#012Voice-Message: 0/0 (0/0)#015#012' This happens when I rpc_execute 'pua_publish' request. Event package parameter in the request is 'message-summary' and content type is 'application/simple-message-summary'. Body is shown in the above error message (I added printing of it). Since body of message-summary is not xml, why is k presence module trying to parse it as such? I don't remember making any changes to the pua_publish request since 4.5, where it works. -- Juha

2 7

git:4.4:ce3d1dd8: presence: test if event is dialog for checking terminated state in presentity update
by Juha Heinanen 17 Sep '16

17 Sep '16

Module: kamailio Branch: 4.4 Commit: ce3d1dd8360567fdf2c8e36fbb4a4238dab8f036 URL: https://github.com/kamailio/kamailio/commit/ce3d1dd8360567fdf2c8e36fbb4a423… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2016-09-17T09:30:30+03:00 presence: test if event is dialog for checking terminated state in presentity update - reported by Juha Heinanen (cherry picked from commit f2ef2a9016f41e97d3466b34b4039e66505d53a1) --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/ce3d1dd8360567fdf2c8e36fbb4a423… Patch: https://github.com/kamailio/kamailio/commit/ce3d1dd8360567fdf2c8e36fbb4a423… --- diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index b78f84a..b5d7b65 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -494,7 +494,7 @@ int get_dialog_state(presentity_t* presentity, char** state) } if (pa_dbf.query (pa_db, query_cols, query_ops, query_vals, - result_cols, n_query_cols, n_result_cols, 0, &result) < 0) + result_cols, n_query_cols, n_result_cols, 0, &result) < 0) { LM_ERR("unsuccessful sql query\n"); return -2; @@ -515,7 +515,8 @@ int get_dialog_state(presentity_t* presentity, char** state) tmp_db_body.s = (char*)row_vals[rez_body_col].val.string_val; tmp_db_body.len = strlen(tmp_db_body.s); - parse_state_result = parse_dialog_state_from_body(tmp_db_body, &db_is_dialog, state); + parse_state_result = parse_dialog_state_from_body(tmp_db_body, + &db_is_dialog, state); pa_dbf.free_result(pa_db, result); result = NULL; @@ -966,23 +967,25 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, else cur_etag= presentity->etag; - if (is_dialog_terminated(presentity)) - { - LM_WARN("Trying to update an already terminated state. Skipping update.\n"); - - /* send 200OK */ - if (publ_send200ok(msg, presentity->expires, cur_etag)< 0) + if (presentity->event->evp->type==EVENT_DIALOG) { + if(is_dialog_terminated(presentity)) { - LM_ERR("sending 200OK reply\n"); - goto error; - } - if (sent_reply) *sent_reply= 1; + LM_WARN("Trying to update an already terminated state." + " Skipping update.\n"); - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; + /* send 200OK */ + if (publ_send200ok(msg, presentity->expires, cur_etag)< 0) { + LM_ERR("sending 200OK reply\n"); + goto error; + } + if (sent_reply) *sent_reply= 1; - goto done; + if(etag.s) + pkg_free(etag.s); + etag.s= NULL; + + goto done; + } } update_keys[n_update_cols] = &str_expires_col;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
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 September 2016