sr-dev January 2019

sr-dev@lists.kamailio.org

27 participants
301 discussions

git:master:ffdec6d3: pipelimit: Fix memleak on shutdown

by Alex Hermann

Module: kamailio Branch: master Commit: ffdec6d38d0935d8af2633e3d3ded8a985ddfcca URL: https://github.com/kamailio/kamailio/commit/ffdec6d38d0935d8af2633e3d3ded8a… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2019-01-22T16:10:19+01:00 pipelimit: Fix memleak on shutdown --- Modified: src/modules/pipelimit/pl_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/ffdec6d38d0935d8af2633e3d3ded8a… Patch: https://github.com/kamailio/kamailio/commit/ffdec6d38d0935d8af2633e3d3ded8a… --- diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index 518254f1fa..319d97b1ff 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -102,6 +102,7 @@ int pl_init_htable(unsigned int hsize) void pl_pipe_free(pl_pipe_t *it) { + shm_free(it); return; }

5 years, 11 months

git:master:ceaeefd4: Merge pull request #1820 from kamailio/presence-fix-debug-msg

by GitHub

Module: kamailio Branch: master Commit: ceaeefd4f0add9123054b68b4f2f30707f487249 URL: https://github.com/kamailio/kamailio/commit/ceaeefd4f0add9123054b68b4f2f307… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-24T14:47:50+01:00 Merge pull request #1820 from kamailio/presence-fix-debug-msg presence: switch warning to debug --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/ceaeefd4f0add9123054b68b4f2f307… Patch: https://github.com/kamailio/kamailio/commit/ceaeefd4f0add9123054b68b4f2f307… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 635ddcefe6..f496f4a583 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -427,7 +427,7 @@ int delete_presentity_if_dialog_id_exists( old_presentity.event = presentity->event; old_presentity.etag = tmp_db_etag; - LM_WARN("Presentity already exists - deleting it\n"); + LM_DBG("Presentity found - deleting it\n"); if(delete_presentity(&old_presentity, NULL) < 0) { LM_ERR("failed to delete presentity\n");

5 years, 11 months

git:master:a4669173: presence: switch warning to debug

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: a466917378d516025062f7c1d5cf2958c70aa0b9 URL: https://github.com/kamailio/kamailio/commit/a466917378d516025062f7c1d5cf295… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2019-01-23T08:39:27-05:00 presence: switch warning to debug --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/a466917378d516025062f7c1d5cf295… Patch: https://github.com/kamailio/kamailio/commit/a466917378d516025062f7c1d5cf295… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 635ddcefe6..f496f4a583 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -427,7 +427,7 @@ int delete_presentity_if_dialog_id_exists( old_presentity.event = presentity->event; old_presentity.etag = tmp_db_etag; - LM_WARN("Presentity already exists - deleting it\n"); + LM_DBG("Presentity found - deleting it\n"); if(delete_presentity(&old_presentity, NULL) < 0) { LM_ERR("failed to delete presentity\n");

5 years, 11 months

