sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:tirpi/cfg_framework_multivalue: cfg framework: apply the additional variable list

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 92f85d59c0bd582b396d09c509a78902c8ccffab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92f85d5… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 28 11:44:29 2010 +0200 cfg framework: apply the additional variable list The additional variable list which is linked to the groups is applied when the config is shmized. During this process, the array of group instances is created, the values are fixed-up, the changes are applied to each instance, and the list is freed. Any change after the config is shmized is directly made in the memory block as opposed to using the list. (The list is necessary at the beginning because not even shm_malloc is available, and the number of group instances is not known.) --- cfg/cfg_ctx.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ cfg/cfg_ctx.h | 7 ++ cfg/cfg_struct.c | 102 +++++++++++++++++++++++++++++++- cfg/cfg_struct.h | 3 + 4 files changed, 286 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=92f…

14 years, 4 months

git:master: xcap_server: added oma auid in example

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 945eb2096fed91def1290f34ab694b08ce878a4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=945eb20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 28 10:04:32 2010 +0200 xcap_server: added oma auid in example --- modules_k/xcap_server/README | 1 + modules_k/xcap_server/doc/xcap_server_admin.xml | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules_k/xcap_server/README b/modules_k/xcap_server/README index 4405afb..681f194 100644 --- a/modules_k/xcap_server/README +++ b/modules_k/xcap_server/README @@ -322,6 +322,7 @@ event_route[xhttp:request] { <auid>xcap-caps</auid> <auid>resource-lists</auid> <auid>pres-rules</auid> + <auid>org.openmobilealliance.pres-rules</auid> </auids> <extensions> </extensions> diff --git a/modules_k/xcap_server/doc/xcap_server_admin.xml b/modules_k/xcap_server/doc/xcap_server_admin.xml index 2c890c0..95ff2a0 100644 --- a/modules_k/xcap_server/doc/xcap_server_admin.xml +++ b/modules_k/xcap_server/doc/xcap_server_admin.xml @@ -369,11 +369,12 @@ event_route[xhttp:request] { "<?xml version='1.0' encoding='UTF-8'?> <xcap-caps xmlns='urn:ietf:params:xml:ns:xcap-caps'> <auids> - <auid>rls-services</auid> - <auid>pidf-manipulation</auid> - <auid>xcap-caps</auid> - <auid>resource-lists</auid> - <auid>pres-rules</auid> + <auid>rls-services</auid> + <auid>pidf-manipulation</auid> + <auid>xcap-caps</auid> + <auid>resource-lists</auid> + <auid>pres-rules</auid> + <auid>org.openmobilealliance.pres-rules</auid> </auids> <extensions> </extensions>

14 years, 4 months

git:master: presence(k): added pres_update_watchers(uri, event)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 373d3ee17acab0304d339b9bc17f8c14eeb5d348 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=373d3ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 28 09:53:19 2010 +0200 presence(k): added pres_update_watchers(uri, event) - function needed to update status of watchers when xcap data changes (e.g., via xcap_server module) --- modules_k/presence/README | 22 +++++++ modules_k/presence/doc/presence_admin.xml | 32 +++++++++++ modules_k/presence/presence.c | 86 +++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/README b/modules_k/presence/README index 6ddcc3e..83996b4 100644 --- a/modules_k/presence/README +++ b/modules_k/presence/README @@ -58,6 +58,7 @@ Juha Heinanen 4.2. handle_subscribe() 4.3. pres_auth_status(watcher_uri, presentity_uri) 4.4. pres_refresh_watchers(uri, event, type) + 4.5. pres_update_watchers(uri, event) 5. Exported MI Functions @@ -105,6 +106,7 @@ Juha Heinanen 1.17. handle_subscribe usage 1.18. pres_auth_status usage 1.19. pres_refresh_watchers usage + 1.20. pres_update_watchers usage 2.1. presence_api_t structure Chapter 1. Admin Guide @@ -141,6 +143,7 @@ Chapter 1. Admin Guide 4.2. handle_subscribe() 4.3. pres_auth_status(watcher_uri, presentity_uri) 4.4. pres_refresh_watchers(uri, event, type) + 4.5. pres_update_watchers(uri, event) 5. Exported MI Functions @@ -410,6 +413,7 @@ modparam("presence", "timeout_rm_subs", 0) 4.2. handle_subscribe() 4.3. pres_auth_status(watcher_uri, presentity_uri) 4.4. pres_refresh_watchers(uri, event, type) + 4.5. pres_update_watchers(uri, event) 4.1. handle_publish(char* sender_uri) @@ -510,6 +514,24 @@ if (method=="MESSAGE") { pres_refresh_watchers("sip:test@kamailio.org", "presence", 1); ... +4.5. pres_update_watchers(uri, event) + + The function can be used in configuration to triger updates to watchers + status if a change in watchers authorization state occurred (i.e., + updates of xcap documents change state from pending to active). + + Parameters: + * uri - the uri of the user who made the change and whose watchers + should be informed. Can be PV. + * event - the event package (e.g., presence). + + This function can be used from ANY_ROUTE. + + Example 1.20. pres_update_watchers usage +... +pres_update_watchers("sip:test@kamailio.org", "presence"); +... + 5. Exported MI Functions 5.1. refreshWatchers diff --git a/modules_k/presence/doc/presence_admin.xml b/modules_k/presence/doc/presence_admin.xml index f71b306..edc6176 100644 --- a/modules_k/presence/doc/presence_admin.xml +++ b/modules_k/presence/doc/presence_admin.xml @@ -568,6 +568,38 @@ pres_refresh_watchers("sip:test@kamailio.org", "presence", 1); </programlisting> </example> </section> + + <section> + <title> + <function moreinfo="none">pres_update_watchers(uri, event)</function> + </title> + <para> + The function can be used in configuration to triger updates to watchers + status if a change in watchers authorization state occurred + (i.e., updates of xcap documents change state from pending to active). + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>uri - the uri of the user who made the change + and whose watchers should be informed. Can be PV.</para> + </listitem> + <listitem> + <para>event - the event package (e.g., presence).</para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pres_update_watchers</function> usage</title> + <programlisting format="linespecific"> +... +pres_update_watchers("sip:test@kamailio.org", "presence"); +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index cbb9f15..5b00ad3 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -122,7 +122,10 @@ static int mi_child_init(void); static int pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2); static int w_pres_refresh_watchers(struct sip_msg *msg, char *puri, char *pevent, char *ptype); +static int w_pres_update_watchers(struct sip_msg *msg, char *puri, + char *pevent); static int fixup_refresh_watchers(void** param, int param_no); +static int fixup_update_watchers(void** param, int param_no); int counter =0; int pid = 0; @@ -152,6 +155,8 @@ static cmd_export_t cmds[]= fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE}, {"pres_refresh_watchers", (cmd_function)w_pres_refresh_watchers, 3, fixup_refresh_watchers, 0, ANY_ROUTE}, + {"pres_update_watchers", (cmd_function)w_pres_update_watchers, 2, + fixup_update_watchers, 0, ANY_ROUTE}, {"bind_presence", (cmd_function)bind_presence, 1, 0, 0, 0}, { 0, 0, 0, 0, 0, 0} @@ -1252,3 +1257,84 @@ static int fixup_refresh_watchers(void** param, int param_no) } return 0; } + + +/** + * wrapper for update_watchers_status to use in config + */ +static int w_pres_update_watchers(struct sip_msg *msg, char *puri, + char *pevent) +{ + str pres_uri; + str event; + pres_ev_t* ev; + struct sip_uri uri; + str* rules_doc = NULL; + int ret; + + if(fixup_get_svalue(msg, (gparam_p)puri, &pres_uri)!=0) + { + LM_ERR("invalid uri parameter"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)pevent, &event)!=0) + { + LM_ERR("invalid uri parameter"); + return -1; + } + + ev = contains_event(&event, NULL); + if(ev==NULL) + { + LM_ERR("event %.*s is not registered\n", + event.len, event.s); + return -1; + } + if(ev->get_rules_doc==NULL) + { + LM_DBG("event %.*s does not provide rules doc API\n", + event.len, event.s); + return -1; + } + if(parse_uri(pres_uri.s, pres_uri.len, &uri)<0) + { + LM_ERR("failed to parse presentity uri [%.*s]\n", + pres_uri.len, pres_uri.s); + return -1; + } + ret = ev->get_rules_doc(&uri.user, &uri.host, &rules_doc); + if((ret < 0) || (rules_doc==NULL) || (rules_doc->s==NULL)) + { + LM_DBG("no xcap rules doc found for presentity uri [%.*s]\n", + pres_uri.len, pres_uri.s); + if(rules_doc != NULL) + pkg_free(rules_doc); + return -1; + } + ret = 1; + if(update_watchers_status(pres_uri, ev, rules_doc)<0) + { + LM_ERR("updating watchers in presence\n"); + ret = -1; + } + + pkg_free(rules_doc->s); + pkg_free(rules_doc); + + return ret; +} + +/** + * fixup for w_pres_update_watchers + */ +static int fixup_update_watchers(void** param, int param_no) +{ + if(param_no==1) + { + return fixup_spve_null(param, 1); + } else if(param_no==2) { + return fixup_spve_null(param, 1); + } + return 0; +}

