sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:master:11667d31: erlang: correcting documetation

by Seudin Kasumovic

Module: kamailio Branch: master Commit: 11667d316e92287affeb5034fe522679ea989ec5 URL: https://github.com/kamailio/kamailio/commit/11667d316e92287affeb5034fe52267… Author: Seudin Kasumovic <seudin(a)bicomsystems.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-14T17:03:22+02:00 erlang: correcting documetation - correcting title of example --- Modified: modules/erlang/doc/erlang_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/11667d316e92287affeb5034fe52267… Patch: https://github.com/kamailio/kamailio/commit/11667d316e92287affeb5034fe52267… --- diff --git a/modules/erlang/doc/erlang_admin.xml b/modules/erlang/doc/erlang_admin.xml index 4a3f3af..000c3e1 100644 --- a/modules/erlang/doc/erlang_admin.xml +++ b/modules/erlang/doc/erlang_admin.xml @@ -512,7 +512,7 @@ erl_reg_send("notifier","$tuple(M)"); Function sends reply message <emphasis>msg</emphasis> to the sender process. </para> <example> - <title>Example of registered process</title> + <title>Example of use <emphasis>erl_reply</emphasis></title> <programlisting format="linespecific"> ... # event route acts as registered process

9 years, 7 months

git:master:7f76c92a: erlang: delete unused code

by Seudin Kasumovic

Module: kamailio Branch: master Commit: 7f76c92a7b2ddac30faa1f075111fc20b652ef69 URL: https://github.com/kamailio/kamailio/commit/7f76c92a7b2ddac30faa1f075111fc2… Author: Seudin Kasumovic <seudin(a)bicomsystems.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-14T17:02:38+02:00 erlang: delete unused code Delete unused function from code. --- Modified: modules/erlang/pv_atom.c --- Diff: https://github.com/kamailio/kamailio/commit/7f76c92a7b2ddac30faa1f075111fc2… Patch: https://github.com/kamailio/kamailio/commit/7f76c92a7b2ddac30faa1f075111fc2… --- diff --git a/modules/erlang/pv_atom.c b/modules/erlang/pv_atom.c index a606e21..b0d38d4 100644 --- a/modules/erlang/pv_atom.c +++ b/modules/erlang/pv_atom.c @@ -146,65 +146,6 @@ sr_xavp_t *xavp_get_atoms() return list; } -int pv_atom_new_xavp(sr_xval_t *xval, pv_value_t *pval, int *counter) -{ - char s[32]; - str name; - sr_xavp_t *xavp = NULL; - sr_xval_t nval; - xbuff_type_t type; - - if (!xval) return -1; - - memset((void*)xval,0,sizeof(sr_xval_t)); - - if (pval->flags&PV_VAL_NULL) { - nval.type = SR_XTYPE_NULL; - } else if (pval->flags&PV_VAL_INT) { - LM_ERR("can't convert integer to atom\n"); - return -1; - } else if (pval->flags&PV_VAL_STR) { - /* check what it is */ - if (xbuff_match_type_re(&pval->rs,&type,&xavp)) { - nval.type = SR_XTYPE_STR; - nval.v.s = pval->rs; - } else { - switch (type) { - case XBUFF_TYPE_ATOM: - case XBUFF_TYPE_STR: - break; - case XBUFF_TYPE_TUPLE: - case XBUFF_TYPE_LIST: - case XBUFF_TYPE_INT: - LM_ERR("can't convert integer, tuple or list into atom\n"); - return -1; - break; - default: - LM_ERR("BUG: unexpected XBUFF type!\n"); - return -1; - } - - /* copy tree */ - nval.type = SR_XTYPE_STR; - nval.v.s = xavp->val.v.s; - } - } - - name.s = s; - name.len = snprintf(s,31,"a%d",(*counter)++) + 1; - - xavp = xavp_new_value(&name,&nval); - - if (!xavp) { - return -1; - } - - xval->type = SR_XTYPE_XAVP; - xval->v.xavp = xavp; - - return 0; -} - int pv_atom_set(struct sip_msg* msg, pv_param_t* param, int op, pv_value_t* val) { str name; @@ -275,6 +216,7 @@ int pv_atom_set(struct sip_msg* msg, pv_param_t* param, int op, pv_value_t* val return -1; } + int pv_atom_get_value(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, sr_xavp_t *avp) {

9 years, 7 months

