sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

git:master:9b003621: examples/kemi: notes about use of return code -255 and exit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9b00362149e5caf03aa90710908e12a120d5a0bd URL: https://github.com/kamailio/kamailio/commit/9b00362149e5caf03aa90710908e12a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-29T11:14:39+02:00 examples/kemi: notes about use of return code -255 and exit --- Modified: examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/9b00362149e5caf03aa90710908e12a… Patch: https://github.com/kamailio/kamailio/commit/9b00362149e5caf03aa90710908e12a… --- diff --git a/examples/kemi/kamailio-basic-kemi-lua.lua b/examples/kemi/kamailio-basic-kemi-lua.lua index 70593bb..f62bc77 100644 --- a/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/examples/kemi/kamailio-basic-kemi-lua.lua @@ -4,6 +4,14 @@ -- sr - the old static object exporting Kamailio functions -- +-- Relevant remarks: +-- * return code -255 is used to propagate the 'exit' behaviour to the +-- parent route block. The alternative is to use KSR.sr.exit() instead +-- of return -255. Do not use native Lua exit(), that kills the Lua +-- interpreter and implicitely stops Kamailio as the Lua interpreter is +-- embedded + + -- global variables corresponding to defined values (e.g., flags) in kamailio.cfg FLT_ACC=1 FLT_ACCMISSED=2

8 years, 7 months

git:master:a9305783: nsq: restructured the sections for functions and parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a9305783c4208f802c824b49dc4f2d9402c78249 URL: https://github.com/kamailio/kamailio/commit/a9305783c4208f802c824b49dc4f2d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-29T09:11:41+02:00 nsq: restructured the sections for functions and parameters - keep them directly under Functions and Parameters chapters, being required to be properly parsed for alphabetic indexes from wiki - added in description of each one a note if they are nsq or presence related --- Modified: modules/nsq/README Modified: modules/nsq/doc/nsq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a9305783c4208f802c824b49dc4f2d9… Patch: https://github.com/kamailio/kamailio/commit/a9305783c4208f802c824b49dc4f2d9…

8 years, 7 months

git:master:5e8c8079: nsq: rephrasing the general description and fixed several section titles

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e8c8079c7f318d80be94ba6064fac505c0f31e2 URL: https://github.com/kamailio/kamailio/commit/5e8c8079c7f318d80be94ba6064fac5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-29T09:38:24+02:00 nsq: rephrasing the general description and fixed several section titles --- Modified: modules/nsq/README Modified: modules/nsq/doc/nsq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e8c8079c7f318d80be94ba6064fac5… Patch: https://github.com/kamailio/kamailio/commit/5e8c8079c7f318d80be94ba6064fac5…

8 years, 7 months

git:master:e46875c9: nsq: regenerated the readme file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e46875c9c75a402966512251c9847eca14c9db44 URL: https://github.com/kamailio/kamailio/commit/e46875c9c75a402966512251c9847ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-29T00:23:40+02:00 nsq: regenerated the readme file --- Modified: modules/nsq/README --- Diff: https://github.com/kamailio/kamailio/commit/e46875c9c75a402966512251c9847ec… Patch: https://github.com/kamailio/kamailio/commit/e46875c9c75a402966512251c9847ec… --- diff --git a/modules/nsq/README b/modules/nsq/README index 40c7c03..f4f135f 100644 --- a/modules/nsq/README +++ b/modules/nsq/README @@ -10,7 +10,7 @@ Emmanuel Schmidbauer <emmanuel(a)getweave.com> - Copyright © 2016 Weave Communications + Copyright Â© 2016 Weave Communications __________________________________________________________________ Table of Contents @@ -313,7 +313,7 @@ modparam("nsq", "consumer_use_nsqd", 1) The default name of the field in json payload to compose the event name 1st part - Default value is "Event-Category". + Default value is âEvent-Categoryâ. Example 1.7. Set consumer_event_key parameter ... @@ -325,7 +325,7 @@ modparam("nsq", "consumer_event_key", "My-JSON-Field-Name") The default name of the field in json payload to compose the event name 2nd part - Default value is "Event-Name". + Default value is âEvent-Nameâ. Example 1.8. Set consumer_event_sub_key parameter ... @@ -357,11 +357,11 @@ modparam("nsq", "consumer_workers", 2) 4.1.10. topic_channel(str) - The NSQ Topic and Channel. Delimiter-separated by ":". It be set + The NSQ Topic and Channel. Delimiter-separated by â:â. It be set multiple times to subscribe to multiple topics and channels. The value of consumer_workers is allocated per topic_channel. - Default value is "Kamailio-Topic:Kamailio-Channel". + Default value is âKamailio-Topic:Kamailio-Channelâ. Example 1.11. Set topic_channel parameter ... @@ -378,7 +378,7 @@ modparam("nsq", "topic_channel", "My-NSQ-Topic-2:My-NSQ-Channel-2") If set, the nsq_pua_publish function will update the presentity status in the database. - Default value is "NULL". + Default value is âNULLâ. Example 1.12. Set db_url parameter ... @@ -389,7 +389,7 @@ modparam("nsq", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") The name of the presentity table in the database. - Default value is "presentity". + Default value is âpresentityâ. Example 1.13. Set presentity_table parameter ... @@ -404,7 +404,7 @@ modparam("nsq", "presentity_table", "my_presentity_table") 5.1. Presence Pelated -5.1.1. nsq_pua_publish(json_payload) +5.1.1. nsq_pua_publish(json_payload) The function build presentity state from json_payload and updates presentity table. @@ -433,10 +433,8 @@ ackage})", 1); * json Example 1.15. nsq.json usage ... -#nsq_json("$var(amqp_result)", "Channels[0].switch_url", "$du"); -$du = $nsqE{nsq.json,Channels[0].switch_url}; -if($du != $null) { - xlog("L_INFO", "$ci|log|user channels found redirecting call to $du"); - return; +$var(Custom-Data) = $(nsqE{nsq.json,Custom-Data}); +if($var(Custom-Data) != $null) { + xlog("L_INFO", "$ci|log|custom data: $var(Custom-Data)"); } ...