14 years, 4 months

git:master: modules/lcr: renamed utils script

by Juha Heinanen

Module: sip-router Branch: master Commit: 86734ff0df67f0f82002cae4cde87e24fe91edeb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86734ff… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Sep 28 08:43:47 2010 +0300 modules/lcr: renamed utils script --- .../{lcr_weight_test.php => lcr_weight_test.sh} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/lcr/utils/lcr_weight_test.php b/modules/lcr/utils/lcr_weight_test.sh similarity index 100% rename from modules/lcr/utils/lcr_weight_test.php rename to modules/lcr/utils/lcr_weight_test.sh

14 years, 4 months

git:master: modules/lcr: README improvement and a new script

by Juha Heinanen

Module: sip-router Branch: master Commit: 2f95266d695532fd5ade1cd45b61c61055577d62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f95266… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Sep 28 08:28:49 2010 +0300 modules/lcr: README improvement and a new script - Added a paragraph on lcr weights. - Added a script that can be used to determine probabilities corresponding to a set of weights. --- modules/lcr/README | 9 ++++++- modules/lcr/doc/lcr_admin.xml | 11 +++++++- modules/lcr/utils/lcr_weight_test.php | 43 +++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 44b9f1f..8fa8a98 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -230,7 +230,14 @@ Chapter 1. Admin Guide expression (see 'man pcresyntax' for syntax), an empty string, or NULL. An empty or NULL from pattern or prefix matches anything. Smaller priority value means higher priority (highest priority value being 0 - and lowest being 255). Weight is an integer value from 1 to 254. + and lowest being 255). + + Weight is an integer value from 1 to 254. Weight implementation is + fast, but unfair favoring larger weight values at the expense smaller + ones. For example, if two gateways have weights 1 and 2, probability + that the gateway with weight 1 is tried first is 1/4, not 1/3. A script + is provided in lcr/utils directory that can be used to check the + probabilities resulting from a given set of weight values. The function next_gw() can then be used to select one gateway at a time for forwarding. Upon each call, unless "dont_strip_of_tag" flag is set, diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index ab0b45e..562a7c0 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -66,8 +66,15 @@ pcresyntax' for syntax), an empty string, or NULL. An empty or NULL from pattern or prefix matches anything. Smaller priority value means higher priority (highest priority - value being 0 and lowest being 255). Weight is an integer value - from 1 to 254. + value being 0 and lowest being 255). + </para> + <para> + Weight is an integer value from 1 to 254. Weight implementation is + fast, but unfair favoring larger weight values at the expense smaller + ones. For example, if two gateways have weights 1 and 2, probability + that the gateway with weight 1 is tried first is 1/4, not 1/3. + A script is provided in lcr/utils directory that can be used to + check the probabilities resulting from a given set of weight values. </para> <para> The function <emphasis>next_gw()</emphasis> can then be used to diff --git a/modules/lcr/utils/lcr_weight_test.php b/modules/lcr/utils/lcr_weight_test.php new file mode 100755 index 0000000..53c9319 --- /dev/null +++ b/modules/lcr/utils/lcr_weight_test.php @@ -0,0 +1,43 @@ +#!/usr/bin/php +<?php + + // This script can be used to find out actual probabilities + // that correspond to a list of LCR gateway weights. + +if ($argc < 2) { + echo "Usage: lcr_weight_test.php <list of weights (integers 1-254)>\n"; + exit; + } + +$iters = 10000; + +$rands = array(); +for ($i = 1; $i <= $iters; $i++) { + $elem = array(); + for ($j = 1; $j < $argc; $j++) { + $elem["$j"] = $argv[$j] * (rand() >> 8); + } + $rands[] = $elem; + } + +$sorted = array(); +foreach ($rands as $rand) { + asort($rand); + $sorted[] = $rand; + } + +$counts = array(); +for ($j = 1; $j < $argc; $j++) { + $counts["$j"] = 0; + } + +foreach ($sorted as $rand) { + end($rand); + $counts[key($rand)]++; + } + +for ($j = 1; $j < $argc; $j++) { + echo "weight " . $argv[$j] . " probability " . $counts["$j"]/$iters . "\n"; + } + +?>

