sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:d43e8965: presence: fix counter and type for removing presentity from cache

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d43e8965640bbc64e56ef33f27d4f3c3a85c73fa URL: https://github.com/kamailio/kamailio/commit/d43e8965640bbc64e56ef33f27d4f3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T17:54:18+01:00 presence: fix counter and type for removing presentity from cache - report and patch by Kristian F. HÃ¸gh --- Modified: modules/presence/event_list.h Modified: modules/presence/hash.c Modified: modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/d43e8965640bbc64e56ef33f27d4f3c… Patch: https://github.com/kamailio/kamailio/commit/d43e8965640bbc64e56ef33f27d4f3c… --- diff --git a/modules/presence/event_list.h b/modules/presence/event_list.h index 2ebcafc..29511cb 100644 --- a/modules/presence/event_list.h +++ b/modules/presence/event_list.h @@ -83,7 +83,7 @@ struct pres_ev event_t* evp; str content_type; int default_expires; - int type; + int type; /* category type: WINFO_TIPE, PUBL_TYPE, ...*/ int etag_not_new; /* * 0 - the standard mechanism (allocating new etag for each Publish) diff --git a/modules/presence/hash.c b/modules/presence/hash.c index 6e85d37..11d9e3e 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -533,14 +533,16 @@ int insert_phtable(str* pres_uri, int event, char* sphere) if(p->sphere== NULL) { lock_release(&pres_htable[hash_code].lock); + shm_free(p); ERR_MEM(SHARE_MEM); } strcpy(p->sphere, sphere); } p->event= event; - + p->publ_count=1; + /* link the item in the hash table */ p->next= pres_htable[hash_code].entries->next; pres_htable[hash_code].entries->next= p; diff --git a/modules/presence/publish.c b/modules/presence/publish.c index 46ec334..4ca9afb 100644 --- a/modules/presence/publish.c +++ b/modules/presence/publish.c @@ -134,7 +134,7 @@ void msg_presentity_clean(unsigned int ticks,void *param) event.s = (char *) VAL_STRING(&values[event_col]); event.len = strlen(event.s); pres.event= contains_event(&event, NULL); - if(pres.event== NULL) + if(pres.event==NULL || pres.event->evp==NULL) { LM_ERR("event not found\n"); goto error; @@ -147,7 +147,7 @@ void msg_presentity_clean(unsigned int ticks,void *param) } /* delete from hash table */ - if(publ_cache_enabled && delete_phtable(&uri, pres.event->type)< 0) + if(publ_cache_enabled && delete_phtable(&uri, pres.event->evp->type)< 0) { LM_ERR("deleting from pres hash table\n"); goto error;

9 years, 10 months