8 years, 7 months

git:master:0f35846c: mtree: exported mt_match(...) to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0f35846cdd02a338a4de2ae864d1f2bc05147eb2 URL: https://github.com/kamailio/kamailio/commit/0f35846cdd02a338a4de2ae864d1f2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-29T00:21:52+02:00 mtree: exported mt_match(...) to kemi --- Modified: modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0f35846cdd02a338a4de2ae864d1f2b… Patch: https://github.com/kamailio/kamailio/commit/0f35846cdd02a338a4de2ae864d1f2b… --- diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 9297a69..f65cdd4 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -1,6 +1,4 @@ /** - * $Id$ - * * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) * * This file is part of Kamailio, a free SIP server. @@ -42,6 +40,7 @@ #include "../../parser/parse_from.h" #include "../../rpc.h" #include "../../rpc_lookup.h" +#include "../../kemi.h" #include "mtree.h" @@ -114,8 +113,8 @@ static int child_init(int rank); static int mi_child_init(void); static int mtree_init_rpc(void); -static int mt_match(struct sip_msg *msg, gparam_t *dm, gparam_t *var, - gparam_t *mode); +static int mt_match(sip_msg_t *msg, str *tname, str *tomatch, + int mval); static struct mi_root* mt_mi_reload(struct mi_root*, void* param); static struct mi_root* mt_mi_list(struct mi_root*, void* param); @@ -397,36 +396,16 @@ static int fixup_mt_match(void** param, int param_no) /* use tree tn, match var, by mode, output in avp params */ -static int mt_match(struct sip_msg *msg, gparam_t *tn, gparam_t *var, - gparam_t *mode) +static int mt_match(sip_msg_t *msg, str *tname, str *tomatch, + int mval) { - str tname; - str tomatch; - int mval; m_tree_t *tr = NULL; - if(msg==NULL) - { + if(msg==NULL) { LM_ERR("received null msg\n"); return -1; } - if(fixup_get_svalue(msg, tn, &tname)<0) - { - LM_ERR("cannot get the tree name\n"); - return -1; - } - if(fixup_get_svalue(msg, var, &tomatch)<0) - { - LM_ERR("cannot get the match var\n"); - return -1; - } - if(fixup_get_ivalue(msg, mode, &mval)<0) - { - LM_ERR("cannot get the mode\n"); - return -1; - } - again: lock_get( mt_lock ); if (mt_reload_flag) { @@ -437,18 +416,17 @@ static int mt_match(struct sip_msg *msg, gparam_t *tn, gparam_t *var, mt_tree_refcnt++; lock_release( mt_lock ); - tr = mt_get_tree(&tname); - if(tr==NULL) - { + tr = mt_get_tree(tname); + if(tr==NULL) { /* no tree with such name*/ goto error; } - if(mt_match_prefix(msg, tr, &tomatch, mval)<0) + if(mt_match_prefix(msg, tr, tomatch, mval)<0) { LM_DBG("no prefix found in [%.*s] for [%.*s]\n", - tname.len, tname.s, - tomatch.len, tomatch.s); + tname->len, tname->s, + tomatch->len, tomatch->s); goto error; } @@ -464,10 +442,36 @@ static int mt_match(struct sip_msg *msg, gparam_t *tn, gparam_t *var, return -1; } -static int w_mt_match(struct sip_msg* msg, char* str1, char* str2, - char* str3) +static int w_mt_match(struct sip_msg* msg, char* ptn, char* pvar, + char* pmode) { - return mt_match(msg, (gparam_t*)str1, (gparam_t*)str2, (gparam_t*)str3); + str tname; + str tomatch; + int mval; + + if(msg==NULL) + { + LM_ERR("received null msg\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)ptn, &tname)<0) + { + LM_ERR("cannot get the tree name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)pvar, &tomatch)<0) + { + LM_ERR("cannot get the match var\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t*)pmode, &mval)<0) + { + LM_ERR("cannot get the mode\n"); + return -1; + } + + return mt_match(msg, &tname, &tomatch, mval); } int mt_param(modparam_t type, void *val) @@ -1427,3 +1431,25 @@ struct mi_root* mt_mi_match(struct mi_root* cmd_tree, void* param) return rpl_tree; } + +/** + * + */ +static sr_kemi_t sr_kemi_mtree_exports[] = { + { str_init("mtree"), str_init("mt_match"), + SR_KEMIP_INT, mt_match, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_mtree_exports); + return 0; +}