14 years, 4 months

git:master: version set to 3.1.0-pre1

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 22f545d80eda337c5834f08fa27f3065dcd2ed2a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22f545d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 27 21:50:40 2010 +0200 version set to 3.1.0-pre1 --- Makefile.defs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index e8a1a21..b6a0b59 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -158,9 +158,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 3 -PATCHLEVEL = 0 -SUBLEVEL = 99 -EXTRAVERSION = -dev1 +PATCHLEVEL = 1 +SUBLEVEL = 0 +EXTRAVERSION = -pre1 # memory debugger switcher # 0 - off (release mode)

14 years, 4 months

git:master: debugger: some fixes in documentation

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e8e372698904c6afae4952d0291b051b4116bbd8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8e3726… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 27 21:51:16 2010 +0200 debugger: some fixes in documentation --- modules/debugger/README | 17 ++++++++++------- modules/debugger/doc/debugger_admin.xml | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/modules/debugger/README b/modules/debugger/README index ce05b89..8e55a64 100644 --- a/modules/debugger/README +++ b/modules/debugger/README @@ -96,12 +96,13 @@ Chapter 1. Admin Guide the config. Debugging can be done from local or remote host via RPC interface - (e.g., XMLRPC, sercmd). + (e.g., XMLRPC, sercmd, siremis). The framework to set breakpoints on specific actions and config lines - is not exported to RPC yet, right now each action has an breakpoint. - The breakpoint can be enabled/disabled at runtime. Also the config - running trace can be enabled/disabled at runtime. + is not exported to RPC yet. Each action can be accompanied by an + breakpoint or you can use dbg_breakpoint() function to set a breakpoint + at certain line. Global breakpoint can be enabled/disabled at runtime. + Also the config running trace can be enabled/disabled at runtime. When the SIP router process is stopped at a breakpoint, you can investigate the values of any pseudo-varaibles. Note that some of @@ -139,6 +140,8 @@ Chapter 1. Admin Guide 3.1. cfgtrace (int) Control whether config running trace is enabled or disabled at startup. + You can change the value at runtime without restart, globally or per + process. Default value is “0” (disabled). @@ -149,7 +152,7 @@ modparam("debugger", "cfgtrace", 1) 3.2. breakpoint (int) - Control whether every line (for now) breakpoint is enabled or disabled + Control whether every line (global) breakpoint is enabled or disabled at startup. Default value is “0” (disabled). @@ -224,7 +227,7 @@ modparam("debugger", "step_loops", 100) 4.1. dbg_breakpoint(mode) - Achor a breakpoint at that line in config. Mode specifies whether the + Anchor a breakpoint at that line in config. Mode specifies whether the breakpoint is enabled (1) or disabled (0) at startup. Note that this version does not export this anchors to RPC for @@ -282,7 +285,7 @@ if($si=="10.0.0.10") Parameters: * _cmd_ : inner command, see next section for the list of available values. - * _pid_ : pid for which to apply the inner command. If it missing, + * _pid_ : pid for which to apply the inner command. If it is missing, then will be applied for all processes. * _params_ : extra params specific for each inner command. diff --git a/modules/debugger/doc/debugger_admin.xml b/modules/debugger/doc/debugger_admin.xml index 30fb574..78d5582 100644 --- a/modules/debugger/doc/debugger_admin.xml +++ b/modules/debugger/doc/debugger_admin.xml @@ -24,13 +24,14 @@ </para> <para> Debugging can be done from local or remote host via RPC interface (e.g., - XMLRPC, sercmd). + XMLRPC, sercmd, siremis). </para> <para> The framework to set breakpoints on specific actions and config lines - is not exported to RPC yet, right now each action has an breakpoint. The - breakpoint can be enabled/disabled at runtime. Also the config running - trace can be enabled/disabled at runtime. + is not exported to RPC yet. Each action can be accompanied by an + breakpoint or you can use dbg_breakpoint() function to set a breakpoint + at certain line. Global breakpoint can be enabled/disabled at runtime. + Also the config running trace can be enabled/disabled at runtime. </para> <para> When the SIP router process is stopped at a breakpoint, you can @@ -77,7 +78,8 @@ <title><varname>cfgtrace</varname> (int)</title> <para> Control whether config running trace is enabled or disabled - at startup. + at startup. You can change the value at runtime without + restart, globally or per process. </para> <para> <emphasis> @@ -97,7 +99,7 @@ modparam("debugger", "cfgtrace", 1) <section> <title><varname>breakpoint</varname> (int)</title> <para> - Control whether every line (for now) breakpoint is enabled + Control whether every line (global) breakpoint is enabled or disabled at startup. </para> <para> @@ -228,7 +230,7 @@ modparam("debugger", "step_loops", 100) <function moreinfo="none">dbg_breakpoint(mode)</function> </title> <para> - Achor a breakpoint at that line in config. Mode specifies + Anchor a breakpoint at that line in config. Mode specifies whether the breakpoint is enabled (1) or disabled (0) at startup. </para> <para> @@ -321,7 +323,7 @@ if($si=="10.0.0.10") the list of available values.</para> </listitem> <listitem><para>_pid_ : pid for which to apply the inner command. - If it missing, then will be applied for all processes.</para> + If it is missing, then will be applied for all processes.</para> </listitem> <listitem><para>_params_ : extra params specific for each inner command.</para>