[kamailio/kamailio] presence: switch warning to debug (#1820)

by Emmanuel Schmidbauer

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1820 -- Commit Summary -- * switch warning to debug -- File Changes -- M src/modules/presence/presentity.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1820.patch https://github.com/kamailio/kamailio/pull/1820.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1820

5 years, 11 months

git:master:4badb27c: Merge pull request #1814 from kamailio/lazedo/pv-def

by GitHub

Module: kamailio Branch: master Commit: 4badb27c07be39fcfaf58686394810ac15e80111 URL: https://github.com/kamailio/kamailio/commit/4badb27c07be39fcfaf58686394810a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-24T14:47:19+01:00 Merge pull request #1814 from kamailio/lazedo/pv-def pv: add $def pseudo variable --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/4badb27c07be39fcfaf58686394810a… Patch: https://github.com/kamailio/kamailio/commit/4badb27c07be39fcfaf58686394810a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 6e4d6971e5..9912d111bc 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -113,7 +113,7 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; - static str *pp_define_get(int len, const char * text); + str *pp_define_get(int len, const char * text); static int pp_ifdef_type(int pos); static void pp_ifdef_var(int len, const char * text); static void pp_ifdef(); @@ -1856,7 +1856,7 @@ int pp_define_set(int len, char *text) return 0; } -static str *pp_define_get(int len, const char * text) +str *pp_define_get(int len, const char * text) { str var = {(char *)text, len}; int i; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 1ff3103f52..a06795f760 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -32,6 +32,7 @@ #include "dprint.h" #include "ppcfg.h" +#include "fmsg.h" typedef struct _pp_subst_rule { char *indata; @@ -184,7 +185,8 @@ int pp_subst_run(char **data) i = 0; while(pr) { - result=subst_str(*data, 0, + sip_msg_t *fmsg = faked_msg_get_next(); + result=subst_str(*data, fmsg, (struct subst_expr*)pr->ppdata, 0); /* pkg malloc'ed result */ if(result!=NULL) { diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 06f831bd97..0df9353606 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -189,6 +189,8 @@ static pv_export_t mod_pvs[] = { {{"dd", (sizeof("dd")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 1}, + {{"def", (sizeof("env")-1)}, PVT_OTHER, pv_get_def, 0, + pv_parse_def_name, 0, 0, 0}, {{"di", (sizeof("di")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 01cebc8534..2e54253eb4 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3658,3 +3658,28 @@ int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } +int pv_parse_def_name(pv_spec_p sp, str *in) +{ + if (in == NULL || in->s == NULL || sp == NULL) { + LM_ERR("INVALID DEF NAME\n"); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + +} + +extern str *pp_define_get(int len, const char * text); + +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str *val = pp_define_get(param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s); + + if (val) { + return pv_get_strval(msg, param, res, val); + } + return pv_get_null(msg, param, res); +} + diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 411f2f8aac..86629e66e0 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -379,5 +379,8 @@ int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_def_name(pv_spec_p sp, str *in); +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + #endif

5 years, 11 months

git:master:43aeb98f: pv: add $def pseudo variable

by lazedo

Module: kamailio Branch: master Commit: 43aeb98fbe3902cb8a1c5d653ce0ff8f4551d99a URL: https://github.com/kamailio/kamailio/commit/43aeb98fbe3902cb8a1c5d653ce0ff8… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2019-01-18T13:25:24Z pv: add $def pseudo variable --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/43aeb98fbe3902cb8a1c5d653ce0ff8… Patch: https://github.com/kamailio/kamailio/commit/43aeb98fbe3902cb8a1c5d653ce0ff8… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 06f831bd97..0df9353606 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -189,6 +189,8 @@ static pv_export_t mod_pvs[] = { {{"dd", (sizeof("dd")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 1}, + {{"def", (sizeof("env")-1)}, PVT_OTHER, pv_get_def, 0, + pv_parse_def_name, 0, 0, 0}, {{"di", (sizeof("di")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 01cebc8534..2e54253eb4 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3658,3 +3658,28 @@ int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } +int pv_parse_def_name(pv_spec_p sp, str *in) +{ + if (in == NULL || in->s == NULL || sp == NULL) { + LM_ERR("INVALID DEF NAME\n"); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + +} + +extern str *pp_define_get(int len, const char * text); + +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str *val = pp_define_get(param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s); + + if (val) { + return pv_get_strval(msg, param, res, val); + } + return pv_get_null(msg, param, res); +} + diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 411f2f8aac..86629e66e0 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -379,5 +379,8 @@ int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_def_name(pv_spec_p sp, str *in); +int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + #endif

5 years, 11 months

git:master:83a43714: core: allow pp_define_get to be used by modules

by lazedo

Module: kamailio Branch: master Commit: 83a437144bad5d31f5ce1bfc10b03f613524852f URL: https://github.com/kamailio/kamailio/commit/83a437144bad5d31f5ce1bfc10b03f6… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2019-01-18T13:18:01Z core: allow pp_define_get to be used by modules --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/83a437144bad5d31f5ce1bfc10b03f6… Patch: https://github.com/kamailio/kamailio/commit/83a437144bad5d31f5ce1bfc10b03f6… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 6e4d6971e5..9912d111bc 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -113,7 +113,7 @@ struct sr_yy_fname *next; } *sr_yy_fname_list = 0; - static str *pp_define_get(int len, const char * text); + str *pp_define_get(int len, const char * text); static int pp_ifdef_type(int pos); static void pp_ifdef_var(int len, const char * text); static void pp_ifdef(); @@ -1856,7 +1856,7 @@ int pp_define_set(int len, char *text) return 0; } -static str *pp_define_get(int len, const char * text) +str *pp_define_get(int len, const char * text) { str var = {(char *)text, len}; int i;

5 years, 11 months

git:master:2a436316: core: allow pvar resolve in subsdef

by lazedo

Module: kamailio Branch: master Commit: 2a43631692285346050ae906f772a1c111906c5b URL: https://github.com/kamailio/kamailio/commit/2a43631692285346050ae906f772a1c… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2019-01-18T13:17:02Z core: allow pvar resolve in subsdef --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/2a43631692285346050ae906f772a1c… Patch: https://github.com/kamailio/kamailio/commit/2a43631692285346050ae906f772a1c… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 1ff3103f52..a06795f760 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -32,6 +32,7 @@ #include "dprint.h" #include "ppcfg.h" +#include "fmsg.h" typedef struct _pp_subst_rule { char *indata; @@ -184,7 +185,8 @@ int pp_subst_run(char **data) i = 0; while(pr) { - result=subst_str(*data, 0, + sip_msg_t *fmsg = faked_msg_get_next(); + result=subst_str(*data, fmsg, (struct subst_expr*)pr->ppdata, 0); /* pkg malloc'ed result */ if(result!=NULL) {

5 years, 11 months

git:master:91c0e143: presence_mwi: small improvement to error log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 91c0e1434d743b8af7bcaa7d993029b6a3c15cb8 URL: https://github.com/kamailio/kamailio/commit/91c0e1434d743b8af7bcaa7d993029b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-24T12:46:57+01:00 presence_mwi: small improvement to error log message --- Modified: src/modules/presence_mwi/add_events.c --- Diff: https://github.com/kamailio/kamailio/commit/91c0e1434d743b8af7bcaa7d993029b… Patch: https://github.com/kamailio/kamailio/commit/91c0e1434d743b8af7bcaa7d993029b… --- diff --git a/src/modules/presence_mwi/add_events.c b/src/modules/presence_mwi/add_events.c index 94c606de75..001034ade4 100644 --- a/src/modules/presence_mwi/add_events.c +++ b/src/modules/presence_mwi/add_events.c @@ -106,8 +106,8 @@ int mwi_publ_handl(struct sip_msg* msg) return 1; err: - LM_ERR("check of body <%.*s> failed at character number %d\n", - body.len, body.s, (int)(at - body.s + 1)); + LM_ERR("check of body <%.*s> failed at character index %d (hexa: 0x%x)\n", + body.len, body.s, (int)(at - body.s + 1), (int)(*at)); return -1; }

5 years, 11 months

git:master:c02c05d5: modules: readme files regenerated - jsonrpcs ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c02c05d50762e14981c9a1817f303e1d10a8ea90 URL: https://github.com/kamailio/kamailio/commit/c02c05d50762e14981c9a1817f303e1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-23T23:01:41+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/c02c05d50762e14981c9a1817f303e1… Patch: https://github.com/kamailio/kamailio/commit/c02c05d50762e14981c9a1817f303e1… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index 3854db4a74..a16d628fae 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -363,13 +363,13 @@ children=2 tcp_accept_no_cl=yes -mpath="modules/" - loadmodule "sl.so" loadmodule "pv.so" loadmodule "xhttp.so" loadmodule "jsonrpcs.so" +modparam("jsonrpcs", "transport", 1) + request_route { send_reply("404", "not found"); exit;

5 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2019