8 years, 7 months

[kamailio/kamailio] Added: Oracle Enterprise Linux 7 kamailio.spec file (#588)

by Konstantin S. Vishnivetsky

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/588 -- Commit Summary -- * Added: Oracle Enterprise Linux 7 kamailio.spec file -- File Changes -- A pkg/kamailio/rpm/kamailio.spec.oracle-7 (854) -- Patch Links -- https://github.com/kamailio/kamailio/pull/588.patch https://github.com/kamailio/kamailio/pull/588.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/588

8 years, 7 months

git:master:ab4e501e: cfgutils: exported lock(...)/unlock(...) to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ab4e501e0e1baf26e5c2ecc24968d0afdded0edc URL: https://github.com/kamailio/kamailio/commit/ab4e501e0e1baf26e5c2ecc24968d0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-28T23:39:54+02:00 cfgutils: exported lock(...)/unlock(...) to kemi --- Modified: modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/ab4e501e0e1baf26e5c2ecc24968d0a… Patch: https://github.com/kamailio/kamailio/commit/ab4e501e0e1baf26e5c2ecc24968d0a…

8 years, 7 months

git:master:b7ec4988: pkg: added rpm spec file for Oracle Enterprise Linux 7

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b7ec49886264b52b15d22b80c1c74ac40a6fb314 URL: https://github.com/kamailio/kamailio/commit/b7ec49886264b52b15d22b80c1c74ac… Author: Konstantin S. Vishnivetsky <voip-projects(a)vishnivetsky.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-28T22:55:12+02:00 pkg: added rpm spec file for Oracle Enterprise Linux 7 - includes adding shadow-utils dependency added to make %pre scriplet work properly - baed on PR #588 --- Added: pkg/kamailio/oracle/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b7ec49886264b52b15d22b80c1c74ac… Patch: https://github.com/kamailio/kamailio/commit/b7ec49886264b52b15d22b80c1c74ac…

8 years, 7 months

[kamailio/kamailio] Fix memory leak when converting body to multipart with set_body_multipart(); (#587)

by sergey-vb

Hi, All. I have some problems with pkg_memory leak. After each call used private memory of the "udp receiver" process increases at 2500 bytes. On test environment I hav set it to 2Mbyte, but it is full after 700 calls. I need to modify SDP in invite and other packets. When I do in script ==================================================== if(has_body("application/sdp")) set_body_multipart(); if (msg_apply_changes()) { xlog("L_INFO", "ISUP 1 Changes Applied Succesfully"); } } record_route(); dlg_manage route(RELAY); ==== I make test this on kamailio 4.3.5 and 4.4.0 - same issue. After discussion in mailing list with Daniel-Constantin Mierla, I have done debugging memory usage by process and found 3 points where memory hase not freeing after execution. This patch solves it for me. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/587 -- Commit Summary -- * Update textops.c * Update msg_translator.c -- File Changes -- M modules/textops/textops.c (2) M msg_translator.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/587.patch https://github.com/kamailio/kamailio/pull/587.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/587

8 years, 7 months

git:master:2b427a33: core: fix leak in case of error to get boundary inside check_boundaries()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2b427a33937c6a86ab231de39d5a4574309dbfc6 URL: https://github.com/kamailio/kamailio/commit/2b427a33937c6a86ab231de39d5a457… Author: sergey-vb <sergey.v.basov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-28T22:42:51+02:00 core: fix leak in case of error to get boundary inside check_boundaries() - impacted setting multi-part body function --- Modified: msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/2b427a33937c6a86ab231de39d5a457… Patch: https://github.com/kamailio/kamailio/commit/2b427a33937c6a86ab231de39d5a457… --- diff --git a/msg_translator.c b/msg_translator.c index bc2c3b2..9441717 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1688,7 +1688,8 @@ int get_boundary(struct sip_msg* msg, str* boundary) msg->content_type->body.len); if (params.s == NULL) { - LM_ERR("Content-Type hdr has no params\n"); + LM_INFO("Content-Type hdr has no params <%.*s>\n", + msg->content_type->body.len, msg->content_type->body.s); return -1; } params.len = msg->content_type->body.len - @@ -1749,7 +1750,10 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) } tmp.s = buf.s; t = tmp.len = buf.len; - if(get_boundary(msg, &ob)!=0) return -1; + if(get_boundary(msg, &ob)!=0) { + if(tmp.s) pkg_free(tmp.s); + return -1; + } if(str_append(&ob, &bsuffix, &b)!=0) { LM_ERR("Can't append suffix to boundary\n"); goto error;

8 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016