[kamailio] siputils: fix for e164_check() (#28)

by Seudin Kasumovic

- fix improper length check You can merge this Pull Request by running: git pull https://github.com/seudin/kamailio siputil_fix Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/28 -- Commit Summary -- * siputils: fix for e164_check() -- File Changes -- M modules/siputils/checks.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/28.patch https://github.com/kamailio/kamailio/pull/28.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/28

9 years, 10 months

git:master:338b00c0: sl: don't remove the lump added in the 'after' list of delete lump

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 338b00c0f2d38694cffe3536e7eeed0e0d5372dd URL: https://github.com/kamailio/kamailio/commit/338b00c0f2d38694cffe3536e7eeed0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T13:42:13+01:00 sl: don't remove the lump added in the 'after' list of delete lump - they are destroyed together, making the operation useless --- Modified: modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/338b00c0f2d38694cffe3536e7eeed0… Patch: https://github.com/kamailio/kamailio/commit/338b00c0f2d38694cffe3536e7eeed0… --- diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 3a8cea2..5f3febb 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -437,9 +437,8 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) if(reason!=NULL) { if(ldel!=NULL) { remove_lump(msg, ldel); - } - if(ladd!=NULL) { - remove_lump(msg, ladd); + /* ladd is liked in the 'after' list inside ldel, + * destroyed together, no need for its own remove operation */ } } if(code!=NULL) {

9 years, 10 months

git:master:1fd0ca99: core: remove_lump() clears its innner before/after lists

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1fd0ca99eaa4b2c5cfcb8bd555a35088ddf49343 URL: https://github.com/kamailio/kamailio/commit/1fd0ca99eaa4b2c5cfcb8bd555a3508… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T13:42:13+01:00 core: remove_lump() clears its innner before/after lists - fixing leak issues that could be created by using sl_forward_reply() in config file --- Modified: data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/1fd0ca99eaa4b2c5cfcb8bd555a3508… Patch: https://github.com/kamailio/kamailio/commit/1fd0ca99eaa4b2c5cfcb8bd555a3508… --- diff --git a/data_lump.c b/data_lump.c index a47ae5a..daab9aa 100644 --- a/data_lump.c +++ b/data_lump.c @@ -698,6 +698,11 @@ unsigned int count_applied_lumps(struct lump *ll, int type) return n; } +/** + * remove a lump in a root list + * - it doesn't look for lumps added as before/after rule + * - destroys the entire lump, with associated before/after rules + */ int remove_lump(sip_msg_t *msg, struct lump *l) { struct lump *t = NULL; @@ -722,7 +727,9 @@ int remove_lump(sip_msg_t *msg, struct lump *l) } else { prev->next = t->next; } - free_lump(t); + /* detach and free all its content */ + t->next = NULL; + free_lump_list(t); return 1; } return 0;

9 years, 10 months

git:master:c1b4d442: core: parse_ppi_pai - free header parameters for PAI and PPI

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c1b4d442501591bd18e8130474eeb5c16101e549 URL: https://github.com/kamailio/kamailio/commit/c1b4d442501591bd18e8130474eeb5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T13:42:13+01:00 core: parse_ppi_pai - free header parameters for PAI and PPI - they are not considere in the compacted p_id_body_t and not freed - specs don't mention headers parameters for PAI and PPI, but could come as UA extensions --- Modified: parser/parse_ppi_pai.c --- Diff: https://github.com/kamailio/kamailio/commit/c1b4d442501591bd18e8130474eeb5c… Patch: https://github.com/kamailio/kamailio/commit/c1b4d442501591bd18e8130474eeb5c… --- diff --git a/parser/parse_ppi_pai.c b/parser/parse_ppi_pai.c index db50dc9..a82b50e 100644 --- a/parser/parse_ppi_pai.c +++ b/parser/parse_ppi_pai.c @@ -62,6 +62,8 @@ int parse_pai_ppi_body(char *buf, int len, p_id_body_t **body) LM_ERR("Error parsing PAI/PPI body %u '%.*s'\n", num_uri, len, buf); return -1; } + /* should be no header params, but in case there are, free them */ + free_to_params(&uri_b[num_uri]); num_uri++; while ((*tmp == ',') && (num_uri < NUM_PAI_BODIES)) { @@ -72,6 +74,8 @@ int parse_pai_ppi_body(char *buf, int len, p_id_body_t **body) LM_ERR("Error parsing PAI/PPI body %u '%.*s'\n", num_uri, len, buf); return -1; } + /* should be no header params, but in case there are, free them */ + free_to_params(&uri_b[num_uri]); num_uri++; } if (num_uri >= NUM_PAI_BODIES)

9 years, 10 months

git:master:5a714295: core: parse_add_spec() free params in case of parsing failure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a71429596851d8096de1abe5542e57e8b8f6547 URL: https://github.com/kamailio/kamailio/commit/5a71429596851d8096de1abe5542e57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T13:42:13+01:00 core: parse_add_spec() free params in case of parsing failure --- Modified: parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/5a71429596851d8096de1abe5542e57… Patch: https://github.com/kamailio/kamailio/commit/5a71429596851d8096de1abe5542e57… --- diff --git a/parser/parse_addr_spec.c b/parser/parse_addr_spec.c index f0388a2..c943bf9 100644 --- a/parser/parse_addr_spec.c +++ b/parser/parse_addr_spec.c @@ -913,6 +913,7 @@ char* parse_addr_spec(char* const buffer, const char* const end, struct to_body* return tmp; error: + free_to_params(to_b); to_b->error=PARSE_ERROR; return tmp;

9 years, 10 months

git:master:98878e11: dmq_usrloc: fixed update contacts

by Andrey Rybkin

Module: kamailio Branch: master Commit: 98878e113794726e2ec7bd7010a86860e6016c02 URL: https://github.com/kamailio/kamailio/commit/98878e113794726e2ec7bd7010a8686… Author: Andrey Rybkin <rybkin.a(a)bks.tv> Committer: Andrey Rybkin <rybkin.a(a)bks.tv> Date: 2015-01-14T13:42:00+03:00 dmq_usrloc: fixed update contacts --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/98878e113794726e2ec7bd7010a8686… Patch: https://github.com/kamailio/kamailio/commit/98878e113794726e2ec7bd7010a8686…

9 years, 10 months

[kamailio] dialplan: don't check subexpressions on expressions with pvs (#17)

by Victor Seva

subexpressions should not be checked when the expression has private variables output of the error ``` 0(10175) DEBUG: dialplan [dp_db.c:496]: build_rule(): building rule for [2:^(00|\+)([1-9][0-9]+)$/^(00|\+)([1-9][0-9]+)$/\2] 0(10175) DEBUG: dialplan [dp_db.c:533]: build_rule(): attrs are: '' 0(10175) DEBUG: dialplan [dp_db.c:580]: add_rule2hash(): new dpl_id 1 0(10175) DEBUG: dialplan [dp_db.c:593]: add_rule2hash(): new index , len 0 0(10175) DEBUG: dialplan [dp_db.c:629]: add_rule2hash(): added the rule id 1 index 0 pr 1 next (nil) to the index with 0 len 0(10175) DEBUG: dialplan [dp_repl.c:146]: repl_exp_parse(): replacement expression is [\1] 0(10175) DEBUG: dialplan [dp_db.c:102]: dpl_check_pv(): parsing [^$avp(s:caller_cc)$avp(s:caller_ac)([1-9][0-9]+)$] 0(10175) DEBUG: <core> [pvapi.c:419]: pv_spec_lookup(): PV <$avp(s:caller_cc)> is not in cache 0(10175) DEBUG: <core> [usr_avp.c:882]: parse_avp_ident(): Parsing 's:caller_cc' 0(10175) DEBUG: <core> [pvapi.c:293]: pv_cache_add(): pvar [$avp(s:caller_cc)] added in cache 0(10175) DEBUG: dialplan [dp_db.c:124]: dpl_check_pv(): string [^$avp(s:caller_cc)$avp(s:caller_ac)([1-9][0-9]+)$] has variables 0(10175) DEBUG: dialplan [dp_db.c:496]: build_rule(): building rule for [2:^$avp(s:caller_cc)$avp(s:caller_ac)([1-9][0-9]+)$/^$avp(s:caller_cc)$avp(s:caller_ac)([1-9][0-9]+)$/\1] 0(10175) ERROR: dialplan [dp_db.c:502]: build_rule(): repl_exp \1 refers to 1 sub-expressions, but subst_exp ^$avp(s:caller_cc)$avp(s:caller_ac)([1-9][0-9]+)$ has only 0 0(10175) DEBUG: dialplan [dp_db.c:685]: destroy_rule(): destroying rule with priority 1 ``` You can merge this Pull Request by running: git pull https://github.com/linuxmaniac/kamailio vseva/dialplan_fix Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/17 -- Commit Summary -- * dialplan: don't check subexpressions on expressions with pvs -- File Changes -- M modules/dialplan/dp_db.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/17.patch https://github.com/kamailio/kamailio/pull/17.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/17

9 years, 10 months

git:master:4763773e: dialplan: skip check subexpressions on expressions with pvs

by Victor Seva

Module: kamailio Branch: master Commit: 4763773eddf5e0e5ea4ae35ee6c2002e05f8bd9d URL: https://github.com/kamailio/kamailio/commit/4763773eddf5e0e5ea4ae35ee6c2002… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-14T11:29:51+01:00 dialplan: skip check subexpressions on expressions with pvs --- Modified: modules/dialplan/dp_db.c Modified: modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/4763773eddf5e0e5ea4ae35ee6c2002… Patch: https://github.com/kamailio/kamailio/commit/4763773eddf5e0e5ea4ae35ee6c2002… --- diff --git a/modules/dialplan/dp_db.c b/modules/dialplan/dp_db.c index 57b0e76..c1c421d 100644 --- a/modules/dialplan/dp_db.c +++ b/modules/dialplan/dp_db.c @@ -494,8 +494,10 @@ dpl_node_t * build_rule(db_val_t * values) LM_DBG("building rule for [%d:%.*s/%.*s/%.*s]\n", matchop, match_exp.len, ZSW(match_exp.s), subst_exp.len, ZSW(subst_exp.s), repl_exp.len, ZSW(repl_exp.s)); - if (repl_comp && (cap_cnt < repl_comp->max_pmatch) && - (repl_comp->max_pmatch != 0)) { + if (!(tflags&(DP_TFLAGS_PV_SUBST|DP_TFLAGS_PV_MATCH)) && + repl_comp && (cap_cnt < repl_comp->max_pmatch) && + (repl_comp->max_pmatch != 0)) + { LM_ERR("repl_exp %.*s refers to %d sub-expressions, but " "subst_exp %.*s has only %d\n", repl_exp.len, repl_exp.s, repl_comp->max_pmatch, diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index ee94be8..1e96ecf 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -188,7 +188,13 @@ int rule_translate(sip_msg_t *msg, str string, dpl_node_t * rule, } if(rule->tflags&DP_TFLAGS_PV_SUBST) { - subst_comp = dpl_dynamic_pcre(msg, &rule->subst_exp, NULL); + subst_comp = dpl_dynamic_pcre(msg, &rule->subst_exp, &cap_cnt); + if (cap_cnt > MAX_REPLACE_WITH) { + LM_ERR("subst expression %.*s has too many sub-expressions\n", + rule->subst_exp.len, rule->subst_exp.s); + if(subst_comp) pcre_free(subst_comp); + return -1; + } } else { subst_comp = rule->subst_comp; }

9 years, 10 months

[kamailio] nathelper: add append_sdp_oldmediaip parameter (#27)

by Victor Seva

In order to control the addition of sdp oldmediaip attribute. The default value (1) keeps the actual functionality. You can merge this Pull Request by running: git pull https://github.com/linuxmaniac/kamailio vseva/nathelper_10931 Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/27 -- Commit Summary -- * nathelper: add append_sdp_oldmediaip parameter -- File Changes -- M modules/nathelper/doc/nathelper_admin.xml (19) M modules/nathelper/nathelper.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/27.patch https://github.com/kamailio/kamailio/pull/27.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/27

9 years, 10 months

← Newer
1
...
20
21
22
23
24
25
26
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015