[kamailio] erlang: fixes and new PV (#163)

by Seudin Kasumovic

- delete unused code - update documentation - new pseudo variable pid You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/163 -- Commit Summary -- * erlang: delete unused code * erlang: correcting documetation * erlang: new pseudo variable for Erlang process id * erlang: update documentation -- File Changes -- M modules/erlang/README (57) M modules/erlang/doc/erlang_admin.xml (27) M modules/erlang/handle_emsg.c (46) M modules/erlang/mod_erlang.c (11) M modules/erlang/pv_atom.c (60) M modules/erlang/pv_list.c (5) A modules/erlang/pv_pid.c (333) A modules/erlang/pv_pid.h (35) M modules/erlang/pv_tuple.c (6) M modules/erlang/pv_xbuff.c (109) M modules/erlang/pv_xbuff.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/163.patch https://github.com/kamailio/kamailio/pull/163.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/163

9 years, 7 months

git:master:4a480ba9: Merge pull request #162 from que273/master

by Hugh Waite

Module: kamailio Branch: master Commit: 4a480ba9745b6874f86808fc21dcd750e00febd3 URL: https://github.com/kamailio/kamailio/commit/4a480ba9745b6874f86808fc21dcd75… Author: Hugh Waite <que273(a)users.noreply.github.com> Committer: Hugh Waite <que273(a)users.noreply.github.com> Date: 2015-05-14T16:00:02+01:00 Merge pull request #162 from que273/master app_lua: Fix memory leak in sr.modf --- Modified: modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/4a480ba9745b6874f86808fc21dcd75… Patch: https://github.com/kamailio/kamailio/commit/4a480ba9745b6874f86808fc21dcd75… --- diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 1eebdd1..e529421 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -265,6 +265,11 @@ static int lua_sr_modf (lua_State *L) } } pkg_free(act); + for(i=0; i<MAX_ACTIONS; i++) + { + if(argv[i]!=NULL) pkg_free(argv[i]); + argv[i] = 0; + } lua_pushinteger(L, ret); return 1;

9 years, 7 months

git:master:733f5ad7: app_lua: Fix memory leak in sr.modf

by Hugh Waite

Module: kamailio Branch: master Commit: 733f5ad7c9b2515c52b00875fb5dac689ddd9a17 URL: https://github.com/kamailio/kamailio/commit/733f5ad7c9b2515c52b00875fb5dac6… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: 2015-05-14T13:54:20+01:00 app_lua: Fix memory leak in sr.modf - Free pkg memory allocated to store cloned function parameters --- Modified: modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/733f5ad7c9b2515c52b00875fb5dac6… Patch: https://github.com/kamailio/kamailio/commit/733f5ad7c9b2515c52b00875fb5dac6… --- diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 1eebdd1..e529421 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -265,6 +265,11 @@ static int lua_sr_modf (lua_State *L) } } pkg_free(act); + for(i=0; i<MAX_ACTIONS; i++) + { + if(argv[i]!=NULL) pkg_free(argv[i]); + argv[i] = 0; + } lua_pushinteger(L, ret); return 1;

9 years, 7 months

[kamailio] app_lua: Fix memory leak in sr.modf (#162)

by Hugh Waite

- Free pkg memory allocated to store cloned function parameters You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/162 -- Commit Summary -- * app_lua: Fix memory leak in sr.modf -- File Changes -- M modules/app_lua/app_lua_sr.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/162.patch https://github.com/kamailio/kamailio/pull/162.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/162

9 years, 7 months

git:master:88b67575: tm: safety check not to allocate 0 bytes in rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 88b67575f9457312d0277e16dc06103be3a31965 URL: https://github.com/kamailio/kamailio/commit/88b67575f9457312d0277e16dc06103… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-14T13:40:11+02:00 tm: safety check not to allocate 0 bytes in rpc command --- Modified: modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/88b67575f9457312d0277e16dc06103… Patch: https://github.com/kamailio/kamailio/commit/88b67575f9457312d0277e16dc06103… --- diff --git a/modules/tm/rpc_uac.c b/modules/tm/rpc_uac.c index 14c02f0..d223fd2 100644 --- a/modules/tm/rpc_uac.c +++ b/modules/tm/rpc_uac.c @@ -211,7 +211,12 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, DBG("get_hfblock: one more hf processed\n"); } /* header loop */ - /* construct a single header block now */ + if(total_len==0) { + LM_DBG("empty result for headers block\n"); + goto error; + } + + /* construct a single header block now */ ret = pkg_malloc(total_len); if (!ret) { LOG(L_ERR, "get_hfblock: no pkg mem for hf block\n");

9 years, 7 months

git:master:af9deb90: core: safety checks for swich statements with no case branch

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: af9deb9026a271aa3a1bdbb5685b63e3e78772bd URL: https://github.com/kamailio/kamailio/commit/af9deb9026a271aa3a1bdbb5685b63e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-14T13:33:50+02:00 core: safety checks for swich statements with no case branch --- Modified: switch.c --- Diff: https://github.com/kamailio/kamailio/commit/af9deb9026a271aa3a1bdbb5685b63e… Patch: https://github.com/kamailio/kamailio/commit/af9deb9026a271aa3a1bdbb5685b63e… --- diff --git a/switch.c b/switch.c index b4a6b75..6aeffc2 100644 --- a/switch.c +++ b/switch.c @@ -230,7 +230,9 @@ int fix_switch(struct action* t) LM_DBG("default only switch optimized away (BLOCK_T)\n"); return 0; } - LM_DBG("default only switch with side-effect...\n"); + LM_CRIT("default only switch with side-effect not expected at this point\n"); + ret=E_BUG; + goto error; }else{ LM_CRIT("empty switch not expected at this point\n"); ret=E_BUG; @@ -545,7 +547,9 @@ static int fix_match(struct action* t) LM_DBG("default only switch optimized away (BLOCK_T)\n"); return 0; } - LM_DBG("default only switch with side-effect...\n"); + LM_CRIT("default only switch with side-effect not expected at this point\n"); + ret=E_BUG; + goto error; }else{ LM_CRIT("empty switch not expected at this point\n"); ret=E_BUG;

9 years, 7 months

git:master:0db313f0: tmx: check for empty result not to allocate 0 bytes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0db313f0047fc512dec2976cac168989b60d49c8 URL: https://github.com/kamailio/kamailio/commit/0db313f0047fc512dec2976cac16898… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-14T13:24:38+02:00 tmx: check for empty result not to allocate 0 bytes - allocation of 0 size is undefined when using system malloc --- Modified: modules/tmx/t_mi.c --- Diff: https://github.com/kamailio/kamailio/commit/0db313f0047fc512dec2976cac16898… Patch: https://github.com/kamailio/kamailio/commit/0db313f0047fc512dec2976cac16898… --- diff --git a/modules/tmx/t_mi.c b/modules/tmx/t_mi.c index 735e911..485b160 100644 --- a/modules/tmx/t_mi.c +++ b/modules/tmx/t_mi.c @@ -228,6 +228,10 @@ static inline char *get_hfblock( str *uri, struct hdr_field *hf, int *l, struct LM_DBG("one more hf processed\n"); } /* header loop */ + if(total_len==0) { + LM_DBG("empty result\n"); + goto error; + } /* construct a single header block now */ ret=pkg_malloc(total_len);

9 years, 7 months

git:master:2d40e14d: presence_xml: better error handling to free all allocated vars

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2d40e14d2b0b150acd34ac2d1df25936d8faaca9 URL: https://github.com/kamailio/kamailio/commit/2d40e14d2b0b150acd34ac2d1df2593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-14T13:15:06+02:00 presence_xml: better error handling to free all allocated vars --- Modified: modules/presence_xml/pres_check.c --- Diff: https://github.com/kamailio/kamailio/commit/2d40e14d2b0b150acd34ac2d1df2593… Patch: https://github.com/kamailio/kamailio/commit/2d40e14d2b0b150acd34ac2d1df2593… --- diff --git a/modules/presence_xml/pres_check.c b/modules/presence_xml/pres_check.c index 4504048..8f45c0f 100644 --- a/modules/presence_xml/pres_check.c +++ b/modules/presence_xml/pres_check.c @@ -140,7 +140,7 @@ int presxml_check_activities(struct sip_msg *msg, str presentity_uri, str activi if (presentity == NULL || presentity->len <= 0 || presentity->s == NULL) { LM_DBG("cannot get presentity for %.*s\n", presentity_uri.len, presentity_uri.s); - return -1; + goto error; } if ((xmlDoc = xmlParseMemory(presentity->s, presentity->len)) == NULL) @@ -192,6 +192,7 @@ int presxml_check_activities(struct sip_msg *msg, str presentity_uri, str activi pkg_free(nodeName); if (xmlDoc != NULL) xmlFreeDoc(xmlDoc); - pres_free_presentity(presentity, ev); + if(presentity != NULL) + pres_free_presentity(presentity, ev); return retval; }

9 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015