14 years, 4 months

git:master: xcap_server: support parsing oma pres-rules auid

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2bc4838464d79016bbb6d606ae39378871c1ed82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bc4838… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 27 22:02:42 2010 +0200 xcap_server: support parsing oma pres-rules auid --- modules_k/xcap_server/xcap_misc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 103d218..16a403d 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -133,6 +133,10 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) LM_DBG("matched pres-rules\n"); xuri->type = PRES_RULES; xuri->auid.len = 10; + } else if(s.len>34 && strncmp(s.s, "org.openmobilealliance.pres-rules/", 34)==0) { + LM_DBG("matched oma pres-rules\n"); + xuri->type = PRES_RULES; + xuri->auid.len = 33; } else if(s.len>13 && strncmp(s.s, "rls-services/", 13)==0) { LM_DBG("matched rls-services\n"); xuri->type = RLS_SERVICE;

14 years, 4 months

releasing v3.1.0 on Oct 6

by Daniel-Constantin Mierla

Hello, I am proposing to release the next major version in about one week and a half, Wednesday, Oct 6. Stability of new features looks very good, it was an extended tresting period since couple of weeks overlapped yearly common summer holidays. Now we need to put a bit of efforts in migration documentation. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

14 years, 4 months

git:master: core: switch(string) memleak fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 6ab93de37f2f1991d3406f52ac9502a7c795ef55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ab93de… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Sep 26 21:28:47 2010 +0200 core: switch(string) memleak fix When a switch(string) is used and one of the case blocks exits the script (by drop, exit or a module function that causes the script to end), the dynamic string rvals were not cleaned up. This happened because run_actions() uses longjmp() to quickly end the script (skipping this way over the cleanups done after the run_actions() call). Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> Reported-by: C�sar Pinto Mag�n Cesar.Pinto a-e es --- action.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/action.c b/action.c index 8349ff9..ec098ff 100644 --- a/action.c +++ b/action.c @@ -1320,17 +1320,39 @@ sw_jt_def: regexec(mct->match[i].l.regex, s.s, 0, 0, 0) == 0) ){ if (likely(mct->jump[i])){ + /* make sure we cleanup first, in case run_actions() + exits the script directly via longjmp() */ + if (rv1){ + rval_destroy(rv1); + rval_destroy(rv); + rval_cache_clean(&c1); + }else if (rv){ + rval_destroy(rv); + rval_cache_clean(&c1); + } ret=run_actions(h, mct->jump[i], msg); h->run_flags &= ~BREAK_R_F; /* catch breaks, but let returns passthrough */ + break; } goto match_cleanup; } match_cond_def: if (mct->def){ + /* make sure we cleanup first, in case run_actions() + exits the script directly via longjmp() */ + if (rv1){ + rval_destroy(rv1); + rval_destroy(rv); + rval_cache_clean(&c1); + }else if (rv){ + rval_destroy(rv); + rval_cache_clean(&c1); + } ret=run_actions(h, mct->def, msg); h->run_flags &= ~BREAK_R_F; /* catch breaks, but let returns passthrough */ + break; } match_cleanup: if (rv1){

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev